summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2018-04-10 04:35:05 +0000
committerTom Stellard <tstellar@redhat.com>2018-04-10 04:35:05 +0000
commitd88ca2927027d254931437c6f6c83f43724945af (patch)
tree114a05537c4db584d270728f32a9b60041845f27
parent2b9ba6c2236f4605b9c31b222fe7cd6ae5cca7a2 (diff)
Merging r328755:
------------------------------------------------------------------------ r328755 | gbiv | 2018-03-28 20:12:03 -0700 (Wed, 28 Mar 2018) | 10 lines [MemorySSA] Turn an assert into a condition Eli pointed out that variadic functions are totally a thing, so this assert is incorrect. No test-case is provided, since the only way this assert fires is if a specific DenseMap falls back to doing `isEqual` checks, and that seems fairly brittle (and requires a pyramid of growing `call void (i8, ...) @varargs(i8 0)`). ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_60@329670 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Analysis/MemorySSA.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Analysis/MemorySSA.cpp b/lib/Analysis/MemorySSA.cpp
index 137b2022e84..09605f61fa9 100644
--- a/lib/Analysis/MemorySSA.cpp
+++ b/lib/Analysis/MemorySSA.cpp
@@ -159,8 +159,8 @@ public:
if (CS.getCalledValue() != Other.CS.getCalledValue())
return false;
- assert(CS.arg_size() == Other.CS.arg_size());
- return std::equal(CS.arg_begin(), CS.arg_end(), Other.CS.arg_begin());
+ return CS.arg_size() == Other.CS.arg_size() &&
+ std::equal(CS.arg_begin(), CS.arg_end(), Other.CS.arg_begin());
}
private: