Fix RhpLockCmpXchg64 FCall on win-x86 (dotnet#100155)

Xinlong-Wu · Mar 22, 2024 · 7005f46 · 7005f46
1 parent 80d37dd
commit 7005f46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/coreclr/nativeaot/Runtime/CommonMacros.h b/src/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -255,6 +255,10 @@ typedef uint8_t CODE_LOCATION;
     FCIMPL_RENAME_ARGSIZE(_rettype, _method, 24) \
     EXTERN_C _rettype F_CALL_CONV _method##_FCall (c, b, a) \
     {
+#define FCIMPL3_ILL(_rettype, _method, a, b, c) \
+    FCIMPL_RENAME_ARGSIZE(_rettype, _method, 20) \
+    EXTERN_C _rettype F_CALL_CONV _method##_FCall (a, c, b) \
+    {
 
 #else
 
@@ -289,6 +293,9 @@ typedef uint8_t CODE_LOCATION;
 #define FCIMPL3_DDD(_rettype, _method, a, b, c) \
     EXTERN_C _rettype F_CALL_CONV _method (a, b, c) \
     {
+#define FCIMPL3_ILL(_rettype, _method, a, b, c) \
+    EXTERN_C _rettype F_CALL_CONV _method (a, b, c) \
+    {
 
 #endif
 

diff --git a/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp b/src/coreclr/nativeaot/Runtime/MiscHelpers.cpp
@@ -423,7 +423,7 @@ FCIMPL3(int32_t, RhpLockCmpXchg32, int32_t * location, int32_t value, int32_t co
 }
 FCIMPLEND
 
-FCIMPL3(int64_t, RhpLockCmpXchg64, int64_t * location, int64_t value, int64_t comparand)
+FCIMPL3_ILL(int64_t, RhpLockCmpXchg64, int64_t * location, int64_t value, int64_t comparand)
 {
     return PalInterlockedCompareExchange64(location, value, comparand);
 }