[wasm][debug] Remove stack from local scope

This removes the stack from the local scope, as the stack is now
in its own scope.

Bug: chromium:1043034
Change-Id: I595604da71ecf4362ef67134ade8b3987086d258
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2128049Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Commit-Queue: Kim-Anh Tran <kimanh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#67038}

src/wasm/wasm-debug.cc

@@ -418,24 +418,6 @@ class InterpreterHandle {
             .Check();
       }
     }
-
-    // Fill stack values.
-    int stack_count = frame->GetStackHeight();
-    // Use an object without prototype instead of an Array, for nicer displaying
-    // in DevTools. For Arrays, the length field and prototype is displayed,
-    // which does not make too much sense here.
-    Handle<JSObject> stack_obj =
-        isolate_->factory()->NewJSObjectWithNullProto();
-    Handle<String> stack_name =
-        isolate_->factory()->InternalizeString(StaticCharVector("stack"));
-    JSObject::AddProperty(isolate, local_scope_object, stack_name, stack_obj,
-                          NONE);
-    for (int i = 0; i < stack_count; ++i) {
-      WasmValue value = frame->GetStackValue(i);
-      Handle<Object> value_obj = WasmValueToValueObject(isolate_, value);
-      JSObject::AddDataElement(stack_obj, static_cast<uint32_t>(i), value_obj,
-                               NONE);
-    }
     return local_scope_object;
   }
 
@@ -616,23 +598,6 @@ class DebugInfoImpl {
             .Check();
       }
     }
-
-    // Fill stack values.
-    // Use an object without prototype instead of an Array, for nicer displaying
-    // in DevTools. For Arrays, the length field and prototype is displayed,
-    // which does not make too much sense here.
-    Handle<JSObject> stack_obj = isolate->factory()->NewJSObjectWithNullProto();
-    Handle<String> stack_name =
-        isolate->factory()->InternalizeString(StaticCharVector("stack"));
-    JSObject::AddProperty(isolate, local_scope_object, stack_name, stack_obj,
-                          NONE);
-    int value_count = debug_side_table_entry->num_values();
-    for (int i = num_locals; i < value_count; ++i) {
-      WasmValue value = GetValue(debug_side_table_entry, i, fp, debug_break_fp);
-      Handle<Object> value_obj = WasmValueToValueObject(isolate, value);
-      JSObject::AddDataElement(stack_obj, static_cast<uint32_t>(i - num_locals),
-                               value_obj, NONE);
-    }
     return local_scope_object;
   }
 

test/inspector/debugger/wasm-inspect-many-registers.js

