diff options
| author | Chris Lattner <sabre@nondot.org> | 2003-06-29 22:36:31 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2003-06-29 22:36:31 +0000 |
| commit | 06e24c8447203a69b428cac0120f75f174970130 (patch) | |
| tree | 1f8d14d4055f19807ea63ffc867a65c5326ba3b8 /lib/Analysis/DataStructure/DataStructure.cpp | |
| parent | 919ffbf9774715bed49e01713e64c211cbc84d26 (diff) | |
Fix minor bug in previous checkin
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6986 91177308-0d34-0410-b5e6-96231b3b80d8
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; |