resolve merge errors

dotnet · Nov 20, 2024 · 6e9e6ff · 6e9e6ff
1 parent b5fa5bf
commit 6e9e6ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/coreclr/jit/emitxarch.cpp b/src/coreclr/jit/emitxarch.cpp
@@ -2177,18 +2177,18 @@ emitter::code_t emitter::AddRexWPrefix(const instrDesc* id, code_t code)
         }
     }
 #ifdef TARGET_AMD64
-    else if (hasRex2Prefix(code))
-    {
-        return emitter::code_t(code | 0x000800000000ULL);
-    }
-    else if (TakesApxExtendedEvexPrefix(code))
+    else if (TakesApxExtendedEvexPrefix(id))
     {
         // If the instruction is not VEX/EVEX encodable, and has EVEX prefix,
         // then it is legacy promoted EVEX.
         assert(hasEvexPrefix(code));
         assert(IsApxExtendedEvexInstruction(ins));
         return emitter::code_t(code | 0x0000800000000000ULL);
     }
+    else if (hasRex2Prefix(code))
+    {
+        return emitter::code_t(code | 0x000800000000ULL);
+    }
     return emitter::code_t(code | 0x4800000000ULL);
 #else
     assert(!"UNREACHED");

diff --git a/src/coreclr/jit/instr.h b/src/coreclr/jit/instr.h
@@ -222,7 +222,7 @@ enum insFlags : uint64_t
     Encoding_REX2  = 1ULL << 44,
 
     // APX: NDD form:
-    INS_Flags_Has_NDD  = 1ULL << 44,
+    INS_Flags_Has_NDD  = 1ULL << 45,
 
     //  TODO-Cleanup:  Remove this flag and its usage from TARGET_XARCH
     INS_FLAGS_DONT_CARE = 0x00ULL,