[wasm][debug] Make Scope order consistent.

JavaScript scopes are reported from inner-most to outer-most, while previously we would report WebAssembly frames from outer-most to inner-most. This is quite confusing for developers, and also doesn't really make sense, so this CL fixes this inconsistency. Bug: chromium:1071432 Change-Id: I6a4742f13b9a0df33e50c6fcd40992873996aaf5 Fixed: chromium:1159309 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2602947 Commit-Queue: Benedikt Meurer <bmeurer@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Auto-Submit: Benedikt Meurer <bmeurer@chromium.org> Reviewed-by: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#71875}

[wasm][debug] Make Scope order consistent.
JavaScript scopes are reported from inner-most to outer-most, while previously we would report WebAssembly frames from outer-most to inner-most. This is quite confusing for developers, and also doesn't really make sense, so this CL fixes this inconsistency. Bug: chromium:1071432 Change-Id: I6a4742f13b9a0df33e50c6fcd40992873996aaf5 Fixed: chromium:1159309 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2602947 Commit-Queue: Benedikt Meurer <bmeurer@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Auto-Submit: Benedikt Meurer <bmeurer@chromium.org> Reviewed-by: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#71875}
f4d408fd · Benedikt Meurer · Commit Bot · 7a7027f8 · f4d408fd · f4d408fd
Commit f4d408fd authored Dec 24, 2020 by Benedikt Meurer Committed by Commit Bot Dec 24, 2020
7 changed files
--- a/src/debug/debug-scope-iterator.cc
+++ b/src/debug/debug-scope-iterator.cc
@@ -132,7 +132,13 @@ DebugWasmScopeIterator::DebugWasmScopeIterator(Isolate* isolate,
                                               WasmFrame* frame)
    : isolate_(isolate),
      frame_(frame),
