From 13e04aef2ae496acb73020461d22ad593b78cf9b Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Thu, 27 Jan 2011 08:38:19 +0000 Subject: Fix surprising missed optimization in mergefunc where we forgot to consider that relationships like "i8* null" is equivalent to "i32* null". llvm-svn: 124368 --- llvm/lib/Transforms/IPO/MergeFunctions.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Transforms/IPO/MergeFunctions.cpp') diff --git a/llvm/lib/Transforms/IPO/MergeFunctions.cpp b/llvm/lib/Transforms/IPO/MergeFunctions.cpp index 1e328ca6819..fb55d7ce4f0 100644 --- a/llvm/lib/Transforms/IPO/MergeFunctions.cpp +++ b/llvm/lib/Transforms/IPO/MergeFunctions.cpp @@ -460,9 +460,18 @@ bool FunctionComparator::Enumerate(const Value *V1, const Value *V2) { if (V1 == F2 && V2 == F1) return true; - // TODO: constant expressions with GEP or references to F1 or F2. - if (isa(V1)) - return V1 == V2; + if (isa(V1)) { + if (V1 == V2) return true; + const Constant *C1 = cast(V1); + const Constant *C2 = dyn_cast(V2); + if (!C2) return false; + // TODO: constant expressions with GEP or references to F1 or F2. + if (C1->isNullValue() && C2->isNullValue() && + isEquivalentType(C1->getType(), C2->getType())) + return true; + return C1->getType()->canLosslesslyBitCastTo(C2->getType()) && + C1 == ConstantExpr::getBitCast(const_cast(C2), C1->getType()); + } if (isa(V1) && isa(V2)) { const InlineAsm *IA1 = cast(V1); -- cgit v1.2.3