Reviewers: ulan,
Description:
Prevent recursion in the debug event listener.
[email protected]
BUG=chromium:409614
LOG=N
Please review this at https://codereview.chromium.org/684573005/
Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+38, -0 lines):
M src/debug.cc
A test/mjsunit/regress/regress-crbug-409614.js
Index: src/debug.cc
diff --git a/src/debug.cc b/src/debug.cc
index
c1c2aad68279b549005857c631e8d3999e6b610d..6521110a61dc61ebb12271ed7a4bdbd1be2ea08d
100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -2762,6 +2762,7 @@ void Debug::CallEventCallback(v8::DebugEvent event,
Handle<Object> exec_state,
Handle<Object> event_data,
v8::Debug::ClientData* client_data) {
+ DisableBreak no_break(this, true);
if (event_listener_->IsForeign()) {
// Invoke the C debug event listener.
v8::Debug::EventCallback callback =
Index: test/mjsunit/regress/regress-crbug-409614.js
diff --git a/test/mjsunit/regress/regress-crbug-409614.js
b/test/mjsunit/regress/regress-crbug-409614.js
new file mode 100644
index
0000000000000000000000000000000000000000..7b27404819faa379e2ac9acb5c2191d12c767909
--- /dev/null
+++ b/test/mjsunit/regress/regress-crbug-409614.js
@@ -0,0 +1,37 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --expose-debug-as debug
+
+Debug = debug.Debug;
+var exception = null;
+var error_count = 0;
+
+function f() {
+ return 0; // Break
+}
+
+function listener(event, exec_state, event_data, data) {
+ if (event != Debug.DebugEvent.Break) return;
+ try {
+ if (exec_state.frame(0).sourceLineText().indexOf("Break") <0) {
+ error_count++;
+ }
+ exec_state.prepareStep(Debug.StepAction.StepIn, 2);
+ f(); // We should not break in this call of f().
+ } catch (e) {
+ print(e + e.stack);
+ exception = e;
+ }
+}
+
+Debug.setListener(listener);
+
+debugger; // Break
+f();
+
+Debug.setListener(null); // Break
+
+assertNull(exception);
+assertEquals(0, error_count);
--
--
v8-dev mailing list
[email protected]
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 [email protected].
For more options, visit https://groups.google.com/d/optout.
