AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[V8] Fixed infinite loop in Debug::PrepareStep

Browse Source 
frame->GetExpression always returns the same function. We should iterate through expression stack when we use Function.call.apply for finding actual target.

LOG=N
BUG=chromium:499479
R=yurys@chromium.org,yangguo@chromium.org

Review URL: https://codereview.chromium.org/1182703003

Cr-Commit-Position: refs/heads/master@{#29048}
This commit is contained in:
kozyatinskiy 2015-06-16 04:09:50 -07:00 committed by Commit bot
parent 63f4c75162
commit 8e1c3a75b0
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/debug.cc
View File

@ -1379,11 +1379,16 @@ void Debug::PrepareStep(StepAction step_action,
Isolate* isolate = JSFunction::cast(fun)->GetIsolate();
Code* apply = isolate->builtins()->builtin(Builtins::kFunctionApply);
Code* call = isolate->builtins()->builtin(Builtins::kFunctionCall);
// Find target function on the expression stack for expression like
// Function.call.call...apply(...)
int i = 1;
while (fun->IsJSFunction()) {
Code* code = JSFunction::cast(fun)->shared()->code();
if (code != apply && code != call) break;
fun = frame->GetExpression(
expressions_count - 1 - call_function_arg_count);
DCHECK(expressions_count - i - call_function_arg_count >= 0);
fun = frame->GetExpression(expressions_count - i -
call_function_arg_count);
i -= 1;
}
}

42
test/cctest/test-debug.cc
View File

@ -3821,6 +3821,48 @@ TEST(DebugStepFunctionCall) {
}
// Test that step in works with Function.call.apply.
TEST(DebugStepFunctionCallApply) {
DebugLocalContext env;
v8::Isolate* isolate = env->GetIsolate();
v8::HandleScope scope(isolate);
// Create a function for testing stepping.
v8::Local<v8::Function> foo =
CompileFunction(&env,
"function bar() { }"
"function foo(){ debugger;"
" Function.call.apply(bar);"
" Function.call.apply(Function.call, "
"[Function.call, bar]);"
"}",
"foo");
// Register a debug event listener which steps and counts.
v8::Debug::SetDebugEventListener(DebugEventStep);
step_action = StepIn;
break_point_hit_count = 0;
foo->Call(env->Global(), 0, NULL);
CHECK_EQ(5, break_point_hit_count);
v8::Debug::SetDebugEventListener(NULL);
CheckDebuggerUnloaded();
// Register a debug event listener which just counts.
v8::Debug::SetDebugEventListener(DebugEventBreakPointHitCount);
break_point_hit_count = 0;
foo->Call(env->Global(), 0, NULL);
// Without stepping only the debugger statement is hit.
CHECK_EQ(1, break_point_hit_count);
v8::Debug::SetDebugEventListener(NULL);
CheckDebuggerUnloaded();
}
// Tests that breakpoint will be hit if it's set in script.
TEST(PauseInScript) {
DebugLocalContext env;