Fix wrong bailout id in polymorphic stores.

test/mjsunit/regress/poly_count_operation.js

 // Copyright 2013 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
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --allow-natives-syntax
 
-var non_const_true = true;
+var o1 = {x:1};
+var o2 = {};
+var deopt = false;
 
-function f(o) {
-  return (non_const_true && (o.val == null || false));
+function f_mono(o) {
+  return 5 + o.x++;
 }
 
-// Create an object with a constant function in another realm.
-var realm = Realm.create();
-var realmObject = Realm.eval(realm, "function g() {}; var o = { val:g }; o;")
+var to_deopt = f_mono;
 
-// Make the CompareNil IC in the function monomorphic.
-assertFalse(f(realmObject));
-assertFalse(f(realmObject));
+var v = 1;
+var s = 0;
 
-// Optimize the function containing the CompareNil IC.
-%OptimizeFunctionOnNextCall(f);
-assertFalse(f(realmObject));
+Object.defineProperty(o2, "x",
+    {get:function() { return v; },
+     set:function(new_v) {

[titzer, 2013/07/19 07:23:05]

Do we need a version of this test that deopts on get? That case doesn't have
anything to do with your changes, but might be worth having in the regression
suite as well.

[Toon Verwaest, 2013/07/19 08:44:16]

Although a bit convoluted perhaps, that's exactly what "v = undefined" + the NaN
check checks. Now I added an explicit getter test as well.

On 2013/07/19 07:23:05, titzer wrote:

+       v = new_v;
+       s++;
+       if (deopt) {
+         deopt = false;
+         %DeoptimizeFunction(to_deopt);
+       }
+     }});
+
+assertEquals(0, s);
+assertEquals(6, f_mono(o2));
+assertEquals(1, s);
+assertEquals(7, f_mono(o2));
+assertEquals(2, s);
+%OptimizeFunctionOnNextCall(f_mono);
+deopt = true;
+assertEquals(8, f_mono(o2));
+assertEquals(3, s);
+
+function f_poly(o) {
+  return 5 + o.x++;
+}
+
+v = 1;
+to_deopt = f_poly;
+
+f_poly(o1);
+f_poly(o1);
+assertEquals(6, f_poly(o2));
+assertEquals(4, s);
+assertEquals(7, f_poly(o2));
+assertEquals(5, s);
+%OptimizeFunctionOnNextCall(f_poly);
+deopt = true;
+assertEquals(8, f_poly(o2));
+assertEquals(6, s);
+
+%OptimizeFunctionOnNextCall(f_poly);
+v = undefined;
+assertEquals(NaN, f_poly(o2));
+assertEquals(7, s);
+
+function f_pre(o) {
+  return 5 + ++o.x
+}
+
+v = 1;
+to_deopt = f_pre;
+
+f_pre(o1);
+f_pre(o1);
+assertEquals(7, f_pre(o2));
+assertEquals(8, s);
+assertEquals(8, f_pre(o2));
+assertEquals(9, s);
+%OptimizeFunctionOnNextCall(f_pre);
+deopt = true;
+assertEquals(9, f_pre(o2));
+assertEquals(10, s);
+
+%OptimizeFunctionOnNextCall(f_pre);
+v = undefined;
+assertEquals(NaN, f_pre(o2));
+assertEquals(11, s);