[llvm-branch-commits] [llvm-branch] r329670 - Merging r328755:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Apr  9 21:35:05 2018
New Revision: 329670

URL: http://llvm.org/viewvc/llvm-project?rev=329670&view=rev
Log:
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)`).

------------------------------------------------------------------------

Modified:
    llvm/branches/release_60/lib/Analysis/MemorySSA.cpp

Modified: llvm/branches/release_60/lib/Analysis/MemorySSA.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/Analysis/MemorySSA.cpp?rev=329670&r1=329669&r2=329670&view=diff
==============================================================================
--- llvm/branches/release_60/lib/Analysis/MemorySSA.cpp (original)
+++ llvm/branches/release_60/lib/Analysis/MemorySSA.cpp Mon Apr  9 21:35:05 2018
@@ -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: