Track locations of Vars in BinaryReaderIR and BinaryReaderInterp (#1963)

- Rebase test output to match new location tracking on Vars
- Eliminate single-argument Var() constructor.

3 files changed, 22 insertions, 22 deletions

diff --git a/test/spec/extended-const/data.txt b/test/spec/extended-const/data.txt
index 679359a1..984e8b1d 100644
--- a/test/spec/extended-const/data.txt
+++ b/test/spec/extended-const/data.txt
@@ -3,22 +3,22 @@
 ;;; ARGS*: --enable-extended-const
 (;; STDOUT ;;;
 out/test/spec/extended-const/data.wast:325: assert_invalid passed:
-  0000000: error: memory variable out of range: 0 (max 0)
+  out/test/spec/extended-const/data/data.43.wasm:000000c: error: memory variable out of range: 0 (max 0)
   000000c: error: BeginDataSegment callback failed
 out/test/spec/extended-const/data.wast:333: assert_invalid passed:
-  0000000: error: memory variable out of range: 1 (max 1)
+  out/test/spec/extended-const/data/data.44.wasm:0000012: error: memory variable out of range: 1 (max 1)
   0000012: error: BeginDataSegment callback failed
 out/test/spec/extended-const/data.wast:346: assert_invalid passed:
-  0000000: error: memory variable out of range: 0 (max 0)
+  out/test/spec/extended-const/data/data.45.wasm:000000c: error: memory variable out of range: 0 (max 0)
   000000c: error: BeginDataSegment callback failed
 out/test/spec/extended-const/data.wast:357: assert_invalid passed:
-  0000000: error: memory variable out of range: 1 (max 0)
+  out/test/spec/extended-const/data/data.46.wasm:000000d: error: memory variable out of range: 1 (max 0)
   000000d: error: BeginDataSegment callback failed
 out/test/spec/extended-const/data.wast:369: assert_invalid passed:
-  0000000: error: memory variable out of range: 1 (max 1)
+  out/test/spec/extended-const/data/data.47.wasm:0000012: error: memory variable out of range: 1 (max 1)
   0000012: error: BeginDataSegment callback failed
 out/test/spec/extended-const/data.wast:391: assert_invalid passed:
-  0000000: error: memory variable out of range: 1 (max 0)
+  out/test/spec/extended-const/data/data.48.wasm:000000d: error: memory variable out of range: 1 (max 0)
   000000d: error: BeginDataSegment callback failed
 out/test/spec/extended-const/data.wast:410: assert_invalid passed:
   out/test/spec/extended-const/data/data.49.wasm:0000013: error: type mismatch in initializer expression, expected [i32] but got [i64]
@@ -51,10 +51,10 @@ out/test/spec/extended-const/data.wast:484: assert_invalid passed:
   out/test/spec/extended-const/data/data.58.wasm:0000014: error: invalid initializer: instruction not valid in initializer expression: nop
   0000014: error: OnNopExpr callback failed
 out/test/spec/extended-const/data.wast:498: assert_invalid passed:
-  0000000: error: global variable out of range: 0 (max 0)
+  out/test/spec/extended-const/data/data.59.wasm:0000013: error: global variable out of range: 0 (max 0)
   0000013: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/data.wast:506: assert_invalid passed:
-  0000000: error: global variable out of range: 1 (max 1)
+  out/test/spec/extended-const/data/data.60.wasm:0000029: error: global variable out of range: 1 (max 1)
   0000029: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/data.wast:515: assert_invalid passed:
   out/test/spec/extended-const/data/data.61.wasm:000002d: error: initializer expression cannot reference a mutable global
diff --git a/test/spec/extended-const/elem.txt b/test/spec/extended-const/elem.txt
index 9748217a..ba2a0452 100644
--- a/test/spec/extended-const/elem.txt
+++ b/test/spec/extended-const/elem.txt
@@ -5,7 +5,7 @@
 out/test/spec/extended-const/elem.wast:321: assert_trap passed: out of bounds table access: table.init out of bounds
 out/test/spec/extended-const/elem.wast:331: assert_trap passed: out of bounds table access: table.init out of bounds
 out/test/spec/extended-const/elem.wast:336: assert_invalid passed:
-  0000000: error: table variable out of range: 0 (max 0)
+  out/test/spec/extended-const/elem/elem.33.wasm:0000016: error: table variable out of range: 0 (max 0)
   0000016: error: BeginElemSegment callback failed
 out/test/spec/extended-const/elem.wast:346: assert_invalid passed:
   out/test/spec/extended-const/elem/elem.34.wasm:0000014: error: type mismatch in initializer expression, expected [i32] but got [i64]
@@ -38,10 +38,10 @@ out/test/spec/extended-const/elem.wast:421: assert_invalid passed:
   out/test/spec/extended-const/elem/elem.43.wasm:0000015: error: invalid initializer: instruction not valid in initializer expression: nop
   0000015: error: OnNopExpr callback failed
 out/test/spec/extended-const/elem.wast:435: assert_invalid passed:
-  0000000: error: global variable out of range: 0 (max 0)
+  out/test/spec/extended-const/elem/elem.44.wasm:0000014: error: global variable out of range: 0 (max 0)
   0000014: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/elem.wast:443: assert_invalid passed:
-  0000000: error: global variable out of range: 1 (max 1)
+  out/test/spec/extended-const/elem/elem.45.wasm:000002a: error: global variable out of range: 1 (max 1)
   000002a: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/elem.wast:452: assert_invalid passed:
   out/test/spec/extended-const/elem/elem.46.wasm:000002e: error: initializer expression cannot reference a mutable global
diff --git a/test/spec/extended-const/global.txt b/test/spec/extended-const/global.txt
index 64692cc4..6d3640ff 100644
--- a/test/spec/extended-const/global.txt
+++ b/test/spec/extended-const/global.txt
@@ -46,13 +46,13 @@ out/test/spec/extended-const/global.wast:354: assert_invalid passed:
   out/test/spec/extended-const/global/global.16.wasm:0000027: error: type mismatch at end of initializer expression, expected [] but got [i32]
   0000028: error: EndGlobalInitExpr callback failed
 out/test/spec/extended-const/global.wast:359: assert_invalid passed:
-  0000000: error: initializer expression can only reference an imported global
+  out/test/spec/extended-const/global/global.17.wasm:000000f: error: initializer expression can only reference an imported global
   000000f: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/global.wast:364: assert_invalid passed:
-  0000000: error: global variable out of range: 1 (max 1)
+  out/test/spec/extended-const/global/global.18.wasm:000000f: error: global variable out of range: 1 (max 1)
   000000f: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/global.wast:369: assert_invalid passed:
-  0000000: error: global variable out of range: 2 (max 2)
+  out/test/spec/extended-const/global/global.19.wasm:0000025: error: global variable out of range: 2 (max 2)
   0000025: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/global.wast:374: assert_invalid passed:
   out/test/spec/extended-const/global/global.20.wasm:0000029: error: initializer expression cannot reference a mutable global
@@ -66,28 +66,28 @@ out/test/spec/extended-const/global.wast:412: assert_malformed passed:
 out/test/spec/extended-const/global.wast:424: assert_malformed passed:
   0000011: error: global mutability must be 0 or 1
 out/test/spec/extended-const/global.wast:438: assert_invalid passed:
-  0000000: error: global variable out of range: 0 (max 0)
+  out/test/spec/extended-const/global/global.27.wasm:000001a: error: global variable out of range: 0 (max 0)
   000001a: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/global.wast:443: assert_invalid passed:
-  0000000: error: global variable out of range: 1 (max 1)
+  out/test/spec/extended-const/global/global.28.wasm:0000022: error: global variable out of range: 1 (max 1)
   0000022: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/global.wast:451: assert_invalid passed:
-  0000000: error: global variable out of range: 1 (max 1)
+  out/test/spec/extended-const/global/global.29.wasm:0000034: error: global variable out of range: 1 (max 1)
   0000034: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/global.wast:459: assert_invalid passed:
-  0000000: error: global variable out of range: 2 (max 2)
+  out/test/spec/extended-const/global/global.30.wasm:000003c: error: global variable out of range: 2 (max 2)
   000003c: error: OnGlobalGetExpr callback failed
 out/test/spec/extended-const/global.wast:469: assert_invalid passed:
-  0000000: error: global variable out of range: 0 (max 0)
+  out/test/spec/extended-const/global/global.31.wasm:000001b: error: global variable out of range: 0 (max 0)
   000001b: error: OnGlobalSetExpr callback failed
 out/test/spec/extended-const/global.wast:474: assert_invalid passed:
-  0000000: error: global variable out of range: 1 (max 1)
+  out/test/spec/extended-const/global/global.32.wasm:0000023: error: global variable out of range: 1 (max 1)
   0000023: error: OnGlobalSetExpr callback failed
 out/test/spec/extended-const/global.wast:482: assert_invalid passed:
-  0000000: error: global variable out of range: 1 (max 1)
+  out/test/spec/extended-const/global/global.33.wasm:0000035: error: global variable out of range: 1 (max 1)
   0000035: error: OnGlobalSetExpr callback failed
 out/test/spec/extended-const/global.wast:490: assert_invalid passed:
-  0000000: error: global variable out of range: 2 (max 2)
+  out/test/spec/extended-const/global/global.34.wasm:000003d: error: global variable out of range: 2 (max 2)
   000003d: error: OnGlobalSetExpr callback failed
 out/test/spec/extended-const/global.wast:500: assert_invalid passed:
   out/test/spec/extended-const/global/global.35.wasm:0000021: error: type mismatch in global.set, expected [i32] but got []