-      type_(debug::ScopeIterator::ScopeTypeModule) {}
+      type_(debug::ScopeIterator::ScopeTypeWasmExpressionStack) {
+  // Skip local scope and expression stack scope if the frame is not
+  // inspectable.
+  if (!frame->is_inspectable()) {
+    type_ = debug::ScopeIterator::ScopeTypeModule;
+  }
+}

 bool DebugWasmScopeIterator::Done() {
  return type_ == debug::ScopeIterator::ScopeTypeWith;
@@ -141,16 +147,13 @@ bool DebugWasmScopeIterator::Done() {
 void DebugWasmScopeIterator::Advance() {
  DCHECK(!Done());
  switch (type_) {
-    case ScopeTypeModule:
-      // Skip local scope and expression stack scope if the frame is not
-      // inspectable.
-      type_ = frame_->is_inspectable() ? debug::ScopeIterator::ScopeTypeLocal
-                                       : debug::ScopeIterator::ScopeTypeWith;
+    case ScopeTypeWasmExpressionStack:
+      type_ = debug::ScopeIterator::ScopeTypeLocal;
      break;
    case ScopeTypeLocal:
-      type_ = debug::ScopeIterator::ScopeTypeWasmExpressionStack;
+      type_ = debug::ScopeIterator::ScopeTypeModule;
      break;
-    case ScopeTypeWasmExpressionStack:
+    case ScopeTypeModule:
      // We use ScopeTypeWith type as marker for done.
      type_ = debug::ScopeIterator::ScopeTypeWith;
      break;
@@ -173,13 +176,13 @@ v8::Local<v8::Object> DebugWasmScopeIterator::GetObject() {
      return Utils::ToLocal(wasm::GetModuleScopeObject(instance));
    }
    case debug::ScopeIterator::ScopeTypeLocal: {
-      DCHECK(frame_->is_wasm());
+      DCHECK(frame_->is_inspectable());
      wasm::DebugInfo* debug_info = frame_->native_module()->GetDebugInfo();
      return Utils::ToLocal(debug_info->GetLocalScopeObject(
          isolate_, frame_->pc(), frame_->fp(), frame_->callee_fp()));
    }
    case debug::ScopeIterator::ScopeTypeWasmExpressionStack: {
-      DCHECK(frame_->is_wasm());
+      DCHECK(frame_->is_inspectable());
      wasm::DebugInfo* debug_info = frame_->native_module()->GetDebugInfo();
      return Utils::ToLocal(debug_info->GetStackScopeObject(
          isolate_, frame_->pc(), frame_->fp(), frame_->callee_fp()));

--- a/test/inspector/debugger/wasm-inspect-many-registers-expected.txt
+++ b/test/inspector/debugger/wasm-inspect-many-registers-expected.txt
@@ -3,100 +3,100 @@ Testing i32.
 Waiting for wasm script.
 Setting 20 breakpoints.
 Calling main.
-Paused at offset 48; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: []
-Paused at offset 50; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0]
-Paused at offset 52; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1]
-Paused at offset 54; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2]
-Paused at offset 56; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3]
-Paused at offset 58; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4]
-Paused at offset 60; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5]
-Paused at offset 62; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]
-Paused at offset 64; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]
-Paused at offset 66; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-Paused at offset 68; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-Paused at offset 69; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]
-Paused at offset 70; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]
-Paused at offset 71; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]
-Paused at offset 72; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 35]
-Paused at offset 73; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 39]
-Paused at offset 74; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 42]
-Paused at offset 75; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 44]
-Paused at offset 76; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 45]
-Paused at offset 77; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [45]
+Paused at offset 48; wasm-expression-stack: []; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 50; wasm-expression-stack: [0]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 52; wasm-expression-stack: [0, 1]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 54; wasm-expression-stack: [0, 1, 2]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 56; wasm-expression-stack: [0, 1, 2, 3]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 58; wasm-expression-stack: [0, 1, 2, 3, 4]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 60; wasm-expression-stack: [0, 1, 2, 3, 4, 5]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 62; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 64; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 66; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 68; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 69; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 70; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 71; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 72; wasm-expression-stack: [0, 1, 2, 3, 4, 35]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 73; wasm-expression-stack: [0, 1, 2, 3, 39]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 74; wasm-expression-stack: [0, 1, 2, 42]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 75; wasm-expression-stack: [0, 1, 44]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 76; wasm-expression-stack: [0, 45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 77; wasm-expression-stack: [45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 main returned.
 Testing i64.
 Waiting for wasm script.
 Setting 20 breakpoints.
 Calling main.
-Paused at offset 48; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: []
-Paused at offset 50; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0]
-Paused at offset 52; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1]
-Paused at offset 54; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2]
-Paused at offset 56; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3]
-Paused at offset 58; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4]
-Paused at offset 60; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5]
-Paused at offset 62; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]
-Paused at offset 64; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]
-Paused at offset 66; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-Paused at offset 68; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-Paused at offset 69; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]
-Paused at offset 70; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]
-Paused at offset 71; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]
-Paused at offset 72; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 35]
-Paused at offset 73; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 39]
-Paused at offset 74; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 42]
-Paused at offset 75; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 44]
-Paused at offset 76; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 45]
-Paused at offset 77; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [45]
+Paused at offset 48; wasm-expression-stack: []; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 50; wasm-expression-stack: [0]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 52; wasm-expression-stack: [0, 1]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 54; wasm-expression-stack: [0, 1, 2]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 56; wasm-expression-stack: [0, 1, 2, 3]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 58; wasm-expression-stack: [0, 1, 2, 3, 4]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 60; wasm-expression-stack: [0, 1, 2, 3, 4, 5]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 62; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 64; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 66; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 68; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 69; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 70; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 71; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 72; wasm-expression-stack: [0, 1, 2, 3, 4, 35]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 73; wasm-expression-stack: [0, 1, 2, 3, 39]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 74; wasm-expression-stack: [0, 1, 2, 42]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 75; wasm-expression-stack: [0, 1, 44]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 76; wasm-expression-stack: [0, 45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 77; wasm-expression-stack: [45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 main returned.
 Testing f32.
 Waiting for wasm script.
 Setting 20 breakpoints.
 Calling main.
-Paused at offset 48; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: []
-Paused at offset 50; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0]
-Paused at offset 52; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1]
-Paused at offset 54; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2]
-Paused at offset 56; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3]
-Paused at offset 58; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4]
-Paused at offset 60; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5]
-Paused at offset 62; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]
-Paused at offset 64; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]
-Paused at offset 66; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-Paused at offset 68; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-Paused at offset 69; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]
-Paused at offset 70; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]
-Paused at offset 71; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]
-Paused at offset 72; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 35]
-Paused at offset 73; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 39]
-Paused at offset 74; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 42]
-Paused at offset 75; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 44]
-Paused at offset 76; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 45]
-Paused at offset 77; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [45]
+Paused at offset 48; wasm-expression-stack: []; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 50; wasm-expression-stack: [0]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 52; wasm-expression-stack: [0, 1]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 54; wasm-expression-stack: [0, 1, 2]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 56; wasm-expression-stack: [0, 1, 2, 3]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 58; wasm-expression-stack: [0, 1, 2, 3, 4]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 60; wasm-expression-stack: [0, 1, 2, 3, 4, 5]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 62; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 64; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 66; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 68; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 69; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 70; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 71; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 72; wasm-expression-stack: [0, 1, 2, 3, 4, 35]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 73; wasm-expression-stack: [0, 1, 2, 3, 39]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 74; wasm-expression-stack: [0, 1, 2, 42]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 75; wasm-expression-stack: [0, 1, 44]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 76; wasm-expression-stack: [0, 45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 77; wasm-expression-stack: [45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 main returned.
 Testing f64.
 Waiting for wasm script.
 Setting 20 breakpoints.
 Calling main.
-Paused at offset 48; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: []
-Paused at offset 50; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0]
-Paused at offset 52; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1]
-Paused at offset 54; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2]
-Paused at offset 56; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3]
-Paused at offset 58; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4]
-Paused at offset 60; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5]
-Paused at offset 62; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]
-Paused at offset 64; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]
-Paused at offset 66; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-Paused at offset 68; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-Paused at offset 69; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]
-Paused at offset 70; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]
-Paused at offset 71; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]
-Paused at offset 72; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 35]
-Paused at offset 73; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 39]
-Paused at offset 74; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 42]
-Paused at offset 75; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 44]
-Paused at offset 76; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 45]
-Paused at offset 77; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [45]
+Paused at offset 48; wasm-expression-stack: []; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 50; wasm-expression-stack: [0]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 52; wasm-expression-stack: [0, 1]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 54; wasm-expression-stack: [0, 1, 2]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 56; wasm-expression-stack: [0, 1, 2, 3]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 58; wasm-expression-stack: [0, 1, 2, 3, 4]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 60; wasm-expression-stack: [0, 1, 2, 3, 4, 5]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 62; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 64; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 66; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 68; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 69; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 70; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 71; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 72; wasm-expression-stack: [0, 1, 2, 3, 4, 35]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 73; wasm-expression-stack: [0, 1, 2, 3, 39]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 74; wasm-expression-stack: [0, 1, 2, 42]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 75; wasm-expression-stack: [0, 1, 44]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 76; wasm-expression-stack: [0, 45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 77; wasm-expression-stack: [45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 main returned.
 Finished!
--- a/test/inspector/debugger/wasm-scope-info-expected.txt
+++ b/test/inspector/debugger/wasm-scope-info-expected.txt
@@ -12,10 +12,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 147: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at func (0:147):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 4 (i32)
@@ -24,16 +21,19 @@ at func (0:147):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -42,10 +42,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 149: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at func (0:149):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 11 (i32)
 - scope (local):
   0: 0 (f64)
   i32Arg: 4 (i32)
@@ -54,17 +52,19 @@ at func (0:149):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 11 (i32)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -73,10 +73,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 151: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at func (0:151):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -85,16 +82,19 @@ at func (0:151):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -103,10 +103,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 153: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at func (0:153):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 47 (i32)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -115,17 +113,19 @@ at func (0:153):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 47 (i32)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -134,10 +134,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 155: Wasm opcode 0x42 (kExprI64Const)
 Scope:
 at func (0:155):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -146,16 +143,19 @@ at func (0:155):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -164,10 +164,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 166: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at func (0:166):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 9223372036854775807 (i64)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -176,17 +174,19 @@ at func (0:166):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 9223372036854775807 (i64)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -195,10 +195,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 168: Wasm opcode 0x42 (kExprI64Const)
 Scope:
 at func (0:168):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -207,16 +204,19 @@ at func (0:168):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -225,10 +225,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 179: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at func (0:179):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: -9223372036854775808 (i64)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -237,17 +235,19 @@ at func (0:179):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: -9223372036854775808 (i64)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -256,10 +256,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 181: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at func (0:181):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -268,16 +265,19 @@ at func (0:181):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -286,10 +286,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 183: Wasm opcode 0xb8 (kExprF64UConvertI32)
 Scope:
 at func (0:183):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 1 (i32)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -298,17 +296,19 @@ at func (0:183):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 1 (i32)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -317,10 +317,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 184: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at func (0:184):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 1 (f64)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -329,17 +327,19 @@ at func (0:184):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 1 (f64)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -348,10 +348,9 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 186: Wasm opcode 0xb8 (kExprF64UConvertI32)
 Scope:
 at func (0:186):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 1 (f64)
+   1: 7 (i32)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -360,18 +359,19 @@ at func (0:186):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 1 (f64)
-   1: 7 (i32)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -380,10 +380,9 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 187: Wasm opcode 0xa3 (kExprF64Div)
 Scope:
 at func (0:187):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 1 (f64)
+   1: 7 (f64)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -392,18 +391,19 @@ at func (0:187):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 1 (f64)
-   1: 7 (f64)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -412,10 +412,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 188: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at func (0:188):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 0.14285714285714285 (f64)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -424,17 +422,19 @@ at func (0:188):
   unicode☼f64: 0 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 0.14285714285714285 (f64)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -443,10 +443,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 190: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at func (0:190):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -455,16 +452,19 @@ at func (0:190):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -473,10 +473,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 192: Wasm opcode 0xfd (kSimdPrefix)
 Scope:
 at func (0:192):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 23 (i32)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -485,17 +483,19 @@ at func (0:192):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 23 (i32)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -504,10 +504,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 194: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at func (0:194):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -516,17 +514,19 @@ at func (0:194):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -535,10 +535,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 196: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at func (0:196):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -547,16 +544,19 @@ at func (0:196):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -565,10 +565,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 198: Wasm opcode 0xb3 (kExprF32UConvertI32)
 Scope:
 at func (0:198):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 21 (i32)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -577,17 +575,19 @@ at func (0:198):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 21 (i32)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -596,10 +596,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 199: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at func (0:199):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 21 (f32)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -608,17 +606,19 @@ at func (0:199):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 21 (f32)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -627,10 +627,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 201: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at func (0:201):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -639,16 +636,19 @@ at func (0:201):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
   var7: 21 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -657,10 +657,8 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 203: Wasm opcode 0x24 (kExprGlobalSet)
 Scope:
 at func (0:203):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 15 (i32)
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -669,17 +667,19 @@ at func (0:203):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
   var7: 21 (f32)
- - scope (wasm-expression-stack):
-   0: 15 (i32)
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -688,10 +688,7 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 205: Wasm opcode 0x0b (kExprEnd)
 Scope:
 at func (0:205):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 15 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f64)
   i32Arg: 11 (i32)
@@ -700,16 +697,19 @@ at func (0:205):
   unicode☼f64: 0.14285714285714285 (f64)
   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
   var7: 21 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 15 (i32)
+at call_func (0:132):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 4 (i32)
   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 15 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -718,14 +718,14 @@ Paused:
 Script wasm://wasm/c723f83a byte offset 134: Wasm opcode 0x0b (kExprEnd)
 Scope:
 at call_func (0:134):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   var0: 4 (i32)
+   var1: 7.199999809265137 (f32)
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 15 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals

--- a/test/inspector/debugger/wasm-scope-info-liftoff-expected.txt
+++ b/test/inspector/debugger/wasm-scope-info-liftoff-expected.txt
@@ -12,20 +12,19 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 169: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
 at C (interpreted) (0:169):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   i32_arg: 42 (i32)
   i32_local: 0 (i32)
   var2: 0 (f32)
- - scope (wasm-expression-stack):
-at B (liftoff) (0:158):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at B (liftoff) (0:158):
+ - scope (wasm-expression-stack):
+   0: 42 (i32)
+   1: 3 (i32)
 - scope (local):
   0: 0 (f32)
   i32_arg: 42 (i32)
@@ -33,17 +32,18 @@ at B (liftoff) (0:158):
   f32_local: 7.199999809265137 (f32)
   var5: 0 (f32)
   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at A (liftoff) (0:128):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 42 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -52,21 +52,20 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 171: Wasm opcode 0x24 (kExprGlobalSet)
 Scope:
 at C (interpreted) (0:171):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 0 (i32)
+ - scope (wasm-expression-stack):
+   0: 42 (i32)
 - scope (local):
   i32_arg: 42 (i32)
   i32_local: 0 (i32)
   var2: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-at B (liftoff) (0:158):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at B (liftoff) (0:158):
+ - scope (wasm-expression-stack):
+   0: 42 (i32)
+   1: 3 (i32)
 - scope (local):
   0: 0 (f32)
   i32_arg: 42 (i32)
@@ -74,17 +73,18 @@ at B (liftoff) (0:158):
   f32_local: 7.199999809265137 (f32)
   var5: 0 (f32)
   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 0 (i32)
+at A (liftoff) (0:128):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 42 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 0 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -93,20 +93,19 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 173: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at C (interpreted) (0:173):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 42 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   i32_arg: 42 (i32)
   i32_local: 0 (i32)
   var2: 0 (f32)
- - scope (wasm-expression-stack):
-at B (liftoff) (0:158):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at B (liftoff) (0:158):
+ - scope (wasm-expression-stack):
+   0: 42 (i32)
+   1: 3 (i32)
 - scope (local):
   0: 0 (f32)
   i32_arg: 42 (i32)
@@ -114,17 +113,18 @@ at B (liftoff) (0:158):
   f32_local: 7.199999809265137 (f32)
   var5: 0 (f32)
   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at A (liftoff) (0:128):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 42 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 42 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -133,21 +133,20 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 175: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at C (interpreted) (0:175):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 42 (i32)
+ - scope (wasm-expression-stack):
+   0: 47 (i32)
 - scope (local):
   i32_arg: 42 (i32)
   i32_local: 0 (i32)
   var2: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 47 (i32)
-at B (liftoff) (0:158):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at B (liftoff) (0:158):
+ - scope (wasm-expression-stack):
+   0: 42 (i32)
+   1: 3 (i32)
 - scope (local):
   0: 0 (f32)
   i32_arg: 42 (i32)
@@ -155,17 +154,18 @@ at B (liftoff) (0:158):
   f32_local: 7.199999809265137 (f32)
   var5: 0 (f32)
   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at A (liftoff) (0:128):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 42 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 42 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -174,20 +174,19 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 177: Wasm opcode 0x0b (kExprEnd)
 Scope:
 at C (interpreted) (0:177):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 42 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   i32_arg: 42 (i32)
   i32_local: 47 (i32)
   var2: 0 (f32)
- - scope (wasm-expression-stack):
-at B (liftoff) (0:158):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at B (liftoff) (0:158):
+ - scope (wasm-expression-stack):
+   0: 42 (i32)
+   1: 3 (i32)
 - scope (local):
   0: 0 (f32)
   i32_arg: 42 (i32)
@@ -195,17 +194,18 @@ at B (liftoff) (0:158):
   f32_local: 7.199999809265137 (f32)
   var5: 0 (f32)
   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at A (liftoff) (0:128):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 42 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 42 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -214,10 +214,9 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 160: Wasm opcode 0x1a (kExprDrop)
 Scope:
 at B (liftoff) (0:160):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 42 (i32)
+ - scope (wasm-expression-stack):
+   0: 42 (i32)
+   1: 3 (i32)
 - scope (local):
   0: 0 (f32)
   i32_arg: 42 (i32)
@@ -225,17 +224,18 @@ at B (liftoff) (0:160):
   f32_local: 7.199999809265137 (f32)
   var5: 0 (f32)
   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at A (liftoff) (0:128):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 42 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 42 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -244,10 +244,8 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 161: Wasm opcode 0x1a (kExprDrop)
 Scope:
 at B (liftoff) (0:161):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 42 (i32)
+ - scope (wasm-expression-stack):
+   0: 42 (i32)
 - scope (local):
   0: 0 (f32)
   i32_arg: 42 (i32)
@@ -255,16 +253,18 @@ at B (liftoff) (0:161):
   f32_local: 7.199999809265137 (f32)
   var5: 0 (f32)
   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-at A (liftoff) (0:128):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at A (liftoff) (0:128):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 42 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 42 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -273,10 +273,7 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 162: Wasm opcode 0x0b (kExprEnd)
 Scope:
 at B (liftoff) (0:162):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Memory(1)
-   globals: "exported_global": 42 (i32)
+ - scope (wasm-expression-stack):
 - scope (local):
   0: 0 (f32)
   i32_arg: 42 (i32)
@@ -284,15 +281,18 @@ at B (liftoff) (0:162):
   f32_local: 7.199999809265137 (f32)
   var5: 0 (f32)
   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-at A (liftoff) (0:128):
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
+at A (liftoff) (0:128):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 42 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
+   exported_memory: Memory(1)
+   globals: "exported_global": 42 (i32)
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals
@@ -301,13 +301,13 @@ Paused:
 Script wasm://wasm/e33badc2 byte offset 130: Wasm opcode 0x0b (kExprEnd)
 Scope:
 at A (liftoff) (0:130):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   var0: 42 (i32)
 - scope (module):
   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
   exported_memory: Memory(1)
   globals: "exported_global": 42 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
 at (anonymous) (0:17):
 - scope (global):
   -- skipped globals

--- a/test/inspector/debugger/wasm-set-breakpoint-liftoff-expected.txt
+++ b/test/inspector/debugger/wasm-set-breakpoint-liftoff-expected.txt
@@ -7,16 +7,16 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
 Scope:
 at wasm_A (0:38):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
 - scope (wasm-expression-stack):
-at wasm_B (0:56):
+ - scope (local):
 - scope (module):
   instance: exports: "main" (Function)
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 3 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Setting breakpoint at offset 39 on script v8://test/runWasm
@@ -32,359 +32,359 @@ Paused:
 Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
 Scope:
 at wasm_A (0:39):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
 - scope (wasm-expression-stack):
-at wasm_B (0:56):
+ - scope (local):
 - scope (module):
   instance: exports: "main" (Function)
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 3 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
 at wasm_B (0:45):
- - scope (module):
-   instance: exports: "main" (Function)
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 3 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
 Scope:
 at wasm_B (0:47):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
 - scope (wasm-expression-stack):
   0: 3 (i32)
+ - scope (local):
+   var0: 3 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
 at wasm_B (0:49):
- - scope (module):
-   instance: exports: "main" (Function)
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 3 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at wasm_B (0:51):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
 - scope (wasm-expression-stack):
   0: 3 (i32)
+ - scope (local):
+   var0: 3 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
 Scope:
 at wasm_B (0:53):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
 - scope (wasm-expression-stack):
   0: 3 (i32)
   1: 1 (i32)
+ - scope (local):
+   var0: 3 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at wasm_B (0:54):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
 - scope (wasm-expression-stack):
   0: 2 (i32)
+ - scope (local):
+   var0: 3 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
 Scope:
 at wasm_A (0:38):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
 - scope (wasm-expression-stack):
-at wasm_B (0:56):
+ - scope (local):
 - scope (module):
   instance: exports: "main" (Function)
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 2 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
 Scope:
 at wasm_A (0:39):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
 - scope (wasm-expression-stack):
-at wasm_B (0:56):
+ - scope (local):
 - scope (module):
   instance: exports: "main" (Function)
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 2 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
 at wasm_B (0:45):
- - scope (module):
-   instance: exports: "main" (Function)
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 2 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
 Scope:
 at wasm_B (0:47):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
 - scope (wasm-expression-stack):
   0: 2 (i32)
+ - scope (local):
+   var0: 2 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
 at wasm_B (0:49):
- - scope (module):
-   instance: exports: "main" (Function)
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 2 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at wasm_B (0:51):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
 - scope (wasm-expression-stack):
   0: 2 (i32)
+ - scope (local):
+   var0: 2 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
 Scope:
 at wasm_B (0:53):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
 - scope (wasm-expression-stack):
   0: 2 (i32)
   1: 1 (i32)
+ - scope (local):
+   var0: 2 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at wasm_B (0:54):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
 - scope (wasm-expression-stack):
   0: 1 (i32)
+ - scope (local):
+   var0: 2 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
 Scope:
 at wasm_A (0:38):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
 - scope (wasm-expression-stack):
-at wasm_B (0:56):
+ - scope (local):
 - scope (module):
   instance: exports: "main" (Function)
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 1 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
 Scope:
 at wasm_A (0:39):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
 - scope (wasm-expression-stack):
-at wasm_B (0:56):
+ - scope (local):
 - scope (module):
   instance: exports: "main" (Function)
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 1 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
 at wasm_B (0:45):
- - scope (module):
-   instance: exports: "main" (Function)
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 1 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
 Scope:
 at wasm_B (0:47):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
 - scope (wasm-expression-stack):
   0: 1 (i32)
+ - scope (local):
+   var0: 1 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
 at wasm_B (0:49):
- - scope (module):
-   instance: exports: "main" (Function)
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 1 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
 Scope:
 at wasm_B (0:51):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
 - scope (wasm-expression-stack):
   0: 1 (i32)
+ - scope (local):
+   var0: 1 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
 Scope:
 at wasm_B (0:53):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
 - scope (wasm-expression-stack):
   0: 1 (i32)
   1: 1 (i32)
+ - scope (local):
+   var0: 1 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
 at wasm_B (0:54):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
 - scope (wasm-expression-stack):
   0: 0 (i32)
+ - scope (local):
+   var0: 1 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
 Scope:
 at wasm_A (0:38):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
 - scope (wasm-expression-stack):
-at wasm_B (0:56):
+ - scope (local):
 - scope (module):
   instance: exports: "main" (Function)
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 0 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
 Scope:
 at wasm_A (0:39):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
 - scope (wasm-expression-stack):
-at wasm_B (0:56):
+ - scope (local):
 - scope (module):
   instance: exports: "main" (Function)
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 0 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
 at wasm_B (0:45):
- - scope (module):
-   instance: exports: "main" (Function)
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 0 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
 Scope:
 at wasm_B (0:47):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 0 (i32)
 - scope (wasm-expression-stack):
   0: 0 (i32)
+ - scope (local):
+   var0: 0 (i32)
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 Paused:
 Script wasm://wasm/0c10a5fe byte offset 61: Wasm opcode 0x0b (kExprEnd)
 Scope:
 at wasm_B (0:61):
- - scope (module):
-   instance: exports: "main" (Function)
+ - scope (wasm-expression-stack):
 - scope (local):
   var0: 0 (i32)
- - scope (wasm-expression-stack):
+ - scope (module):
+   instance: exports: "main" (Function)
 at (anonymous) (0:17):
   -- skipped
 exports.main returned!

--- a/test/inspector/debugger/wasm-stack-check-expected.txt
+++ b/test/inspector/debugger/wasm-stack-check-expected.txt
@@ -4,9 +4,9 @@ Wait for script
 Got wasm script: wasm://wasm/c84b7cde
 Run
 Expecting to pause at 61
-Paused at offset 61; local: [12]; wasm-expression-stack: []
-Paused at offset 62; local: [12]; wasm-expression-stack: []
-Paused at offset 64; local: [12]; wasm-expression-stack: [12]
-Paused at offset 66; local: [12]; wasm-expression-stack: [12, 1]
-Paused at offset 67; local: [12]; wasm-expression-stack: [13]
+Paused at offset 61; wasm-expression-stack: []; local: [12]
+Paused at offset 62; wasm-expression-stack: []; local: [12]
+Paused at offset 64; wasm-expression-stack: [12]; local: [12]
+Paused at offset 66; wasm-expression-stack: [12, 1]; local: [12]
+Paused at offset 67; wasm-expression-stack: [13]; local: [12]
 Finished!
--- a/test/inspector/debugger/wasm-stepping-with-source-map-expected.txt
+++ b/test/inspector/debugger/wasm-stepping-with-source-map-expected.txt
@@ -11,318 +11,318 @@ Setting breakpoint on offset 54 (on the setlocal before the call), url wasm://wa
 }
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 at wasm_B (0:54):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":4}
 - scope (wasm-expression-stack):
   {"0":3}
