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 | 205d1acfbaca2987757f52a3028f001fe05080b2 (patch) | |
| tree | 20c10522ed3051816d7aea1c44a755e55513be83 /llvm/lib/Analysis/DataStructure/DataStructure.cpp | |
| parent | 992abdae26b95b411c0cba12366765f88f59f84e (diff) | |
| download | bcm5719-llvm-205d1acfbaca2987757f52a3028f001fe05080b2.tar.gz bcm5719-llvm-205d1acfbaca2987757f52a3028f001fe05080b2.zip | |
Fix minor bug in previous checkin
llvm-svn: 6986
Diffstat (limited to 'llvm/lib/Analysis/DataStructure/DataStructure.cpp')
| -rw-r--r-- | llvm/lib/Analysis/DataStructure/DataStructure.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/llvm/lib/Analysis/DataStructure/DataStructure.cpp b/llvm/lib/Analysis/DataStructure/DataStructure.cpp index b2eac93fda7..ea593de2f56 100644 --- a/llvm/lib/Analysis/DataStructure/DataStructure.cpp +++ b/llvm/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; |
