Revision: 5162
Author: [email protected]
Date: Mon Aug 2 02:14:44 2010
Log: Fix issue 806.
Ensure that we are not using r12 as a receiver in inlined NamedStore code.
Review URL: http://codereview.chromium.org/3081007
http://code.google.com/p/v8/source/detail?r=5162
Added:
/branches/bleeding_edge/test/mjsunit/regress/regress-806.js
Modified:
/branches/bleeding_edge/src/x64/codegen-x64.cc
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/regress/regress-806.js Mon Aug 2
02:14:44 2010
@@ -0,0 +1,51 @@
+// Copyright 2010 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.
+
+// Test that we do no use r12 as a receiver in inlined NamedStores on x64.
+
+// See: http://code.google.com/p/v8/issues/detail?id=806
+
+function foo(a) {
+ for (var o = 1; o < 2; o++) {
+ for (var n = 1; n < 2; n++) {
+ for (var m = 1; m < 2; m++) {
+ for (var l = 1; l < 2; l++) {
+ for (var i = 1; i < 2; i++) {
+ for (var j = 1; j < 2; j++) {
+ for (var k = 1; k < 2; k++) {
+ var z = a.foo;
+ z.foo = i * j * k * m * n * o;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+foo({foo: {foo: 1}});
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Wed Jul 28 02:36:53 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Mon Aug 2 02:14:44 2010
@@ -8070,6 +8070,18 @@
// Allocate result register.
result = allocator()->Allocate();
ASSERT(result.is_valid() && receiver.is_valid() && value.is_valid());
+
+ // Cannot use r12 for receiver, because that changes
+ // the distance between a call and a fixup location,
+ // due to a special encoding of r12 as r/m in a ModR/M byte.
+ if (receiver.reg().is(r12)) {
+ frame()->Spill(receiver.reg()); // It will be overwritten with
result.
+ // Swap receiver and value.
+ __ movq(result.reg(), receiver.reg());
+ Result temp = receiver;
+ receiver = result;
+ result = temp;
+ }
// Check that the receiver is a heap object.
Condition is_smi = __ CheckSmi(receiver.reg());
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