+ - scope (local):
+   {"var0":4}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10 (kExprCallFunction)
 at wasm_B (0:56):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":3}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:38):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
 - scope (wasm-expression-stack):
   {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
 - scope (module):
   -- skipped
- - scope (local):
-   {"var0":3}
+at wasm_B (0:56):
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 39: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:39):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
 - scope (wasm-expression-stack):
   {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
 - scope (module):
   -- skipped
- - scope (local):
-   {"var0":3}
+at wasm_B (0:56):
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c (kExprBr)
 at wasm_B (0:58):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":3}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 at wasm_B (0:54):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":3}
 - scope (wasm-expression-stack):
   {"0":2}
+ - scope (local):
+   {"var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10 (kExprCallFunction)
 at wasm_B (0:56):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":2}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":2}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c (kExprBr)
 at wasm_B (0:58):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":2}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":2}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.resume called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 at wasm_B (0:54):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":2}
 - scope (wasm-expression-stack):
   {"0":1}
+ - scope (local):
+   {"var0":2}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10 (kExprCallFunction)
 at wasm_B (0:56):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:38):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
 - scope (wasm-expression-stack):
   {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
 - scope (module):
   -- skipped
- - scope (local):
-   {"var0":1}
+at wasm_B (0:56):
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c (kExprBr)
 at wasm_B (0:58):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
 at wasm_B (0:45):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 47: Wasm opcode 0x04 (kExprIf)
 at wasm_B (0:47):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
 - scope (wasm-expression-stack):
   {"0":1}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
 at wasm_B (0:49):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 51: Wasm opcode 0x41 (kExprI32Const)
 at wasm_B (0:51):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
 - scope (wasm-expression-stack):
   {"0":1}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
 at wasm_B (0:53):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
 - scope (wasm-expression-stack):
   {"0":1,"1":1}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 at wasm_B (0:54):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
 - scope (wasm-expression-stack):
   {"0":0}
+ - scope (local):
+   {"var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10 (kExprCallFunction)
 at wasm_B (0:56):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":0}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:38):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
 - scope (wasm-expression-stack):
   {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
 - scope (module):
   -- skipped
- - scope (local):
-   {"var0":0}
+at wasm_B (0:56):
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 39: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:39):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
 - scope (wasm-expression-stack):
   {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
 - scope (module):
   -- skipped
- - scope (local):
-   {"var0":0}
+at wasm_B (0:56):
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 40: Wasm opcode 0x0b (kExprEnd)
 at wasm_A (0:40):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
 - scope (wasm-expression-stack):
   {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
 - scope (module):
   -- skipped
- - scope (local):
-   {"var0":0}
+at wasm_B (0:56):
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c (kExprBr)
 at wasm_B (0:58):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":0}
 - scope (wasm-expression-stack):
   {}
+ - scope (local):
+   {"var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
 - scope (global):
   -- skipped