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 | 207c193e7e9cc177115101333079e952a7676689 (patch) | |
| tree | e25ac62bae748f6babb901de05176de38a1d5dd9 /lib/Transforms/IPO/MergeFunctions.cpp | |
| parent | 388f4918fbd8349a6c5b8403e31f65aa3408add6 (diff) | |
| download | llvm-207c193e7e9cc177115101333079e952a7676689.tar.gz llvm-207c193e7e9cc177115101333079e952a7676689.tar.bz2 llvm-207c193e7e9cc177115101333079e952a7676689.tar.xz | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@124285 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/IPO/MergeFunctions.cpp')
| -rw-r--r-- | lib/Transforms/IPO/MergeFunctions.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/Transforms/IPO/MergeFunctions.cpp b/lib/Transforms/IPO/MergeFunctions.cpp index 8aa7cb24b9..49679baaeb 100644 --- a/lib/Transforms/IPO/MergeFunctions.cpp +++ b/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: |