From 1a3c1a58cc7e97a846f612baf7f74a370980458f Mon Sep 17 00:00:00 2001
From: Heejin Ahn <aheejin@gmail.com>
Date: Tue, 21 May 2019 13:25:14 -0700
Subject: 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.
---
 src/passes/RelooperJumpThreading.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/passes/RelooperJumpThreading.cpp')

diff --git a/src/passes/RelooperJumpThreading.cpp b/src/passes/RelooperJumpThreading.cpp
index 855e89b7f..8dfc1e0e4 100644
--- a/src/passes/RelooperJumpThreading.cpp
+++ b/src/passes/RelooperJumpThreading.cpp
@@ -48,7 +48,7 @@ static If* isLabelCheckingIf(Expression* curr, Index labelIndex) {
   if (!(condition && condition->op == EqInt32)) {
     return nullptr;
   }
-  auto* left = condition->left->dynCast<GetLocal>();
+  auto* left = condition->left->dynCast<LocalGet>();
   if (!(left && left->index == labelIndex)) {
     return nullptr;
   }
@@ -59,11 +59,11 @@ static Index getCheckedLabelValue(If* iff) {
   return iff->condition->cast<Binary>()->right->cast<Const>()->value.geti32();
 }
 
-static SetLocal* isLabelSettingSetLocal(Expression* curr, Index labelIndex) {
+static LocalSet* isLabelSettingLocalSet(Expression* curr, Index labelIndex) {
   if (!curr) {
     return nullptr;
   }
-  auto* set = curr->dynCast<SetLocal>();
+  auto* set = curr->dynCast<LocalSet>();
   if (!set) {
     return nullptr;
   }
@@ -73,7 +73,7 @@ static SetLocal* isLabelSettingSetLocal(Expression* curr, Index labelIndex) {
   return set;
 }
 
-static Index getSetLabelValue(SetLocal* set) {
+static Index getSetLabelValue(LocalSet* set) {
   return set->value->cast<Const>()->value.geti32();
 }
 
@@ -93,8 +93,8 @@ struct LabelUseFinder : public PostWalker<LabelUseFinder> {
     }
   }
 
-  void visitSetLocal(SetLocal* curr) {
-    if (isLabelSettingSetLocal(curr, labelIndex)) {
+  void visitLocalSet(LocalSet* curr) {
+    if (isLabelSettingLocalSet(curr, labelIndex)) {
       sets[getSetLabelValue(curr)]++;
     }
   }
@@ -247,7 +247,7 @@ private:
       Index targetNum;
       Name targetName;
 
-      void visitSetLocal(SetLocal* curr) {
+      void visitLocalSet(LocalSet* curr) {
         if (curr->index == labelIndex) {
           if (Index(curr->value->cast<Const>()->value.geti32()) == targetNum) {
             replaceCurrent(Builder(*getModule()).makeBreak(targetName));
-- 
cgit v1.2.3