Address some review feedback

src/coreclr/jit/emit.h

@@ -640,10 +640,6 @@ class emitter
         BasicBlock*       idTargetBlock; // Target block for branches
     };
 
-#if defined(TARGET_WASM)
-#include "wasmtypesdef.h"
-#endif
-
 #ifdef TARGET_ARM
     unsigned insEncodeSetFlags(insFlags sf);
 
@@ -896,9 +892,6 @@ class emitter
         unsigned _idLclFPBase : 1; // access a local on stack - SP based offset
         insOpts  _idInsOpt    : 3; // options for Load/Store instructions
 #endif
-#ifdef TARGET_WASM
-        unsigned _idLclDecl : 1; // is this a local declaration?
-#endif
 
         ////////////////////////////////////////////////////////////////////////
         // Space taken up to here:
@@ -926,7 +919,7 @@ class emitter
 #elif defined(TARGET_AMD64)
 #define ID_EXTRA_BITFIELD_BITS (20)
 #elif defined(TARGET_WASM)
-#define ID_EXTRA_BITFIELD_BITS (-3)
+#define ID_EXTRA_BITFIELD_BITS (-4)
 #else
 #error Unsupported or unset target architecture
 #endif
@@ -1306,12 +1299,7 @@ class emitter
 #ifdef TARGET_WASM
         bool idIsLclVarDecl() const
         {
-            return (_idLclDecl != 0);
-        }
-
-        void idSetIsLclVarDecl(bool isDecl)
-        {
-            _idLclDecl = isDecl ? 1 : 0;
+            return _idInsFmt == IF_LOCAL_DECL
         }
 #endif
 
@@ -2359,9 +2347,9 @@ class emitter
     {
         instrDescLclVarDecl() = delete;
         cnsval_ssize_t    lclCnt;
-        instWasmValueType lclType;
+        WasmValueType lclType;
 
-        void idLclType(instWasmValueType type)
+        void idLclType(WasmValueType type)
         {
             lclType = type;
         }

src/coreclr/jit/emitwasm.cpp

@@ -116,7 +116,7 @@ bool emitter::emitInsIsStore(instruction ins)
     return false;
 }
 
-emitter::instrDesc* emitter::emitNewInstrLclVarDecl(emitAttr attr, cnsval_ssize_t localCount, instWasmValueType type)
+emitter::instrDesc* emitter::emitNewInstrLclVarDecl(emitAttr attr, cnsval_ssize_t localCount, WasmValueType type)
 {
     instrDescLclVarDecl* id = static_cast<instrDescLclVarDecl*>(emitAllocAnyInstr(sizeof(instrDescLclVarDecl), attr));
     id->idSetIsLclVarDecl(true);
@@ -131,7 +131,7 @@ emitter::instrDesc* emitter::emitNewInstrLclVarDecl(emitAttr attr, cnsval_ssize_
 // a count (immediate) and a value type. This is specifically used for local variable
 // declarations that require both the number of locals and their type to be encoded.
 //
-void emitter::emitIns_I_Ty(instruction ins, cnsval_ssize_t imm, emitter::instWasmValueType valType)
+void emitter::emitIns_I_Ty(instruction ins, cnsval_ssize_t imm, WasmValueType valType)
 {
     instrDesc* id  = this->emitNewInstrLclVarDecl(EA_8BYTE, imm, valType);
     insFormat  fmt = this->emitInsFormat(ins);
@@ -225,6 +225,24 @@ unsigned emitter::SizeOfSLEB128(int64_t value)
     return (x * 37) >> 8;
 }
 
+uint8_t getWasmValueTypeCode(WasmValueType type)
+{
+    // clang-format off
+    static const WasmValueType typecode_mapping[] = {
+        0x00, // WasmValueType::Invalid = 0,
+        0x7C, // WasmValueType::F64 = 1,
+        0x7D, // WasmValueType::F32 = 2,
+        0x7E, // WasmValueType::I64 = 3,
+        0x7F, // WasmValueType::I32 = 4,
+    };
+
+    static_assert(ArrLen(mapping) == TYP_COUNT);
+    // clang-format on
+
+    assert(0 <= type && type < WasmValueType::Count);
+    return typecode_mapping[static_cast<unsigned>(type)];
+}
+
 unsigned emitter::instrDesc::idCodeSize() const
 {
 #ifdef TARGET_WASM32
@@ -252,7 +270,8 @@ unsigned emitter::instrDesc::idCodeSize() const
         {
             assert(idIsLclVarDecl());
             instrDescLclVarDecl* idl = static_cast<instrDescLclVarDecl*>(const_cast<instrDesc*>(this));
-            size                     = SizeOfULEB128(idl->lclCnt) + sizeof(emitter::instWasmValueType);
+            uint8_t typeCode = getWasmValueTypeCode(idl->lclType);
+            size                     = SizeOfULEB128(idl->lclCnt) + sizeof(typeCode);
             break;
         }
         case IF_ULEB128:

src/coreclr/jit/emitwasm.h

@@ -5,8 +5,6 @@
 /*             Debug-only routines to display instructions              */
 /************************************************************************/
 
-#include "wasmtypesdef.h"
-
 #if defined(DEBUG) || defined(LATE_DISASM)
 void getInsSveExecutionCharacteristics(instrDesc* id, insExecutionCharacteristics& result);
 #endif // defined(DEBUG) || defined(LATE_DISASM)
@@ -20,7 +18,7 @@ void emitDispInst(instruction ins);
 public:
 void emitIns(instruction ins);
 void emitIns_I(instruction ins, emitAttr attr, cnsval_ssize_t imm);
-void emitIns_I_Ty(instruction ins, cnsval_ssize_t imm, instWasmValueType valType);
+void emitIns_I_Ty(instruction ins, cnsval_ssize_t imm, WasmValueType valType);
 void emitIns_J(instruction ins, emitAttr attr, cnsval_ssize_t imm, BasicBlock* tgtBlock);
 void emitIns_S(instruction ins, emitAttr attr, int varx, int offs);
 void emitIns_R(instruction ins, emitAttr attr, regNumber reg);