Fix arm64 disasm failures

GTF_ICON_STATIC_HDL and GTF_ICON_FTN_ADDR can't be converted to names using eeGetFieldName and eeGetMethodFullName, respectively. So, just print out the type of the target. Fixes dotnet#40354
BruceForstall · Nov 11, 2020 · d45bb7b · d45bb7b
1 parent 72b7d23
commit d45bb7b
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/coreclr/src/jit/emitarm64.cpp b/src/coreclr/src/jit/emitarm64.cpp
@@ -12340,14 +12340,22 @@ void emitter::emitDispIns(
                             targetName = "String handle";
                         }
                     }
-                    else if ((idFlags == GTF_ICON_FIELD_HDL) || (idFlags == GTF_ICON_STATIC_HDL))
+                    else if (idFlags == GTF_ICON_FIELD_HDL)
                     {
                         targetName = emitComp->eeGetFieldName((CORINFO_FIELD_HANDLE)targetHandle);
                     }
-                    else if ((idFlags == GTF_ICON_METHOD_HDL) || (idFlags == GTF_ICON_FTN_ADDR))
+                    else if (idFlags == GTF_ICON_STATIC_HDL)
+                    {
+                        targetName = "Static handle";
+                    }
+                    else if (idFlags == GTF_ICON_METHOD_HDL)
                     {
                         targetName = emitComp->eeGetMethodFullName((CORINFO_METHOD_HANDLE)targetHandle);
                     }
+                    else if (idFlags == GTF_ICON_FTN_ADDR)
+                    {
+                        targetName = "Function address";
+                    }
                     else if (idFlags == GTF_ICON_CLASS_HDL)
                     {
                         targetName = emitComp->eeGetClassName((CORINFO_CLASS_HANDLE)targetHandle);