Undo Chris' last patch, it caused a regression.

[oota-llvm.git] / lib / Transforms / TransformInternals.h

diff --git a/lib/Transforms/TransformInternals.h b/lib/Transforms/TransformInternals.h
index 7a2dbf1b69cf3c7e635134d52f81f71acf260c81..51e32c81e67b9dbdbad86360bfffee1d346092e1 100644 (file)
--- a/lib/Transforms/TransformInternals.h
+++ b/lib/Transforms/TransformInternals.h
@@ -1,4 +1,11 @@
-//===-- TransformInternals.h - Shared functions for Transforms ---*- C++ -*--=//
+//===-- TransformInternals.h - Shared functions for Transforms --*- C++ -*-===//
+//
+//                     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 header file declares shared functions used by the different components
 //  of the Transforms library.
@@ -15,18 +22,10 @@
 #include <map>
 #include <set>
 
-// TargetData Hack: Eventually we will have annotations given to us by the
-// backend so that we know stuff about type size and alignments.  For now
-// though, just use this, because it happens to match the model that GCC uses.
-//
-// FIXME: This should use annotations
-//
-extern const TargetData TD;
+namespace llvm {
 
-static inline int getConstantValue(const ConstantInt *CPI) {
-  if (const ConstantSInt *CSI = dyn_cast<ConstantSInt>(CPI))
-    return (int)CSI->getValue();
-  return (int)cast<ConstantUInt>(CPI)->getValue();
+static inline int64_t getConstantValue(const ConstantInt *CPI) {
+  return (int64_t)cast<ConstantInt>(CPI)->getRawValue();
 }
 
 
@@ -38,27 +37,15 @@ static inline const CompositeType *getPointedToComposite(const Type *Ty) {
   return PT ? dyn_cast<CompositeType>(PT->getElementType()) : 0;
 }
 
-// ConvertableToGEP - This function returns true if the specified value V is
-// a valid index into a pointer of type Ty.  If it is valid, Idx is filled in
-// with the values that would be appropriate to make this a getelementptr
-// instruction.  The type returned is the root type that the GEP would point
-// to if it were synthesized with this operands.
-//
-// If BI is nonnull, cast instructions are inserted as appropriate for the
-// arguments of the getelementptr.
-//
-const Type *ConvertableToGEP(const Type *Ty, Value *V,
-                             std::vector<Value*> &Indices,
-                             BasicBlock::iterator *BI = 0);
-
 
 //===----------------------------------------------------------------------===//
 //  ValueHandle Class - Smart pointer that occupies a slot on the users USE list
 //  that prevents it from being destroyed.  This "looks" like an Instruction
 //  with Opcode UserOp1.
-// 
+//
 class ValueMapCache;
 class ValueHandle : public Instruction {
+  Use Op;
   ValueMapCache &Cache;
 public:
   ValueHandle(ValueMapCache &VMC, Value *V);
@@ -90,7 +77,8 @@ public:
 
 typedef std::map<const Value*, const Type*> ValueTypeCache;
 
-struct ValueMapCache {
+class ValueMapCache {
+public:
   // Operands mapped - Contains an entry if the first value (the user) has had
   // the second value (the operand) mapped already.
   //
@@ -103,7 +91,7 @@ struct ValueMapCache {
   typedef std::map<const Value *, Value *> ExprMapTy;
 
   // Cast Map - Cast instructions can have their source and destination values
-  // changed independantly for each part.  Because of this, our old naive
+  // changed independently for each part.  Because of this, our old naive
   // implementation would create a TWO new cast instructions, which would cause
   // all kinds of problems.  Here we keep track of the newly allocated casts, so
   // that we only create one for a particular instruction.
@@ -112,14 +100,18 @@ struct ValueMapCache {
 };
 
 
-bool ExpressionConvertableToType(Value *V, const Type *Ty, ValueTypeCache &Map);
-Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC);
+bool ExpressionConvertibleToType(Value *V, const Type *Ty, ValueTypeCache &Map,
+                                 const TargetData &TD);
+Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
+                               const TargetData &TD);
 
-// ValueConvertableToType - Return true if it is possible
-bool ValueConvertableToType(Value *V, const Type *Ty,
-                            ValueTypeCache &ConvertedTypes);
+// ValueConvertibleToType - Return true if it is possible
+bool ValueConvertibleToType(Value *V, const Type *Ty,
+                            ValueTypeCache &ConvertedTypes,
+                            const TargetData &TD);
 
-void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC);
+void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
+                           const TargetData &TD);
 
 
 // getStructOffsetType - Return a vector of offsets that are to be used to index
@@ -135,6 +127,8 @@ void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC);
 //
 const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
                                 std::vector<Value*> &Offsets,
-                                bool StopEarly = true);
+                                const TargetData &TD, bool StopEarly = true);
+
+} // End llvm namespace
 
 #endif