1 files changed, 14 insertions, 14 deletions

diff --git a/src/passes/InstrumentLocals.cpp b/src/passes/InstrumentLocals.cpp
index cc1234fc5..85da3bd9b 100644
--- a/src/passes/InstrumentLocals.cpp
+++ b/src/passes/InstrumentLocals.cpp
@@ -55,25 +55,25 @@ Name get_i32("get_i32");
 Name get_i64("get_i64");
 Name get_f32("get_f32");
 Name get_f64("get_f64");
+Name get_v128("get_v128");
 Name get_funcref("get_funcref");
 Name get_externref("get_externref");
 Name get_anyref("get_anyref");
 Name get_eqref("get_eqref");
-Name get_dataref("get_dataref");
 Name get_i31ref("get_i31ref");
-Name get_v128("get_v128");
+Name get_dataref("get_dataref");
 
 Name set_i32("set_i32");
 Name set_i64("set_i64");
 Name set_f32("set_f32");
 Name set_f64("set_f64");
+Name set_v128("set_v128");
 Name set_funcref("set_funcref");
 Name set_externref("set_externref");
 Name set_anyref("set_anyref");
 Name set_eqref("set_eqref");
-Name set_dataref("set_dataref");
 Name set_i31ref("set_i31ref");
-Name set_v128("set_v128");
+Name set_dataref("set_dataref");
 
 struct InstrumentLocals : public WalkerPass<PostWalker<InstrumentLocals>> {
   void visitLocalGet(LocalGet* curr) {
@@ -107,12 +107,12 @@ struct InstrumentLocals : public WalkerPass<PostWalker<InstrumentLocals>> {
       case Type::eqref:
         import = get_eqref;
         break;
-      case Type::dataref:
-        import = get_dataref;
-        break;
       case Type::i31ref:
         import = get_i31ref;
         break;
+      case Type::dataref:
+        import = get_dataref;
+        break;
       case Type::none:
       case Type::unreachable:
         WASM_UNREACHABLE("unexpected type");
@@ -167,12 +167,12 @@ struct InstrumentLocals : public WalkerPass<PostWalker<InstrumentLocals>> {
       case Type::eqref:
         import = set_eqref;
         break;
-      case Type::dataref:
-        import = set_dataref;
-        break;
       case Type::i31ref:
         import = set_i31ref;
         break;
+      case Type::dataref:
+        import = set_dataref;
+        break;
       case Type::unreachable:
         return; // nothing to do here
       default:
@@ -221,6 +221,10 @@ struct InstrumentLocals : public WalkerPass<PostWalker<InstrumentLocals>> {
           curr, get_eqref, {Type::i32, Type::i32, Type::eqref}, Type::eqref);
         addImport(
           curr, set_eqref, {Type::i32, Type::i32, Type::eqref}, Type::eqref);
+        addImport(
+          curr, get_i31ref, {Type::i32, Type::i32, Type::i31ref}, Type::i31ref);
+        addImport(
+          curr, set_i31ref, {Type::i32, Type::i32, Type::i31ref}, Type::i31ref);
         addImport(curr,
                   get_dataref,
                   {Type::i32, Type::i32, Type::dataref},
@@ -229,10 +233,6 @@ struct InstrumentLocals : public WalkerPass<PostWalker<InstrumentLocals>> {
                   set_dataref,
                   {Type::i32, Type::i32, Type::dataref},
                   Type::dataref);
-        addImport(
-          curr, get_i31ref, {Type::i32, Type::i32, Type::i31ref}, Type::i31ref);
-        addImport(
-          curr, set_i31ref, {Type::i32, Type::i32, Type::i31ref}, Type::i31ref);
       }
     }
     if (curr->features.hasSIMD()) {