Fallback to the callconv(*) format in ILDasm

dotnet · Jul 2, 2020 · 56ad025 · 56ad025
1 parent 5b0b0f2
commit 56ad025
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/src/coreclr/src/ildasm/dasm.cpp b/src/coreclr/src/ildasm/dasm.cpp
@@ -3475,20 +3475,10 @@ BOOL DumpMethod(mdToken FuncToken, const char *pszClassName, DWORD dwEntryPointT
     bool bRet = FALSE;
 
     PAL_CPP_TRY {
-        if((*pComSig & IMAGE_CEE_CS_CALLCONV_MASK) > IMAGE_CEE_CS_CALLCONV_VARARG
-            && (*pComSig & IMAGE_CEE_CS_CALLCONV_MASK) != IMAGE_CEE_CS_CALLCONV_UNMANAGED)
-        {
-            sprintf_s(szString,SZSTRING_SIZE,"%sERROR: signature of method '%s' has invalid calling convention 0x%2.2X",g_szAsmCodeIndent,pszMemberName,*pComSig);
-            printError(GUICookie,ERRORMSG(szString));
-            bRet = TRUE;
-            goto lDone;
-        }
-
         g_tkMVarOwner = FuncToken;
         szString[0] = 0;
         DumpGenericPars(szString,FuncToken); //,NULL,FALSE);
         pszMemberSig = PrettyPrintSig(pComSig, cComSig, szString, &qbMemberSig, g_pImport,NULL);
-lDone: ;
     } PAL_CPP_CATCH_ALL {
         printError(GUICookie,"INVALID DATA ADDRESS");
         bRet = TRUE;

diff --git a/src/coreclr/src/inc/formattype.cpp b/src/coreclr/src/inc/formattype.cpp
@@ -247,19 +247,37 @@ PCCOR_SIGNATURE PrettyPrintSignature(
         }
         else
         {
-            static const char* const callConvNames[10] = {
+            const char* const callConvUndefined = (const char*)-1;
+            static const char* const callConvNames[16] = {
                 "",
                 "unmanaged cdecl ",
                 "unmanaged stdcall ",
                 "unmanaged thiscall ",
                 "unmanaged fastcall ",
                 "vararg ",
-                "<error> ", // field
-                "<error> ", // local sig
-                "<error> ", // property
-                "unmanaged "
+                callConvUndefined, // field
+                callConvUndefined, // local sig
+                callConvUndefined, // property
+                "unmanaged ",
+                callConvUndefined,
+                callConvUndefined,
+                callConvUndefined,
+                callConvUndefined,
+                callConvUndefined,
+                callConvUndefined
                 };
-            appendStr(out, KEYWORD(callConvNames[callConv & 0xf]));
+            static_assert_no_msg(COUNTOF(callConvNames) == (IMAGE_CEE_CS_CALLCONV_MASK + 1));
+
+            char tmp[32];
+            unsigned callConvIdx = callConv & IMAGE_CEE_CS_CALLCONV_MASK;
+            const char* name_cc = callConvNames[callConvIdx];
+            if (name_cc == callConvUndefined)
+            {
+                sprintf_s(tmp, COUNTOF(tmp), "callconv(%u) ", callConvIdx);
+                name_cc = tmp;
+            }
+
+            appendStr(out, KEYWORD(name_cc));
         }
 
         if (callConv & IMAGE_CEE_CS_CALLCONV_GENERIC)