[wasm] Rename {Get,Set}Global to Global{Get,Set}

This brings our constants back in line with the changed spec text. We
already use kExprTableGet and kExprTableSet, but for locals and globals
we still use the old wording.

This renaming is mostly mechanical.

PS1 was created using:
ag -l 'kExpr(Get|Set)Global' src test | \
  xargs -L1 sed -E 's/kExpr(Get|Set)Global\b/kExprGlobal\1/g' -i

PS2 contains manual fixes.

R=mstarzinger@chromium.org

Bug: v8:9810
Change-Id: I064a6448cd95bc24d31a5931b5b4ef2464ea88b1
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1847355
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#64163}

src/asmjs/asm-parser.cc

@@ -387,8 +387,8 @@ void AsmJsParser::ValidateModule() {
     uint32_t import_index = module_builder_->AddGlobalImport(
         global_import.import_name, global_import.value_type,
         false /* mutability */);
-    start->EmitWithI32V(kExprGetGlobal, import_index);
-    start->EmitWithI32V(kExprSetGlobal, VarIndex(global_import.var_info));
+    start->EmitWithI32V(kExprGlobalGet, import_index);
+    start->EmitWithI32V(kExprGlobalSet, VarIndex(global_import.var_info));
   }
   start->Emit(kExprEnd);
   FunctionSig::Builder b(zone(), 0, 0);
@@ -952,8 +952,8 @@ void AsmJsParser::ValidateFunctionLocals(size_t param_count,
           } else {
             FAIL("Bad local variable definition");
           }