@@ -37,18 +37,22 @@ Protocol.Debugger.onPaused(async msg => {
   // Inspect only the top wasm frame.
   var frame = msg.params.callFrames[0];
   for (var scope of frame.scopeChain) {
-    if (scope.type != 'local') continue;
+    if (scope.type == 'global') continue;
     var scope_properties =
         await Protocol.Runtime.getProperties({objectId: scope.object.objectId});
-    for (var value of scope_properties.result.result) {
-      let msg = await Protocol.Runtime.getProperties(
+    if (scope.type == 'local') {
+      for (var value of scope_properties.result.result) {
+        let msg = await Protocol.Runtime.getProperties(
           {objectId: value.value.objectId});
-      let str = msg.result.result.map(elem => elem.value.value).join(', ');
-      line.push(`${value.name} : [${str}]`);
+        let str = msg.result.result.map(elem => elem.value.value).join(', ');
+        line.push(`${value.name}: [${str}]`);
+      }
+    } else {
+      let str = scope_properties.result.result.map(elem => elem.value.value).join(', ');
+      line.push(`${scope.type}: [${str}]`);
     }
-    InspectorTest.log(line.join('; '));
   }
-
+  InspectorTest.log(line.join('; '));
   Protocol.Debugger.resume();
 });
 

test/inspector/debugger/wasm-scope-info-expected.txt

@@ -16,14 +16,12 @@ at func (0:69):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 4 (number), "var1": 0 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at call_func (0:58):
  - scope (global):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -37,7 +35,6 @@ at func (0:71):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 4 (number), "var1": 0 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
-   stack: "0": 11 (number)
  - scope (wasm-expression-stack):
    0: 11 (number)
 at call_func (0:58):
@@ -45,7 +42,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -59,14 +55,12 @@ at func (0:73):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 0 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at call_func (0:58):
  - scope (global):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -80,7 +74,6 @@ at func (0:75):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 0 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
-   stack: "0": 47 (number)
  - scope (wasm-expression-stack):
    0: 47 (number)
 at call_func (0:58):
@@ -88,7 +81,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -102,14 +94,12 @@ at func (0:77):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at call_func (0:58):
  - scope (global):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -123,7 +113,6 @@ at func (0:88):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": 0 (number), "unicode☼f64": 0 (number)
-   stack: "0": 9223372036854775807 (string)
  - scope (wasm-expression-stack):
    0: 9223372036854775807 (string)
 at call_func (0:58):
@@ -131,7 +120,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -145,14 +133,12 @@ at func (0:90):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": 9223372036854775807 (string), "unicode☼f64": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at call_func (0:58):
  - scope (global):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -166,7 +152,6 @@ at func (0:101):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": 9223372036854775807 (string), "unicode☼f64": 0 (number)
-   stack: "0": -9223372036854775808 (string)
  - scope (wasm-expression-stack):
    0: -9223372036854775808 (string)
 at call_func (0:58):
@@ -174,7 +159,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -188,14 +172,12 @@ at func (0:103):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at call_func (0:58):
  - scope (global):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -209,7 +191,6 @@ at func (0:105):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
-   stack: "0": 1 (number)
  - scope (wasm-expression-stack):
    0: 1 (number)
 at call_func (0:58):
@@ -217,7 +198,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -231,7 +211,6 @@ at func (0:106):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
-   stack: "0": 1 (number)
  - scope (wasm-expression-stack):
    0: 1 (number)
 at call_func (0:58):
@@ -239,7 +218,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -253,7 +231,6 @@ at func (0:108):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
-   stack: "0": 1 (number), "1": 7 (number)
  - scope (wasm-expression-stack):
    0: 1 (number)
    1: 7 (number)
@@ -262,7 +239,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -276,7 +252,6 @@ at func (0:109):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
-   stack: "0": 1 (number), "1": 7 (number)
  - scope (wasm-expression-stack):
    0: 1 (number)
    1: 7 (number)
@@ -285,7 +260,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -299,7 +273,6 @@ at func (0:110):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0 (number)
-   stack: "0": 0.14285714285714285 (number)
  - scope (wasm-expression-stack):
    0: 0.14285714285714285 (number)
 at call_func (0:58):
@@ -307,7 +280,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -321,14 +293,12 @@ at func (0:112):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0.14285714285714285 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at call_func (0:58):
  - scope (global):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -342,7 +312,6 @@ at func (0:114):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0.14285714285714285 (number)
-   stack: "0": 15 (number)
  - scope (wasm-expression-stack):
    0: 15 (number)
 at call_func (0:58):
@@ -350,7 +319,6 @@ at call_func (0:58):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -364,14 +332,12 @@ at func (0:116):
    globals: "global0": 15 (number)
  - scope (local):
    locals: "0": 0 (number), "i32Arg": 11 (number), "var1": 47 (number), "i64_local": -9223372036854775808 (string), "unicode☼f64": 0.14285714285714285 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at call_func (0:58):
  - scope (global):
    globals: "global0": 15 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -385,7 +351,6 @@ at call_func (0:60):
    globals: "global0": 15 (number)
  - scope (local):
    locals: "var0": 4 (number), "var1": 7.199999809265137 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):

test/inspector/debugger/wasm-scope-info-liftoff-expected.txt

@@ -17,14 +17,12 @@ at C (interpreted) (0:85):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at B (liftoff) (0:76):
  - scope (global):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "var5": 0 (number)
-   stack: "0": 42 (number), "1": 3 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
    1: 3 (number)
@@ -33,7 +31,6 @@ at A (liftoff) (0:54):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -47,7 +44,6 @@ at C (interpreted) (0:87):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 0 (number)
-   stack: "0": 42 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
 at B (liftoff) (0:76):
@@ -55,7 +51,6 @@ at B (liftoff) (0:76):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "var5": 0 (number)
-   stack: "0": 42 (number), "1": 3 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
    1: 3 (number)
@@ -64,7 +59,6 @@ at A (liftoff) (0:54):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -78,14 +72,12 @@ at C (interpreted) (0:89):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at B (liftoff) (0:76):
  - scope (global):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "var5": 0 (number)
-   stack: "0": 42 (number), "1": 3 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
    1: 3 (number)
@@ -94,7 +86,6 @@ at A (liftoff) (0:54):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -108,7 +99,6 @@ at C (interpreted) (0:91):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 0 (number)
-   stack: "0": 47 (number)
  - scope (wasm-expression-stack):
    0: 47 (number)
 at B (liftoff) (0:76):
@@ -116,7 +106,6 @@ at B (liftoff) (0:76):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "var5": 0 (number)
-   stack: "0": 42 (number), "1": 3 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
    1: 3 (number)
@@ -125,7 +114,6 @@ at A (liftoff) (0:54):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -139,14 +127,12 @@ at C (interpreted) (0:93):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 47 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at B (liftoff) (0:76):
  - scope (global):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "var5": 0 (number)
-   stack: "0": 42 (number), "1": 3 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
    1: 3 (number)
@@ -155,7 +141,6 @@ at A (liftoff) (0:54):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -169,7 +154,6 @@ at B (liftoff) (0:78):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "var5": 0 (number)
-   stack: "0": 42 (number), "1": 3 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
    1: 3 (number)
@@ -178,7 +162,6 @@ at A (liftoff) (0:54):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -192,7 +175,6 @@ at B (liftoff) (0:79):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "var5": 0 (number)
-   stack: "0": 42 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
 at A (liftoff) (0:54):
@@ -200,7 +182,6 @@ at A (liftoff) (0:54):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -214,14 +195,12 @@ at B (liftoff) (0:80):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "0": 0 (number), "i32_arg": 42 (number), "i32_local": 0 (number), "f32_local": 7.199999809265137 (number), "var5": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at A (liftoff) (0:54):
  - scope (global):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):
