Fix arm64 disasm failures (#44547)
authorBruce Forstall <brucefo@microsoft.com>
Thu, 12 Nov 2020 00:36:24 +0000 (16:36 -0800)
committerGitHub <noreply@github.com>
Thu, 12 Nov 2020 00:36:24 +0000 (16:36 -0800)
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 #40354

src/coreclr/src/jit/emitarm64.cpp

index 6a819f8..29dd58e 100644 (file)
@@ -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);