-          current_function_builder_->EmitWithI32V(kExprGetGlobal,
-                                                    VarIndex(sinfo));
+          current_function_builder_->EmitWithI32V(kExprGlobalGet,
+                                                  VarIndex(sinfo));
           current_function_builder_->EmitSetLocal(info->index);
         } else if (sinfo->type->IsA(stdlib_fround_)) {
           EXPECT_TOKEN('(');
@@ -1447,7 +1447,7 @@ AsmType* AsmJsParser::Identifier() {
     if (info->kind != VarKind::kGlobal) {
       FAILn("Undefined global variable");
     }
-    current_function_builder_->EmitWithI32V(kExprGetGlobal, VarIndex(info));
+    current_function_builder_->EmitWithI32V(kExprGlobalGet, VarIndex(info));
     return info->type;
   }
   UNREACHABLE();
@@ -1558,8 +1558,8 @@ AsmType* AsmJsParser::AssignmentExpression() {
       if (info->kind == VarKind::kLocal) {
         current_function_builder_->EmitTeeLocal(info->index);
       } else if (info->kind == VarKind::kGlobal) {
-        current_function_builder_->EmitWithU32V(kExprSetGlobal, VarIndex(info));
-        current_function_builder_->EmitWithU32V(kExprGetGlobal, VarIndex(info));
+        current_function_builder_->EmitWithU32V(kExprGlobalSet, VarIndex(info));
+        current_function_builder_->EmitWithU32V(kExprGlobalGet, VarIndex(info));
       } else {
         UNREACHABLE();
       }

src/compiler/wasm-compiler.cc

@@ -3362,7 +3362,7 @@ Node* WasmGraphBuilder::BuildCallToRuntime(Runtime::FunctionId f,
                                        parameter_count, effect_, Control());
 }
 
-Node* WasmGraphBuilder::GetGlobal(uint32_t index) {
+Node* WasmGraphBuilder::GlobalGet(uint32_t index) {
   const wasm::WasmGlobal& global = env_->module->globals[index];
   if (wasm::ValueTypes::IsReferenceType(global.type)) {
     if (global.mutability && global.imported) {
@@ -3392,7 +3392,7 @@ Node* WasmGraphBuilder::GetGlobal(uint32_t index) {
   return result;
 }
 
-Node* WasmGraphBuilder::SetGlobal(uint32_t index, Node* val) {
+Node* WasmGraphBuilder::GlobalSet(uint32_t index, Node* val) {
   const wasm::WasmGlobal& global = env_->module->globals[index];
   if (wasm::ValueTypes::IsReferenceType(global.type)) {
     if (global.mutability && global.imported) {

src/compiler/wasm-compiler.h

@@ -287,8 +287,8 @@ class WasmGraphBuilder {
 
   Node* Invert(Node* node);
 
-  Node* GetGlobal(uint32_t index);
-  Node* SetGlobal(uint32_t index, Node* val);
+  Node* GlobalGet(uint32_t index);
+  Node* GlobalSet(uint32_t index, Node* val);
   Node* TableGet(uint32_t table_index, Node* index,
                  wasm::WasmCodePosition position);
   Node* TableSet(uint32_t table_index, Node* index, Node* val,

src/wasm/baseline/liftoff-compiler.cc

@@ -1312,7 +1312,7 @@ class LiftoffCompiler {
     return addr;
   }
 
-  void GetGlobal(FullDecoder* decoder, Value* result,
+  void GlobalGet(FullDecoder* decoder, Value* result,
                  const GlobalIndexImmediate<validate>& imm) {
     const auto* global = &env_->module->globals[imm.index];
     if (!CheckSupportedType(decoder, kSupportedTypes, global->type, "global"))
@@ -1327,7 +1327,7 @@ class LiftoffCompiler {
     __ PushRegister(global->type, value);
   }
 
-  void SetGlobal(FullDecoder* decoder, const Value& value,
+  void GlobalSet(FullDecoder* decoder, const Value& value,
                  const GlobalIndexImmediate<validate>& imm) {
     auto* global = &env_->module->globals[imm.index];
     if (!CheckSupportedType(decoder, kSupportedTypes, global->type, "global"))

src/wasm/function-body-decoder-impl.h

@@ -718,8 +718,8 @@ struct ControlBase {
   F(LocalSet, const Value& value, const LocalIndexImmediate<validate>& imm)   \
   F(LocalTee, const Value& value, Value* result,                              \
     const LocalIndexImmediate<validate>& imm)                                 \
-  F(GetGlobal, Value* result, const GlobalIndexImmediate<validate>& imm)      \
-  F(SetGlobal, const Value& value, const GlobalIndexImmediate<validate>& imm) \
+  F(GlobalGet, Value* result, const GlobalIndexImmediate<validate>& imm)      \
+  F(GlobalSet, const Value& value, const GlobalIndexImmediate<validate>& imm) \
   F(TableGet, const Value& index, Value* result,                              \
     const TableIndexImmediate<validate>& imm)                                 \
   F(TableSet, const Value& index, const Value& value,                         \
@@ -1252,8 +1252,8 @@ class WasmDecoder : public Decoder {
         BranchDepthImmediate<validate> imm(decoder, pc);
         return 1 + imm.length;
       }
-      case kExprGetGlobal:
-      case kExprSetGlobal: {
+      case kExprGlobalGet:
+      case kExprGlobalSet: {
         GlobalIndexImmediate<validate> imm(decoder, pc);
         return 1 + imm.length;
       }
@@ -1462,7 +1462,7 @@ class WasmDecoder : public Decoder {
       case kExprMemoryGrow:
         return {1, 1};
       case kExprLocalSet:
-      case kExprSetGlobal:
+      case kExprGlobalSet:
       case kExprDrop:
       case kExprBrIf:
       case kExprBrTable:
@@ -1470,7 +1470,7 @@ class WasmDecoder : public Decoder {
       case kExprRethrow:
         return {1, 0};
       case kExprLocalGet:
-      case kExprGetGlobal:
+      case kExprGlobalGet:
       case kExprI32Const:
       case kExprI64Const:
       case kExprF32Const:
@@ -2155,15 +2155,15 @@ class WasmFullDecoder : public WasmDecoder<validate> {
           CALL_INTERFACE_IF_REACHABLE(Drop, value);
           break;
         }
-        case kExprGetGlobal: {
+        case kExprGlobalGet: {
           GlobalIndexImmediate<validate> imm(this, this->pc_);
           len = 1 + imm.length;
           if (!this->Validate(this->pc_, imm)) break;
           auto* result = Push(imm.type);
-          CALL_INTERFACE_IF_REACHABLE(GetGlobal, result, imm);
+          CALL_INTERFACE_IF_REACHABLE(GlobalGet, result, imm);
           break;
         }
-        case kExprSetGlobal: {
+        case kExprGlobalSet: {
           GlobalIndexImmediate<validate> imm(this, this->pc_);
           len = 1 + imm.length;
           if (!this->Validate(this->pc_, imm)) break;
@@ -2173,7 +2173,7 @@ class WasmFullDecoder : public WasmDecoder<validate> {
             break;
           }
           auto value = Pop(0, imm.type);
-          CALL_INTERFACE_IF_REACHABLE(SetGlobal, value, imm);
+          CALL_INTERFACE_IF_REACHABLE(GlobalSet, value, imm);
           break;
         }
         case kExprTableGet: {
@@ -2454,8 +2454,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
               TRACE_PART("[%u]", imm.index);
               break;
             }
-            case kExprGetGlobal:
-            case kExprSetGlobal: {
+            case kExprGlobalGet:
+            case kExprGlobalSet: {
               GlobalIndexImmediate<Decoder::kNoValidate> imm(this, val.pc);
               TRACE_PART("[%u]", imm.index);
               break;

src/wasm/graph-builder-interface.cc

@@ -281,14 +281,14 @@ class WasmGraphBuildingInterface {
     ssa_env_->locals[imm.index] = value.node;
   }
 
-  void GetGlobal(FullDecoder* decoder, Value* result,
+  void GlobalGet(FullDecoder* decoder, Value* result,
                  const GlobalIndexImmediate<validate>& imm) {
-    result->node = BUILD(GetGlobal, imm.index);
+    result->node = BUILD(GlobalGet, imm.index);
   }
 
-  void SetGlobal(FullDecoder* decoder, const Value& value,
+  void GlobalSet(FullDecoder* decoder, const Value& value,
                  const GlobalIndexImmediate<validate>& imm) {
-    BUILD(SetGlobal, imm.index, value.node);
+    BUILD(GlobalSet, imm.index, value.node);
   }
 
   void TableGet(FullDecoder* decoder, const Value& index, Value* result,

src/wasm/module-decoder.cc

@@ -1488,7 +1488,7 @@ class ModuleDecoderImpl : public Decoder {
     WasmInitExpr expr;
     uint32_t len = 0;
     switch (opcode) {
-      case kExprGetGlobal: {
+      case kExprGlobalGet: {
         GlobalIndexImmediate<Decoder::kValidate> imm(this, pc() - 1);
         if (module->globals.size() <= imm.index) {
           error("global index is out of bounds");

src/wasm/wasm-interpreter.cc

@@ -3302,7 +3302,7 @@ class ThreadImpl {
           }
         } break;
 
-        case kExprGetGlobal: {
+        case kExprGlobalGet: {
           GlobalIndexImmediate<Decoder::kNoValidate> imm(&decoder,
                                                          code->at(pc));
           HandleScope handle_scope(isolate_);
@@ -3310,7 +3310,7 @@ class ThreadImpl {
           len = 1 + imm.length;
           break;
         }
-        case kExprSetGlobal: {
+        case kExprGlobalSet: {
           GlobalIndexImmediate<Decoder::kNoValidate> imm(&decoder,
                                                          code->at(pc));
           const WasmGlobal* global = &module()->globals[imm.index];

src/wasm/wasm-module-builder.cc

@@ -505,7 +505,7 @@ void WasmModuleBuilder::WriteTo(ZoneBuffer* buffer) const {
           buffer->write_f64(global.init.val.f64_const);
           break;
         case WasmInitExpr::kGlobalIndex:
-          buffer->write_u8(kExprGetGlobal);
+          buffer->write_u8(kExprGlobalGet);
           buffer->write_u32v(global.init.val.global_index);
           break;
         case WasmInitExpr::kRefNullConst:

src/wasm/wasm-opcodes.cc

@@ -150,8 +150,8 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) {
     CASE_OP(LocalGet, "local.get")
     CASE_OP(LocalSet, "local.set")
     CASE_OP(LocalTee, "local.tee")
-    CASE_OP(GetGlobal, "global.get")
-    CASE_OP(SetGlobal, "global.set")
+    CASE_OP(GlobalGet, "global.get")
+    CASE_OP(GlobalSet, "global.set")
     CASE_OP(TableGet, "table.get")
     CASE_OP(TableSet, "table.set")
     CASE_ALL_OP(Const, "const")

src/wasm/wasm-opcodes.h

@@ -51,8 +51,8 @@ bool IsJSCompatibleSignature(const FunctionSig* sig, const WasmFeatures&);
   V(LocalGet, 0x20, _)           \
   V(LocalSet, 0x21, _)           \
   V(LocalTee, 0x22, _)           \
-  V(GetGlobal, 0x23, _)          \
-  V(SetGlobal, 0x24, _)          \
+  V(GlobalGet, 0x23, _)          \
+  V(GlobalSet, 0x24, _)          \
   V(TableGet, 0x25, _)           \
   V(TableSet, 0x26, _)           \
   V(I32Const, 0x41, _)           \

src/wasm/wasm-text.cc

@@ -166,8 +166,8 @@ void PrintWasmText(const WasmModule* module, const ModuleWireBytes& wire_bytes,
         os << WasmOpcodes::OpcodeName(opcode) << ' ' << imm.index;
         break;
       }
-      case kExprGetGlobal:
-      case kExprSetGlobal: {
+      case kExprGlobalGet:
+      case kExprGlobalSet: {
         GlobalIndexImmediate<Decoder::kNoValidate> imm(&i, i.pc());
         os << WasmOpcodes::OpcodeName(opcode) << ' ' << imm.index;
         break;

test/cctest/wasm/test-run-wasm-simd.cc

@@ -2724,7 +2724,7 @@ void BuildShuffle(const std::vector<Shuffle>& shuffles,
     }
     row_index /= 2;
   } while (row_index != 0);
-  byte epilog[] = {kExprSetGlobal, static_cast<byte>(0), WASM_ONE};
+  byte epilog[] = {kExprGlobalSet, static_cast<byte>(0), WASM_ONE};
   for (size_t j = 0; j < arraysize(epilog); ++j) buffer->push_back(epilog[j]);
 }
 

test/common/wasm/wasm-macro-gen.h

@@ -367,9 +367,9 @@ inline WasmOpcode LoadStoreOpcodeOf(MachineType type, bool store) {
 #define WASM_SET_LOCAL(index, val) val, kExprLocalSet, static_cast<byte>(index)
 #define WASM_TEE_LOCAL(index, val) val, kExprLocalTee, static_cast<byte>(index)
 #define WASM_DROP kExprDrop
-#define WASM_GET_GLOBAL(index) kExprGetGlobal, static_cast<byte>(index)
+#define WASM_GET_GLOBAL(index) kExprGlobalGet, static_cast<byte>(index)
 #define WASM_SET_GLOBAL(index, val) \
-  val, kExprSetGlobal, static_cast<byte>(index)
+  val, kExprGlobalSet, static_cast<byte>(index)
 #define WASM_TABLE_GET(table_index, index) \
   index, kExprTableGet, static_cast<byte>(table_index)
 #define WASM_TABLE_SET(table_index, index, val) \

test/fuzzer/wasm-compile.cc

@@ -377,7 +377,7 @@ class WasmGenerator {
     }
 
     if (is_set) Generate(global.type, data);
-    builder_->EmitWithU32V(is_set ? kExprSetGlobal : kExprGetGlobal,
+    builder_->EmitWithU32V(is_set ? kExprGlobalSet : kExprGlobalGet,
                            global.index);
     if (!is_set && global.type != wanted_type) {
       Convert(global.type, wanted_type);

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

@@ -15,7 +15,7 @@ let {session, contextGroup, Protocol} =
     builder.addImportedGlobal('m', 'global', kWasmAnyRef, false);
     builder.addFunction('func', kSig_v_v)
         .addBody([
-          kExprGetGlobal, 0,  //
+          kExprGlobalGet, 0,  //
           kExprDrop,          //
         ])
         .exportAs('main');

test/inspector/debugger/wasm-scope-info.js

@@ -55,7 +55,7 @@ async function instantiateWasm() {
         kExprF64UConvertI32, kExprF64Div, kExprLocalSet, 3,
 
         // Set global 0 to 15
-        kExprI32Const, 15, kExprSetGlobal, 0,
+        kExprI32Const, 15, kExprGlobalSet, 0,
       ])
       .exportAs('main');
 

test/mjsunit/regress/wasm/regress-910824.js

@@ -11,26 +11,26 @@ builder.addType(makeSig([kWasmI32, kWasmF32, kWasmF32, kWasmF64], [kWasmI32]));
 builder.addFunction(undefined, 0 /* sig */)
   .addLocals({i32_count: 504})
   .addBody([
-kExprGetGlobal, 0x00,
+kExprGlobalGet, 0x00,
 kExprLocalSet, 0x04,
 kExprLocalGet, 0x04,
 kExprI32Const, 0x01,
 kExprI32Sub,
-kExprGetGlobal, 0x00,
+kExprGlobalGet, 0x00,
 kExprI32Const, 0x00,
 kExprI32Eqz,
-kExprGetGlobal, 0x00,
+kExprGlobalGet, 0x00,
 kExprI32Const, 0x01,
 kExprI32Const, 0x01,
 kExprI32Sub,
-kExprGetGlobal, 0x00,
+kExprGlobalGet, 0x00,
 kExprI32Const, 0x00,
 kExprI32Eqz,
-kExprGetGlobal, 0x00,
+kExprGlobalGet, 0x00,
 kExprI32Const, 0x00,
 kExprI32Const, 0x01,
 kExprI32Sub,
-kExprGetGlobal, 0x01,
+kExprGlobalGet, 0x01,
 kExprUnreachable,
 ]);
 builder.instantiate();

test/mjsunit/wasm/anyref-globals.js

@@ -12,10 +12,10 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   const g_nullref = builder.addGlobal(kWasmAnyRef, true).index;
   const g_nullfunc = builder.addGlobal(kWasmAnyFunc, true).index;
   builder.addFunction("get_anyref_global", kSig_r_v)
-    .addBody([kExprGetGlobal, g_nullref])
+    .addBody([kExprGlobalGet, g_nullref])
     .exportAs("get_anyref_global");
   builder.addFunction("get_anyfunc_global", kSig_a_v)
-    .addBody([kExprGetGlobal, g_nullfunc])
+    .addBody([kExprGlobalGet, g_nullfunc])
     .exportAs("get_anyfunc_global");
 
   const instance = builder.instantiate();
@@ -33,15 +33,15 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   builder.addFunction("get_anyref_global", kSig_r_r)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g_setref.index,
-      kExprGetGlobal, g_nullref.index
+      kExprGlobalSet, g_setref.index,
+      kExprGlobalGet, g_nullref.index
     ])
     .exportAs("get_anyref_global");
   builder.addFunction("get_anyfunc_global", kSig_a_a)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g_setfunc.index,
-      kExprGetGlobal, g_nullfunc.index
+      kExprGlobalSet, g_setfunc.index,
+      kExprGlobalGet, g_nullfunc.index
     ])
     .exportAs("get_anyfunc_global");
 
@@ -60,8 +60,8 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   builder.addFunction("main", kSig_r_r)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g.index,
-      kExprGetGlobal, g.index
+      kExprGlobalSet, g.index,
+      kExprGlobalGet, g.index
     ])
     .exportAs("main");
 
@@ -80,8 +80,8 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   builder.addFunction("main", kSig_a_a)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g.index,
-      kExprGetGlobal, g.index
+      kExprGlobalSet, g.index,
+      kExprGlobalGet, g.index
     ])
     .exportAs("main");
 
@@ -101,9 +101,9 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   builder.addFunction("main", kSig_r_r)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g.index,
+      kExprGlobalSet, g.index,
       kExprCallFunction, gc_index,  // call gc
-      kExprGetGlobal, g.index
+      kExprGlobalGet, g.index
     ])
     .exportAs("main");
 
@@ -121,14 +121,14 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   const g = builder.addGlobal(kWasmAnyRef, true);
   builder.addFunction("get_global", kSig_r_v)
     .addBody([
-      kExprGetGlobal, g.index
+      kExprGlobalGet, g.index
     ])
     .exportAs("get_global");
 
   builder.addFunction("set_global", kSig_v_r)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g.index
+      kExprGlobalSet, g.index
     ])
     .exportAs("set_global");
 
@@ -150,7 +150,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
     let builder = new WasmModuleBuilder();
     const g = builder.addImportedGlobal('m', 'val', kWasmAnyRef);
     builder.addFunction('main', kSig_r_v)
-      .addBody([kExprGetGlobal, g])
+      .addBody([kExprGlobalGet, g])
       .exportAs('main');
 
     const instance = builder.instantiate({ m: { val: obj } });
@@ -178,7 +178,7 @@ function dummy_func() {
   let builder = new WasmModuleBuilder();
   const g = builder.addImportedGlobal('m', 'val', kWasmAnyFunc);
   builder.addFunction('main', kSig_a_v)
-    .addBody([kExprGetGlobal, g])
+    .addBody([kExprGlobalGet, g])
     .exportAs('main');
 
   const module = builder.toModule();
@@ -286,13 +286,13 @@ function dummy_func() {
     makeSig([kWasmAnyRef, kWasmAnyFunc, kWasmAnyRef, kWasmAnyFunc], []))
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g1.index,
+      kExprGlobalSet, g1.index,
       kExprLocalGet, 1,
-      kExprSetGlobal, g2.index,
+      kExprGlobalSet, g2.index,
       kExprLocalGet, 2,
-      kExprSetGlobal, g3.index,
+      kExprGlobalSet, g3.index,
       kExprLocalGet, 3,
-      kExprSetGlobal, g4.index
+      kExprGlobalSet, g4.index
     ])
     .exportAs("main");
 
@@ -314,7 +314,7 @@ function dummy_func() {
     let builder = new WasmModuleBuilder();
     const g = builder.addImportedGlobal('m', 'val', kWasmAnyRef, true);
     builder.addFunction('main', kSig_r_v)
-      .addBody([kExprGetGlobal, g])
+      .addBody([kExprGlobalGet, g])
       .exportAs('main');
 
     const global = new WebAssembly.Global({ value: 'anyref', mutable: 'true' }, obj);
@@ -335,7 +335,7 @@ function dummy_func() {
     let builder = new WasmModuleBuilder();
     const g = builder.addImportedGlobal('m', 'val', kWasmAnyFunc, true);
     builder.addFunction('main', kSig_a_v)
-      .addBody([kExprGetGlobal, g])
+      .addBody([kExprGlobalGet, g])
       .exportAs('main');
 
     const global = new WebAssembly.Global({ value: 'anyfunc', mutable: 'true' }, obj);
@@ -359,18 +359,18 @@ function dummy_func() {
   builder1.addFunction("set_globals", kSig_v_rr)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g2.index,
+      kExprGlobalSet, g2.index,
       kExprLocalGet, 1,
-      kExprSetGlobal, g3.index,
+      kExprGlobalSet, g3.index,
     ])
     .exportAs("set_globals");
 
   builder1.addFunction('get_global2', kSig_r_v)
-    .addBody([kExprGetGlobal, g2.index])
+    .addBody([kExprGlobalGet, g2.index])
     .exportAs('get_global2');
 
   builder1.addFunction('get_global3', kSig_r_v)
-    .addBody([kExprGetGlobal, g3.index])
+    .addBody([kExprGlobalGet, g3.index])
     .exportAs('get_global3');
 
   const instance1 = builder1.instantiate();
@@ -393,18 +393,18 @@ function dummy_func() {
   builder2.addFunction("set_globals", kSig_v_rr)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, i2,
+      kExprGlobalSet, i2,
       kExprLocalGet, 1,
-      kExprSetGlobal, i3,
+      kExprGlobalSet, i3,
     ])
     .exportAs("set_globals");
 
   builder2.addFunction('get_global2', kSig_r_v)
-    .addBody([kExprGetGlobal, i2])
+    .addBody([kExprGlobalGet, i2])
     .exportAs('get_global2');
 
   builder2.addFunction('get_global3', kSig_r_v)
-    .addBody([kExprGetGlobal, i3])
+    .addBody([kExprGlobalGet, i3])
     .exportAs('get_global3');
 
   const instance2 = builder2.instantiate(instance1);
@@ -455,18 +455,18 @@ function dummy_func() {
   builder1.addFunction("set_globals", kSig_v_aa)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g2.index,
+      kExprGlobalSet, g2.index,
       kExprLocalGet, 1,
-      kExprSetGlobal, g3.index,
+      kExprGlobalSet, g3.index,
     ])
     .exportAs("set_globals");
 
   builder1.addFunction('get_global2', kSig_a_v)
-    .addBody([kExprGetGlobal, g2.index])
+    .addBody([kExprGlobalGet, g2.index])
     .exportAs('get_global2');
 
   builder1.addFunction('get_global3', kSig_a_v)
-    .addBody([kExprGetGlobal, g3.index])
+    .addBody([kExprGlobalGet, g3.index])
     .exportAs('get_global3');
 
   const instance1 = builder1.instantiate();
@@ -490,18 +490,18 @@ function dummy_func() {
   builder2.addFunction("set_globals", kSig_v_aa)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, i2,
+      kExprGlobalSet, i2,
       kExprLocalGet, 1,
-      kExprSetGlobal, i3,
+      kExprGlobalSet, i3,
     ])
     .exportAs("set_globals");
 
   builder2.addFunction('get_global2', kSig_a_v)
-    .addBody([kExprGetGlobal, i2])
+    .addBody([kExprGlobalGet, i2])
     .exportAs('get_global2');
 
   builder2.addFunction('get_global3', kSig_a_v)
-    .addBody([kExprGetGlobal, i3])
+    .addBody([kExprGlobalGet, i3])
     .exportAs('get_global3');
 
   const instance2 = builder2.instantiate(instance1);
@@ -563,10 +563,10 @@ function dummy_func() {
   const g_ref = builder.addGlobal(kWasmAnyRef, true);
   const g_func = builder.addGlobal(kWasmAnyFunc, true);
   const f_ref = builder.addFunction('get_anyref_global', kSig_r_v)
-                    .addBody([kExprGetGlobal, g_ref.index])
+                    .addBody([kExprGlobalGet, g_ref.index])
                     .exportAs('get_anyref_global');
   const f_func = builder.addFunction('get_anyfunc_global', kSig_a_v)
-                     .addBody([kExprGetGlobal, g_func.index])
+                     .addBody([kExprGlobalGet, g_func.index])
                      .exportAs('get_anyfunc_global');
 
   g_ref.function_index = f_ref.index;
@@ -591,10 +591,10 @@ function dummy_func() {
   g_wasm.function_index = import_wasm;
   g_js.function_index = import_js;
   builder.addFunction('get_global_wasm', kSig_a_v)
-      .addBody([kExprGetGlobal, g_wasm.index])
+      .addBody([kExprGlobalGet, g_wasm.index])
       .exportFunc();
   builder.addFunction('get_global_js', kSig_a_v)
-      .addBody([kExprGetGlobal, g_js.index])
+      .addBody([kExprGlobalGet, g_js.index])
       .exportFunc();
 
   const expected_wasm = dummy_func();

test/mjsunit/wasm/compiled-module-serialization.js

@@ -175,13 +175,13 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   builder.addGlobal(kWasmI32, true);
   builder.addFunction("read", kSig_i_v)
     .addBody([
-      kExprGetGlobal, 0])
+      kExprGlobalGet, 0])
     .exportFunc();
 
   builder.addFunction("write", kSig_v_i)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, 0])
+      kExprGlobalSet, 0])
     .exportFunc();
 
   var wire_bytes = builder.toBuffer();

test/mjsunit/wasm/exceptions-global.js

@@ -16,7 +16,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   let g = builder.addGlobal(kWasmExnRef);
   builder.addFunction("push_and_drop_exnref", kSig_v_v)
       .addBody([
-        kExprGetGlobal, g.index,
+        kExprGlobalGet, g.index,
         kExprDrop,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -30,7 +30,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   let builder = new WasmModuleBuilder();
   let g = builder.addGlobal(kWasmExnRef);
   builder.addFunction('push_and_return_exnref', kSig_e_v)
-      .addBody([kExprGetGlobal, g.index])
+      .addBody([kExprGlobalGet, g.index])
       .exportFunc();
   let instance = builder.instantiate();
 
@@ -49,7 +49,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
           kExprLocalGet, 0,
           kExprThrow, except,
         kExprCatch,
-          kExprSetGlobal, g.index,
+          kExprGlobalSet, g.index,
         kExprEnd,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -71,7 +71,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
           kExprLocalGet, 0,
           kExprRethrow,
         kExprCatch,
-          kExprSetGlobal, g.index,
+          kExprGlobalSet, g.index,
         kExprEnd,
       ]).exportFunc();
   let exception = "my fancy exception";
@@ -88,7 +88,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   let g_index = builder.addImportedGlobal("m", "exn", kWasmExnRef);
   builder.addFunction('rethrow_exnref', kSig_v_v)
       .addBody([
-        kExprGetGlobal, g_index,
+        kExprGlobalGet, g_index,
         kExprRethrow,
       ]).exportFunc();
   let exception = "my fancy exception";
@@ -104,7 +104,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   let g = builder.addGlobal(kWasmExnRef, true).exportAs("exn");
   builder.addFunction('rethrow_exnref', kSig_v_v)
       .addBody([
-        kExprGetGlobal, g.index,
+        kExprGlobalGet, g.index,
         kExprRethrow,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -122,7 +122,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   let g_index = builder.addImportedGlobal("m", "exn", kWasmExnRef, true);
   builder.addFunction('rethrow_exnref', kSig_v_v)
       .addBody([
-        kExprGetGlobal, g_index,
+        kExprGlobalGet, g_index,
         kExprRethrow,
       ]).exportFunc();
   let exception1 = "my fancy exception";
@@ -143,7 +143,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   let g2 = builder.addGlobal(kWasmExnRef);
   g2.init_index = g1_index;  // Initialize {g2} to equal {g1}.
   builder.addFunction('push_and_return_exnref', kSig_e_v)
-      .addBody([kExprGetGlobal, g2.index])
+      .addBody([kExprGlobalGet, g2.index])
       .exportFunc();
   let exception = { x: "my fancy exception" };
   let instance = builder.instantiate({ "m": { "exn": exception }});

test/mjsunit/wasm/export-mutable-global.js

@@ -59,10 +59,10 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
     let global_builder = builder.addGlobal(type, true).exportAs(name);
     if (value) global_builder.init = value;
     builder.addFunction("get " + name, makeSig([], [type]))
-      .addBody([kExprGetGlobal, index])
+      .addBody([kExprGlobalGet, index])
       .exportFunc();
     builder.addFunction("set " + name, makeSig([type], []))
-      .addBody([kExprLocalGet, 0, kExprSetGlobal, index])
+      .addBody([kExprLocalGet, 0, kExprGlobalSet, index])
       .exportFunc();
   }
   var instance = builder.instantiate();

test/mjsunit/wasm/globals.js

@@ -15,12 +15,12 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   let sig_index = builder.addType(kSig_i_v);
   builder.addFunction("get", sig_index)
     .addBody([
-      kExprGetGlobal, g.index])
+      kExprGlobalGet, g.index])
     .exportAs("get");
   builder.addFunction("set", kSig_v_i)
     .addBody([
       kExprLocalGet, 0,
-      kExprSetGlobal, g.index])
+      kExprGlobalSet, g.index])
     .exportAs("set");
 
   let module = new WebAssembly.Module(builder.toBuffer());
@@ -54,7 +54,7 @@ function TestImported(type, val, expected) {
   var sig = makeSig([], [type]);
   var g = builder.addImportedGlobal("uuu", "foo", type);
   builder.addFunction("main", sig)
-    .addBody([kExprGetGlobal, g])
+    .addBody([kExprGlobalGet, g])
     .exportAs("main");
   builder.addGlobal(kWasmI32);  // pad
 
@@ -76,7 +76,7 @@ TestImported(kWasmF64, 77777.88888, 77777.88888);
   let sig_index = builder.addType(kSig_i_v);
   builder.addFunction("main", sig_index)
     .addBody([
-      kExprGetGlobal, g])
+      kExprGlobalGet, g])
     .exportAs("main");
 
   let module = new WebAssembly.Module(builder.toBuffer());
@@ -152,7 +152,7 @@ function TestGlobalIndexSpace(type, val) {
 
   var sig = makeSig([], [type]);
   builder.addFunction("main", sig)
-    .addBody([kExprGetGlobal, def.index])
+    .addBody([kExprGlobalGet, def.index])
     .exportAs("main");
 
   var instance = builder.instantiate({nnn: {foo: val}});
@@ -175,9 +175,9 @@ TestGlobalIndexSpace(kWasmF64, 12345.678);
     .addBody([
       kExprLocalGet, 0,
       kExprIf, kWasmI32,
-      kExprGetGlobal, g.index,
+      kExprGlobalGet, g.index,
       kExprElse,
-      kExprGetGlobal, h.index,
+      kExprGlobalGet, h.index,
       kExprEnd])
     .exportAs("get");
   builder.addFunction("set", kSig_v_ii)
@@ -185,10 +185,10 @@ TestGlobalIndexSpace(kWasmF64, 12345.678);
       kExprLocalGet, 0,
       kExprIf, kWasmStmt,
       kExprLocalGet, 1,
-      kExprSetGlobal, g.index,
+      kExprGlobalSet, g.index,
       kExprElse,
       kExprLocalGet, 1,
-      kExprSetGlobal, h.index,
+      kExprGlobalSet, h.index,
       kExprEnd])
     .exportAs("set");
 

test/mjsunit/wasm/import-mutable-global.js

@@ -11,7 +11,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   let builder = new WasmModuleBuilder();
   builder.addImportedGlobal("mod", "g", kWasmI32);
   builder.addFunction("main", kSig_i_v)
-    .addBody([kExprGetGlobal, 0])
+    .addBody([kExprGlobalGet, 0])
     .exportAs("main");
 
   let main = builder.instantiate({mod: {g: global}}).exports.main;
@@ -54,10 +54,10 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
 
 function addGlobalGetterAndSetter(builder, index, name, type) {
   builder.addFunction('get' + name, makeSig([], [type]))
-      .addBody([kExprGetGlobal, index])
+      .addBody([kExprGlobalGet, index])
       .exportFunc();
   builder.addFunction('set' + name, makeSig([type], []))
-      .addBody([kExprLocalGet, 0, kExprSetGlobal, index])
+      .addBody([kExprLocalGet, 0, kExprGlobalSet, index])
       .exportFunc();
 }
 
@@ -137,12 +137,12 @@ function addGlobalGetterAndSetter(builder, index, name, type) {
     const index = 0;
     builder.addFunction('geti64_hi', makeSig([], [kWasmI32]))
       .addBody([
-        kExprGetGlobal, index,
+        kExprGlobalGet, index,
         kExprI64Const, 32, kExprI64ShrU,
         kExprI32ConvertI64])
       .exportFunc();
     builder.addFunction('geti64_lo', makeSig([], [kWasmI32]))
-      .addBody([kExprGetGlobal, index, kExprI32ConvertI64])
+      .addBody([kExprGlobalGet, index, kExprI32ConvertI64])
       .exportFunc();
     builder.addFunction("seti64", makeSig([kWasmI32, kWasmI32], []))
       .addBody([
@@ -150,7 +150,7 @@ function addGlobalGetterAndSetter(builder, index, name, type) {
         kExprLocalGet, 0, kExprI64UConvertI32,
         kExprI64Const, 32, kExprI64Shl,
         kExprI64Ior,
-        kExprSetGlobal, index])
+        kExprGlobalSet, index])
       .exportFunc();
   };
 

test/mjsunit/wasm/import-table.js

@@ -92,7 +92,7 @@ function addConstFuncUsingGlobal(builder, val) {
   let g = builder.addGlobal(kWasmI32, false);
   g.init = val;
   return builder.addFunction("global" + val, kSig_i_v)
-    .addBody([kExprGetGlobal, g.index]).index;
+    .addBody([kExprGlobalGet, g.index]).index;
 }
 
 (function TestAliasedImportedTableInstanceGlobals() {

test/mjsunit/wasm/indirect-call-non-zero-table.js

@@ -119,7 +119,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
 
   const sig_index = builder.addType(kSig_i_v);
   const f1 = builder.addFunction("foo", sig_index)
-    .addBody([kExprGetGlobal, g, kExprI32Const, 12, kExprI32Add]);
+    .addBody([kExprGlobalGet, g, kExprI32Const, 12, kExprI32Add]);
 
   builder.addFunction('call', kSig_i_i)
     .addBody([kExprLocalGet, 0,   // function index

test/mjsunit/wasm/indirect-tables.js

@@ -249,7 +249,7 @@ function js_div(a, b) { return (a / b) | 0; }
   let sig_index = builder.addType(kSig_i_v);
   let f = builder.addFunction("f", sig_index)
     .addBody([
-      kExprGetGlobal, g
+      kExprGlobalGet, g
     ]);
   builder.addFunction("main", kSig_i_ii)
     .addBody([
@@ -404,7 +404,7 @@ function js_div(a, b) { return (a / b) | 0; }
   let sig_index = builder.addType(kSig_i_v);
   builder.addFunction("g", sig_index)
     .addBody([
-      kExprGetGlobal, g
+      kExprGlobalGet, g
     ]);
   builder.addFunction("main", kSig_i_ii)
     .addBody([

test/mjsunit/wasm/instantiate-module-basic.js

@@ -176,11 +176,11 @@ assertFalse(WebAssembly.validate(bytes(88, 88, 88, 88, 88, 88, 88, 88)));
   var builder = new WasmModuleBuilder();
   builder.addGlobal(kWasmI32, true);
   builder.addFunction('read', kSig_i_v)
-      .addBody([kExprGetGlobal, 0])
+      .addBody([kExprGlobalGet, 0])
       .exportFunc();
 
   builder.addFunction('write', kSig_v_i)
-      .addBody([kExprLocalGet, 0, kExprSetGlobal, 0])
+      .addBody([kExprLocalGet, 0, kExprGlobalSet, 0])
       .exportFunc();
 
   var module = new WebAssembly.Module(builder.toBuffer());

test/mjsunit/wasm/interpreter.js

@@ -151,28 +151,28 @@ function checkStack(stack, expected_lines) {
   builder.addGlobal(kWasmF32, true);  // 2
   builder.addGlobal(kWasmF64, true);  // 3
   builder.addFunction('get_i32', kSig_i_v)
-      .addBody([kExprGetGlobal, 0])
+      .addBody([kExprGlobalGet, 0])
       .exportFunc();
   builder.addFunction('get_i64', kSig_d_v)
-      .addBody([kExprGetGlobal, 1, kExprF64SConvertI64])
+      .addBody([kExprGlobalGet, 1, kExprF64SConvertI64])
       .exportFunc();
   builder.addFunction('get_f32', kSig_d_v)
-      .addBody([kExprGetGlobal, 2, kExprF64ConvertF32])
+      .addBody([kExprGlobalGet, 2, kExprF64ConvertF32])
       .exportFunc();
   builder.addFunction('get_f64', kSig_d_v)
-      .addBody([kExprGetGlobal, 3])
+      .addBody([kExprGlobalGet, 3])
       .exportFunc();
   builder.addFunction('set_i32', kSig_v_i)
-      .addBody([kExprLocalGet, 0, kExprSetGlobal, 0])
+      .addBody([kExprLocalGet, 0, kExprGlobalSet, 0])
       .exportFunc();
   builder.addFunction('set_i64', kSig_v_d)
-      .addBody([kExprLocalGet, 0, kExprI64SConvertF64, kExprSetGlobal, 1])
+      .addBody([kExprLocalGet, 0, kExprI64SConvertF64, kExprGlobalSet, 1])
       .exportFunc();
   builder.addFunction('set_f32', kSig_v_d)
-      .addBody([kExprLocalGet, 0, kExprF32ConvertF64, kExprSetGlobal, 2])
+      .addBody([kExprLocalGet, 0, kExprF32ConvertF64, kExprGlobalSet, 2])
       .exportFunc();
   builder.addFunction('set_f64', kSig_v_d)
-      .addBody([kExprLocalGet, 0, kExprSetGlobal, 3])
+      .addBody([kExprLocalGet, 0, kExprGlobalSet, 3])
       .exportFunc();
   var instance = builder.instantiate();
   // Initially, all should be zero.

test/mjsunit/wasm/table-copy.js

@@ -38,7 +38,7 @@ function assertCall(call, ...elems) {
     for (let i = 0; i < kTableSize; i++) {
       let f = builder.addFunction("", kSig_i_v)
           .addBody([
-            kExprGetGlobal, g,
+            kExprGlobalGet, g,
             ...wasmI32Const(i),
             kExprI32Add
           ]);

test/mjsunit/wasm/wasm-module-builder.js

@@ -213,8 +213,8 @@ let kExprSelect = 0x1b;
 let kExprLocalGet = 0x20;
 let kExprLocalSet = 0x21;
 let kExprLocalTee = 0x22;
-let kExprGetGlobal = 0x23;
-let kExprSetGlobal = 0x24;
+let kExprGlobalGet = 0x23;
+let kExprGlobalSet = 0x24;
 let kExprTableGet = 0x25;
 let kExprTableSet = 0x26;
 let kExprI32LoadMem = 0x28;
@@ -1094,7 +1094,7 @@ class WasmModuleBuilder {
             }
           } else {
             // Emit a global-index initializer.
-            section.emit_u8(kExprGetGlobal);
+            section.emit_u8(kExprGlobalGet);
             section.emit_u32v(global.init_index);
           }
           section.emit_u8(kExprEnd);  // end of init expression
@@ -1159,7 +1159,7 @@ class WasmModuleBuilder {
               section.emit_u32v(init.table);
             }
             if (init.is_global) {
-              section.emit_u8(kExprGetGlobal);
+              section.emit_u8(kExprGlobalGet);
             } else {
               section.emit_u8(kExprI32Const);
             }
@@ -1294,7 +1294,7 @@ class WasmModuleBuilder {
             section.emit_u8(0);  // linear memory index 0 / flags
             if (seg.is_global) {
               // initializer is a global variable
-              section.emit_u8(kExprGetGlobal);
+              section.emit_u8(kExprGlobalGet);
               section.emit_u32v(seg.addr);
             } else {
               // initializer is a constant

test/unittests/wasm/function-body-decoder-unittest.cc

@@ -3487,8 +3487,8 @@ TEST_F(WasmOpcodeLengthTest, MiscExpressions) {
   ExpectLength(1, kExprRefNull);
   ExpectLength(2, kExprLocalGet);
   ExpectLength(2, kExprLocalSet);
-  ExpectLength(2, kExprGetGlobal);
-  ExpectLength(2, kExprSetGlobal);
+  ExpectLength(2, kExprGlobalGet);
+  ExpectLength(2, kExprGlobalSet);
   ExpectLength(2, kExprCallFunction);
   ExpectLength(3, kExprCallIndirect);
 }
@@ -3514,11 +3514,11 @@ TEST_F(WasmOpcodeLengthTest, I64Const) {
 }
 
 TEST_F(WasmOpcodeLengthTest, VariableLength) {
-  ExpectLength(2, kExprGetGlobal, U32V_1(1));
-  ExpectLength(3, kExprGetGlobal, U32V_2(33));
-  ExpectLength(4, kExprGetGlobal, U32V_3(44));
-  ExpectLength(5, kExprGetGlobal, U32V_4(66));
-  ExpectLength(6, kExprGetGlobal, U32V_5(77));
+  ExpectLength(2, kExprGlobalGet, U32V_1(1));
+  ExpectLength(3, kExprGlobalGet, U32V_2(33));
+  ExpectLength(4, kExprGlobalGet, U32V_3(44));
+  ExpectLength(5, kExprGlobalGet, U32V_4(66));
+  ExpectLength(6, kExprGlobalGet, U32V_5(77));
 
   ExpectLength(2, kExprRefFunc, U32V_1(1));
   ExpectLength(3, kExprRefFunc, U32V_2(33));