| Index: src/deoptimizer.cc
|
| diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
|
| index 1e1a47544ad6a19000a302663b26c693a09bd9c3..8c0623354849fe4588017b8430bddce0f0df8c39 100644
|
| --- a/src/deoptimizer.cc
|
| +++ b/src/deoptimizer.cc
|
| @@ -2265,8 +2265,11 @@ void Deoptimizer::DoComputeBuiltinContinuation(
|
|
|
| if (trace_scope_ != NULL) {
|
| PrintF(trace_scope_->file(),
|
| - " translating BuiltinContinuation to %s, stack param count %d\n",
|
| - Builtins::name(builtin_name), stack_param_count);
|
| + " translating BuiltinContinuation to %s,"
|
| + " register param count %d,"
|
| + " stack param count %d\n",
|
| + Builtins::name(builtin_name), register_parameter_count,
|
| + stack_param_count);
|
| }
|
|
|
| unsigned output_frame_offset = output_frame_size;
|
| @@ -3527,7 +3530,6 @@ TranslatedFrame TranslatedFrame::ConstructStubFrame(
|
|
|
| TranslatedFrame TranslatedFrame::BuiltinContinuationFrame(
|
| BailoutId bailout_id, SharedFunctionInfo* shared_info, int height) {
|
| - base::OS::DebugBreak();
|
| TranslatedFrame frame(kBuiltinContinuation, shared_info->GetIsolate(),
|
| shared_info, height);
|
| frame.node_id_ = bailout_id;
|
| @@ -3683,8 +3685,11 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
|
| PrintF(trace_file, " => bailout_id=%d, height=%d; inputs:\n",
|
| bailout_id.ToInt(), height);
|
| }
|
| + // Add one to the height to account for the context which was implicitly
|
| + // added to the translation during code generation.
|
| + int height_with_context = height + 1;
|
| return TranslatedFrame::BuiltinContinuationFrame(bailout_id, shared_info,
|
| - height);
|
| + height_with_context);
|
| }
|
|
|
| case Translation::JAVA_SCRIPT_BUILTIN_CONTINUATION_FRAME: {
|
| @@ -3699,8 +3704,11 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
|
| PrintF(trace_file, " => bailout_id=%d, height=%d; inputs:\n",
|
| bailout_id.ToInt(), height);
|
| }
|
| + // Add one to the height to account for the context which was implicitly
|
| + // added to the translation during code generation.
|
| + int height_with_context = height + 1;
|
| return TranslatedFrame::JavaScriptBuiltinContinuationFrame(
|
| - bailout_id, shared_info, height + 1);
|
| + bailout_id, shared_info, height_with_context);
|
| }
|
|
|
| case Translation::GETTER_STUB_FRAME: {
|
|
|