@@ -235,7 +214,6 @@ at A (liftoff) (0:56):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
  - scope (global):

test/inspector/debugger/wasm-set-breakpoint-liftoff-expected.txt

@@ -9,13 +9,11 @@ Scope:
 at wasm_A (0:38):
  - scope (global):
  - scope (local):
-   stack: 
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
  - scope (global):
  - scope (local):
    locals: "var0": 3 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -34,13 +32,11 @@ Scope:
 at wasm_A (0:39):
  - scope (global):
  - scope (local):
-   stack: 
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
  - scope (global):
  - scope (local):
    locals: "var0": 3 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -51,7 +47,6 @@ at wasm_B (0:45):
  - scope (global):
  - scope (local):
    locals: "var0": 3 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -62,7 +57,6 @@ at wasm_B (0:47):
  - scope (global):
  - scope (local):
    locals: "var0": 3 (number)
-   stack: "0": 3 (number)
  - scope (wasm-expression-stack):
    0: 3 (number)
 at (anonymous) (0:17):
@@ -74,7 +68,6 @@ at wasm_B (0:49):
  - scope (global):
  - scope (local):
    locals: "var0": 3 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -85,7 +78,6 @@ at wasm_B (0:51):
  - scope (global):
  - scope (local):
    locals: "var0": 3 (number)
-   stack: "0": 3 (number)
  - scope (wasm-expression-stack):
    0: 3 (number)
 at (anonymous) (0:17):
@@ -97,7 +89,6 @@ at wasm_B (0:53):
  - scope (global):
  - scope (local):
    locals: "var0": 3 (number)
-   stack: "0": 3 (number), "1": 1 (number)
  - scope (wasm-expression-stack):
    0: 3 (number)
    1: 1 (number)
