Move a few more NonLoc static functions to ValueManager.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68800 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/GRSimpleVals.cpp b/lib/Analysis/GRSimpleVals.cpp
index 1961da2..107bea7 100644
--- a/lib/Analysis/GRSimpleVals.cpp
+++ b/lib/Analysis/GRSimpleVals.cpp
@@ -231,10 +231,11 @@
         }
         
       case nonloc::SymbolValKind:
-        if (isa<nonloc::ConcreteInt>(R))
-          return NonLoc::MakeVal(Eng.getSymbolManager(),
-                                 cast<nonloc::SymbolVal>(L).getSymbol(), Op,
-                                 cast<nonloc::ConcreteInt>(R).getValue(), T);
+        if (isa<nonloc::ConcreteInt>(R)) {
+          ValueManager &ValMgr = Eng.getValueManager();
+          return ValMgr.makeNonLoc(cast<nonloc::SymbolVal>(L).getSymbol(), Op,
+                                   cast<nonloc::ConcreteInt>(R).getValue(), T);
+        }
         else
           return UnknownVal();
     }