Fix issue with Arm64 AsmDiffs

Commit migrated from https://github.com/dotnet/coreclr/commit/ede046b68183e228d9a7b3753542c8f4a1bea017

diff --git a/src/coreclr/src/jit/compiler.cpp b/src/coreclr/src/jit/compiler.cpp
index 4a71f4e..39d9a05 100644 (file)
--- a/src/coreclr/src/jit/compiler.cpp
+++ b/src/coreclr/src/jit/compiler.cpp
@@ -1871,7 +1871,6 @@ unsigned ReinterpretHexAsDecimal(unsigned in)
     return result;
 }
 
-inline
 void                Compiler::compInitOptions(CORJIT_FLAGS* jitFlags)
 {
 #ifdef UNIX_AMD64_ABI

diff --git a/src/coreclr/src/jit/emitarm64.cpp b/src/coreclr/src/jit/emitarm64.cpp
index c1e6f93..c77f9ab 100644 (file)
--- a/src/coreclr/src/jit/emitarm64.cpp
+++ b/src/coreclr/src/jit/emitarm64.cpp
@@ -10328,10 +10328,6 @@ void                emitter::emitDispIns(instrDesc *  id,
             printf("(LARGELDC)");
         }
 
-        if (fmt == IF_LARGELDC)
-        {
-            printf("(LARGELDC)");
-        }
         printf("[");
         if (id->idAddr()->iiaIsJitDataOffset())
         {
@@ -10349,7 +10345,12 @@ void                emitter::emitDispIns(instrDesc *  id,
         else
         {
             assert(imm == 0);
-            if (id->idIsBound())
+            if (id->idIsReloc())
+            {
+                printf("RELOC ");
+                emitDispImm((ssize_t)id->idAddr()->iiaAddr, false);
+            }
+            else if (id->idIsBound())
             {
                 printf("G_M%03u_IG%02u", Compiler::s_compMethodsCount, id->idAddr()->iiaIGlabel->igNum);
             }