@@ -110,7 +101,6 @@ at wasm_B (0:54):
  - scope (global):
  - scope (local):
    locals: "var0": 3 (number)
-   stack: "0": 2 (number)
  - scope (wasm-expression-stack):
    0: 2 (number)
 at (anonymous) (0:17):
@@ -121,13 +111,11 @@ Scope:
 at wasm_A (0:38):
  - scope (global):
  - scope (local):
-   stack: 
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
  - scope (global):
  - scope (local):
    locals: "var0": 2 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -137,13 +125,11 @@ Scope:
 at wasm_A (0:39):
  - scope (global):
  - scope (local):
-   stack: 
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
  - scope (global):
  - scope (local):
    locals: "var0": 2 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -154,7 +140,6 @@ at wasm_B (0:45):
  - scope (global):
  - scope (local):
    locals: "var0": 2 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -165,7 +150,6 @@ at wasm_B (0:47):
  - scope (global):
  - scope (local):
    locals: "var0": 2 (number)
-   stack: "0": 2 (number)
  - scope (wasm-expression-stack):
    0: 2 (number)
 at (anonymous) (0:17):
@@ -177,7 +161,6 @@ at wasm_B (0:49):
  - scope (global):
  - scope (local):
    locals: "var0": 2 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -188,7 +171,6 @@ at wasm_B (0:51):
  - scope (global):
  - scope (local):
    locals: "var0": 2 (number)
-   stack: "0": 2 (number)
  - scope (wasm-expression-stack):
    0: 2 (number)
 at (anonymous) (0:17):
@@ -200,7 +182,6 @@ at wasm_B (0:53):
  - scope (global):
  - scope (local):
    locals: "var0": 2 (number)
-   stack: "0": 2 (number), "1": 1 (number)
  - scope (wasm-expression-stack):
    0: 2 (number)
    1: 1 (number)
@@ -213,7 +194,6 @@ at wasm_B (0:54):
  - scope (global):
  - scope (local):
    locals: "var0": 2 (number)
-   stack: "0": 1 (number)
  - scope (wasm-expression-stack):
    0: 1 (number)
 at (anonymous) (0:17):
@@ -224,13 +204,11 @@ Scope:
 at wasm_A (0:38):
  - scope (global):
  - scope (local):
-   stack: 
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
  - scope (global):
  - scope (local):
    locals: "var0": 1 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -240,13 +218,11 @@ Scope:
 at wasm_A (0:39):
  - scope (global):
  - scope (local):
-   stack: 
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
  - scope (global):
  - scope (local):
    locals: "var0": 1 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -257,7 +233,6 @@ at wasm_B (0:45):
  - scope (global):
  - scope (local):
    locals: "var0": 1 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -268,7 +243,6 @@ at wasm_B (0:47):
  - scope (global):
  - scope (local):
    locals: "var0": 1 (number)
-   stack: "0": 1 (number)
  - scope (wasm-expression-stack):
    0: 1 (number)
 at (anonymous) (0:17):
@@ -280,7 +254,6 @@ at wasm_B (0:49):
  - scope (global):
  - scope (local):
    locals: "var0": 1 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -291,7 +264,6 @@ at wasm_B (0:51):
  - scope (global):
  - scope (local):
    locals: "var0": 1 (number)
-   stack: "0": 1 (number)
  - scope (wasm-expression-stack):
    0: 1 (number)
 at (anonymous) (0:17):
@@ -303,7 +275,6 @@ at wasm_B (0:53):
  - scope (global):
  - scope (local):
    locals: "var0": 1 (number)
-   stack: "0": 1 (number), "1": 1 (number)
  - scope (wasm-expression-stack):
    0: 1 (number)
    1: 1 (number)
@@ -316,7 +287,6 @@ at wasm_B (0:54):
  - scope (global):
  - scope (local):
    locals: "var0": 1 (number)
-   stack: "0": 0 (number)
  - scope (wasm-expression-stack):
    0: 0 (number)
 at (anonymous) (0:17):
@@ -327,13 +297,11 @@ Scope:
 at wasm_A (0:38):
  - scope (global):
  - scope (local):
