Reviewers: ulan, yurys_slow,
Description:
Debugger: preserve stepping state after evaluating breakpoint condition.
[email protected], [email protected]
BUG=chromium:467180
LOG=N
Please review this at https://codereview.chromium.org/1132643004/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+67, -0 lines):
M src/debug.h
M src/debug.cc
A test/mjsunit/regress/regress-crbug-467180.js
Index: src/debug.cc
diff --git a/src/debug.cc b/src/debug.cc
index
82fab36a2b83ea96c80042d232b06dda40db30c2..d477c865a3d42f4ea8b1a024ff77b8528364356f
100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -897,6 +897,11 @@ Handle<Object> Debug::CheckBreakPoints(Handle<Object>
break_point_objects) {
Handle<FixedArray> break_points_hit;
int break_points_hit_count = 0;
DCHECK(!break_point_objects->IsUndefined());
+
+ // Break points are checked by calling into Javascript. This could change
+ // the stepping state we are currently in.
+ PreserveDebugState state(this);
+
if (break_point_objects->IsFixedArray()) {
Handle<FixedArray> array(FixedArray::cast(*break_point_objects));
break_points_hit = factory->NewFixedArray(array->length());
Index: src/debug.h
diff --git a/src/debug.h b/src/debug.h
index
9a9a3ba9239d035b69ed1e6e9c05442cfa0c2259..5fe56d3e212ba3cc43ceba249979d83988c8ce31
100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -732,6 +732,27 @@ class Debug {
Object** restarter_frame_function_pointer_;
};
+
+ class PreserveDebugState {
+ public:
+ explicit PreserveDebugState(Debug* debug) : debug_(debug) {
+ size_t size = sizeof(debug_->thread_local_);
+ storage_ = NewArray<char>(size);
+ MemCopy(storage_, &debug_->thread_local_, size);
+ }
+
+ ~PreserveDebugState() {
+ size_t size = sizeof(debug_->thread_local_);
+ MemCopy(&debug_->thread_local_, storage_, size);
+ DeleteArray(storage_);
+ }
+
+ private:
+ Debug* debug_;
+ char* storage_;
+ };
+
+
// Storage location for registers when handling debug break calls
ThreadLocal thread_local_;
Index: test/mjsunit/regress/regress-crbug-467180.js
diff --git a/test/mjsunit/regress/regress-crbug-467180.js
b/test/mjsunit/regress/regress-crbug-467180.js
new file mode 100644
index
0000000000000000000000000000000000000000..fcf5c30294e8cedacf1db1083a61a35ad6b64c59
--- /dev/null
+++ b/test/mjsunit/regress/regress-crbug-467180.js
@@ -0,0 +1,41 @@
+// Copyright 2015 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
+
+function f() {
+ for (var i = 10; i < 14; i++) { // 1
+ i; // 2
+ }
+} // 3
+
+var state = "conditional";
+var log = [];
+var exception = null;
+
+function listener(event, exec_state, event_data, data) {
+ if (event != Debug.DebugEvent.Break) return;
+ try {
+ var label = +exec_state.frame(0).sourceLineText().substr(-1);
+ log.push(label);
+ if (label == 2) log.push(exec_state.frame(0).evaluate("i").value());
+ exec_state.prepareStep(Debug.StepAction.StepNext, 1);
+ } catch (e) {
+ exception = e;
+ print("Caught something. " + e + " " + e.stack);
+ };
+};
+
+
+var Debug = debug.Debug;
+Debug.setListener(listener);
+
+Debug.setBreakPoint(f, 2, 0, "i == 12");
+
+f();
+
+Debug.setListener(null); // 4
+
+assertEquals([2,12,1,1,2,13,1,1,3,4], log);
+assertNull(exception);
--
--
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.
