diff --git a/llvm/lib/Analysis/DataStructure/Local.cpp b/llvm/lib/Analysis/DataStructure/Local.cpp
index 32d7aea..ffc80e7 100644
--- a/llvm/lib/Analysis/DataStructure/Local.cpp
+++ b/llvm/lib/Analysis/DataStructure/Local.cpp
@@ -143,6 +143,16 @@
 #ifndef NDEBUG
   Timer::addPeakMemoryMeasurement();
 #endif
+
+  // Remove all integral constants from the scalarmap!
+  for (hash_map<Value*, DSNodeHandle>::iterator I = ScalarMap.begin();
+       I != ScalarMap.end();)
+    if (isa<ConstantIntegral>(I->first)) {
+      hash_map<Value*, DSNodeHandle>::iterator J = I++;
+      ScalarMap.erase(J);
+    } else
+      ++I;
+
   markIncompleteNodes(DSGraph::MarkFormalArgs);
 
   // Remove any nodes made dead due to merging...