-   stack: 
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
  - scope (global):
  - scope (local):
    locals: "var0": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -343,13 +311,11 @@ Scope:
 at wasm_A (0:39):
  - scope (global):
  - scope (local):
-   stack: 
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
  - scope (global):
  - scope (local):
    locals: "var0": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -360,7 +326,6 @@ at wasm_B (0:45):
  - scope (global):
  - scope (local):
    locals: "var0": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped
@@ -371,7 +336,6 @@ at wasm_B (0:47):
  - scope (global):
  - scope (local):
    locals: "var0": 0 (number)
-   stack: "0": 0 (number)
  - scope (wasm-expression-stack):
    0: 0 (number)
 at (anonymous) (0:17):
@@ -383,7 +347,6 @@ at wasm_B (0:61):
  - scope (global):
  - scope (local):
    locals: "var0": 0 (number)
-   stack: 
  - scope (wasm-expression-stack):
 at (anonymous) (0:17):
    -- skipped

test/inspector/debugger/wasm-stepping-byte-offsets-expected.txt

@@ -13,7 +13,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {"0":1024}
  - scope (wasm-expression-stack):
    {"0":1024}
 at (anonymous) (0:17):
@@ -26,7 +25,6 @@ at wasm_A (0:39):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
@@ -34,7 +32,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -47,7 +44,6 @@ at wasm_A (0:40):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
@@ -55,7 +51,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -68,7 +63,6 @@ at wasm_B (0:62):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -81,7 +75,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":2}
-   stack: {"0":1024}
  - scope (wasm-expression-stack):
    {"0":1024}
 at (anonymous) (0:17):
@@ -94,7 +87,6 @@ at wasm_B (0:62):
    -- skipped
  - scope (local):
    locals: {"var0":2}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -107,7 +99,6 @@ at wasm_B (0:46):
    -- skipped
  - scope (local):
    locals: {"var0":2}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -120,7 +111,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":1024}
  - scope (wasm-expression-stack):
    {"0":1024}
 at (anonymous) (0:17):
@@ -133,7 +123,6 @@ at wasm_A (0:39):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
@@ -141,7 +130,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -154,7 +142,6 @@ at wasm_B (0:62):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -167,7 +154,6 @@ at wasm_B (0:46):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -180,7 +166,6 @@ at wasm_B (0:48):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":1}
  - scope (wasm-expression-stack):
    {"0":1}
 at (anonymous) (0:17):
@@ -193,7 +178,6 @@ at wasm_B (0:50):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -206,7 +190,6 @@ at wasm_B (0:52):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":1}
  - scope (wasm-expression-stack):
    {"0":1}
 at (anonymous) (0:17):
@@ -219,7 +202,6 @@ at wasm_B (0:54):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":1,"1":1}
  - scope (wasm-expression-stack):
    {"0":1,"1":1}
 at (anonymous) (0:17):
@@ -232,7 +214,6 @@ at wasm_B (0:55):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":0}
  - scope (wasm-expression-stack):
    {"0":0}
 at (anonymous) (0:17):
@@ -245,7 +226,6 @@ at wasm_B (0:57):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -258,7 +238,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {"0":1024}
  - scope (wasm-expression-stack):
    {"0":1024}
 at (anonymous) (0:17):
@@ -271,7 +250,6 @@ at wasm_A (0:39):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
@@ -279,7 +257,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -292,7 +269,6 @@ at wasm_A (0:40):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
@@ -300,7 +276,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -313,7 +288,6 @@ at wasm_A (0:41):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
@@ -321,7 +295,6 @@ at wasm_B (0:60):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -334,7 +307,6 @@ at wasm_B (0:62):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):

test/inspector/debugger/wasm-stepping-byte-offsets.js

@@ -114,9 +114,7 @@ async function waitForPauseAndStep(stepAction) {
             returnByValue: true
           });
         if (scope.type === 'local') {
-          if (value.locals)
-            InspectorTest.log(`   locals: ${JSON.stringify(value.locals)}`);
-          InspectorTest.log(`   stack: ${JSON.stringify(value.stack)}`);
+          InspectorTest.log(`   locals: ${JSON.stringify(value.locals)}`);
         } else {
           InspectorTest.log(`   ${JSON.stringify(value)}`);
         }

