Reflect instruction renaming in code (#2128)

- Reflected new renamed instruction names in code and tests:
  - `get_local` -> `local.get`
  - `set_local` -> `local.set`
  - `tee_local` -> `local.tee`
  - `get_global` -> `global.get`
  - `set_global` -> `global.set`
  - `current_memory` -> `memory.size`
  - `grow_memory` -> `memory.grow`

- Removed APIs related to old instruction names in Binaryen.js and added
  APIs with new names if they are missing.

- Renamed `typedef SortedVector LocalSet` to `SetsOfLocals` to prevent
  name clashes.

- Resolved several TODO renaming items in wasm-binary.h:
  - `TableSwitch` -> `BrTable`
  - `I32ConvertI64` -> `I32WrapI64`
  - `I64STruncI32` -> `I64SExtendI32`
  - `I64UTruncI32` -> `I64UExtendI32`
  - `F32ConvertF64` -> `F32DemoteI64`
  - `F64ConvertF32` -> `F64PromoteF32`

- Renamed `BinaryenGetFeatures` and `BinaryenSetFeatures` to
  `BinaryenModuleGetFeatures` and `BinaryenModuleSetFeatures` for
  consistency.

15 files changed, 45 insertions, 45 deletions

diff --git a/test/wasm2js/address.2asm.js b/test/wasm2js/address.2asm.js
index 366bcec11..4038425ba 100644
--- a/test/wasm2js/address.2asm.js
+++ b/test/wasm2js/address.2asm.js
@@ -46,9 +46,9 @@ function asmFunc(global, env, buffer) {
  }
  
  var FUNCTION_TABLE = [];
- function __wasm_grow_memory(pagesToAdd) {
+ function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
-  var oldPages = __wasm_current_memory() | 0;
+  var oldPages = __wasm_memory_size() | 0;
   var newPages = oldPages + pagesToAdd | 0;
   if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
@@ -68,7 +68,7 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
  
- function __wasm_current_memory() {
+ function __wasm_memory_size() {
   return buffer.byteLength / 65536 | 0;
  }
  
diff --git a/test/wasm2js/br.2asm.js b/test/wasm2js/br.2asm.js
index f02b0a154..2dfb17d2e 100644
--- a/test/wasm2js/br.2asm.js
+++ b/test/wasm2js/br.2asm.js
@@ -695,7 +695,7 @@ function asmFunc(global, env, buffer) {
   "as_compare_left": $49, 
   "as_compare_right": $50, 
   "as_convert_operand": $51, 
-  "as_grow_memory_size": $52, 
+  "as_memory_grow_size": $52, 
   "nested_block_value": $53, 
   "nested_br_value": $54, 
   "nested_br_if_value": $55, 
@@ -757,7 +757,7 @@ export var as_test_operand = retasmFunc.as_test_operand;
 export var as_compare_left = retasmFunc.as_compare_left;
 export var as_compare_right = retasmFunc.as_compare_right;
 export var as_convert_operand = retasmFunc.as_convert_operand;
-export var as_grow_memory_size = retasmFunc.as_grow_memory_size;
+export var as_memory_grow_size = retasmFunc.as_memory_grow_size;
 export var nested_block_value = retasmFunc.nested_block_value;
 export var nested_br_value = retasmFunc.nested_br_value;
 export var nested_br_if_value = retasmFunc.nested_br_if_value;
diff --git a/test/wasm2js/br_table.2asm.js b/test/wasm2js/br_table.2asm.js
index 952e99b1b..b462871e5 100644
--- a/test/wasm2js/br_table.2asm.js
+++ b/test/wasm2js/br_table.2asm.js
@@ -13377,7 +13377,7 @@ function asmFunc(global, env, buffer) {
   "as_compare_left": $56, 
   "as_compare_right": $57, 
   "as_convert_operand": $58, 
-  "as_grow_memory_size": $59, 
+  "as_memory_grow_size": $59, 
   "nested_block_value": $60, 
   "nested_br_value": $61, 
   "nested_br_if_value": $62, 
@@ -13446,7 +13446,7 @@ export var as_test_operand = retasmFunc.as_test_operand;
 export var as_compare_left = retasmFunc.as_compare_left;
 export var as_compare_right = retasmFunc.as_compare_right;
 export var as_convert_operand = retasmFunc.as_convert_operand;
-export var as_grow_memory_size = retasmFunc.as_grow_memory_size;
+export var as_memory_grow_size = retasmFunc.as_memory_grow_size;
 export var nested_block_value = retasmFunc.nested_block_value;
 export var nested_br_value = retasmFunc.nested_br_value;
 export var nested_br_if_value = retasmFunc.nested_br_if_value;
diff --git a/test/wasm2js/br_table_temp.2asm.js b/test/wasm2js/br_table_temp.2asm.js
index b55d6ab24..34dffb54e 100644
--- a/test/wasm2js/br_table_temp.2asm.js
+++ b/test/wasm2js/br_table_temp.2asm.js
@@ -13281,7 +13281,7 @@ function asmFunc(global, env, buffer) {
   "as_compare_left": $56, 
   "as_compare_right": $57, 
   "as_convert_operand": $58, 
-  "as_grow_memory_size": $59, 
+  "as_memory_grow_size": $59, 
   "nested_block_value": $60, 
   "nested_br_value": $61, 
   "nested_br_if_value": $62, 
@@ -13350,7 +13350,7 @@ export var as_test_operand = retasmFunc.as_test_operand;
 export var as_compare_left = retasmFunc.as_compare_left;
 export var as_compare_right = retasmFunc.as_compare_right;
 export var as_convert_operand = retasmFunc.as_convert_operand;
-export var as_grow_memory_size = retasmFunc.as_grow_memory_size;
+export var as_memory_grow_size = retasmFunc.as_memory_grow_size;
 export var nested_block_value = retasmFunc.nested_block_value;
 export var nested_br_value = retasmFunc.nested_br_value;
 export var nested_br_if_value = retasmFunc.nested_br_if_value;
diff --git a/test/wasm2js/br_table_temp.2asm.js.opt b/test/wasm2js/br_table_temp.2asm.js.opt
index 4633a99e3..eae9b99ab 100644
--- a/test/wasm2js/br_table_temp.2asm.js.opt
+++ b/test/wasm2js/br_table_temp.2asm.js.opt
@@ -12729,7 +12729,7 @@ function asmFunc(global, env, buffer) {
   "as_compare_left": $56, 
   "as_compare_right": $57, 
   "as_convert_operand": $58, 
-  "as_grow_memory_size": $59, 
+  "as_memory_grow_size": $59, 
   "nested_block_value": $60, 
   "nested_br_value": $61, 
   "nested_br_if_value": $62, 
@@ -12798,7 +12798,7 @@ export var as_test_operand = retasmFunc.as_test_operand;
 export var as_compare_left = retasmFunc.as_compare_left;
 export var as_compare_right = retasmFunc.as_compare_right;
 export var as_convert_operand = retasmFunc.as_convert_operand;
-export var as_grow_memory_size = retasmFunc.as_grow_memory_size;
+export var as_memory_grow_size = retasmFunc.as_memory_grow_size;
 export var nested_block_value = retasmFunc.nested_block_value;
 export var nested_br_value = retasmFunc.nested_br_value;
 export var nested_br_if_value = retasmFunc.nested_br_if_value;
diff --git a/test/wasm2js/br_table_temp.wast b/test/wasm2js/br_table_temp.wast
index 865072b28..1ddff07ca 100644
--- a/test/wasm2js/br_table_temp.wast
+++ b/test/wasm2js/br_table_temp.wast
@@ -1090,8 +1090,8 @@
     (block i32 (i32.wrap_i64 (br_table 0 (i32.const 41) (i32.const 0))))
   )
 
-  (func (export "as-grow_memory-size") (result i32)
-    (block i32 (grow_memory (br_table 0 (i32.const 40) (i32.const 0))))
+  (func (export "as-memory.grow-size") (result i32)
+    (block i32 (memory.grow (br_table 0 (i32.const 40) (i32.const 0))))
   )
 
   (func (export "nested-block-value") (param i32) (result i32)
@@ -1331,7 +1331,7 @@
 
 (assert_return (invoke "as-convert-operand") (i32.const 41))
 
-(assert_return (invoke "as-grow_memory-size") (i32.const 40))
+(assert_return (invoke "as-memory.grow-size") (i32.const 40))
 
 (assert_return (invoke "nested-block-value" (i32.const 0)) (i32.const 19))
 (assert_return (invoke "nested-block-value" (i32.const 1)) (i32.const 17))
diff --git a/test/wasm2js/emscripten.wast b/test/wasm2js/emscripten.wast
index 5b1b81507..2f9e560ca 100644
--- a/test/wasm2js/emscripten.wast
+++ b/test/wasm2js/emscripten.wast
@@ -197,7 +197,7 @@
   (call $getf64)
  )
  (func $__growWasmMemory (param $0 i32) (result i32)
-  (grow_memory
+  (memory.grow
    (local.get $0)
   )
  )
diff --git a/test/wasm2js/endianness.2asm.js b/test/wasm2js/endianness.2asm.js
index 364486744..ef27e82d9 100644
--- a/test/wasm2js/endianness.2asm.js
+++ b/test/wasm2js/endianness.2asm.js
@@ -651,9 +651,9 @@ function asmFunc(global, env, buffer) {
  }
  
  var FUNCTION_TABLE = [];
- function __wasm_grow_memory(pagesToAdd) {
+ function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
-  var oldPages = __wasm_current_memory() | 0;
+  var oldPages = __wasm_memory_size() | 0;
   var newPages = oldPages + pagesToAdd | 0;
   if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
@@ -673,7 +673,7 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
  
- function __wasm_current_memory() {
+ function __wasm_memory_size() {
   return buffer.byteLength / 65536 | 0;
  }
  
diff --git a/test/wasm2js/grow-memory-tricky.2asm.js b/test/wasm2js/grow-memory-tricky.2asm.js
index ed69a4a43..0e92bc100 100644
--- a/test/wasm2js/grow-memory-tricky.2asm.js
+++ b/test/wasm2js/grow-memory-tricky.2asm.js
@@ -23,7 +23,7 @@ function asmFunc(global, env, buffer) {
  var infinity = global.Infinity;
  function $0() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_grow_memory(1 | 0)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_memory_grow(1 | 0)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
   return HEAP32[0 >> 2] | 0 | 0;
  }
  
@@ -34,13 +34,13 @@ function asmFunc(global, env, buffer) {
  }
  
  function grow() {
-  return __wasm_grow_memory(1 | 0) | 0;
+  return __wasm_memory_grow(1 | 0) | 0;
  }
  
  var FUNCTION_TABLE = [];
- function __wasm_grow_memory(pagesToAdd) {
+ function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
-  var oldPages = __wasm_current_memory() | 0;
+  var oldPages = __wasm_memory_size() | 0;
   var newPages = oldPages + pagesToAdd | 0;
   if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
@@ -60,14 +60,14 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
  
- function __wasm_current_memory() {
+ function __wasm_memory_size() {
   return buffer.byteLength / 65536 | 0;
  }
  
  return {
   "memory": Object.create(Object.prototype, {
    "grow": {
-    "value": __wasm_grow_memory
+    "value": __wasm_memory_grow
    }, 
    "buffer": {
     "get": function () {
diff --git a/test/wasm2js/grow-memory-tricky.2asm.js.opt b/test/wasm2js/grow-memory-tricky.2asm.js.opt
index 42255e0f8..078fad5ec 100644
--- a/test/wasm2js/grow-memory-tricky.2asm.js.opt
+++ b/test/wasm2js/grow-memory-tricky.2asm.js.opt
@@ -23,14 +23,14 @@ function asmFunc(global, env, buffer) {
  var infinity = global.Infinity;
  function $0() {
   var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_grow_memory(1)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  (wasm2js_i32$0 = 0, wasm2js_i32$1 = __wasm_memory_grow(1)), HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
   return HEAP32[0];
  }
  
  var FUNCTION_TABLE = [];
- function __wasm_grow_memory(pagesToAdd) {
+ function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
-  var oldPages = __wasm_current_memory() | 0;
+  var oldPages = __wasm_memory_size() | 0;
   var newPages = oldPages + pagesToAdd | 0;
   if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
@@ -50,14 +50,14 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
  
- function __wasm_current_memory() {
+ function __wasm_memory_size() {
   return buffer.byteLength / 65536 | 0;
  }
  
  return {
   "memory": Object.create(Object.prototype, {
    "grow": {
-    "value": __wasm_grow_memory
+    "value": __wasm_memory_grow
    }, 
    "buffer": {
     "get": function () {
diff --git a/test/wasm2js/grow-memory-tricky.wast b/test/wasm2js/grow-memory-tricky.wast
index 8513eb2af..163892d58 100644
--- a/test/wasm2js/grow-memory-tricky.wast
+++ b/test/wasm2js/grow-memory-tricky.wast
@@ -8,7 +8,7 @@
 
  (func $0 (result i32)
   (block (result i32)
-    (i32.store (i32.const 0) (grow_memory (i32.const 1)))
+    (i32.store (i32.const 0) (memory.grow (i32.const 1)))
     (i32.load (i32.const 0))
   )
  )
@@ -21,7 +21,7 @@
  )
 
  (func $grow (result i32)
-  (grow_memory (i32.const 1))
+  (memory.grow (i32.const 1))
  )
 )
 
diff --git a/test/wasm2js/grow_memory.2asm.js b/test/wasm2js/grow_memory.2asm.js
index 372442436..0e9864bc3 100644
--- a/test/wasm2js/grow_memory.2asm.js
+++ b/test/wasm2js/grow_memory.2asm.js
@@ -23,17 +23,17 @@ function asmFunc(global, env, buffer) {
  var infinity = global.Infinity;
  function $0(var$0) {
   var$0 = var$0 | 0;
-  return __wasm_grow_memory(var$0 | 0) | 0;
+  return __wasm_memory_grow(var$0 | 0) | 0;
  }
  
  function $1() {
-  return __wasm_current_memory() | 0;
+  return __wasm_memory_size() | 0;
  }
  
  var FUNCTION_TABLE = [];
- function __wasm_grow_memory(pagesToAdd) {
+ function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
-  var oldPages = __wasm_current_memory() | 0;
+  var oldPages = __wasm_memory_size() | 0;
   var newPages = oldPages + pagesToAdd | 0;
   if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
@@ -53,14 +53,14 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
  
- function __wasm_current_memory() {
+ function __wasm_memory_size() {
   return buffer.byteLength / 65536 | 0;
  }
  
  return {
   "memory": Object.create(Object.prototype, {
    "grow": {
-    "value": __wasm_grow_memory
+    "value": __wasm_memory_grow
    }, 
    "buffer": {
     "get": function () {
diff --git a/test/wasm2js/left-to-right.2asm.js b/test/wasm2js/left-to-right.2asm.js
index 74fe50cd6..8f8f6db3f 100644
--- a/test/wasm2js/left-to-right.2asm.js
+++ b/test/wasm2js/left-to-right.2asm.js
@@ -2091,9 +2091,9 @@ function asmFunc(global, env, buffer) {
  }
  
  var FUNCTION_TABLE = [i32_t0, i32_t1, i64_t0, i64_t1, f32_t0, f32_t1, f64_t0, f64_t1];
- function __wasm_grow_memory(pagesToAdd) {
+ function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
-  var oldPages = __wasm_current_memory() | 0;
+  var oldPages = __wasm_memory_size() | 0;
   var newPages = oldPages + pagesToAdd | 0;
   if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
@@ -2113,7 +2113,7 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
  
- function __wasm_current_memory() {
+ function __wasm_memory_size() {
   return buffer.byteLength / 65536 | 0;
  }
  
diff --git a/test/wasm2js/traps.2asm.js b/test/wasm2js/traps.2asm.js
index e702a65a0..bba034c13 100644
--- a/test/wasm2js/traps.2asm.js
+++ b/test/wasm2js/traps.2asm.js
@@ -1973,9 +1973,9 @@ function asmFunc(global, env, buffer) {
  }
  
  var FUNCTION_TABLE = [];
- function __wasm_grow_memory(pagesToAdd) {
+ function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
-  var oldPages = __wasm_current_memory() | 0;
+  var oldPages = __wasm_memory_size() | 0;
   var newPages = oldPages + pagesToAdd | 0;
   if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
@@ -1995,7 +1995,7 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
  
- function __wasm_current_memory() {
+ function __wasm_memory_size() {
   return buffer.byteLength / 65536 | 0;
  }
  
diff --git a/test/wasm2js/unreachable.2asm.js b/test/wasm2js/unreachable.2asm.js
index 47a5ff4da..b2eeb0bec 100644
--- a/test/wasm2js/unreachable.2asm.js
+++ b/test/wasm2js/unreachable.2asm.js
@@ -432,7 +432,7 @@ function asmFunc(global, env, buffer) {
   "as_compare_left": $51, 
   "as_compare_right": $52, 
   "as_convert_operand": $53, 
-  "as_grow_memory_size": $54
+  "as_memory_grow_size": $54
  };
 }
 
@@ -490,4 +490,4 @@ export var as_test_operand = retasmFunc.as_test_operand;
 export var as_compare_left = retasmFunc.as_compare_left;
 export var as_compare_right = retasmFunc.as_compare_right;
 export var as_convert_operand = retasmFunc.as_convert_operand;
-export var as_grow_memory_size = retasmFunc.as_grow_memory_size;
+export var as_memory_grow_size = retasmFunc.as_memory_grow_size;