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 c21599f18e883589eb7b1cc9944040bc7a55a285..ea336bd46d7df3b99754e5295ed27df8df256a62 100644 (file)
--- a/include/llvm/Analysis/Expressions.h
+++ b/include/llvm/Analysis/Expressions.h
@@ -10,51 +10,43 @@
 #ifndef LLVM_ANALYSIS_EXPRESSIONS_H
 #define LLVM_ANALYSIS_EXPRESSIONS_H
 
-#include <assert.h>
+class Type;
 class Value;
-class ConstPoolInt;
-struct ExprAnalysisResult;
+class ConstantInt;
+
+struct ExprType;
 
 // ClassifyExpression: Analyze an expression to determine the complexity of the
 // expression, and which other values it depends on.  
 //
-ExprAnalysisResult ClassifyExpression(Value *Expr);
+ExprType ClassifyExpression(Value *Expr);
 
-// ExprAnalysisResult - Represent an expression of the form CONST*VAR+CONST
+// ExprType - Represent an expression of the form CONST*VAR+CONST
 // or simpler.  The expression form that yields the least information about the
 // expression is just the Linear form with no offset.
 //
-struct ExprAnalysisResult {
+struct ExprType {
   enum ExpressionType {
     Constant,            // Expr is a simple constant, Offset is value
     Linear,              // Expr is linear expr, Value is Var+Offset
     ScaledLinear,        // Expr is scaled linear exp, Value is Scale*Var+Offset
-  } ExprType;
+  } 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 ExprAnalysisResult(const ConstPoolInt *CPV = 0) {
+  inline ExprType(const ConstantInt *CPV = 0) {
     Offset = CPV; Var = 0; Scale = 0;
-    ExprType = Constant;
-  }
-  inline ExprAnalysisResult(Value *Val) {
-    Var = Val; Offset = Scale = 0;
-    ExprType = Var ? Linear : Constant;
+    ExprTy = Constant;
   }
-  inline ExprAnalysisResult(const ConstPoolInt *scale, Value *var, 
-                           const ConstPoolInt *offset) {
-    assert(!(Scale && !Var) && "Can't have scaled nonvariable!");
-    Scale = scale; Var = var; Offset = offset;
-    ExprType = Scale ? ScaledLinear : (Var ? Linear : Constant);
-  }
-
+  ExprType(Value *Val);        // Create a linear or constant expression
+  ExprType(const ConstantInt *scale, Value *var, const ConstantInt *offset);
 
-private:
-  friend ExprAnalysisResult ClassifyExpression(Value *);
-  inline ExprAnalysisResult operator+(const ConstPoolInt *Offset);
-  
+  // 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