[wasm][debug] Rename global scope to module scope

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

src/debug/debug-scope-iterator.cc

@@ -134,7 +134,7 @@ DebugWasmScopeIterator::DebugWasmScopeIterator(Isolate* isolate,
     : isolate_(isolate),
       frame_(frame),
       inlined_frame_index_(inlined_frame_index),
-      type_(debug::ScopeIterator::ScopeTypeGlobal) {}
+      type_(debug::ScopeIterator::ScopeTypeModule) {}
 
 bool DebugWasmScopeIterator::Done() {
   return type_ == debug::ScopeIterator::ScopeTypeWith;
@@ -143,7 +143,7 @@ bool DebugWasmScopeIterator::Done() {
 void DebugWasmScopeIterator::Advance() {
   DCHECK(!Done());
   switch (type_) {
-    case ScopeTypeGlobal:
+    case ScopeTypeModule:
       type_ = debug::ScopeIterator::ScopeTypeLocal;
       break;
     case ScopeTypeLocal:
@@ -166,10 +166,10 @@ v8::debug::ScopeIterator::ScopeType DebugWasmScopeIterator::GetType() {
 v8::Local<v8::Object> DebugWasmScopeIterator::GetObject() {
   DCHECK(!Done());
   switch (type_) {
-    case debug::ScopeIterator::ScopeTypeGlobal: {
+    case debug::ScopeIterator::ScopeTypeModule: {
       Handle<WasmInstanceObject> instance =
           FrameSummary::GetTop(frame_).AsWasm().wasm_instance();
-      return Utils::ToLocal(wasm::GetGlobalScopeObject(instance));
+      return Utils::ToLocal(wasm::GetModuleScopeObject(instance));
     }
     case debug::ScopeIterator::ScopeTypeLocal: {
       if (frame_->is_wasm_interpreter_entry()) {

src/wasm/wasm-debug.cc

@@ -495,10 +495,10 @@ Address FindNewPC(WasmCode* wasm_code, int byte_offset,
 
 }  // namespace
 
-Handle<JSObject> GetGlobalScopeObject(Handle<WasmInstanceObject> instance) {
+Handle<JSObject> GetModuleScopeObject(Handle<WasmInstanceObject> instance) {
   Isolate* isolate = instance->GetIsolate();
 
-  Handle<JSObject> global_scope_object =
+  Handle<JSObject> module_scope_object =
       isolate->factory()->NewJSObjectWithNullProto();
   if (instance->has_memory_object()) {
     Handle<String> name;
@@ -514,7 +514,7 @@ Handle<JSObject> GetGlobalScopeObject(Handle<WasmInstanceObject> instance) {
         instance->memory_object().array_buffer(), isolate);
     Handle<JSTypedArray> uint8_array = isolate->factory()->NewJSTypedArray(
         kExternalUint8Array, memory_buffer, 0, memory_buffer->byte_length());
-    JSObject::AddProperty(isolate, global_scope_object, name, uint8_array,
+    JSObject::AddProperty(isolate, module_scope_object, name, uint8_array,
                           NONE);
   }
 
@@ -524,7 +524,7 @@ Handle<JSObject> GetGlobalScopeObject(Handle<WasmInstanceObject> instance) {
         isolate->factory()->NewJSObjectWithNullProto();
     Handle<String> globals_name =
         isolate->factory()->InternalizeString(StaticCharVector("globals"));
-    JSObject::AddProperty(isolate, global_scope_object, globals_name,
+    JSObject::AddProperty(isolate, module_scope_object, globals_name,
                           globals_obj, NONE);
 
     for (uint32_t i = 0; i < globals.size(); ++i) {
@@ -540,8 +540,7 @@ Handle<JSObject> GetGlobalScopeObject(Handle<WasmInstanceObject> instance) {
       JSObject::AddProperty(isolate, globals_obj, name, value_obj, NONE);
     }
   }
-
-  return global_scope_object;
+  return module_scope_object;
 }
 
 class DebugInfoImpl {

src/wasm/wasm-debug.h

@@ -130,9 +130,9 @@ class DebugSideTable {
   std::vector<Entry> entries_;
 };
 
-// Get the global scope for a given instance. This will contain the wasm memory
+// Get the module scope for a given instance. This will contain the wasm memory
 // (if the instance has a memory) and the values of all globals.
-Handle<JSObject> GetGlobalScopeObject(Handle<WasmInstanceObject>);
+Handle<JSObject> GetModuleScopeObject(Handle<WasmInstanceObject>);
 
 // Debug info per NativeModule, created lazily on demand.
 // Implementation in {wasm-debug.cc} using PIMPL.

test/inspector/debugger/wasm-anyref-global.js

@@ -57,16 +57,17 @@ let {session, contextGroup, Protocol} =
     InspectorTest.log('Paused in debugger.');
     let scopeChain = callFrames[0].scopeChain;
     for (let scope of scopeChain) {
-      if (scope.type != 'global') continue;
+      if (scope.type != 'module') continue;
 
-      let globalObjectProps = (await Protocol.Runtime.getProperties({
+      let moduleObjectProps = (await Protocol.Runtime.getProperties({
                               'objectId': scope.object.objectId
                             })).result.result;
 
-      for (let prop of globalObjectProps) {
+      for (let prop of moduleObjectProps) {
+        if (prop.name != 'globals') continue;
         let subProps = (await Protocol.Runtime.getProperties({
-                              objectId: prop.value.objectId
-                            })).result.result;
+                            objectId: prop.value.objectId
+                          })).result.result;
         let values =
             subProps.map((value) => `"${value.name}": ${value.value.value}`)
                 .join(', ');

test/inspector/debugger/wasm-global-names.js

@@ -58,16 +58,16 @@ function test(moduleBytes) {
     InspectorTest.log('Paused in debugger.');
     let scopeChain = callFrames[0].scopeChain;
     for (let scope of scopeChain) {
-      if (scope.type != 'global') continue;
-
-      let globalObjectProps = (await Protocol.Runtime.getProperties({
+      if (scope.type != 'module') continue;
+      let moduleObjectProps = (await Protocol.Runtime.getProperties({
                                 'objectId': scope.object.objectId
                               })).result.result;
 
-      for (let prop of globalObjectProps) {
+      for (let prop of moduleObjectProps) {
+        if (prop.name != 'globals') continue;
         let subProps = (await Protocol.Runtime.getProperties({
-                         objectId: prop.value.objectId
-                       })).result.result;
+                        objectId: prop.value.objectId
+                      })).result.result;
         let values = subProps.map((value) => `"${value.name}"`).join(', ');
         InspectorTest.log(`   ${prop.name}: {${values}}`);
       }

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

@@ -35,7 +35,7 @@ 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 == 'global') continue;
+    if (scope.type == 'module') continue;
     var scope_properties =
         await Protocol.Runtime.getProperties({objectId: scope.object.objectId});
     if (scope.type == 'local') {

test/inspector/debugger/wasm-memory-names.js

@@ -56,12 +56,12 @@ async function logMemoryName(msg, Protocol) {
 
   let scopeChain = callFrames[0].scopeChain;
   for (let scope of scopeChain) {
-    if (scope.type != 'global') continue;
-
-    let globalObjectProps = (await Protocol.Runtime.getProperties({
+    if (scope.type != 'module') continue;
+    let moduleObjectProps = (await Protocol.Runtime.getProperties({
                               'objectId': scope.object.objectId
                             })).result.result;
-    for (let prop of globalObjectProps) {
+
+    for (let prop of moduleObjectProps) {
       InspectorTest.log(`name: ${prop.name}`);
     }
   }

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

@@ -13,13 +13,13 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 85: Wasm opcode 0x20
 Scope:
 at C (interpreted) (0:85):
- - scope (global):
+ - scope (module):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 0 (number)
  - scope (wasm-expression-stack):
 at B (liftoff) (0:76):
- - scope (global):
+ - scope (module):
    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)
@@ -27,7 +27,7 @@ at B (liftoff) (0:76):
    0: 42 (number)
    1: 3 (number)
 at A (liftoff) (0:54):
- - scope (global):
+ - scope (module):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 42 (number)
@@ -40,14 +40,14 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 87: Wasm opcode 0x24
 Scope:
 at C (interpreted) (0:87):
- - scope (global):
+ - scope (module):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 0 (number)
  - scope (wasm-expression-stack):
    0: 42 (number)
 at B (liftoff) (0:76):
- - scope (global):
+ - scope (module):
    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)
@@ -55,7 +55,7 @@ at B (liftoff) (0:76):
    0: 42 (number)
    1: 3 (number)
 at A (liftoff) (0:54):
- - scope (global):
+ - scope (module):
    globals: "global0": 0 (number)
  - scope (local):
    locals: "var0": 42 (number)
@@ -68,13 +68,13 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 89: Wasm opcode 0x41
 Scope:
 at C (interpreted) (0:89):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 0 (number)
  - scope (wasm-expression-stack):
 at B (liftoff) (0:76):
- - scope (global):
+ - scope (module):
    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)
@@ -82,7 +82,7 @@ at B (liftoff) (0:76):
    0: 42 (number)
    1: 3 (number)
 at A (liftoff) (0:54):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
@@ -95,14 +95,14 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 91: Wasm opcode 0x21
 Scope:
 at C (interpreted) (0:91):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 0 (number)
  - scope (wasm-expression-stack):
    0: 47 (number)
 at B (liftoff) (0:76):
- - scope (global):
+ - scope (module):
    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)
@@ -110,7 +110,7 @@ at B (liftoff) (0:76):
    0: 42 (number)
    1: 3 (number)
 at A (liftoff) (0:54):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
@@ -123,13 +123,13 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 93: Wasm opcode 0x0b
 Scope:
 at C (interpreted) (0:93):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "i32_arg": 42 (number), "i32_local": 47 (number)
  - scope (wasm-expression-stack):
 at B (liftoff) (0:76):
- - scope (global):
+ - scope (module):
    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)
@@ -137,7 +137,7 @@ at B (liftoff) (0:76):
    0: 42 (number)
    1: 3 (number)
 at A (liftoff) (0:54):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
@@ -150,7 +150,7 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 78: Wasm opcode 0x1a
 Scope:
 at B (liftoff) (0:78):
- - scope (global):
+ - scope (module):
    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)
@@ -158,7 +158,7 @@ at B (liftoff) (0:78):
    0: 42 (number)
    1: 3 (number)
 at A (liftoff) (0:54):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
@@ -171,14 +171,14 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 79: Wasm opcode 0x1a
 Scope:
 at B (liftoff) (0:79):
- - scope (global):
+ - scope (module):
    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)
  - scope (wasm-expression-stack):
    0: 42 (number)
 at A (liftoff) (0:54):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
@@ -191,13 +191,13 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 80: Wasm opcode 0x0b
 Scope:
 at B (liftoff) (0:80):
- - scope (global):
+ - scope (module):
    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)
  - scope (wasm-expression-stack):
 at A (liftoff) (0:54):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)
@@ -210,7 +210,7 @@ Paused:
 Script wasm://wasm/c4eb034a byte offset 56: Wasm opcode 0x0b
 Scope:
 at A (liftoff) (0:56):
- - scope (global):
+ - scope (module):
    globals: "global0": 42 (number)
  - scope (local):
    locals: "var0": 42 (number)

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

@@ -7,11 +7,11 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01
 Scope:
 at wasm_A (0:38):
- - scope (global):
+ - scope (module):
  - scope (local):
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 3 (number)
  - scope (wasm-expression-stack):
@@ -30,11 +30,11 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01
 Scope:
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
  - scope (local):
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 3 (number)
  - scope (wasm-expression-stack):
@@ -44,7 +44,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20
 Scope:
 at wasm_B (0:45):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 3 (number)
  - scope (wasm-expression-stack):
@@ -54,7 +54,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04
 Scope:
 at wasm_B (0:47):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 3 (number)
  - scope (wasm-expression-stack):
@@ -65,7 +65,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20
 Scope:
 at wasm_B (0:49):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 3 (number)
  - scope (wasm-expression-stack):
@@ -75,7 +75,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41
 Scope:
 at wasm_B (0:51):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 3 (number)
  - scope (wasm-expression-stack):
@@ -86,7 +86,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b
 Scope:
 at wasm_B (0:53):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 3 (number)
  - scope (wasm-expression-stack):
@@ -98,7 +98,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21
 Scope:
 at wasm_B (0:54):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 3 (number)
  - scope (wasm-expression-stack):
@@ -109,11 +109,11 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01
 Scope:
 at wasm_A (0:38):
- - scope (global):
+ - scope (module):
  - scope (local):
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 2 (number)
  - scope (wasm-expression-stack):
@@ -123,11 +123,11 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01
 Scope:
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
  - scope (local):
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 2 (number)
  - scope (wasm-expression-stack):
@@ -137,7 +137,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20
 Scope:
 at wasm_B (0:45):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 2 (number)
  - scope (wasm-expression-stack):
@@ -147,7 +147,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04
 Scope:
 at wasm_B (0:47):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 2 (number)
  - scope (wasm-expression-stack):
@@ -158,7 +158,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20
 Scope:
 at wasm_B (0:49):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 2 (number)
  - scope (wasm-expression-stack):
@@ -168,7 +168,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41
 Scope:
 at wasm_B (0:51):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 2 (number)
  - scope (wasm-expression-stack):
@@ -179,7 +179,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b
 Scope:
 at wasm_B (0:53):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 2 (number)
  - scope (wasm-expression-stack):
@@ -191,7 +191,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21
 Scope:
 at wasm_B (0:54):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 2 (number)
  - scope (wasm-expression-stack):
@@ -202,11 +202,11 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01
 Scope:
 at wasm_A (0:38):
- - scope (global):
+ - scope (module):
  - scope (local):
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 1 (number)
  - scope (wasm-expression-stack):
@@ -216,11 +216,11 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01
 Scope:
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
  - scope (local):
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 1 (number)
  - scope (wasm-expression-stack):
@@ -230,7 +230,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20
 Scope:
 at wasm_B (0:45):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 1 (number)
  - scope (wasm-expression-stack):
@@ -240,7 +240,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04
 Scope:
 at wasm_B (0:47):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 1 (number)
  - scope (wasm-expression-stack):
@@ -251,7 +251,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20
 Scope:
 at wasm_B (0:49):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 1 (number)
  - scope (wasm-expression-stack):
@@ -261,7 +261,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41
 Scope:
 at wasm_B (0:51):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 1 (number)
  - scope (wasm-expression-stack):
@@ -272,7 +272,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b
 Scope:
 at wasm_B (0:53):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 1 (number)
  - scope (wasm-expression-stack):
@@ -284,7 +284,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21
 Scope:
 at wasm_B (0:54):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 1 (number)
  - scope (wasm-expression-stack):
@@ -295,11 +295,11 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01
 Scope:
 at wasm_A (0:38):
- - scope (global):
+ - scope (module):
  - scope (local):
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 0 (number)
  - scope (wasm-expression-stack):
@@ -309,11 +309,11 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01
 Scope:
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
  - scope (local):
  - scope (wasm-expression-stack):
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 0 (number)
  - scope (wasm-expression-stack):
@@ -323,7 +323,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20
 Scope:
 at wasm_B (0:45):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 0 (number)
  - scope (wasm-expression-stack):
@@ -333,7 +333,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04
 Scope:
 at wasm_B (0:47):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 0 (number)
  - scope (wasm-expression-stack):
@@ -344,7 +344,7 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 61: Wasm opcode 0x0b
 Scope:
 at wasm_B (0:61):
- - scope (global):
+ - scope (module):
  - scope (local):
    locals: "var0": 0 (number)
  - scope (wasm-expression-stack):

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

@@ -9,7 +9,7 @@ Setting breakpoint on offset 59 (should be propagated to 60, the offset of the c
 }
 Script wasm://wasm/befe41aa byte offset 60: Wasm opcode 0x10
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -21,14 +21,14 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 39: Wasm opcode 0x01
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -40,14 +40,14 @@ at (anonymous) (0:17):
 Debugger.stepOver called
 Script wasm://wasm/befe41aa byte offset 40: Wasm opcode 0x01
 at wasm_A (0:40):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -59,7 +59,7 @@ at (anonymous) (0:17):
 Debugger.stepOut called
 Script wasm://wasm/befe41aa byte offset 62: Wasm opcode 0x0c
 at wasm_B (0:62):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -71,7 +71,7 @@ at (anonymous) (0:17):
 Debugger.stepOut called
 Script wasm://wasm/befe41aa byte offset 60: Wasm opcode 0x10
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":2}
@@ -83,7 +83,7 @@ at (anonymous) (0:17):
 Debugger.stepOver called
 Script wasm://wasm/befe41aa byte offset 62: Wasm opcode 0x0c
 at wasm_B (0:62):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":2}
@@ -95,7 +95,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 46: Wasm opcode 0x20
 at wasm_B (0:46):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":2}
@@ -107,7 +107,7 @@ at (anonymous) (0:17):
 Debugger.resume called
 Script wasm://wasm/befe41aa byte offset 60: Wasm opcode 0x10
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -119,14 +119,14 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 39: Wasm opcode 0x01
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -138,7 +138,7 @@ at (anonymous) (0:17):
 Debugger.stepOut called
 Script wasm://wasm/befe41aa byte offset 62: Wasm opcode 0x0c
 at wasm_B (0:62):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -150,7 +150,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 46: Wasm opcode 0x20
 at wasm_B (0:46):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -162,7 +162,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 48: Wasm opcode 0x04
 at wasm_B (0:48):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -174,7 +174,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 50: Wasm opcode 0x20
 at wasm_B (0:50):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -186,7 +186,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 52: Wasm opcode 0x41
 at wasm_B (0:52):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -198,7 +198,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 54: Wasm opcode 0x6b
 at wasm_B (0:54):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -210,7 +210,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 55: Wasm opcode 0x21
 at wasm_B (0:55):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -222,7 +222,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 57: Wasm opcode 0x41
 at wasm_B (0:57):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -234,7 +234,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 60: Wasm opcode 0x10
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -246,14 +246,14 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 39: Wasm opcode 0x01
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -265,14 +265,14 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 40: Wasm opcode 0x01
 at wasm_A (0:40):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -284,14 +284,14 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 41: Wasm opcode 0x0b
 at wasm_A (0:41):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1024}
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:60):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -303,7 +303,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/befe41aa byte offset 62: Wasm opcode 0x0c
 at wasm_B (0:62):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}

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

@@ -104,7 +104,7 @@ async function waitForPauseAndStep(stepAction) {
     InspectorTest.log(`at ${functionName} (${lineNumber}:${columnNumber}):`);
     for (var scope of frame.scopeChain) {
       InspectorTest.logObject(' - scope (' + scope.type + '):');
-      if (scope.type === 'global') {
+      if (scope.type === 'module' || scope.type === 'global') {
         InspectorTest.logObject('   -- skipped');
       } else {
         const {result: {result: {value}}} =

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

@@ -12,7 +12,7 @@ Setting breakpoint on offset 54 (on the setlocal before the call), url wasm://wa
 }
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21
 at wasm_B (0:54):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":4}
@@ -24,7 +24,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -36,13 +36,13 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01
 at wasm_A (0:38):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -54,13 +54,13 @@ at (anonymous) (0:17):
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 39: Wasm opcode 0x01
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -72,7 +72,7 @@ at (anonymous) (0:17):
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c
 at wasm_B (0:58):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -84,7 +84,7 @@ at (anonymous) (0:17):
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21
 at wasm_B (0:54):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":3}
@@ -96,7 +96,7 @@ at (anonymous) (0:17):
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":2}
@@ -108,7 +108,7 @@ at (anonymous) (0:17):
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c
 at wasm_B (0:58):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":2}
@@ -120,7 +120,7 @@ at (anonymous) (0:17):
 Debugger.resume called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21
 at wasm_B (0:54):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":2}
@@ -132,7 +132,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -144,13 +144,13 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01
 at wasm_A (0:38):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -162,7 +162,7 @@ at (anonymous) (0:17):
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c
 at wasm_B (0:58):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -174,7 +174,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 45: Wasm opcode 0x20
 at wasm_B (0:45):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -186,7 +186,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 47: Wasm opcode 0x04
 at wasm_B (0:47):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -198,7 +198,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 49: Wasm opcode 0x20
 at wasm_B (0:49):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -210,7 +210,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 51: Wasm opcode 0x41
 at wasm_B (0:51):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -222,7 +222,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 53: Wasm opcode 0x6b
 at wasm_B (0:53):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -234,7 +234,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21
 at wasm_B (0:54):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":1}
@@ -246,7 +246,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -258,13 +258,13 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01
 at wasm_A (0:38):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -276,13 +276,13 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 39: Wasm opcode 0x01
 at wasm_A (0:39):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -294,13 +294,13 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 40: Wasm opcode 0x0b
 at wasm_A (0:40):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
  - scope (wasm-expression-stack):
    {}
 at wasm_B (0:56):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}
@@ -312,7 +312,7 @@ at (anonymous) (0:17):
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c
 at wasm_B (0:58):
- - scope (global):
+ - scope (module):
    -- skipped
  - scope (local):
    locals: {"var0":0}

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

@@ -102,7 +102,7 @@ async function waitForPauseAndStep(stepAction) {
     InspectorTest.log(`at ${functionName} (${lineNumber}:${columnNumber}):`);
     for (var scope of frame.scopeChain) {
       InspectorTest.logObject(' - scope (' + scope.type + '):');
-      if (scope.type === 'global') {
+      if (scope.type === 'global' || scope.type === 'module') {
         InspectorTest.logObject('   -- skipped');
       } else {
         const {result: {result: {value}}} =