Fix minor bug in previous checkin
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6986 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index b2eac93..ea593de 100644
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -406,9 +406,7 @@
// Ok, we are getting desperate now. Check for physical subtyping, where we
// just require each element in the node to be compatible.
- assert(NewTySize <= SubTypeSize &&
- "Expected smaller type merging into this one!");
- if (NewTySize && NewTySize < 256 &&
+ if (NewTySize <= SubTypeSize && NewTySize && NewTySize < 256 &&
SubTypeSize && SubTypeSize < 256 &&
ElementTypesAreCompatible(NewTy, SubType))
return false;