[debug-wrapper] LiveEdit, frame.restart(), breakpoints

This adds access to the LiveEdit API object, frame.restart(), and various breakpoint setters. The LiveEdit API still depends on the JS debugging context and blocks its removal; but it should be removed once LiveEdit is rewritten in the midterm. BUG=v8:5530 Review-Url: https://codereview.chromium.org/2503293002 Cr-Commit-Position: refs/heads/master@{#41062}

[debug-wrapper] LiveEdit, frame.restart(), breakpoints
This adds access to the LiveEdit API object, frame.restart(), and various breakpoint setters. The LiveEdit API still depends on the JS debugging context and blocks its removal; but it should be removed once LiveEdit is rewritten in the midterm. BUG=v8:5530 Review-Url: https://codereview.chromium.org/2503293002 Cr-Commit-Position: refs/heads/master@{#41062}
4fb4f340 · jgruber · Commit bot · 5f0be34c · 4fb4f340 · 4fb4f340
Commit 4fb4f340 authored Nov 17, 2016 by jgruber Committed by Commit bot Nov 17, 2016
24 changed files
--- a/test/mjsunit/debug-liveedit-1.js
+++ b/test/mjsunit/debug-liveedit-1.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/debug-liveedit-2.js
+++ b/test/mjsunit/debug-liveedit-2.js
@@ -25,8 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug --noalways-opt
+// Flags: --noalways-opt
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/debug-liveedit-3.js
+++ b/test/mjsunit/debug-liveedit-3.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 // In this test case we edit a script so that techincally function text
 // hasen't been changed. However actually function became one level more nested

--- a/test/mjsunit/debug-liveedit-4.js
+++ b/test/mjsunit/debug-liveedit-4.js
@@ -25,8 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug --noalways-opt
+// Flags: --noalways-opt
-// Get the Debug object exposed from the debug context global object.
 // In this test case we edit a script so that techincally function text
 // hasen't been changed. However actually function became one level more nested

--- a/test/mjsunit/debug-liveedit-check-stack.js
+++ b/test/mjsunit/debug-liveedit-check-stack.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug --allow-natives-syntax
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/debug-liveedit-compile-error.js
+++ b/test/mjsunit/debug-liveedit-compile-error.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/debug-liveedit-diff.js
+++ b/test/mjsunit/debug-liveedit-diff.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/debug-liveedit-exceptions.js
+++ b/test/mjsunit/debug-liveedit-exceptions.js
@@ -2,7 +2,6 @@
 // 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

--- a/test/mjsunit/debug-liveedit-literals.js
+++ b/test/mjsunit/debug-liveedit-literals.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/debug-liveedit-newsource.js
+++ b/test/mjsunit/debug-liveedit-newsource.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/debug-liveedit-patch-positions-replace.js
+++ b/test/mjsunit/debug-liveedit-patch-positions-replace.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 // Scenario: a function is being changed, which causes enclosing function to
 // have its positions patched; position changing requires new instance of Code

--- a/test/mjsunit/debug-liveedit-restart-frame.js
+++ b/test/mjsunit/debug-liveedit-restart-frame.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/debug-liveedit-stack-padding.js
+++ b/test/mjsunit/debug-liveedit-stack-padding.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug;
 Debug.setListener(listener);

--- a/test/mjsunit/debug-liveedit-stepin.js
+++ b/test/mjsunit/debug-liveedit-stepin.js
@@ -2,7 +2,6 @@
 // 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

--- a/test/mjsunit/debug-liveedit-utils.js
+++ b/test/mjsunit/debug-liveedit-utils.js
@@ -25,8 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --expose-debug-as debug
-// Get the Debug object exposed from the debug context global object.
 Debug = debug.Debug

--- a/test/mjsunit/es6/debug-liveedit-new-target-1.js
+++ b/test/mjsunit/es6/debug-liveedit-new-target-1.js
@@ -2,7 +2,6 @@
 // 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 --allow-natives-syntax
 // Test that live-editing a frame that uses new.target fails.

--- a/test/mjsunit/es6/debug-liveedit-new-target-2.js
+++ b/test/mjsunit/es6/debug-liveedit-new-target-2.js
@@ -2,7 +2,6 @@
 // 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 --allow-natives-syntax
 // Test that live-editing a frame to introduce new.target fails.

--- a/test/mjsunit/es6/debug-liveedit-new-target-3.js
+++ b/test/mjsunit/es6/debug-liveedit-new-target-3.js
@@ -2,7 +2,6 @@
 // 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 --allow-natives-syntax
 // Test that live-editing a frame above one that uses new.target succeeds.

--- a/test/mjsunit/es6/generators-debug-liveedit.js
+++ b/test/mjsunit/es6/generators-debug-liveedit.js
@@ -2,7 +2,6 @@
 // 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 --allow-natives-syntax
 var Debug = debug.Debug;
 var LiveEdit = Debug.LiveEdit;

--- a/test/mjsunit/harmony/debug-async-liveedit.js
+++ b/test/mjsunit/harmony/debug-async-liveedit.js
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 // Flags: --harmony-async-await
-// Flags: --expose-debug-as debug --allow-natives-syntax
 var Debug = debug.Debug;
 var LiveEdit = Debug.LiveEdit;

