1 files changed, 4 insertions, 16 deletions
diff --git a/lib/Analysis/GRSimpleVals.cpp b/lib/Analysis/GRSimpleVals.cpp
index 3bd51ecd72..a38d76d260 100644
--- a/lib/Analysis/GRSimpleVals.cpp
+++ b/lib/Analysis/GRSimpleVals.cpp
@@ -231,22 +231,10 @@ SVal GRSimpleVals::DetermEvalBinOpNN(GRExprEngine& Eng,
         }
         
       case nonloc::SymbolValKind:
-        if (isa<nonloc::ConcreteInt>(R)) {
-          if (Op >= BinaryOperator::LT && Op <= BinaryOperator::NE) {
-            const SymIntExpr *SE =
-              Eng.getSymbolManager().getSymIntExpr(
-                                     cast<nonloc::SymbolVal>(L).getSymbol(), Op,
-                                     cast<nonloc::ConcreteInt>(R).getValue(),T);
-
-            
-            return nonloc::SymExprVal(SE);
-          } else {
-            return NonLoc::MakeVal(Eng.getSymbolManager(),
-                                   cast<nonloc::SymbolVal>(L).getSymbol(),
-                                   Op, cast<nonloc::ConcreteInt>(R).getValue(),
-                                   T);
-          }
-        }
+        if (isa<nonloc::ConcreteInt>(R))
+          return NonLoc::MakeVal(Eng.getSymbolManager(),
+                                 cast<nonloc::SymbolVal>(L).getSymbol(), Op,
+                                 cast<nonloc::ConcreteInt>(R).getValue(), T);
         else
           return UnknownVal();
     }