--- a/js/src/jit/MOpcodes.h
+++ b/js/src/jit/MOpcodes.h
@@ -118,17 +118,16 @@ namespace jit {
     _(GuardObject)                                                          \
     _(GuardString)                                                          \
     _(PolyInlineGuard)                                                      \
     _(AssertRange)                                                          \
     _(ToDouble)                                                             \
     _(ToFloat32)                                                            \
     _(ToInt32)                                                              \
     _(TruncateToInt32)                                                      \
-    _(WasmTruncateToInt64)                                                  \
     _(WrapInt64ToInt32)                                                     \
     _(ExtendInt32ToInt64)                                                   \
     _(Int64ToFloatingPoint)                                                 \
     _(ToString)                                                             \
     _(ToObjectOrNull)                                                       \
     _(NewArray)                                                             \
     _(NewArrayCopyOnWrite)                                                  \
     _(NewArrayDynamicLength)                                                \
@@ -267,53 +266,54 @@ namespace jit {
     _(GetDOMProperty)                                                       \
     _(GetDOMMember)                                                         \
     _(SetDOMProperty)                                                       \
     _(IsConstructor)                                                        \
     _(IsCallable)                                                           \
     _(IsObject)                                                             \
     _(HasClass)                                                             \
     _(CopySign)                                                             \
-    _(WasmBoundsCheck)                                                      \
-    _(WasmAddOffset)                                                        \
-    _(WasmLoad)                                                             \
-    _(WasmStore)                                                            \
-    _(WasmTrap)                                                             \
-    _(WasmTruncateToInt32)                                                  \
-    _(AsmJSNeg)                                                             \
-    _(WasmUnsignedToDouble)                                                 \
-    _(WasmUnsignedToFloat32)                                                \
-    _(AsmJSLoadHeap)                                                        \
-    _(AsmJSStoreHeap)                                                       \
-    _(WasmLoadGlobalVar)                                                    \
-    _(WasmStoreGlobalVar)                                                   \
-    _(WasmReturn)                                                           \
-    _(WasmReturnVoid)                                                       \
-    _(WasmParameter)                                                        \
-    _(WasmStackArg)                                                         \
-    _(WasmCall)                                                             \
-    _(WasmSelect)                                                           \
-    _(WasmReinterpret)                                                      \
     _(Rotate)                                                               \
     _(NewDerivedTypedObject)                                                \
     _(RecompileCheck)                                                       \
-    _(AsmJSCompareExchangeHeap)                                             \
-    _(AsmJSAtomicExchangeHeap)                                              \
-    _(AsmJSAtomicBinopHeap)                                                 \
     _(UnknownValue)                                                         \
     _(LexicalCheck)                                                         \
     _(ThrowRuntimeLexicalError)                                             \
     _(GlobalNameConflictsCheck)                                             \
     _(Debugger)                                                             \
     _(NewTarget)                                                            \
     _(ArrowNewTarget)                                                       \
     _(CheckReturn)                                                          \
     _(CheckIsObj)                                                           \
     _(CheckObjCoercible)                                                    \
-    _(DebugCheckSelfHosted)
+    _(DebugCheckSelfHosted)                                                 \
+    _(AsmJSNeg)                                                             \
+    _(AsmJSLoadHeap)                                                        \
+    _(AsmJSStoreHeap)                                                       \
+    _(AsmJSCompareExchangeHeap)                                             \
+    _(AsmJSAtomicExchangeHeap)                                              \
+    _(AsmJSAtomicBinopHeap)                                                 \
+    _(WasmBoundsCheck)                                                      \
+    _(WasmAddOffset)                                                        \
+    _(WasmLoad)                                                             \
+    _(WasmStore)                                                            \
+    _(WasmTrap)                                                             \
+    _(WasmTruncateToInt32)                                                  \
+    _(WasmUnsignedToDouble)                                                 \
+    _(WasmUnsignedToFloat32)                                                \
+    _(WasmLoadGlobalVar)                                                    \
+    _(WasmStoreGlobalVar)                                                   \
+    _(WasmReturn)                                                           \
+    _(WasmReturnVoid)                                                       \
+    _(WasmParameter)                                                        \
+    _(WasmStackArg)                                                         \
+    _(WasmCall)                                                             \
+    _(WasmSelect)                                                           \
+    _(WasmReinterpret)                                                      \
+    _(WasmTruncateToInt64)
 
 // Forward declarations of MIR types.
 #define FORWARD_DECLARE(op) class M##op;
  MIR_OPCODE_LIST(FORWARD_DECLARE)
 #undef FORWARD_DECLARE
 
 class MDefinitionVisitor // interface i.e. pure abstract class
 {

--- a/js/src/jit/shared/LOpcodes-shared.h
+++ b/js/src/jit/shared/LOpcodes-shared.h
@@ -205,17 +205,16 @@
     _(Int32ToFloat32)               \
     _(ValueToDouble)                \
     _(ValueToInt32)                 \
     _(ValueToFloat32)               \
     _(DoubleToInt32)                \
     _(Float32ToInt32)               \
     _(TruncateDToInt32)             \
     _(TruncateFToInt32)             \
-    _(WasmTruncateToInt32)          \
     _(WrapInt64ToInt32)             \
     _(ExtendInt32ToInt64)           \
     _(BooleanToString)              \
     _(IntToString)                  \
     _(DoubleToString)               \
     _(ValueToString)                \
     _(ValueToObjectOrNull)          \
     _(Int32x4ToFloat32x4)           \
@@ -368,61 +367,28 @@
     _(Round)                        \
     _(RoundF)                       \
     _(In)                           \
     _(InArray)                      \
     _(InstanceOfO)                  \
     _(InstanceOfV)                  \
     _(CallInstanceOf)               \
     _(InterruptCheck)               \
-    _(WasmTrap)                     \
-    _(WasmReinterpret)              \
-    _(WasmReinterpretToI64)         \
-    _(WasmReinterpretFromI64)       \
     _(Rotate)                       \
     _(RotateI64)                    \
     _(GetDOMProperty)               \
     _(GetDOMMemberV)                \
     _(GetDOMMemberT)                \
     _(SetDOMProperty)               \
     _(CallDOMNative)                \
     _(IsCallable)                   \
     _(IsConstructor)                \
     _(IsObject)                     \
     _(IsObjectAndBranch)            \
     _(HasClass)                     \
-    _(WasmSelect)                   \
-    _(WasmSelectI64)                \
-    _(WasmBoundsCheck)              \
-    _(WasmAddOffset)                \
-    _(WasmLoad)                     \
-    _(WasmLoadI64)                  \
-    _(WasmStore)                    \
-    _(WasmStoreI64)                 \
-    _(WasmLoadGlobalVar)            \
-    _(WasmLoadGlobalVarI64)         \
-    _(WasmStoreGlobalVar)           \
-    _(WasmStoreGlobalVarI64)        \
-    _(AsmJSLoadHeap)                \
-    _(AsmJSStoreHeap)               \
-    _(WasmParameter)                \
-    _(WasmParameterI64)             \
-    _(WasmReturn)                   \
-    _(WasmReturnI64)                \
-    _(WasmReturnVoid)               \
-    _(WasmStackArg)                 \
-    _(WasmStackArgI64)              \
-    _(WasmCall)                     \
-    _(WasmCallI64)                  \
-    _(AsmJSCompareExchangeHeap)     \
-    _(AsmJSAtomicExchangeHeap)      \
-    _(AsmJSAtomicBinopHeap)         \
-    _(AsmJSAtomicBinopHeapForEffect)\
-    _(WasmUint32ToDouble)           \
-    _(WasmUint32ToFloat32)          \
     _(RecompileCheck)               \
     _(MemoryBarrier)                \
     _(AssertRangeI)                 \
     _(AssertRangeD)                 \
     _(AssertRangeF)                 \
     _(AssertRangeV)                 \
     _(AssertResultV)                \
     _(AssertResultT)                \
@@ -430,11 +396,45 @@
     _(ThrowRuntimeLexicalError)     \
     _(GlobalNameConflictsCheck)     \
     _(Debugger)                     \
     _(NewTarget)                    \
     _(ArrowNewTarget)               \
     _(CheckReturn)                  \
     _(CheckIsObj)                   \
     _(CheckObjCoercible)            \
-    _(DebugCheckSelfHosted)
+    _(DebugCheckSelfHosted)         \
+    _(AsmJSLoadHeap)                \
+    _(AsmJSStoreHeap)               \
+    _(AsmJSCompareExchangeHeap)     \
+    _(AsmJSAtomicExchangeHeap)      \
+    _(AsmJSAtomicBinopHeap)         \
+    _(AsmJSAtomicBinopHeapForEffect)\
+    _(WasmTruncateToInt32)          \
+    _(WasmTrap)                     \
+    _(WasmReinterpret)              \
+    _(WasmReinterpretToI64)         \
+    _(WasmReinterpretFromI64)       \
+    _(WasmSelect)                   \
+    _(WasmSelectI64)                \
+    _(WasmBoundsCheck)              \
+    _(WasmAddOffset)                \
+    _(WasmLoad)                     \
+    _(WasmLoadI64)                  \
+    _(WasmStore)                    \
+    _(WasmStoreI64)                 \
+    _(WasmLoadGlobalVar)            \
+    _(WasmLoadGlobalVarI64)         \
+    _(WasmStoreGlobalVar)           \
+    _(WasmStoreGlobalVarI64)        \
+    _(WasmParameter)                \
+    _(WasmParameterI64)             \
+    _(WasmReturn)                   \
+    _(WasmReturnI64)                \
+    _(WasmReturnVoid)               \
+    _(WasmStackArg)                 \
+    _(WasmStackArgI64)              \
+    _(WasmCall)                     \
+    _(WasmCallI64)                  \
+    _(WasmUint32ToDouble)           \
+    _(WasmUint32ToFloat32)
 
 #endif /* jit_shared_LOpcodes_shared_h */