diff options
Diffstat (limited to 'lib/Analysis/DataStructure/DataStructure.cpp')
| -rw-r--r-- | lib/Analysis/DataStructure/DataStructure.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index b2eac93fda..ea593de2f5 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -406,9 +406,7 @@ bool DSNode::mergeTypeInfo(const Type *NewTy, unsigned Offset, // 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; |