Moved removeFile() and getUniqueFilename() into FileUtilities.

[oota-llvm.git] / include / llvm / Analysis / Expressions.h

diff --git a/include/llvm/Analysis/Expressions.h b/include/llvm/Analysis/Expressions.h
index 0471fb21a677ff1a50f95820078093c80bc4a5b2..ea336bd46d7df3b99754e5295ed27df8df256a62 100644 (file)
--- a/include/llvm/Analysis/Expressions.h
+++ b/include/llvm/Analysis/Expressions.h
@@ -10,11 +10,9 @@
 #ifndef LLVM_ANALYSIS_EXPRESSIONS_H
 #define LLVM_ANALYSIS_EXPRESSIONS_H
 
-#include <assert.h>
+class Type;
 class Value;
-class ConstPoolInt;
-
-namespace analysis {
+class ConstantInt;
 
 struct ExprType;
 
@@ -34,25 +32,21 @@ struct ExprType {
     ScaledLinear,        // Expr is scaled linear exp, Value is Scale*Var+Offset
   } ExprTy;
 
-  const ConstPoolInt *Offset;  // Offset of expr, or null if 0
-  Value              *Var;     // Var referenced, if Linear or above (null if 0)
-  const ConstPoolInt *Scale;   // Scale of var if ScaledLinear expr (null if 1)
+  const ConstantInt *Offset;  // Offset of expr, or null if 0
+  Value             *Var;     // Var referenced, if Linear or above (null if 0)
+  const ConstantInt *Scale;   // Scale of var if ScaledLinear expr (null if 1)
 
-  inline ExprType(const ConstPoolInt *CPV = 0) {
+  inline ExprType(const ConstantInt *CPV = 0) {
     Offset = CPV; Var = 0; Scale = 0;
     ExprTy = Constant;
   }
-  inline ExprType(Value *Val) {
-    Var = Val; Offset = Scale = 0;
-    ExprTy = Var ? Linear : Constant;
-  }
-  inline ExprType(const ConstPoolInt *scale, Value *var, 
-                 const ConstPoolInt *offset) {
-    Scale = scale; Var = var; Offset = offset;
-    ExprTy = Scale ? ScaledLinear : (Var ? Linear : Constant);
-  }
-};
+  ExprType(Value *Val);        // Create a linear or constant expression
+  ExprType(const ConstantInt *scale, Value *var, const ConstantInt *offset);
 
-} // End namespace analysis
+  // If this expression has an intrinsic type, return it.  If it is zero, return
+  // the specified type.
+  //
+  const Type *getExprType(const Type *Default) const;
+};
 
 #endif