Reviewers: Yang, yurys,
Message:
Yury, please take a look.
Description:
[V8] Fixed infinite loop in Debug::PrepareStep
frame->GetExpression always returns the same function. We should iterate
through
expression stack when we use Function.call.apply for finding actual target.
BUG=chromium:499479
R=yu...@chromium.org,yang...@chromium.org
Please review this at https://codereview.chromium.org/1182703003/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+48, -2 lines):
M src/debug.cc
M test/cctest/test-debug.cc
Index: src/debug.cc
diff --git a/src/debug.cc b/src/debug.cc
index
342aa505da7b6378f66f9636dfc3eef12ce3df1d..e96ef4626d7d402e927dd7f96634c8eaeaad4e3b
100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1360,11 +1360,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;
}
}
Index: test/cctest/test-debug.cc
diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
index
25a75103e3704e5f7938877b8d56fee2ea9b2ffc..409e46aac538dab507e97a1bfd811d0394e2ac14
100644
--- a/test/cctest/test-debug.cc
+++ b/test/cctest/test-debug.cc
@@ -3825,6 +3825,47 @@ 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);"
+ "}",
+ "foo");
+
+ // Register a debug event listener which steps and counts.
+ v8::Debug::SetDebugEventListener(DebugEventStep);
+ step_action = StepIn;
+
+ // Check stepping where the if condition in bar is false.
+ break_point_hit_count = 0;
+ foo->Call(env->Global(), 0, NULL);
+ CHECK_EQ(4, 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;
--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
