diff options
| author | Logan Chien <loganchien@google.com> | 2011-07-20 14:35:08 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2011-07-20 14:37:02 +0800 |
| commit | ebf5f0962932032481ae306b42c96c68c3a0be95 (patch) | |
| tree | bbb4590c963c577450081053136a90c5bd05c74e /lib/VMCore/ConstantFold.h | |
| parent | 46b77918fb8670fbc0a4a6389c5fa0795264c2cb (diff) | |
| parent | e76a33b9567d78a5744dc52fcec3a6056d6fb576 (diff) | |
| download | external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.zip external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.tar.gz external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.tar.bz2 | |
Merge with LLVM upstream r135568 (Jul 20th 2011)
Conflicts:
lib/Bitcode/Reader/BitcodeReader.cpp
Change-Id: Iebed76d2f7d281e742947e31d9a0b78174daf2d6
Diffstat (limited to 'lib/VMCore/ConstantFold.h')
| -rw-r--r-- | lib/VMCore/ConstantFold.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h index 653a1c3..e12f27a 100644 --- a/lib/VMCore/ConstantFold.h +++ b/lib/VMCore/ConstantFold.h @@ -30,7 +30,7 @@ namespace llvm { Constant *ConstantFoldCastInstruction( unsigned opcode, ///< The opcode of the cast Constant *V, ///< The source constant - const Type *DestTy ///< The destination type + Type *DestTy ///< The destination type ); Constant *ConstantFoldSelectInstruction(Constant *Cond, Constant *V1, Constant *V2); @@ -48,9 +48,9 @@ namespace llvm { Constant *ConstantFoldCompareInstruction(unsigned short predicate, Constant *C1, Constant *C2); Constant *ConstantFoldGetElementPtr(Constant *C, bool inBounds, - Constant* const *Idxs, unsigned NumIdx); + ArrayRef<Constant *> Idxs); Constant *ConstantFoldGetElementPtr(Constant *C, bool inBounds, - Value* const *Idxs, unsigned NumIdx); + ArrayRef<Value *> Idxs); } // End llvm namespace #endif |