diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2011-01-26 09:13:58 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2011-01-26 09:13:58 +0000 |
| commit | 82d4db86620e66d623b0998878fab3673764fbb8 (patch) | |
| tree | 92bd673c0329bb5b5d3f288a44f9992054792c11 /llvm/lib/Transforms | |
| parent | fb622f99206f3f3b540f624223f689b90e4172f1 (diff) | |
| download | bcm5719-llvm-82d4db86620e66d623b0998878fab3673764fbb8.tar.gz bcm5719-llvm-82d4db86620e66d623b0998878fab3673764fbb8.zip | |
Teach mergefunc that intptr_t is the same width as a pointer. We still can't
merge vector<intptr_t>::push_back() and vector<void*>::push_back() because
Enumerate() doesn't realize that "i64* null" and "i8** null" are equivalent.
llvm-svn: 124285
Diffstat (limited to 'llvm/lib/Transforms')
| -rw-r--r-- | llvm/lib/Transforms/IPO/MergeFunctions.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/IPO/MergeFunctions.cpp b/llvm/lib/Transforms/IPO/MergeFunctions.cpp index 8aa7cb24b95..49679baaeb7 100644 --- a/llvm/lib/Transforms/IPO/MergeFunctions.cpp +++ b/llvm/lib/Transforms/IPO/MergeFunctions.cpp @@ -286,8 +286,14 @@ bool FunctionComparator::isEquivalentType(const Type *Ty1, const Type *Ty2) const { if (Ty1 == Ty2) return true; - if (Ty1->getTypeID() != Ty2->getTypeID()) + if (Ty1->getTypeID() != Ty2->getTypeID()) { + if (TD) { + LLVMContext &Ctx = Ty1->getContext(); + if (isa<PointerType>(Ty1) && Ty2 == TD->getIntPtrType(Ctx)) return true; + if (isa<PointerType>(Ty2) && Ty1 == TD->getIntPtrType(Ctx)) return true; + } return false; + } switch(Ty1->getTypeID()) { default: |
