Changes between Version 1 and Version 2 of HeapCanonicalization

Timestamp:

07/31/14 11:44:39 (12 years ago)

Author:

zmanchun

Comment:

--

HeapCanonicalization

@@ -33 +33 @@
 {{{
 Map<HeapObject, Integer> reachableHeapObjectsOfState(state){
-  Set<HeapObject> visited;
   Map<HeapObject, Integer> idMap;
 
   for(dyscope: state.dyscopes()){
     for(varValue: dyscope.varValues()){
-      reachableHeapObjects(varValue);
+      reachableHeapObjectsOfValue(varValue, idMap);
     }
   }
@@ -45 +44 @@
 
 //dfs
-void reachableHeapObjectsOfValue(varValue, visited, idMap){
+void reachableHeapObjectsOfValue(varValue, idMap){
   if(varValue NOT pointer){
     for(element: varValue.elements()){
-      reachableHeapObjects(varValue, visited, idMap);
+      reachableHeapObjects(varValue, idMap);
     }
   }else if(varValue IS heap pointer){
     object = dereference(varValue);
    
-    if(!visited.contains(object)){
-      visited.add(object);
-      idMap.put(object, idMap.size());
-    }
+    if(! dMap.containsKey(object))
+      if(object is SymbolicConstant)
+        idMap.put(object, idMap.size());
+      else
+         idMap.put(object, -1);
   }else{//other pointer
-    reachableHeapObjects(dereference(varValue), visited, idMap){
+    reachableHeapObjects(dereference(varValue), idMap){
   }
 }