From 08de1e476c8404cf49ea37e4268b5ca7b90e0795 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Sat, 17 May 2008 19:00:05 +0000 Subject: [PATCH] Revert constant-folding change that will miscompile in some cases. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51223 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/VMCore/ConstantFold.cpp | 23 ------------------- .../InstCombine/2008-05-17-FoldIntToPtr.ll | 8 ------- 2 files changed, 31 deletions(-) diff --git a/lib/VMCore/ConstantFold.cpp b/lib/VMCore/ConstantFold.cpp index 07df0bfba05..0913c481ad8 100644 --- a/lib/VMCore/ConstantFold.cpp +++ b/lib/VMCore/ConstantFold.cpp @@ -1029,29 +1029,6 @@ static ICmpInst::Predicate evaluateICmpRelation(const Constant *V1, } break; - case Instruction::PtrToInt: - case Instruction::IntToPtr: - // inttoptr(x1) != inttoptr(x2) iff x1 != x2 - if (const ConstantExpr *CE2 = dyn_cast(V2)) - if (CE1->getOpcode() == CE2->getOpcode()) { - Constant *Op1 = const_cast(CE1Op0); - Constant *Op2 = CE2->getOperand(0); - if (Op1->getType() == Op2->getType()) { - ConstantInt *R = 0; - - ICmpInst::Predicate pred = ICmpInst::ICMP_EQ; - R = dyn_cast(ConstantExpr::getICmp(pred, Op1, Op2)); - if (R && !R->isZero()) - return pred; - - pred = ICmpInst::ICMP_NE; - R = dyn_cast(ConstantExpr::getICmp(pred, Op1, Op2)); - if (R && !R->isZero()) - return pred; - } - } - break; - case Instruction::GetElementPtr: // Ok, since this is a getelementptr, we know that the constant has a // pointer type. Check the various cases. diff --git a/test/Transforms/InstCombine/2008-05-17-FoldIntToPtr.ll b/test/Transforms/InstCombine/2008-05-17-FoldIntToPtr.ll index 1d93294fe45..e69de29bb2d 100644 --- a/test/Transforms/InstCombine/2008-05-17-FoldIntToPtr.ll +++ b/test/Transforms/InstCombine/2008-05-17-FoldIntToPtr.ll @@ -1,8 +0,0 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i1 false} -; PR2329 - -define i1 @f() { - %x = icmp eq i8* inttoptr (i32 1 to i8*), inttoptr (i32 2 to i8*) - ret i1 %x -} -