Move BasicBlockEdge to the cpp file. No functionality change.

[oota-llvm.git] / lib / VMCore / ConstantFold.h

diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h
index ffb7b1057e5b5b83b249ce5c00bc3e5ac38d3371..e12f27a7cb1ead40b9e0805e7b638937f52dd2c2 100644 (file)
--- a/lib/VMCore/ConstantFold.h
+++ b/lib/VMCore/ConstantFold.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -11,15 +11,15 @@
 // interfaces are used by the ConstantExpr::get* methods to automatically fold
 // constants when possible.
 //
-// These operators may return a null object if I don't know how to perform the
-// specified operation on the specified constant types.
+// These operators may return a null object if they don't know how to perform
+// the specified operation on the specified constant types.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef CONSTANTFOLDING_H
 #define CONSTANTFOLDING_H
 
-#include <iterator>
+#include "llvm/ADT/ArrayRef.h"
 
 namespace llvm {
   class Value;
@@ -29,28 +29,28 @@ namespace llvm {
   // Constant fold various types of instruction...
   Constant *ConstantFoldCastInstruction(
     unsigned opcode,     ///< The opcode of the cast
-    const Constant *V,   ///< The source constant
-    const Type *DestTy   ///< The destination type
+    Constant *V,         ///< The source constant
+    Type *DestTy   ///< The destination type
   );
-  Constant *ConstantFoldSelectInstruction(const Constant *Cond,
-                                          const Constant *V1,
-                                          const Constant *V2);
-  Constant *ConstantFoldExtractElementInstruction(const Constant *Val,
-                                                  const Constant *Idx);
-  Constant *ConstantFoldInsertElementInstruction(const Constant *Val,
-                                                 const Constant *Elt,
-                                                 const Constant *Idx);
-  Constant *ConstantFoldShuffleVectorInstruction(const Constant *V1,
-                                                 const Constant *V2,
-                                                 const Constant *Mask);
-  Constant *ConstantFoldBinaryInstruction(unsigned Opcode, const Constant *V1,
-                                          const Constant *V2);
+  Constant *ConstantFoldSelectInstruction(Constant *Cond,
+                                          Constant *V1, Constant *V2);
+  Constant *ConstantFoldExtractElementInstruction(Constant *Val, Constant *Idx);
+  Constant *ConstantFoldInsertElementInstruction(Constant *Val, Constant *Elt,
+                                                 Constant *Idx);
+  Constant *ConstantFoldShuffleVectorInstruction(Constant *V1, Constant *V2,
+                                                 Constant *Mask);
+  Constant *ConstantFoldExtractValueInstruction(Constant *Agg,
+                                                ArrayRef<unsigned> Idxs);
+  Constant *ConstantFoldInsertValueInstruction(Constant *Agg, Constant *Val,
+                                               ArrayRef<unsigned> Idxs);
+  Constant *ConstantFoldBinaryInstruction(unsigned Opcode, Constant *V1,
+                                          Constant *V2);
   Constant *ConstantFoldCompareInstruction(unsigned short predicate, 
-                                           const Constant *C1, 
-                                           const Constant *C2);
-
-  Constant *ConstantFoldGetElementPtr(const Constant *C,
-                                      Constant* const *Idxs, unsigned NumIdx);
+                                           Constant *C1, Constant *C2);
+  Constant *ConstantFoldGetElementPtr(Constant *C, bool inBounds,
+                                      ArrayRef<Constant *> Idxs);
+  Constant *ConstantFoldGetElementPtr(Constant *C, bool inBounds,
+                                      ArrayRef<Value *> Idxs);
 } // End llvm namespace
 
 #endif