Revision: 11436
Author: [email protected]
Date: Wed Apr 25 06:22:04 2012
Log: Fix deopted construct stub frame to contain code object.
[email protected]
BUG=chromium:124594
TEST=mjsunit/regress/regress-124594
Review URL: https://chromiumcodereview.appspot.com/10155024
http://code.google.com/p/v8/source/detail?r=11436
Added:
/branches/bleeding_edge/test/mjsunit/regress/regress-124594.js
Modified:
/branches/bleeding_edge/src/arm/deoptimizer-arm.cc
/branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc
/branches/bleeding_edge/src/mips/deoptimizer-mips.cc
/branches/bleeding_edge/src/x64/deoptimizer-x64.cc
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/regress/regress-124594.js Wed Apr
25 06:22:04 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.
+
+// Flags: --allow-natives-syntax --expose-gc
+
+// Test that a GC inside a constructor frame is correctly handled right
+// after we deoptimize from an inlined constructor to a constructor stub
+// stack frame.
+
+function f(deopt) {
+ var x = 1;
+ if (deopt) {
+ x = x + "foo";
+ gc();
+ }
+ this.x = x;
+}
+
+function g(deopt) {
+ return new f(deopt);
+}
+
+assertEquals({x:1}, g(false));
+assertEquals({x:1}, g(false));
+%OptimizeFunctionOnNextCall(g);
+assertEquals({x:"1foo"}, g(true));
=======================================
--- /branches/bleeding_edge/src/arm/deoptimizer-arm.cc Fri Mar 23 05:16:40
2012
+++ /branches/bleeding_edge/src/arm/deoptimizer-arm.cc Wed Apr 25 06:22:04
2012
@@ -457,6 +457,8 @@
void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator*
iterator,
int frame_index) {
+ Builtins* builtins = isolate_->builtins();
+ Code* construct_stub =
builtins->builtin(Builtins::kJSConstructStubGeneric);
JSFunction* function =
JSFunction::cast(ComputeLiteral(iterator->Next()));
unsigned height = iterator->Next();
unsigned height_in_bytes = height * kPointerSize;
@@ -464,7 +466,7 @@
PrintF(" translating construct stub => height=%d\n", height_in_bytes);
}
- unsigned fixed_frame_size = 7 * kPointerSize;
+ unsigned fixed_frame_size = 8 * kPointerSize;
unsigned output_frame_size = height_in_bytes + fixed_frame_size;
// Allocate and store the output frame description.
@@ -528,6 +530,15 @@
PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function (construct
sentinel)\n",
top_address + output_offset, output_offset, value);
}
+
+ // The output frame reflects a JSConstructStubGeneric frame.
+ output_offset -= kPointerSize;
+ value = reinterpret_cast<intptr_t>(construct_stub);
+ output_frame->SetFrameSlot(output_offset, value);
+ if (FLAG_trace_deopt) {
+ PrintF(" 0x%08x: [top + %d] <- 0x%08x ; code object\n",
+ top_address + output_offset, output_offset, value);
+ }
// Number of incoming arguments.
output_offset -= kPointerSize;
@@ -559,8 +570,6 @@
ASSERT(0 == output_offset);
- Builtins* builtins = isolate_->builtins();
- Code* construct_stub =
builtins->builtin(Builtins::kJSConstructStubGeneric);
uint32_t pc = reinterpret_cast<uint32_t>(
construct_stub->instruction_start() +
isolate_->heap()->construct_stub_deopt_pc_offset()->value());
=======================================
--- /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc Tue Mar 27
04:21:27 2012
+++ /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc Wed Apr 25
06:22:04 2012
@@ -548,6 +548,8 @@
void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator*
iterator,
int frame_index) {
+ Builtins* builtins = isolate_->builtins();
+ Code* construct_stub =
builtins->builtin(Builtins::kJSConstructStubGeneric);
JSFunction* function =
JSFunction::cast(ComputeLiteral(iterator->Next()));
unsigned height = iterator->Next();
unsigned height_in_bytes = height * kPointerSize;
@@ -555,7 +557,7 @@
PrintF(" translating construct stub => height=%d\n", height_in_bytes);
}
- unsigned fixed_frame_size = 6 * kPointerSize;
+ unsigned fixed_frame_size = 7 * kPointerSize;
unsigned output_frame_size = height_in_bytes + fixed_frame_size;
// Allocate and store the output frame description.
@@ -619,6 +621,15 @@
PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function (construct
sentinel)\n",
top_address + output_offset, output_offset, value);
}
+
+ // The output frame reflects a JSConstructStubGeneric frame.
+ output_offset -= kPointerSize;
+ value = reinterpret_cast<intptr_t>(construct_stub);
+ output_frame->SetFrameSlot(output_offset, value);
+ if (FLAG_trace_deopt) {
+ PrintF(" 0x%08x: [top + %d] <- 0x%08x ; code object\n",
+ top_address + output_offset, output_offset, value);
+ }
// Number of incoming arguments.
output_offset -= kPointerSize;
@@ -641,8 +652,6 @@
ASSERT(0 == output_offset);
- Builtins* builtins = isolate_->builtins();
- Code* construct_stub =
builtins->builtin(Builtins::kJSConstructStubGeneric);
uint32_t pc = reinterpret_cast<uint32_t>(
construct_stub->instruction_start() +
isolate_->heap()->construct_stub_deopt_pc_offset()->value());
=======================================
--- /branches/bleeding_edge/src/mips/deoptimizer-mips.cc Mon Mar 26
04:29:44 2012
+++ /branches/bleeding_edge/src/mips/deoptimizer-mips.cc Wed Apr 25
06:22:04 2012
@@ -447,6 +447,8 @@
void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator*
iterator,
int frame_index) {
+ Builtins* builtins = isolate_->builtins();
+ Code* construct_stub =
builtins->builtin(Builtins::kJSConstructStubGeneric);
JSFunction* function =
JSFunction::cast(ComputeLiteral(iterator->Next()));
unsigned height = iterator->Next();
unsigned height_in_bytes = height * kPointerSize;
@@ -454,7 +456,7 @@
PrintF(" translating construct stub => height=%d\n", height_in_bytes);
}
- unsigned fixed_frame_size = 7 * kPointerSize;
+ unsigned fixed_frame_size = 8 * kPointerSize;
unsigned output_frame_size = height_in_bytes + fixed_frame_size;
// Allocate and store the output frame description.
@@ -518,6 +520,15 @@
PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function (construct
sentinel)\n",
top_address + output_offset, output_offset, value);
}
+
+ // The output frame reflects a JSConstructStubGeneric frame.
+ output_offset -= kPointerSize;
+ value = reinterpret_cast<intptr_t>(construct_stub);
+ output_frame->SetFrameSlot(output_offset, value);
+ if (FLAG_trace_deopt) {
+ PrintF(" 0x%08x: [top + %d] <- 0x%08x ; code object\n",
+ top_address + output_offset, output_offset, value);
+ }
// Number of incoming arguments.
output_offset -= kPointerSize;
@@ -549,8 +560,6 @@
ASSERT(0 == output_offset);
- Builtins* builtins = isolate_->builtins();
- Code* construct_stub =
builtins->builtin(Builtins::kJSConstructStubGeneric);
uint32_t pc = reinterpret_cast<uint32_t>(
construct_stub->instruction_start() +
isolate_->heap()->construct_stub_deopt_pc_offset()->value());
=======================================
--- /branches/bleeding_edge/src/x64/deoptimizer-x64.cc Thu Mar 29 07:04:41
2012
+++ /branches/bleeding_edge/src/x64/deoptimizer-x64.cc Wed Apr 25 06:22:04
2012
@@ -458,6 +458,8 @@
void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator*
iterator,
int frame_index) {
+ Builtins* builtins = isolate_->builtins();
+ Code* construct_stub =
builtins->builtin(Builtins::kJSConstructStubGeneric);
JSFunction* function =
JSFunction::cast(ComputeLiteral(iterator->Next()));
unsigned height = iterator->Next();
unsigned height_in_bytes = height * kPointerSize;
@@ -465,7 +467,7 @@
PrintF(" translating construct stub => height=%d\n", height_in_bytes);
}
- unsigned fixed_frame_size = 6 * kPointerSize;
+ unsigned fixed_frame_size = 7 * kPointerSize;
unsigned output_frame_size = height_in_bytes + fixed_frame_size;
// Allocate and store the output frame description.
@@ -533,6 +535,16 @@
V8PRIxPTR " ; function (construct sentinel)\n",
top_address + output_offset, output_offset, value);
}
+
+ // The output frame reflects a JSConstructStubGeneric frame.
+ output_offset -= kPointerSize;
+ value = reinterpret_cast<intptr_t>(construct_stub);
+ output_frame->SetFrameSlot(output_offset, value);
+ if (FLAG_trace_deopt) {
+ PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08"
+ V8PRIxPTR " ; code object\n",
+ top_address + output_offset, output_offset, value);
+ }
// Number of incoming arguments.
output_offset -= kPointerSize;
@@ -557,8 +569,6 @@
ASSERT(0 == output_offset);
- Builtins* builtins = isolate_->builtins();
- Code* construct_stub =
builtins->builtin(Builtins::kJSConstructStubGeneric);
intptr_t pc = reinterpret_cast<intptr_t>(
construct_stub->instruction_start() +
isolate_->heap()->construct_stub_deopt_pc_offset()->value());
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
