Object.observe: fix observation for optimised in/decrement and compound assignment.

test/mjsunit/harmony/object-observe.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 285 matching lines @@
 Object.observe(obj3, observer.callback);
 Object.deliverChangeRecords(observer.callback);
 observer.assertCallbackRecords([
   { object: obj, type: 'foo1' },
   { object: obj2, type: 'foo2' },
   { object: obj3, type: 'foo3' }
 ]);
 
 
 // Recursive observation.
-/* TODO(rossberg): temporarily disabled until fixed.
 var obj = {a: 1};
 var callbackCount = 0;
 function recursiveObserver(r) {
   assertEquals(1, r.length);
   ++callbackCount;
   if (r[0].oldValue < 100) ++obj[r[0].name];
 }
 Object.observe(obj, recursiveObserver);
 ++obj.a;
 Object.deliverChangeRecords(recursiveObserver);
 assertEquals(100, callbackCount);
 
 var obj1 = {a: 1};
 var obj2 = {a: 1};
 var recordCount = 0;
 function recursiveObserver2(r) {
   recordCount += r.length;
   if (r[0].oldValue < 100) {
     ++obj1.a;
     ++obj2.a;
   }
 }
 Object.observe(obj1, recursiveObserver2);
 Object.observe(obj2, recursiveObserver2);
 ++obj1.a;
 Object.deliverChangeRecords(recursiveObserver2);
 assertEquals(199, recordCount);
-*/
 
 
 // Observing named properties.
 reset();
 var obj = {a: 1}
 Object.observe(obj, observer.callback);
 obj.a = 2;
 obj["a"] = 3;
 delete obj.a;
 obj.a = 4;
 obj.a = 4;  // ignored
 obj.a = 5;
 Object.defineProperty(obj, "a", {value: 6});
 Object.defineProperty(obj, "a", {writable: false});
 obj.a = 7;  // ignored
 Object.defineProperty(obj, "a", {value: 8});
 Object.defineProperty(obj, "a", {value: 7, writable: true});
 Object.defineProperty(obj, "a", {get: function() {}});
 Object.defineProperty(obj, "a", {get: frozenFunction});
 Object.defineProperty(obj, "a", {get: frozenFunction});  // ignored
 Object.defineProperty(obj, "a", {get: frozenFunction, set: frozenFunction});
 Object.defineProperty(obj, "a", {set: frozenFunction});  // ignored
 Object.defineProperty(obj, "a", {get: undefined, set: frozenFunction});
 delete obj.a;
 delete obj.a;
 Object.defineProperty(obj, "a", {get: function() {}, configurable: true});
 Object.defineProperty(obj, "a", {value: 9, writable: true});
 obj.a = 10;
+++obj.a;
+obj.a++;
+obj.a *= 3;
 delete obj.a;
 Object.defineProperty(obj, "a", {value: 11, configurable: true});
 Object.deliverChangeRecords(observer.callback);
 observer.assertCallbackRecords([
   { object: obj, name: "a", type: "updated", oldValue: 1 },
   { object: obj, name: "a", type: "updated", oldValue: 2 },
   { object: obj, name: "a", type: "deleted", oldValue: 3 },
   { object: obj, name: "a", type: "new" },
   { object: obj, name: "a", type: "updated", oldValue: 4 },
   { object: obj, name: "a", type: "updated", oldValue: 5 },
   { object: obj, name: "a", type: "reconfigured", oldValue: 6 },
   { object: obj, name: "a", type: "updated", oldValue: 6 },
   { object: obj, name: "a", type: "reconfigured", oldValue: 8 },
   { object: obj, name: "a", type: "reconfigured", oldValue: 7 },
   { object: obj, name: "a", type: "reconfigured" },
   { object: obj, name: "a", type: "reconfigured" },
   { object: obj, name: "a", type: "reconfigured" },
   { object: obj, name: "a", type: "deleted" },
   { object: obj, name: "a", type: "new" },
   { object: obj, name: "a", type: "reconfigured" },
   { object: obj, name: "a", type: "updated", oldValue: 9 },
-  { object: obj, name: "a", type: "deleted", oldValue: 10 },
+  { object: obj, name: "a", type: "updated", oldValue: 10 },
+  { object: obj, name: "a", type: "updated", oldValue: 11 },
+  { object: obj, name: "a", type: "updated", oldValue: 12 },
+  { object: obj, name: "a", type: "deleted", oldValue: 36 },
   { object: obj, name: "a", type: "new" },
 ]);
 
 
 // Observing indexed properties.
 reset();
 var obj = {'1': 1}
 Object.observe(obj, observer.callback);
 obj[1] = 2;
 obj[1] = 3;
