[cfe-commits] r63412 - in /cfe/trunk: include/clang/Analysis/PathSensitive/GRExprEngine.h lib/Analysis/GRExprEngine.cpp

[Ted Kremenek]

Author: kremenek
Date: Fri Jan 30 13:27:39 2009
New Revision: 63412

URL: http://llvm.org/viewvc/llvm-project?rev=63412&view=rev
Log:
Move method out-of-line.

Modified:
    cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h
    cfe/trunk/lib/Analysis/GRExprEngine.cpp

Modified: cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h?rev=63412&r1=63411&r2=63412&view=diff

==============================================================================
--- cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h (original)
+++ cfe/trunk/include/clang/Analysis/PathSensitive/GRExprEngine.h Fri Jan 30 13:27:39 2009
@@ -638,36 +638,7 @@
   void EvalBinOp(GRStateSet& OStates, const GRState* St, Expr* Ex,
                  BinaryOperator::Opcode Op, NonLoc L, NonLoc R);  
   
-  SVal EvalBinOp(BinaryOperator::Opcode Op, SVal L, SVal R) {
-
-    if (L.isUndef() || R.isUndef())
-      return UndefinedVal();
-
-    if (L.isUnknown() || R.isUnknown())
-      return UnknownVal();
-
-    if (isa<Loc>(L)) {
-      if (isa<Loc>(R))
-        return getTF().EvalBinOp(*this, Op, cast<Loc>(L), cast<Loc>(R));
-      else
-        return getTF().EvalBinOp(*this, Op, cast<Loc>(L), cast<NonLoc>(R));
-    }
-
-    if (isa<Loc>(R)) {
-      // Support pointer arithmetic where the increment/decrement operand
-      // is on the left and the pointer on the right.
-
-      assert (Op == BinaryOperator::Add || Op == BinaryOperator::Sub);
-
-      // Commute the operands.
-      return getTF().EvalBinOp(*this, Op, cast<Loc>(R),
-                               cast<NonLoc>(L));
-    }
-    else
-      return getTF().DetermEvalBinOpNN(*this, Op, cast<NonLoc>(L),
-                                       cast<NonLoc>(R));
-  }
-  
+  SVal EvalBinOp(BinaryOperator::Opcode Op, SVal L, SVal R);
   
   void EvalCall(NodeSet& Dst, CallExpr* CE, SVal L, NodeTy* Pred) {
     assert (Builder && "GRStmtNodeBuilder must be defined.");

Modified: cfe/trunk/lib/Analysis/GRExprEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/GRExprEngine.cpp?rev=63412&r1=63411&r2=63412&view=diff

==============================================================================
--- cfe/trunk/lib/Analysis/GRExprEngine.cpp (original)
+++ cfe/trunk/lib/Analysis/GRExprEngine.cpp Fri Jan 30 13:27:39 2009
@@ -2691,6 +2691,36 @@
   if (R.isValid()) getTF().EvalBinOpNN(OStates, *this, St, Ex, Op, L, R);
 }
 
+SVal GRExprEngine::EvalBinOp(BinaryOperator::Opcode Op, SVal L, SVal R) {
+  
+  if (L.isUndef() || R.isUndef())
+    return UndefinedVal();
+  
+  if (L.isUnknown() || R.isUnknown())
+    return UnknownVal();
+  
+  if (isa<Loc>(L)) {
+    if (isa<Loc>(R))
+      return getTF().EvalBinOp(*this, Op, cast<Loc>(L), cast<Loc>(R));
+    else
+      return getTF().EvalBinOp(*this, Op, cast<Loc>(L), cast<NonLoc>(R));
+  }
+  
+  if (isa<Loc>(R)) {
+    // Support pointer arithmetic where the increment/decrement operand
+    // is on the left and the pointer on the right.
+    
+    assert (Op == BinaryOperator::Add || Op == BinaryOperator::Sub);
+    
+    // Commute the operands.
+    return getTF().EvalBinOp(*this, Op, cast<Loc>(R),
+                             cast<NonLoc>(L));
+  }
+  else
+    return getTF().DetermEvalBinOpNN(*this, Op, cast<NonLoc>(L),
+                                     cast<NonLoc>(R));
+}
+
 //===----------------------------------------------------------------------===//
 // Visualization.
 //===----------------------------------------------------------------------===//