--- a/test/mjsunit/regress/regress-crbug-481896.js
+++ b/test/mjsunit/regress/regress-crbug-481896.js
@@ -2,7 +2,6 @@
 // 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 static() {
  print("> static");  // Break
@@ -43,7 +42,7 @@ for (var script of scripts) {
 }
 Debug.setScriptBreakPointById(dynamic_script.id, 1);
-Debug.setScriptBreakPointById(static_script.id, 7);
+Debug.setScriptBreakPointById(static_script.id, 6);
 dynamic();
 static();

--- a/test/debugger/debugger.status
+++ b/test/debugger/debugger.status
@@ -42,4 +42,13 @@
  'debug/harmony/async-debug-caught-exception-cases2': [SKIP],
  'debug/harmony/async-debug-caught-exception-cases3': [SKIP],
 }],  # 'gc_stress == True'
+##############################################################################
+['arch == s390 or arch == s390x', {
+  # Stack manipulations in LiveEdit is not implemented for this arch.
+  'debug/debug-liveedit-check-stack': [SKIP],
+  'debug/debug-liveedit-stack-padding': [SKIP],
+  'debug/debug-liveedit-restart-frame': [SKIP],
+}],  # 'arch == s390 or arch == s390x'
 ]
--- a/test/debugger/test-api.js
+++ b/test/debugger/test-api.js
@@ -70,6 +70,11 @@ class DebugWrapper {
      BreakPosition: 1
    };
+    // The different script break point types.
+    this.ScriptBreakPointType = { ScriptId: 0,
+                                  ScriptName: 1,
+                                  ScriptRegExp: 2 };
    // Store the current script id so we can skip corresponding break events.
    this.thisScriptId = %FunctionGetScriptId(receive);
@@ -141,8 +146,37 @@ class DebugWrapper {
      params.condition = opt_condition;
    }
-    const {msgid, msg} = this.createMessage(
+    const {msgid, msg} = this.createMessage("Debugger.setBreakpoint", params);
-        "Debugger.setBreakpoint", params);
+    this.sendMessage(msg);
+    const reply = this.takeReplyChecked(msgid);
+    assertTrue(reply.result !== undefined);
+    const breakid = reply.result.breakpointId;
+    assertTrue(breakid !== undefined);
+    return breakid;
+  }
+  setScriptBreakPoint(type, scriptid, opt_line, opt_column, opt_condition) {
+    // Only sets by script id are supported for now.
+    assertEquals(this.ScriptBreakPointType.ScriptId, type);
+    return this.setScriptBreakPointById(scriptid, opt_line, opt_column,
+                                        opt_condition);
+  }
+  setScriptBreakPointById(scriptid, opt_line, opt_column, opt_condition) {
+    const loc = %ScriptLocationFromLine2(scriptid, opt_line, opt_column, 0);
+    const params = { location :
+                       { scriptId : scriptid.toString(),
+                         lineNumber : loc.line,
+                         columnNumber : loc.column,
+                       }};
+    if (!!opt_condition) {
+      params.condition = opt_condition;
+    }
+    const {msgid, msg} = this.createMessage("Debugger.setBreakpoint", params);
    this.sendMessage(msg);
    const reply = this.takeReplyChecked(msgid);
@@ -247,6 +281,11 @@ class DebugWrapper {
    this.takeReplyChecked(msgid);
  }
+  get LiveEdit() {
+    const debugContext = %GetDebugContext();
+    return debugContext.Debug.LiveEdit;
+  }
  // --- Internal methods. -----------------------------------------------------
  getNextMessageId() {
@@ -463,7 +502,6 @@ class DebugWrapper {
    return { value : () => value,
             isUndefined : () => obj.type == "undefined"
           };
  }
  evaluateOnCallFrame(frame, expr) {
@@ -480,6 +518,14 @@ class DebugWrapper {
    return this.reconstructRemoteObject(result);
  }
+  execStateFrameRestart(frame) {
+    const frameid = frame.callFrameId;
+    const {msgid, msg} = this.createMessage(
+        "Debugger.restartFrame", { callFrameId : frameid });
+    this.sendMessage(msg);
+    this.takeReplyChecked(msgid);
+  }
  execStateFrame(frame) {
    const scriptid = parseInt(frame.location.scriptId);
    const line = frame.location.lineNumber;
@@ -504,6 +550,7 @@ class DebugWrapper {
             localCount : () => this.execStateFrameLocalCount(frame),
             localName : (ix) => this.execStateFrameLocalName(frame, ix),
             localValue: (ix) => this.execStateFrameLocalValue(frame, ix),
+             restart : () => this.execStateFrameRestart(frame),
             scopeCount : () => frame.scopeChain.length,
             scope : (index) => this.execStateScope(frame, index),
             allScopes : allScopes.bind(this)

--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -530,9 +530,6 @@
 ['arch == s390 or arch == s390x', {
  # Stack manipulations in LiveEdit is not implemented for this arch.
-  'debug-liveedit-check-stack': [SKIP],
-  'debug-liveedit-stack-padding': [SKIP],
-  'debug-liveedit-restart-frame': [SKIP],
  'debug-liveedit-double-call': [SKIP],
 }],  # 'arch == s390 or arch == s390x'