test/inspector/debugger/wasm-stepping-with-source-map-expected.txt

@@ -16,7 +16,6 @@ at wasm_B (0:54):
    -- skipped
  - scope (local):
    locals: {"var0":4}
-   stack: {"0":3}
  - scope (wasm-expression-stack):
    {"0":3}
 at (anonymous) (0:17):
@@ -29,7 +28,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -41,7 +39,6 @@ at wasm_A (0:38):
  - scope (global):
    -- skipped
  - scope (local):
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
@@ -49,7 +46,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -61,7 +57,6 @@ at wasm_A (0:39):
  - scope (global):
    -- skipped
  - scope (local):
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
@@ -69,7 +64,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -82,7 +76,6 @@ at wasm_B (0:58):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -95,7 +88,6 @@ at wasm_B (0:54):
    -- skipped
  - scope (local):
    locals: {"var0":3}
-   stack: {"0":2}
  - scope (wasm-expression-stack):
    {"0":2}
 at (anonymous) (0:17):
@@ -108,7 +100,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":2}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -121,7 +112,6 @@ at wasm_B (0:58):
    -- skipped
  - scope (local):
    locals: {"var0":2}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -134,7 +124,6 @@ at wasm_B (0:54):
    -- skipped
  - scope (local):
    locals: {"var0":2}
-   stack: {"0":1}
  - scope (wasm-expression-stack):
    {"0":1}
 at (anonymous) (0:17):
@@ -147,7 +136,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -159,7 +147,6 @@ at wasm_A (0:38):
  - scope (global):
    -- skipped
  - scope (local):
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
@@ -167,7 +154,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -180,7 +166,6 @@ at wasm_B (0:58):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -193,7 +178,6 @@ at wasm_B (0:45):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -206,7 +190,6 @@ at wasm_B (0:47):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":1}
  - scope (wasm-expression-stack):
    {"0":1}
 at (anonymous) (0:17):
@@ -219,7 +202,6 @@ at wasm_B (0:49):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -232,7 +214,6 @@ at wasm_B (0:51):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":1}
  - scope (wasm-expression-stack):
    {"0":1}
 at (anonymous) (0:17):
@@ -245,7 +226,6 @@ at wasm_B (0:53):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":1,"1":1}
  - scope (wasm-expression-stack):
    {"0":1,"1":1}
 at (anonymous) (0:17):
@@ -258,7 +238,6 @@ at wasm_B (0:54):
    -- skipped
  - scope (local):
    locals: {"var0":1}
-   stack: {"0":0}
  - scope (wasm-expression-stack):
    {"0":0}
 at (anonymous) (0:17):
@@ -271,7 +250,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -283,7 +261,6 @@ at wasm_A (0:38):
  - scope (global):
    -- skipped
  - scope (local):
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
@@ -291,7 +268,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -303,7 +279,6 @@ at wasm_A (0:39):
  - scope (global):
    -- skipped
  - scope (local):
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
@@ -311,7 +286,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -323,7 +297,6 @@ at wasm_A (0:40):
  - scope (global):
    -- skipped
  - scope (local):
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
@@ -331,7 +304,6 @@ at wasm_B (0:56):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):
@@ -344,7 +316,6 @@ at wasm_B (0:58):
    -- skipped
  - scope (local):
    locals: {"var0":0}
-   stack: {}
  - scope (wasm-expression-stack):
    {}
 at (anonymous) (0:17):

test/inspector/debugger/wasm-stepping-with-source-map.js

@@ -115,7 +115,6 @@ async function waitForPauseAndStep(stepAction) {
         if (scope.type === 'local') {
           if (value.locals)
             InspectorTest.log(`   locals: ${JSON.stringify(value.locals)}`);
-          InspectorTest.log(`   stack: ${JSON.stringify(value.stack)}`);
         } else {
           InspectorTest.log(`   ${JSON.stringify(value)}`);
         }