partly fixing #43

SRA-SiliconValley · Feb 8, 2014 · cff5bbb · cff5bbb
1 parent 4427e6f
commit cff5bbb
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 6 deletions.
diff --git a/jout/production/jalangijava/AndFormula.class b/jout/production/jalangijava/AndFormula.class
diff --git a/jout/production/jalangijava/FalseFormula.class b/jout/production/jalangijava/FalseFormula.class
diff --git a/jout/production/jalangijava/Formula.class b/jout/production/jalangijava/Formula.class
diff --git a/jout/production/jalangijava/OrFormula.class b/jout/production/jalangijava/OrFormula.class
diff --git a/jout/production/jalangijava/RegexpEncoder.class b/jout/production/jalangijava/RegexpEncoder.class
diff --git a/jout/production/jalangijava/RelConstant.class b/jout/production/jalangijava/RelConstant.class
diff --git a/jout/production/jalangijava/TrueFormula.class b/jout/production/jalangijava/TrueFormula.class
diff --git a/scripts/histogram.py b/scripts/histogram.py
@@ -12,10 +12,11 @@
 iids = {}
 for line in ins:
 	record = json.loads(line)
-	if record[2] in iids:
-		iids[record[2]] = iids[record[2]] + 1
+	key = str(record[2])+":"+str(record[4])
+	if key in iids:
+		iids[key] = iids[key] + 1
 	else: 
-		iids[record[2]] = 1
+		iids[key] = 1
 	count = count + 1
 ins.close()
 stats = sorted(iids.iteritems(), key=operator.itemgetter(1), reverse=True)

diff --git a/src/js/analysis.js b/src/js/analysis.js
@@ -1225,7 +1225,12 @@
                                         }
                                     }
                                 }
-                                val[SPECIAL_PROP] = {};
+                                if (val.__proto__ && val.__proto__[SPECIAL_PROP])
+                                    val[SPECIAL_PROP] = Object.create(val.__proto__[SPECIAL_PROP]);
+                                else
+                                    val[SPECIAL_PROP] = {};
+
+//                                val[SPECIAL_PROP] = Object.create(val[SPECIAL_PROP]);
                                 val[SPECIAL_PROP][SPECIAL_PROP] = objectId;
 //                            console.log("oid:"+objectId);
                                 objectId = objectId + 2;
@@ -1286,7 +1291,11 @@
                                 writable:true
                             });
                         }
-                        val[SPECIAL_PROP] = {};
+                        if (val.__proto__ && val.__proto__[SPECIAL_PROP])
+                            val[SPECIAL_PROP] = Object.create(val.__proto__[SPECIAL_PROP]);
+                        else
+                            val[SPECIAL_PROP] = {};
+                        //val[SPECIAL_PROP] = Object.create(val[SPECIAL_PROP]);
                         val[SPECIAL_PROP][SPECIAL_PROP] = id = literalId;
                         literalId = literalId + 2;
                         // changes due to getter or setter method
@@ -1352,7 +1361,10 @@
                                     writable:true
                                 });
                             }
-                            obj[SPECIAL_PROP] = {};
+                            if (obj.__proto__ && obj.__proto__[SPECIAL_PROP])
+                                obj[SPECIAL_PROP] = Object.create(obj.__proto__[SPECIAL_PROP]);
+                            else
+                                obj[SPECIAL_PROP] = {};
                             obj[SPECIAL_PROP][SPECIAL_PROP] = recordedValue;
                             objectMap[recordedValue] = ((obj === replayValue) ? oldReplayValue : obj);
                         }

diff --git a/tests/unit/proto_prop_lookup.js b/tests/unit/proto_prop_lookup.js
@@ -0,0 +1,14 @@
+function C() {
+    this.x = 1;
+}
+
+C.prototype.foo = function () {
+    this.x = 2;
+}
+
+var o = new C();
+o.foo();
+o.foo();
+o.foo();
+o.foo();
+o.foo();