Change constant folding APIs to take an optional TargetData, and change

ConstantFoldInstOperands/ConstantFoldCall to take a pointer to an array
of operands + size, instead of an std::vector.

llvm-svn: 33669

2 files changed, 8 insertions, 11 deletions

diff --git a/llvm/include/llvm/Analysis/ConstantFolding.h b/llvm/include/llvm/Analysis/ConstantFolding.h
index 4e996f9d089..ef1c052d9ee 100644
--- a/llvm/include/llvm/Analysis/ConstantFolding.h
+++ b/llvm/include/llvm/Analysis/ConstantFolding.h
@@ -20,17 +20,11 @@ namespace llvm {
 
 /// canConstantFoldCallTo - Return true if its even possible to fold a call to
 /// the specified function.
-extern
 bool canConstantFoldCallTo(Function *F);
 
-/// ConstantFoldFP - Given a function that evaluates the constant, return an
-///                  LLVM Constant that represents the evaluated constant
-extern Constant *
-ConstantFoldFP(double (*NativeFP)(double), double V, const Type *Ty);
-
 /// ConstantFoldCall - Attempt to constant fold a call to the specified function
 /// with the specified arguments, returning null if unsuccessful.
-extern Constant *
-ConstantFoldCall(Function *F, const std::vector<Constant*> &Operands);
+Constant *
+ConstantFoldCall(Function *F, Constant** Operands, unsigned NumOperands);
 }
 
diff --git a/llvm/include/llvm/Transforms/Utils/Local.h b/llvm/include/llvm/Transforms/Utils/Local.h
index 4fc016d02be..3b14e41187e 100644
--- a/llvm/include/llvm/Transforms/Utils/Local.h
+++ b/llvm/include/llvm/Transforms/Utils/Local.h
@@ -24,6 +24,7 @@ class Pass;
 class PHINode;
 class AllocaInst;
 class ConstantExpr;
+class TargetData;
 
 //===----------------------------------------------------------------------===//
 //  Local constant propagation...
@@ -32,7 +33,7 @@ class ConstantExpr;
 /// doConstantPropagation - Constant prop a specific instruction.  Returns true
 /// and potentially moves the iterator if constant propagation was performed.
 ///
-bool doConstantPropagation(BasicBlock::iterator &I);
+bool doConstantPropagation(BasicBlock::iterator &I, const TargetData *TD = 0);
 
 /// ConstantFoldTerminator - If a terminator instruction is predicated on a
 /// constant value, convert it into an unconditional branch to the constant
@@ -46,7 +47,7 @@ bool ConstantFoldTerminator(BasicBlock *BB);
 /// is returned.  Note that this function can only fail when attempting to fold
 /// instructions like loads and stores, which have no constant expression form.
 ///
-Constant *ConstantFoldInstruction(Instruction *I);
+Constant *ConstantFoldInstruction(Instruction *I, const TargetData *TD = 0);
 
 /// ConstantFoldInstOperands - Attempt to constant fold an instruction with the
 /// specified operands.  If successful, the constant result is returned, if not,
@@ -56,7 +57,9 @@ Constant *ConstantFoldInstruction(Instruction *I);
 ///
 Constant *ConstantFoldInstOperands(
   const Instruction *I, ///< The model instruction
-  const std::vector<Constant*> &Ops ///< The constant operands to use.
+  Constant** Ops,       ///< The array of constant operands to use.
+  unsigned NumOps,      ///< The number of operands provided.
+  const TargetData *TD = 0 ///< Optional target information.
 );