@@ skipping 10 matching lines @@
 Object.defineProperty(obj, "1", {get: frozenFunction});
 Object.defineProperty(obj, "1", {get: frozenFunction});  // ignored
 Object.defineProperty(obj, "1", {get: frozenFunction, set: frozenFunction});
 Object.defineProperty(obj, "1", {set: frozenFunction});  // ignored
 Object.defineProperty(obj, "1", {get: undefined, set: frozenFunction});
 delete obj[1];
 delete obj[1];
 Object.defineProperty(obj, "1", {get: function() {}, configurable: true});
 Object.defineProperty(obj, "1", {value: 9, writable: true});
 obj[1] = 10;
+++obj[1];
+obj[1]++;
+obj[1] *= 3;
 delete obj[1];
 Object.defineProperty(obj, "1", {value: 11, configurable: true});
 Object.deliverChangeRecords(observer.callback);
 observer.assertCallbackRecords([
   { object: obj, name: "1", type: "updated", oldValue: 1 },
   { object: obj, name: "1", type: "updated", oldValue: 2 },
   { object: obj, name: "1", type: "deleted", oldValue: 3 },
   { object: obj, name: "1", type: "new" },
   { object: obj, name: "1", type: "updated", oldValue: 4 },
   { object: obj, name: "1", type: "updated", oldValue: 5 },
   { object: obj, name: "1", type: "reconfigured", oldValue: 6 },
   { object: obj, name: "1", type: "updated", oldValue: 6 },
   { object: obj, name: "1", type: "reconfigured", oldValue: 8 },
   { object: obj, name: "1", type: "reconfigured", oldValue: 7 },
   { object: obj, name: "1", type: "reconfigured" },
   { object: obj, name: "1", type: "reconfigured" },
   { object: obj, name: "1", type: "reconfigured" },
   { object: obj, name: "1", type: "deleted" },
   { object: obj, name: "1", type: "new" },
   { object: obj, name: "1", type: "reconfigured" },
   { object: obj, name: "1", type: "updated", oldValue: 9 },
-  { object: obj, name: "1", type: "deleted", oldValue: 10 },
+  { object: obj, name: "1", type: "updated", oldValue: 10 },
+  { object: obj, name: "1", type: "updated", oldValue: 11 },
+  { object: obj, name: "1", type: "updated", oldValue: 12 },
+  { object: obj, name: "1", type: "deleted", oldValue: 36 },
   { object: obj, name: "1", type: "new" },
 ]);
 
 
 // Test all kinds of objects generically.
 function TestObserveConfigurable(obj, prop) {
   reset();
   obj[prop] = 1;
   Object.observe(obj, observer.callback);
   obj[prop] = 2;
@@ skipping 16 matching lines @@
   obj.__defineSetter__(prop, frozenFunction);  // ignored
   obj.__defineSetter__(prop, function() {});
   obj.__defineGetter__(prop, function() {});
   delete obj[prop];
   delete obj[prop];  // ignored
   obj.__defineGetter__(prop, function() {});
   delete obj[prop];
   Object.defineProperty(obj, prop, {get: function() {}, configurable: true});
   Object.defineProperty(obj, prop, {value: 9, writable: true});
   obj[prop] = 10;
+  ++obj[prop];
+  obj[prop]++;
+  obj[prop] *= 3;
   delete obj[prop];
   Object.defineProperty(obj, prop, {value: 11, configurable: true});
   Object.deliverChangeRecords(observer.callback);
   observer.assertCallbackRecords([
     { object: obj, name: prop, type: "updated", oldValue: 1 },
     { object: obj, name: prop, type: "updated", oldValue: 2 },
     { object: obj, name: prop, type: "deleted", oldValue: 3 },
     { object: obj, name: prop, type: "new" },
     { object: obj, name: prop, type: "updated", oldValue: 4 },
     { object: obj, name: prop, type: "updated", oldValue: 5 },
     { object: obj, name: prop, type: "reconfigured", oldValue: 6 },
     { object: obj, name: prop, type: "updated", oldValue: 6 },
     { object: obj, name: prop, type: "reconfigured", oldValue: 8 },
     { object: obj, name: prop, type: "reconfigured", oldValue: 7 },
     { object: obj, name: prop, type: "reconfigured" },
     { object: obj, name: prop, type: "reconfigured" },
     { object: obj, name: prop, type: "reconfigured" },
     { object: obj, name: prop, type: "reconfigured" },
     { object: obj, name: prop, type: "reconfigured" },
     { object: obj, name: prop, type: "deleted" },
     { object: obj, name: prop, type: "new" },
     { object: obj, name: prop, type: "deleted" },
     { object: obj, name: prop, type: "new" },
     { object: obj, name: prop, type: "reconfigured" },
     { object: obj, name: prop, type: "updated", oldValue: 9 },
-    { object: obj, name: prop, type: "deleted", oldValue: 10 },
+    { object: obj, name: prop, type: "updated", oldValue: 10 },
+    { object: obj, name: prop, type: "updated", oldValue: 11 },
+    { object: obj, name: prop, type: "updated", oldValue: 12 },
+    { object: obj, name: prop, type: "deleted", oldValue: 36 },
     { object: obj, name: prop, type: "new" },
   ]);
   Object.unobserve(obj, observer.callback);
   delete obj[prop];
 }
 
 function TestObserveNonConfigurable(obj, prop, desc) {
   reset();
   obj[prop] = 1;
   Object.observe(obj, observer.callback);
@@ skipping 112 matching lines @@
 Object.observe(arr2, observer.callback);
 Object.observe(arr3, observer.callback);
 arr.length = 2;
 arr.length = 0;
 arr.length = 10;
 Object.defineProperty(arr, 'length', {writable: false});
 arr2.length = 0;
 arr2.length = 1; // no change expected
 Object.defineProperty(arr2, 'length', {value: 1, writable: false});
 arr3.length = 0;
+++arr3.length;
+arr3.length++;
+arr3.length /= 2;
 Object.defineProperty(arr3, 'length', {value: 5});
 Object.defineProperty(arr3, 'length', {value: 10, writable: false});
 Object.deliverChangeRecords(observer.callback);
 observer.assertCallbackRecords([
   { object: arr, name: '3', type: 'deleted', oldValue: 'd' },
   { object: arr, name: '2', type: 'deleted' },
   { object: arr, name: 'length', type: 'updated', oldValue: 4 },
   { object: arr, name: '1', type: 'deleted', oldValue: 'b' },
   { object: arr, name: 'length', type: 'updated', oldValue: 2 },
   { object: arr, name: 'length', type: 'updated', oldValue: 1 },
   { object: arr, name: 'length', type: 'reconfigured', oldValue: 10 },
   { object: arr2, name: '1', type: 'deleted', oldValue: 'beta' },
   { object: arr2, name: 'length', type: 'updated', oldValue: 2 },
   { object: arr2, name: 'length', type: 'reconfigured', oldValue: 1 },
   { object: arr3, name: '2', type: 'deleted', oldValue: 'goodbye' },
   { object: arr3, name: '0', type: 'deleted', oldValue: 'hello' },
   { object: arr3, name: 'length', type: 'updated', oldValue: 6 },
   { object: arr3, name: 'length', type: 'updated', oldValue: 0 },
+  { object: arr3, name: 'length', type: 'updated', oldValue: 1 },
+  { object: arr3, name: 'length', type: 'updated', oldValue: 2 },
+  { object: arr3, name: 'length', type: 'updated', oldValue: 1 },
   { object: arr3, name: 'length', type: 'reconfigured', oldValue: 5 },
 ]);
 
 
 // Assignments in loops (checking different IC states).
 reset();
 var obj = {};
 Object.observe(obj, observer.callback);
 for (var i = 0; i < 5; i++) {
   obj["a" + i] = i;
@@ skipping 259 matching lines @@
 var fun = function(){};
 var obj = { __proto__: fun };
 Object.observe(obj, observer.callback);
 obj.prototype = 7;
 Object.deliverChangeRecords(observer.callback);
 observer.assertNotCalled();
 
 
 // Check that changes in observation status are detected in all IC states and
 // in optimized code, especially in cases usually using fast elements.
-function TestFastElements(prepopulate, polymorphic, optimize) {
+var mutation = [
+  "a[i] = v",
+  "a[i] ? ++a[i] : a[i] = v",
+  "a[i] ? a[i]++ : a[i] = v",
+  "a[i] ? a[i] += 1 : a[i] = v",
+  "a[i] ? a[i] -= -1 : a[i] = v",
+];
+
+var props = [1, "1", "a"];
+
+function TestFastElements(prop, mutation, prepopulate, polymorphic, optimize) {
   var setElement = eval(
-    "(function setElement(a, i, v) { a[i] = v " +
-    "/* " + prepopulate + " " + polymorphic + " " + optimize + " */" +
+    "(function setElement(a, i, v) { " + mutation + "; " +
+    "/* " + [].join.call(arguments, " ") + " */" +
     "})"
   );
   print("TestFastElements:", setElement);
 
   var arr = prepopulate ? [1, 2, 3, 4, 5] : [0];
-  setElement(arr, 1, 210);
-  setElement(arr, 1, 211);
+  if (prepopulate) arr[prop] = 2;  // for non-element case
+  setElement(arr, prop, 3);
+  setElement(arr, prop, 4);
   if (polymorphic) setElement(["M", "i", "l", "n", "e", "r"], 0, "m");
   if (optimize) %OptimizeFunctionOnNextCall(setElement);
-  setElement(arr, 1, 212);
+  setElement(arr, prop, 5);
 
   reset();
   Object.observe(arr, observer.callback);
-  setElement(arr, 1, 989898);
+  setElement(arr, prop, 989898);
   Object.deliverChangeRecords(observer.callback);
   observer.assertCallbackRecords([
-    { object: arr, name: '1', type: 'updated', oldValue: 212 }
+    { object: arr, name: "" + prop, type: 'updated', oldValue: 5 }
   ]);
 }
 
 for (var b1 = 0; b1 < 2; ++b1)
   for (var b2 = 0; b2 < 2; ++b2)
     for (var b3 = 0; b3 < 2; ++b3)
-      TestFastElements(b1 != 0, b2 != 0, b3 != 0);
+      for (var i in props)
+        for (var j in mutation)
+          TestFastElements(props[i], mutation[j], b1 != 0, b2 != 0, b3 != 0);
 
-function TestFastElementsLength(polymorphic, optimize, oldSize, newSize) {
+
+var mutation = [
+  "a.length = v",
+  "a.length += newSize - oldSize",
+  "a.length -= oldSize - newSize",
+];
+
+var mutationByIncr = [
+  "++a.length",
+  "a.length++",
+];
+
+function TestFastElementsLength(
+  mutation, polymorphic, optimize, oldSize, newSize) {
   var setLength = eval(
-    "(function setLength(a, n) { a.length = n " +
-    "/* " + polymorphic + " " + optimize + " " + oldSize + " " + newSize + " */"
+    "(function setLength(a, v) { " + mutation + "; " +
+    "/* " + [].join.call(arguments, " ") + " */"
     + "})"
   );
   print("TestFastElementsLength:", setLength);
 
   function array(n) {
     var arr = new Array(n);
     for (var i = 0; i < n; ++i) arr[i] = i;
     return arr;
   }
 
@@ skipping 18 matching lines @@
     assertEquals('length', lengthRecord.name);
     assertEquals('updated', lengthRecord.type);
     assertSame(oldSize, lengthRecord.oldValue);
   }
 }
 
 for (var b1 = 0; b1 < 2; ++b1)
   for (var b2 = 0; b2 < 2; ++b2)
     for (var n1 = 0; n1 < 3; ++n1)
       for (var n2 = 0; n2 < 3; ++n2)
-        TestFastElementsLength(b1 != 0, b2 != 0, 20*n1, 20*n2);
+        for (var i in mutation)
+          TestFastElementsLength(mutation[i], b1 != 0, b2 != 0, 20*n1, 20*n2);
+
+for (var b1 = 0; b1 < 2; ++b1)
+  for (var b2 = 0; b2 < 2; ++b2)
+    for (var n = 0; n < 3; ++n)
+      for (var i in mutationByIncr)
+        TestFastElementsLength(mutationByIncr[i], b1 != 0, b2 != 0, 7*n, 7*n+1);