Handle subtract in expression classifier

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@548 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 8 insertions, 9 deletions

diff --git a/include/llvm/Analysis/Expressions.h b/include/llvm/Analysis/Expressions.h
index 0471fb21a6..9ddd5863b5 100644
--- a/include/llvm/Analysis/Expressions.h
+++ b/include/llvm/Analysis/Expressions.h
@@ -11,6 +11,7 @@
 #define LLVM_ANALYSIS_EXPRESSIONS_H
 
 #include <assert.h>
+class Type;
 class Value;
 class ConstPoolInt;
 
@@ -42,15 +43,13 @@ struct ExprType {
     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 ConstPoolInt *scale, Value *var, 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;
 };
 
 } // End namespace analysis