[llvm-commits] [llvm] r76598 - in /llvm/trunk: include/llvm/ lib/Analysis/ lib/AsmParser/ lib/CodeGen/SelectionDAG/ lib/Transforms/IPO/ lib/Transforms/Scalar/ lib/VMCore/
Daniel Dunbar
daniel at zuster.org
Tue Jul 21 13:36:17 PDT 2009
Hi Owen,
Before forging on with more LLVMContextification, can you please fix
the Pass interfaces? See the comments from Bob, Devang, and myself.
- Daniel
On Tue, Jul 21, 2009 at 11:03 AM, Owen Anderson<resistor at mac.com> wrote:
> Author: resistor
> Date: Tue Jul 21 13:03:38 2009
> New Revision: 76598
>
> URL: http://llvm.org/viewvc/llvm-project?rev=76598&view=rev
> Log:
> Rename getConstantInt{True|False} to get{True|False} at Chris' behest.
>
> Modified:
> llvm/trunk/include/llvm/LLVMContext.h
> llvm/trunk/lib/Analysis/SparsePropagation.cpp
> llvm/trunk/lib/AsmParser/LLParser.cpp
> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
> llvm/trunk/lib/Transforms/Scalar/GVN.cpp
> llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
> llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp
> llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
> llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp
> llvm/trunk/lib/Transforms/Scalar/SCCP.cpp
> llvm/trunk/lib/VMCore/ConstantFold.cpp
> llvm/trunk/lib/VMCore/LLVMContext.cpp
> llvm/trunk/lib/VMCore/LLVMContextImpl.h
>
> Modified: llvm/trunk/include/llvm/LLVMContext.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LLVMContext.h?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/LLVMContext.h (original)
> +++ llvm/trunk/include/llvm/LLVMContext.h Tue Jul 21 13:03:38 2009
> @@ -68,8 +68,8 @@
> UndefValue* getUndef(const Type* Ty);
>
> // ConstantInt accessors
> - ConstantInt* getConstantIntTrue();
> - ConstantInt* getConstantIntFalse();
> + ConstantInt* getTrue();
> + ConstantInt* getFalse();
>
> /// If Ty is a vector type, return a Constant with a splat of the given
> /// value. Otherwise return a ConstantInt for the given value.
>
> Modified: llvm/trunk/lib/Analysis/SparsePropagation.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/SparsePropagation.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Analysis/SparsePropagation.cpp (original)
> +++ llvm/trunk/lib/Analysis/SparsePropagation.cpp Tue Jul 21 13:03:38 2009
> @@ -154,7 +154,7 @@
> }
>
> // Constant condition variables mean the branch can only go a single way
> - Succs[C == Context->getConstantIntFalse()] = true;
> + Succs[C == Context->getFalse()] = true;
> return;
> }
>
>
> Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
> +++ llvm/trunk/lib/AsmParser/LLParser.cpp Tue Jul 21 13:03:38 2009
> @@ -1706,11 +1706,11 @@
> ID.Kind = ValID::t_APFloat;
> break;
> case lltok::kw_true:
> - ID.ConstantVal = Context.getConstantIntTrue();
> + ID.ConstantVal = Context.getTrue();
> ID.Kind = ValID::t_Constant;
> break;
> case lltok::kw_false:
> - ID.ConstantVal = Context.getConstantIntFalse();
> + ID.ConstantVal = Context.getFalse();
> ID.Kind = ValID::t_Constant;
> break;
> case lltok::kw_null: ID.Kind = ValID::t_Null; break;
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Jul 21 13:03:38 2009
> @@ -1149,7 +1149,7 @@
> }
>
> // Create a CaseBlock record representing this branch.
> - CaseBlock CB(ISD::SETEQ, Cond, DAG.getContext()->getConstantIntTrue(),
> + CaseBlock CB(ISD::SETEQ, Cond, DAG.getContext()->getTrue(),
> NULL, TBB, FBB, CurBB);
> SwitchCases.push_back(CB);
> }
> @@ -1304,7 +1304,7 @@
> }
>
> // Create a CaseBlock record representing this branch.
> - CaseBlock CB(ISD::SETEQ, CondVal, DAG.getContext()->getConstantIntTrue(),
> + CaseBlock CB(ISD::SETEQ, CondVal, DAG.getContext()->getTrue(),
> NULL, Succ0MBB, Succ1MBB, CurMBB);
> // Use visitSwitchCase to actually insert the fast branch sequence for this
> // cond branch.
> @@ -1322,10 +1322,10 @@
> if (CB.CmpMHS == NULL) {
> // Fold "(X == true)" to X and "(X == false)" to !X to
> // handle common cases produced by branch lowering.
> - if (CB.CmpRHS == DAG.getContext()->getConstantIntTrue() &&
> + if (CB.CmpRHS == DAG.getContext()->getTrue() &&
> CB.CC == ISD::SETEQ)
> Cond = CondLHS;
> - else if (CB.CmpRHS == DAG.getContext()->getConstantIntFalse() &&
> + else if (CB.CmpRHS == DAG.getContext()->getFalse() &&
> CB.CC == ISD::SETEQ) {
> SDValue True = DAG.getConstant(1, CondLHS.getValueType());
> Cond = DAG.getNode(ISD::XOR, dl, CondLHS.getValueType(), CondLHS, True);
>
> Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Tue Jul 21 13:03:38 2009
> @@ -865,7 +865,7 @@
> GlobalVariable *InitBool =
> new GlobalVariable(*Context, Type::Int1Ty, false,
> GlobalValue::InternalLinkage,
> - Context->getConstantIntFalse(), GV->getName()+".init",
> + Context->getFalse(), GV->getName()+".init",
> GV->isThreadLocal());
> bool InitBoolUsed = false;
>
> @@ -886,7 +886,7 @@
> default: llvm_unreachable("Unknown ICmp Predicate!");
> case ICmpInst::ICMP_ULT:
> case ICmpInst::ICMP_SLT:
> - LV = Context->getConstantIntFalse(); // X < null -> always false
> + LV = Context->getFalse(); // X < null -> always false
> break;
> case ICmpInst::ICMP_ULE:
> case ICmpInst::ICMP_SLE:
> @@ -908,7 +908,7 @@
> } else {
> StoreInst *SI = cast<StoreInst>(GV->use_back());
> // The global is initialized when the store to it occurs.
> - new StoreInst(Context->getConstantIntTrue(), InitBool, SI);
> + new StoreInst(Context->getTrue(), InitBool, SI);
> SI->eraseFromParent();
> }
>
> @@ -1583,7 +1583,7 @@
>
> // Create the new global, initializing it to false.
> GlobalVariable *NewGV = new GlobalVariable(*Context, Type::Int1Ty, false,
> - GlobalValue::InternalLinkage, Context->getConstantIntFalse(),
> + GlobalValue::InternalLinkage, Context->getFalse(),
> GV->getName()+".b",
> GV->isThreadLocal());
> GV->getParent()->getGlobalList().insert(GV, NewGV);
>
> Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Tue Jul 21 13:03:38 2009
> @@ -1384,9 +1384,9 @@
> BasicBlock* falseSucc = BI->getSuccessor(1);
>
> if (trueSucc->getSinglePredecessor())
> - localAvail[trueSucc]->table[condVN] = Context->getConstantIntTrue();
> + localAvail[trueSucc]->table[condVN] = Context->getTrue();
> if (falseSucc->getSinglePredecessor())
> - localAvail[falseSucc]->table[condVN] = Context->getConstantIntFalse();
> + localAvail[falseSucc]->table[condVN] = Context->getFalse();
>
> return false;
>
>
> Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Jul 21 13:03:38 2009
> @@ -2876,8 +2876,8 @@
> *I = SI->getOperand(NonNullOperand);
> AddToWorkList(BBI);
> } else if (*I == SelectCond) {
> - *I = NonNullOperand == 1 ? Context->getConstantIntTrue() :
> - Context->getConstantIntFalse();
> + *I = NonNullOperand == 1 ? Context->getTrue() :
> + Context->getFalse();
> AddToWorkList(BBI);
> }
> }
> @@ -3371,7 +3371,7 @@
> LLVMContext *Context) {
> switch (code) {
> default: llvm_unreachable("Illegal ICmp code!");
> - case 0: return Context->getConstantIntFalse();
> + case 0: return Context->getFalse();
> case 1:
> if (sign)
> return new ICmpInst(*Context, ICmpInst::ICMP_SGT, LHS, RHS);
> @@ -3394,7 +3394,7 @@
> return new ICmpInst(*Context, ICmpInst::ICMP_SLE, LHS, RHS);
> else
> return new ICmpInst(*Context, ICmpInst::ICMP_ULE, LHS, RHS);
> - case 7: return Context->getConstantIntTrue();
> + case 7: return Context->getTrue();
> }
> }
>
> @@ -3440,7 +3440,7 @@
> return new FCmpInst(*Context, FCmpInst::FCMP_OLE, LHS, RHS);
> else
> return new FCmpInst(*Context, FCmpInst::FCMP_ULE, LHS, RHS);
> - case 7: return Context->getConstantIntTrue();
> + case 7: return Context->getTrue();
> }
> }
>
> @@ -3825,7 +3825,7 @@
> case ICmpInst::ICMP_EQ: // (X == 13 & X == 15) -> false
> case ICmpInst::ICMP_UGT: // (X == 13 & X > 15) -> false
> case ICmpInst::ICMP_SGT: // (X == 13 & X > 15) -> false
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> case ICmpInst::ICMP_NE: // (X == 13 & X != 15) -> X == 13
> case ICmpInst::ICMP_ULT: // (X == 13 & X < 15) -> X == 13
> case ICmpInst::ICMP_SLT: // (X == 13 & X < 15) -> X == 13
> @@ -3863,7 +3863,7 @@
> default: llvm_unreachable("Unknown integer condition code!");
> case ICmpInst::ICMP_EQ: // (X u< 13 & X == 15) -> false
> case ICmpInst::ICMP_UGT: // (X u< 13 & X u> 15) -> false
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> case ICmpInst::ICMP_SGT: // (X u< 13 & X s> 15) -> no change
> break;
> case ICmpInst::ICMP_NE: // (X u< 13 & X != 15) -> X u< 13
> @@ -3878,7 +3878,7 @@
> default: llvm_unreachable("Unknown integer condition code!");
> case ICmpInst::ICMP_EQ: // (X s< 13 & X == 15) -> false
> case ICmpInst::ICMP_SGT: // (X s< 13 & X s> 15) -> false
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> case ICmpInst::ICMP_UGT: // (X s< 13 & X u> 15) -> no change
> break;
> case ICmpInst::ICMP_NE: // (X s< 13 & X != 15) -> X < 13
> @@ -4211,7 +4211,7 @@
> // If either of the constants are nans, then the whole thing returns
> // false.
> if (LHSC->getValueAPF().isNaN() || RHSC->getValueAPF().isNaN())
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> return new FCmpInst(*Context, FCmpInst::FCMP_ORD,
> LHS->getOperand(0), RHS->getOperand(0));
> }
> @@ -4234,7 +4234,7 @@
> Op0LHS, Op0RHS);
> else if (Op0CC == FCmpInst::FCMP_FALSE ||
> Op1CC == FCmpInst::FCMP_FALSE)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> else if (Op0CC == FCmpInst::FCMP_TRUE)
> return ReplaceInstUsesWith(I, Op1);
> else if (Op1CC == FCmpInst::FCMP_TRUE)
> @@ -4256,7 +4256,7 @@
> // uno && oeq -> uno && (ord && eq) -> false
> // uno && ord -> false
> if (!Op0Ordered)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> // ord && ueq -> ord && (uno || eq) -> oeq
> return cast<Instruction>(getFCmpValue(true, Op1Pred,
> Op0LHS, Op0RHS, Context));
> @@ -4541,7 +4541,7 @@
> case ICmpInst::ICMP_NE: // (X != 13 | X != 15) -> true
> case ICmpInst::ICMP_ULT: // (X != 13 | X u< 15) -> true
> case ICmpInst::ICMP_SLT: // (X != 13 | X s< 15) -> true
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> }
> break;
> case ICmpInst::ICMP_ULT:
> @@ -4596,7 +4596,7 @@
> break;
> case ICmpInst::ICMP_NE: // (X u> 13 | X != 15) -> true
> case ICmpInst::ICMP_ULT: // (X u> 13 | X u< 15) -> true
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> case ICmpInst::ICMP_SLT: // (X u> 13 | X s< 15) -> no change
> break;
> }
> @@ -4611,7 +4611,7 @@
> break;
> case ICmpInst::ICMP_NE: // (X s> 13 | X != 15) -> true
> case ICmpInst::ICMP_SLT: // (X s> 13 | X s< 15) -> true
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> case ICmpInst::ICMP_ULT: // (X s> 13 | X u< 15) -> no change
> break;
> }
> @@ -4919,7 +4919,7 @@
> // If either of the constants are nans, then the whole thing returns
> // true.
> if (LHSC->getValueAPF().isNaN() || RHSC->getValueAPF().isNaN())
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
>
> // Otherwise, no need to compare the two constants, compare the
> // rest.
> @@ -4945,7 +4945,7 @@
> Op0LHS, Op0RHS);
> else if (Op0CC == FCmpInst::FCMP_TRUE ||
> Op1CC == FCmpInst::FCMP_TRUE)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> else if (Op0CC == FCmpInst::FCMP_FALSE)
> return ReplaceInstUsesWith(I, Op1);
> else if (Op1CC == FCmpInst::FCMP_FALSE)
> @@ -5037,7 +5037,7 @@
>
>
> if (ConstantInt *RHS = dyn_cast<ConstantInt>(Op1)) {
> - if (RHS == Context->getConstantIntTrue() && Op0->hasOneUse()) {
> + if (RHS == Context->getTrue() && Op0->hasOneUse()) {
> // xor (cmp A, B), true = not (cmp A, B) = !cmp A, B
> if (ICmpInst *ICI = dyn_cast<ICmpInst>(Op0))
> return new ICmpInst(*Context, ICI->getInversePredicate(),
> @@ -5055,7 +5055,7 @@
> Instruction::CastOps Opcode = Op0C->getOpcode();
> if (Opcode == Instruction::ZExt || Opcode == Instruction::SExt) {
> if (RHS == Context->getConstantExprCast(Opcode,
> - Context->getConstantIntTrue(),
> + Context->getTrue(),
> Op0C->getDestTy())) {
> Instruction *NewCI = InsertNewInstBefore(CmpInst::Create(
> *Context,
> @@ -5706,9 +5706,9 @@
> Pred = ICmpInst::ICMP_NE;
> break;
> case FCmpInst::FCMP_ORD:
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> case FCmpInst::FCMP_UNO:
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> }
>
> const IntegerType *IntTy = cast<IntegerType>(LHSI->getOperand(0)->getType());
> @@ -5728,8 +5728,8 @@
> if (SMax.compare(RHS) == APFloat::cmpLessThan) { // smax < 13123.0
> if (Pred == ICmpInst::ICMP_NE || Pred == ICmpInst::ICMP_SLT ||
> Pred == ICmpInst::ICMP_SLE)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> }
> } else {
> // If the RHS value is > UnsignedMax, fold the comparison. This handles
> @@ -5740,8 +5740,8 @@
> if (UMax.compare(RHS) == APFloat::cmpLessThan) { // umax < 13123.0
> if (Pred == ICmpInst::ICMP_NE || Pred == ICmpInst::ICMP_ULT ||
> Pred == ICmpInst::ICMP_ULE)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> }
> }
>
> @@ -5753,8 +5753,8 @@
> if (SMin.compare(RHS) == APFloat::cmpGreaterThan) { // smin > 12312.0
> if (Pred == ICmpInst::ICMP_NE || Pred == ICmpInst::ICMP_SGT ||
> Pred == ICmpInst::ICMP_SGE)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> }
> }
>
> @@ -5776,14 +5776,14 @@
> switch (Pred) {
> default: llvm_unreachable("Unexpected integer comparison!");
> case ICmpInst::ICMP_NE: // (float)int != 4.4 --> true
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> case ICmpInst::ICMP_EQ: // (float)int == 4.4 --> false
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> case ICmpInst::ICMP_ULE:
> // (float)int <= 4.4 --> int <= 4
> // (float)int <= -4.4 --> false
> if (RHS.isNegative())
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> break;
> case ICmpInst::ICMP_SLE:
> // (float)int <= 4.4 --> int <= 4
> @@ -5795,7 +5795,7 @@
> // (float)int < -4.4 --> false
> // (float)int < 4.4 --> int <= 4
> if (RHS.isNegative())
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> Pred = ICmpInst::ICMP_ULE;
> break;
> case ICmpInst::ICMP_SLT:
> @@ -5808,7 +5808,7 @@
> // (float)int > 4.4 --> int > 4
> // (float)int > -4.4 --> true
> if (RHS.isNegative())
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> break;
> case ICmpInst::ICMP_SGT:
> // (float)int > 4.4 --> int > 4
> @@ -5820,7 +5820,7 @@
> // (float)int >= -4.4 --> true
> // (float)int >= 4.4 --> int > 4
> if (!RHS.isNegative())
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> Pred = ICmpInst::ICMP_UGT;
> break;
> case ICmpInst::ICMP_SGE:
> @@ -5844,9 +5844,9 @@
>
> // Fold trivial predicates.
> if (I.getPredicate() == FCmpInst::FCMP_FALSE)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> if (I.getPredicate() == FCmpInst::FCMP_TRUE)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
>
> // Simplify 'fcmp pred X, X'
> if (Op0 == Op1) {
> @@ -5855,11 +5855,11 @@
> case FCmpInst::FCMP_UEQ: // True if unordered or equal
> case FCmpInst::FCMP_UGE: // True if unordered, greater than, or equal
> case FCmpInst::FCMP_ULE: // True if unordered, less than, or equal
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> case FCmpInst::FCMP_OGT: // True if ordered and greater than
> case FCmpInst::FCMP_OLT: // True if ordered and less than
> case FCmpInst::FCMP_ONE: // True if ordered and operands are unequal
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
>
> case FCmpInst::FCMP_UNO: // True if unordered: isnan(X) | isnan(Y)
> case FCmpInst::FCMP_ULT: // True if unordered or less than
> @@ -5890,11 +5890,11 @@
> if (ConstantFP *CFP = dyn_cast<ConstantFP>(RHSC)) {
> if (CFP->getValueAPF().isNaN()) {
> if (FCmpInst::isOrdered(I.getPredicate())) // True if ordered and...
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> assert(FCmpInst::isUnordered(I.getPredicate()) &&
> "Comparison must be either ordered or unordered!");
> // True if unordered.
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> }
> }
>
> @@ -6044,22 +6044,22 @@
> default: break;
> case ICmpInst::ICMP_ULE:
> if (CI->isMaxValue(false)) // A <=u MAX -> TRUE
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> return new ICmpInst(*Context, ICmpInst::ICMP_ULT, Op0,
> AddOne(CI, Context));
> case ICmpInst::ICMP_SLE:
> if (CI->isMaxValue(true)) // A <=s MAX -> TRUE
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> return new ICmpInst(*Context, ICmpInst::ICMP_SLT, Op0,
> AddOne(CI, Context));
> case ICmpInst::ICMP_UGE:
> if (CI->isMinValue(false)) // A >=u MIN -> TRUE
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> return new ICmpInst(*Context, ICmpInst::ICMP_UGT, Op0,
> SubOne(CI, Context));
> case ICmpInst::ICMP_SGE:
> if (CI->isMinValue(true)) // A >=s MIN -> TRUE
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> return new ICmpInst(*Context, ICmpInst::ICMP_SGT, Op0,
> SubOne(CI, Context));
> }
> @@ -6119,17 +6119,17 @@
> default: llvm_unreachable("Unknown icmp opcode!");
> case ICmpInst::ICMP_EQ:
> if (Op0Max.ult(Op1Min) || Op0Min.ugt(Op1Max))
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> break;
> case ICmpInst::ICMP_NE:
> if (Op0Max.ult(Op1Min) || Op0Min.ugt(Op1Max))
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> break;
> case ICmpInst::ICMP_ULT:
> if (Op0Max.ult(Op1Min)) // A <u B -> true if max(A) < min(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> if (Op0Min.uge(Op1Max)) // A <u B -> false if min(A) >= max(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> if (Op1Min == Op0Max) // A <u B -> A != B if max(A) == min(B)
> return new ICmpInst(*Context, ICmpInst::ICMP_NE, Op0, Op1);
> if (ConstantInt *CI = dyn_cast<ConstantInt>(Op1)) {
> @@ -6145,9 +6145,9 @@
> break;
> case ICmpInst::ICMP_UGT:
> if (Op0Min.ugt(Op1Max)) // A >u B -> true if min(A) > max(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> if (Op0Max.ule(Op1Min)) // A >u B -> false if max(A) <= max(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
>
> if (Op1Max == Op0Min) // A >u B -> A != B if min(A) == max(B)
> return new ICmpInst(*Context, ICmpInst::ICMP_NE, Op0, Op1);
> @@ -6164,9 +6164,9 @@
> break;
> case ICmpInst::ICMP_SLT:
> if (Op0Max.slt(Op1Min)) // A <s B -> true if max(A) < min(C)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> if (Op0Min.sge(Op1Max)) // A <s B -> false if min(A) >= max(C)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> if (Op1Min == Op0Max) // A <s B -> A != B if max(A) == min(B)
> return new ICmpInst(*Context, ICmpInst::ICMP_NE, Op0, Op1);
> if (ConstantInt *CI = dyn_cast<ConstantInt>(Op1)) {
> @@ -6177,9 +6177,9 @@
> break;
> case ICmpInst::ICMP_SGT:
> if (Op0Min.sgt(Op1Max)) // A >s B -> true if min(A) > max(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> if (Op0Max.sle(Op1Min)) // A >s B -> false if max(A) <= min(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
>
> if (Op1Max == Op0Min) // A >s B -> A != B if min(A) == max(B)
> return new ICmpInst(*Context, ICmpInst::ICMP_NE, Op0, Op1);
> @@ -6192,30 +6192,30 @@
> case ICmpInst::ICMP_SGE:
> assert(!isa<ConstantInt>(Op1) && "ICMP_SGE with ConstantInt not folded!");
> if (Op0Min.sge(Op1Max)) // A >=s B -> true if min(A) >= max(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> if (Op0Max.slt(Op1Min)) // A >=s B -> false if max(A) < min(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> break;
> case ICmpInst::ICMP_SLE:
> assert(!isa<ConstantInt>(Op1) && "ICMP_SLE with ConstantInt not folded!");
> if (Op0Max.sle(Op1Min)) // A <=s B -> true if max(A) <= min(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> if (Op0Min.sgt(Op1Max)) // A <=s B -> false if min(A) > max(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> break;
> case ICmpInst::ICMP_UGE:
> assert(!isa<ConstantInt>(Op1) && "ICMP_UGE with ConstantInt not folded!");
> if (Op0Min.uge(Op1Max)) // A >=u B -> true if min(A) >= max(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> if (Op0Max.ult(Op1Min)) // A >=u B -> false if max(A) < min(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> break;
> case ICmpInst::ICMP_ULE:
> assert(!isa<ConstantInt>(Op1) && "ICMP_ULE with ConstantInt not folded!");
> if (Op0Max.ule(Op1Min)) // A <=u B -> true if max(A) <= min(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(I, Context->getTrue());
> if (Op0Min.ugt(Op1Max)) // A <=u B -> false if min(A) > max(B)
> - return ReplaceInstUsesWith(I, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(I, Context->getFalse());
> break;
> }
>
> @@ -6628,7 +6628,7 @@
> default: llvm_unreachable("Unhandled icmp opcode!");
> case ICmpInst::ICMP_EQ:
> if (LoOverflow && HiOverflow)
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(ICI, Context->getFalse());
> else if (HiOverflow)
> return new ICmpInst(*Context, DivIsSigned ? ICmpInst::ICMP_SGE :
> ICmpInst::ICMP_UGE, X, LoBound);
> @@ -6639,7 +6639,7 @@
> return InsertRangeTest(X, LoBound, HiBound, DivIsSigned, true, ICI);
> case ICmpInst::ICMP_NE:
> if (LoOverflow && HiOverflow)
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(ICI, Context->getTrue());
> else if (HiOverflow)
> return new ICmpInst(*Context, DivIsSigned ? ICmpInst::ICMP_SLT :
> ICmpInst::ICMP_ULT, X, LoBound);
> @@ -6651,16 +6651,16 @@
> case ICmpInst::ICMP_ULT:
> case ICmpInst::ICMP_SLT:
> if (LoOverflow == +1) // Low bound is greater than input range.
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(ICI, Context->getTrue());
> if (LoOverflow == -1) // Low bound is less than input range.
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(ICI, Context->getFalse());
> return new ICmpInst(*Context, Pred, X, LoBound);
> case ICmpInst::ICMP_UGT:
> case ICmpInst::ICMP_SGT:
> if (HiOverflow == +1) // High bound greater than input range.
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(ICI, Context->getFalse());
> else if (HiOverflow == -1) // High bound less than input range.
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(ICI, Context->getTrue());
> if (Pred == ICmpInst::ICMP_UGT)
> return new ICmpInst(*Context, ICmpInst::ICMP_UGE, X, HiBound);
> else
> @@ -6829,9 +6829,9 @@
> // As a special case, check to see if this means that the
> // result is always true or false now.
> if (ICI.getPredicate() == ICmpInst::ICMP_EQ)
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(ICI, Context->getFalse());
> if (ICI.getPredicate() == ICmpInst::ICMP_NE)
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(ICI, Context->getTrue());
> } else {
> ICI.setOperand(1, NewCst);
> Constant *NewAndCST;
> @@ -7252,9 +7252,9 @@
> // First, handle some easy cases. We know the result cannot be equal at this
> // point so handle the ICI.isEquality() cases
> if (ICI.getPredicate() == ICmpInst::ICMP_EQ)
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntFalse());
> + return ReplaceInstUsesWith(ICI, Context->getFalse());
> if (ICI.getPredicate() == ICmpInst::ICMP_NE)
> - return ReplaceInstUsesWith(ICI, Context->getConstantIntTrue());
> + return ReplaceInstUsesWith(ICI, Context->getTrue());
>
> // Evaluate the comparison for LT (we invert for GT below). LE and GE cases
> // should have been folded away previously and not enter in here.
> @@ -7262,9 +7262,9 @@
> if (isSignedCmp) {
> // We're performing a signed comparison.
> if (cast<ConstantInt>(CI)->getValue().isNegative())
> - Result = Context->getConstantIntFalse(); // X < (small) --> false
> + Result = Context->getFalse(); // X < (small) --> false
> else
> - Result = Context->getConstantIntTrue(); // X < (large) --> true
> + Result = Context->getTrue(); // X < (large) --> true
> } else {
> // We're performing an unsigned comparison.
> if (isSignedExt) {
> @@ -7275,7 +7275,7 @@
> LHSCIOp, NegOne, ICI.getName()), ICI);
> } else {
> // Unsigned extend & unsigned compare -> always true.
> - Result = Context->getConstantIntTrue();
> + Result = Context->getTrue();
> }
> }
>
> @@ -8406,7 +8406,7 @@
> // cast (xor bool X, true) to int --> xor (cast bool X to int), 1
> if (isa<ZExtInst>(CI) && SrcBitSize == 1 &&
> SrcI->getOpcode() == Instruction::Xor &&
> - Op1 == Context->getConstantIntTrue() &&
> + Op1 == Context->getTrue() &&
> (!Op0->hasOneUse() || !isa<CmpInst>(Op0))) {
> Value *New = InsertCastBefore(Instruction::ZExt, Op0, DestTy, CI);
> return BinaryOperator::CreateXor(New,
> @@ -10021,7 +10021,7 @@
> Instruction *OldCall = CS.getInstruction();
> // If the call and callee calling conventions don't match, this call must
> // be unreachable, as the call is undefined.
> - new StoreInst(Context->getConstantIntTrue(),
> + new StoreInst(Context->getTrue(),
> Context->getUndef(Context->getPointerTypeUnqual(Type::Int1Ty)),
> OldCall);
> if (!OldCall->use_empty())
> @@ -10035,7 +10035,7 @@
> // This instruction is not reachable, just remove it. We insert a store to
> // undef so that we know that this code is not reachable, despite the fact
> // that we can't modify the CFG here.
> - new StoreInst(Context->getConstantIntTrue(),
> + new StoreInst(Context->getTrue(),
> Context->getUndef(Context->getPointerTypeUnqual(Type::Int1Ty)),
> CS.getInstruction());
>
> @@ -10046,7 +10046,7 @@
> if (InvokeInst *II = dyn_cast<InvokeInst>(CS.getInstruction())) {
> // Don't break the CFG, insert a dummy cond branch.
> BranchInst::Create(II->getNormalDest(), II->getUnwindDest(),
> - Context->getConstantIntTrue(), II);
> + Context->getTrue(), II);
> }
> return EraseInstFromFunction(*CS.getInstruction());
> }
> @@ -11354,7 +11354,7 @@
> // free undef -> unreachable.
> if (isa<UndefValue>(Op)) {
> // Insert a new store to null because we cannot modify the CFG here.
> - new StoreInst(Context->getConstantIntTrue(),
> + new StoreInst(Context->getTrue(),
> Context->getUndef(Context->getPointerTypeUnqual(Type::Int1Ty)), &FI);
> return EraseInstFromFunction(FI);
> }
>
> Modified: llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp Tue Jul 21 13:03:38 2009
> @@ -718,7 +718,7 @@
> // Next, figure out which successor we are threading to.
> BasicBlock *SuccBB;
> if (BranchInst *BI = dyn_cast<BranchInst>(BB->getTerminator()))
> - SuccBB = BI->getSuccessor(PredCst == Context->getConstantIntFalse());
> + SuccBB = BI->getSuccessor(PredCst == Context->getFalse());
> else {
> SwitchInst *SI = cast<SwitchInst>(BB->getTerminator());
> SuccBB = SI->getSuccessor(SI->findCaseValue(PredCst));
> @@ -803,7 +803,7 @@
> if (LHS == RHS)
> if (isa<IntegerType>(LHS->getType()) || isa<PointerType>(LHS->getType()))
> return ICmpInst::isTrueWhenEqual(pred) ?
> - Context->getConstantIntTrue() : Context->getConstantIntFalse();
> + Context->getTrue() : Context->getFalse();
>
> return 0;
> }
>
> Modified: llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Tue Jul 21 13:03:38 2009
> @@ -233,7 +233,7 @@
> Value *LoopCond = FindLIVLoopCondition(BI->getCondition(),
> currentLoop, Changed);
> if (LoopCond && UnswitchIfProfitable(LoopCond,
> - Context->getConstantIntTrue())) {
> + Context->getTrue())) {
> ++NumBranches;
> return true;
> }
> @@ -263,7 +263,7 @@
> Value *LoopCond = FindLIVLoopCondition(SI->getCondition(),
> currentLoop, Changed);
> if (LoopCond && UnswitchIfProfitable(LoopCond,
> - Context->getConstantIntTrue())) {
> + Context->getTrue())) {
> ++NumSelects;
> return true;
> }
> @@ -351,10 +351,10 @@
> // this.
> if ((LoopExitBB = isTrivialLoopExitBlock(currentLoop,
> BI->getSuccessor(0)))) {
> - if (Val) *Val = Context->getConstantIntTrue();
> + if (Val) *Val = Context->getTrue();
> } else if ((LoopExitBB = isTrivialLoopExitBlock(currentLoop,
> BI->getSuccessor(1)))) {
> - if (Val) *Val = Context->getConstantIntFalse();
> + if (Val) *Val = Context->getFalse();
> }
> } else if (SwitchInst *SI = dyn_cast<SwitchInst>(HeaderTerm)) {
> // If this isn't a switch on Cond, we can't handle it.
> @@ -510,7 +510,7 @@
> Value *BranchVal = LIC;
> if (!isa<ConstantInt>(Val) || Val->getType() != Type::Int1Ty)
> BranchVal = new ICmpInst(InsertPt, ICmpInst::ICMP_EQ, LIC, Val, "tmp");
> - else if (Val != Context->getConstantIntTrue())
> + else if (Val != Context->getTrue())
> // We want to enter the new loop when the condition is true.
> std::swap(TrueDest, FalseDest);
>
> @@ -947,7 +947,7 @@
>
> Instruction* OldTerm = Old->getTerminator();
> BranchInst::Create(Split, SISucc,
> - Context->getConstantIntTrue(), OldTerm);
> + Context->getTrue(), OldTerm);
>
> LPM->deleteSimpleAnalysisValue(Old->getTerminator(), L);
> Old->getTerminator()->eraseFromParent();
>
> Modified: llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp Tue Jul 21 13:03:38 2009
> @@ -1691,7 +1691,7 @@
> if (Constant *C1 = dyn_cast<Constant>(V1))
> if (Constant *C2 = dyn_cast<Constant>(V2))
> return Context->getConstantExprCompare(Pred, C1, C2) ==
> - Context->getConstantIntTrue();
> + Context->getTrue();
>
> unsigned n1 = VN.valueNumber(V1, Top);
> unsigned n2 = VN.valueNumber(V2, Top);
> @@ -1803,10 +1803,10 @@
> // "icmp ult i32 %a, %y" EQ true then %a u< y
> // etc.
>
> - if (Canonical == Context->getConstantIntTrue()) {
> + if (Canonical == Context->getTrue()) {
> add(IC->getOperand(0), IC->getOperand(1), IC->getPredicate(),
> NewContext);
> - } else if (Canonical == Context->getConstantIntFalse()) {
> + } else if (Canonical == Context->getFalse()) {
> add(IC->getOperand(0), IC->getOperand(1),
> ICmpInst::getInversePredicate(IC->getPredicate()), NewContext);
> }
> @@ -1822,11 +1822,11 @@
> if (isRelatedBy(True, False, ICmpInst::ICMP_NE)) {
> if (Canonical == VN.canonicalize(True, Top) ||
> isRelatedBy(Canonical, False, ICmpInst::ICMP_NE))
> - add(SI->getCondition(), Context->getConstantIntTrue(),
> + add(SI->getCondition(), Context->getTrue(),
> ICmpInst::ICMP_EQ, NewContext);
> else if (Canonical == VN.canonicalize(False, Top) ||
> isRelatedBy(Canonical, True, ICmpInst::ICMP_NE))
> - add(SI->getCondition(), Context->getConstantIntFalse(),
> + add(SI->getCondition(), Context->getFalse(),
> ICmpInst::ICMP_EQ, NewContext);
> }
> } else if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(I)) {
> @@ -2050,9 +2050,9 @@
>
> ICmpInst::Predicate Pred = IC->getPredicate();
> if (isRelatedBy(Op0, Op1, Pred))
> - add(IC, Context->getConstantIntTrue(), ICmpInst::ICMP_EQ, NewContext);
> + add(IC, Context->getTrue(), ICmpInst::ICMP_EQ, NewContext);
> else if (isRelatedBy(Op0, Op1, ICmpInst::getInversePredicate(Pred)))
> - add(IC, Context->getConstantIntFalse(),
> + add(IC, Context->getFalse(),
> ICmpInst::ICMP_EQ, NewContext);
>
> } else if (SelectInst *SI = dyn_cast<SelectInst>(I)) {
> @@ -2064,9 +2064,9 @@
> // %b EQ %c then %a EQ %b
>
> Value *Canonical = VN.canonicalize(SI->getCondition(), Top);
> - if (Canonical == Context->getConstantIntTrue()) {
> + if (Canonical == Context->getTrue()) {
> add(SI, SI->getTrueValue(), ICmpInst::ICMP_EQ, NewContext);
> - } else if (Canonical == Context->getConstantIntFalse()) {
> + } else if (Canonical == Context->getFalse()) {
> add(SI, SI->getFalseValue(), ICmpInst::ICMP_EQ, NewContext);
> } else if (VN.canonicalize(SI->getTrueValue(), Top) ==
> VN.canonicalize(SI->getFalseValue(), Top)) {
> @@ -2156,7 +2156,7 @@
> if (Constant *CI_L = dyn_cast<Constant>(O.LHS)) {
> if (Constant *CI_R = dyn_cast<Constant>(O.RHS)) {
> if (Context->getConstantExprCompare(O.Op, CI_L, CI_R) ==
> - Context->getConstantIntFalse())
> + Context->getFalse())
> UB.mark(TopBB);
>
> WorkList.pop_front();
> @@ -2458,7 +2458,7 @@
> if (Dest == TrueDest) {
> DOUT << "(" << DTNode->getBlock()->getName() << ") true set:\n";
> VRPSolver VRP(VN, IG, UB, VR, PS->DTDFS, PS->modified, Dest);
> - VRP.add(Context->getConstantIntTrue(), Condition, ICmpInst::ICMP_EQ);
> + VRP.add(Context->getTrue(), Condition, ICmpInst::ICMP_EQ);
> VRP.solve();
> DEBUG(VN.dump());
> DEBUG(IG.dump());
> @@ -2466,7 +2466,7 @@
> } else if (Dest == FalseDest) {
> DOUT << "(" << DTNode->getBlock()->getName() << ") false set:\n";
> VRPSolver VRP(VN, IG, UB, VR, PS->DTDFS, PS->modified, Dest);
> - VRP.add(Context->getConstantIntFalse(), Condition, ICmpInst::ICMP_EQ);
> + VRP.add(Context->getFalse(), Condition, ICmpInst::ICMP_EQ);
> VRP.solve();
> DEBUG(VN.dump());
> DEBUG(IG.dump());
>
> Modified: llvm/trunk/lib/Transforms/Scalar/SCCP.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SCCP.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Scalar/SCCP.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/SCCP.cpp Tue Jul 21 13:03:38 2009
> @@ -441,7 +441,7 @@
> Succs[0] = Succs[1] = true;
> } else if (BCValue.isConstant()) {
> // Constant condition variables mean the branch can only go a single way
> - Succs[BCValue.getConstant() == Context->getConstantIntFalse()] = true;
> + Succs[BCValue.getConstant() == Context->getFalse()] = true;
> }
> }
> } else if (isa<InvokeInst>(&TI)) {
> @@ -486,7 +486,7 @@
>
> // Constant condition variables mean the branch can only go a single way
> return BI->getSuccessor(BCValue.getConstant() ==
> - Context->getConstantIntFalse()) == To;
> + Context->getFalse()) == To;
> }
> return false;
> }
> @@ -1487,7 +1487,7 @@
> // as undef, then further analysis could think the undef went another way
> // leading to an inconsistent set of conclusions.
> if (BranchInst *BI = dyn_cast<BranchInst>(TI)) {
> - BI->setCondition(Context->getConstantIntFalse());
> + BI->setCondition(Context->getFalse());
> } else {
> SwitchInst *SI = cast<SwitchInst>(TI);
> SI->setCondition(SI->getCaseValue(1));
>
> Modified: llvm/trunk/lib/VMCore/ConstantFold.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ConstantFold.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/VMCore/ConstantFold.cpp (original)
> +++ llvm/trunk/lib/VMCore/ConstantFold.cpp Tue Jul 21 13:03:38 2009
> @@ -1398,9 +1398,9 @@
> // Don't try to evaluate aliases. External weak GV can be null.
> if (!isa<GlobalAlias>(GV) && !GV->hasExternalWeakLinkage()) {
> if (pred == ICmpInst::ICMP_EQ)
> - return Context.getConstantIntFalse();
> + return Context.getFalse();
> else if (pred == ICmpInst::ICMP_NE)
> - return Context.getConstantIntTrue();
> + return Context.getTrue();
> }
> // icmp eq/ne(GV,null) -> false/true
> } else if (C2->isNullValue()) {
> @@ -1408,9 +1408,9 @@
> // Don't try to evaluate aliases. External weak GV can be null.
> if (!isa<GlobalAlias>(GV) && !GV->hasExternalWeakLinkage()) {
> if (pred == ICmpInst::ICMP_EQ)
> - return Context.getConstantIntFalse();
> + return Context.getFalse();
> else if (pred == ICmpInst::ICMP_NE)
> - return Context.getConstantIntTrue();
> + return Context.getTrue();
> }
> }
>
> @@ -1446,8 +1446,8 @@
> APFloat::cmpResult R = C1V.compare(C2V);
> switch (pred) {
> default: llvm_unreachable("Invalid FCmp Predicate"); return 0;
> - case FCmpInst::FCMP_FALSE: return Context.getConstantIntFalse();
> - case FCmpInst::FCMP_TRUE: return Context.getConstantIntTrue();
> + case FCmpInst::FCMP_FALSE: return Context.getFalse();
> + case FCmpInst::FCMP_TRUE: return Context.getTrue();
> case FCmpInst::FCMP_UNO:
> return Context.getConstantInt(Type::Int1Ty, R==APFloat::cmpUnordered);
> case FCmpInst::FCMP_ORD:
>
> Modified: llvm/trunk/lib/VMCore/LLVMContext.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/LLVMContext.cpp?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/VMCore/LLVMContext.cpp (original)
> +++ llvm/trunk/lib/VMCore/LLVMContext.cpp Tue Jul 21 13:03:38 2009
> @@ -80,16 +80,16 @@
> }
>
> // ConstantInt accessors.
> -ConstantInt* LLVMContext::getConstantIntTrue() {
> +ConstantInt* LLVMContext::getTrue() {
> assert(this && "Context not initialized!");
> assert(pImpl && "Context not initialized!");
> - return pImpl->getConstantIntTrue();
> + return pImpl->getTrue();
> }
>
> -ConstantInt* LLVMContext::getConstantIntFalse() {
> +ConstantInt* LLVMContext::getFalse() {
> assert(this && "Context not initialized!");
> assert(pImpl && "Context not initialized!");
> - return pImpl->getConstantIntFalse();
> + return pImpl->getFalse();
> }
>
> Constant* LLVMContext::getConstantInt(const Type* Ty, uint64_t V,
>
> Modified: llvm/trunk/lib/VMCore/LLVMContextImpl.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/LLVMContextImpl.h?rev=76598&r1=76597&r2=76598&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/VMCore/LLVMContextImpl.h (original)
> +++ llvm/trunk/lib/VMCore/LLVMContextImpl.h Tue Jul 21 13:03:38 2009
> @@ -120,14 +120,14 @@
>
> MDNode *getMDNode(Value*const* Vals, unsigned NumVals);
>
> - ConstantInt *getConstantIntTrue() {
> + ConstantInt *getTrue() {
> if (TheTrueVal)
> return TheTrueVal;
> else
> return (TheTrueVal = Context.getConstantInt(IntegerType::get(1), 1));
> }
>
> - ConstantInt *getConstantIntFalse() {
> + ConstantInt *getFalse() {
> if (TheFalseVal)
> return TheFalseVal;
> else
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
More information about the llvm-commits
mailing list