Fix Interlocked.Or/And for arm64 (#91557)

dotnet · Sep 6, 2023 · 23987d2 · 23987d2
1 parent 1487d46
commit 23987d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/coreclr/jit/importercalls.cpp b/src/coreclr/jit/importercalls.cpp
@@ -9200,8 +9200,6 @@ NamedIntrinsic Compiler::lookupNamedIntrinsic(CORINFO_METHOD_HANDLE method)
             {
                 if (strcmp(className, "Interlocked") == 0)
                 {
-#ifndef TARGET_ARM64
-                    // TODO-CQ: Implement for XArch (https://github.com/dotnet/runtime/issues/32239).
                     if (strcmp(methodName, "And") == 0)
                     {
                         result = NI_System_Threading_Interlocked_And;
@@ -9210,9 +9208,7 @@ NamedIntrinsic Compiler::lookupNamedIntrinsic(CORINFO_METHOD_HANDLE method)
                     {
                         result = NI_System_Threading_Interlocked_Or;
                     }
-                    else
-#endif
-                        if (strcmp(methodName, "CompareExchange") == 0)
+                    else if (strcmp(methodName, "CompareExchange") == 0)
                     {
                         result = NI_System_Threading_Interlocked_CompareExchange;
                     }

diff --git a/src/coreclr/jit/lsraarm64.cpp b/src/coreclr/jit/lsraarm64.cpp
@@ -1044,8 +1044,8 @@ int LinearScan::BuildNode(GenTree* tree)
                     }
                     setInternalRegsDelayFree = true;
                 }
-                buildInternalRegisterUses();
             }
+            buildInternalRegisterUses();
             if (dstCount == 1)
             {
                 BuildDef(tree);