From b97e2788ff303e83eab8d24960966bfde05e6a37 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 1 Feb 2004 01:23:19 +0000 Subject: [PATCH] Fix a crasher bug in my constant folding rewrite git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11044 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/VMCore/ConstantFold.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/VMCore/ConstantFold.cpp b/lib/VMCore/ConstantFold.cpp index 094ec373f10..28d671b898c 100644 --- a/lib/VMCore/ConstantFold.cpp +++ b/lib/VMCore/ConstantFold.cpp @@ -625,11 +625,18 @@ static Instruction::BinaryOps evaluateRelation(const Constant *V1, // If the first operand is simple, swap operands. assert((isa(V2) || isa(V2)) && "Simple cases should have been handled by caller!"); - return SetCondInst::getSwappedCondition(evaluateRelation(V2, V1)); + Instruction::BinaryOps SwappedRelation = evaluateRelation(V2, V1); + if (SwappedRelation != Instruction::BinaryOpsEnd) + return SetCondInst::getSwappedCondition(SwappedRelation); } else if (const ConstantPointerRef *CPR1 = dyn_cast(V1)){ - if (isa(V2)) // Swap as necessary. - return SetCondInst::getSwappedCondition(evaluateRelation(V2, V1)); + if (isa(V2)) { // Swap as necessary. + Instruction::BinaryOps SwappedRelation = evaluateRelation(V2, V1); + if (SwappedRelation != Instruction::BinaryOpsEnd) + return SetCondInst::getSwappedCondition(SwappedRelation); + else + return Instruction::BinaryOpsEnd; + } // Now we know that the RHS is a ConstantPointerRef or simple constant, // which (since the types must match) means that it's a ConstantPointerNull. -- 2.34.1