Revision: 12043
Author: [email protected]
Date: Wed Jul 11 07:27:53 2012
Log: Perform HasFastProperties check on prototypes when computing call
targets in Crankshaft.
BUG=125148
TEST=mjsunit/regress/regress-crbug-125148
Review URL: https://chromiumcodereview.appspot.com/10735054
http://code.google.com/p/v8/source/detail?r=12043
Added:
/branches/bleeding_edge/test/mjsunit/regress/regress-crbug-125148.js
Modified:
/branches/bleeding_edge/src/ast.cc
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/regress/regress-crbug-125148.js
Wed Jul 11 07:27:53 2012
@@ -0,0 +1,50 @@
+// 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
+// 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.
+
+var A = {
+ foo: function() { assertUnreachable(); }
+}
+
+var B = {
+ b: 2,
+ foo: function() { return 1; }
+}
+B.__proto__ = A;
+
+var C = {};
+C.__proto__ = B;
+
+function bar(x) {
+ return x.foo();
+}
+
+for (var i = 0; i < 3; i++) {
+ assertEquals(1, bar(C));
+}
+%OptimizeObjectForAddingMultipleProperties(B, 100); // Force dictionary
mode.
+%OptimizeFunctionOnNextCall(bar);
+assertEquals(1, bar(C));
=======================================
--- /branches/bleeding_edge/src/ast.cc Mon Jul 9 01:59:03 2012
+++ /branches/bleeding_edge/src/ast.cc Wed Jul 11 07:27:53 2012
@@ -528,6 +528,7 @@
if (!type->prototype()->IsJSObject()) return false;
// Go up the prototype chain, recording where we are currently.
holder_ = Handle<JSObject>(JSObject::cast(type->prototype()));
+ if (!holder_->HasFastProperties()) return false;
type = Handle<Map>(holder()->map());
}
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
