Do not use PAL_CPP_TRY/PAL_CPP_CATCH_ALL

diff --git a/src/debug/netcoredbg/typeprinter.cpp b/src/debug/netcoredbg/typeprinter.cpp
index 6ca17fd50592abc61526d74cd8645c918d4bd7d8..7fc92bed0403b7a4c84301c61d91568b469ca1f2 100644 (file)
--- a/src/debug/netcoredbg/typeprinter.cpp
+++ b/src/debug/netcoredbg/typeprinter.cpp
@@ -173,100 +173,93 @@ HRESULT TypePrinter::NameForToken(mdTypeDef mb,
 
     HRESULT hr = E_FAIL;
 
-    PAL_CPP_TRY
+    WCHAR name[MAX_CLASSNAME_LENGTH];
+    if (TypeFromToken(mb) == mdtTypeDef)
     {
-        WCHAR name[MAX_CLASSNAME_LENGTH];
-        if (TypeFromToken(mb) == mdtTypeDef)
-        {
-            hr = NameForTypeDef(mb, pImport, mdName, args);
-        }
-        else if (TypeFromToken(mb) ==  mdtFieldDef)
+        hr = NameForTypeDef(mb, pImport, mdName, args);
+    }
+    else if (TypeFromToken(mb) ==  mdtFieldDef)
+    {
+        mdTypeDef mdClass;
+        ULONG size;
+        hr = pImport->GetMemberProps(mb, &mdClass,
+                                        name, _countof(name), &size,
+                                        NULL, NULL, NULL, NULL,
+                                        NULL, NULL, NULL, NULL);
+        if (SUCCEEDED(hr))
         {
-            mdTypeDef mdClass;
-            ULONG size;
-            hr = pImport->GetMemberProps(mb, &mdClass,
-                                         name, _countof(name), &size,
-                                         NULL, NULL, NULL, NULL,
-                                         NULL, NULL, NULL, NULL);
-            if (SUCCEEDED(hr))
+            if (mdClass != mdTypeDefNil && bClassName)
             {
-                if (mdClass != mdTypeDefNil && bClassName)
-                {
-                    hr = NameForTypeDef(mdClass, pImport, mdName, args);
-                    mdName += ".";
-                }
-                mdName += to_utf8(name/*, size*/);
+                hr = NameForTypeDef(mdClass, pImport, mdName, args);
+                mdName += ".";
             }
+            mdName += to_utf8(name/*, size*/);
         }
-        else if (TypeFromToken(mb) == mdtMethodDef)
+    }
+    else if (TypeFromToken(mb) == mdtMethodDef)
+    {
+        mdTypeDef mdClass;
+        ULONG size;
+        hr = pImport->GetMethodProps(mb, &mdClass,
+                                        name, _countof(name), &size,
+                                        NULL, NULL, NULL, NULL, NULL);
+        if (SUCCEEDED (hr))
         {
-            mdTypeDef mdClass;
-            ULONG size;
-            hr = pImport->GetMethodProps(mb, &mdClass,
-                                         name, _countof(name), &size,
-                                         NULL, NULL, NULL, NULL, NULL);
-            if (SUCCEEDED (hr))
+            if (mdClass != mdTypeDefNil && bClassName)
             {
-                if (mdClass != mdTypeDefNil && bClassName)
-                {
-                    hr = NameForTypeDef(mdClass, pImport, mdName, args);
-                    mdName += ".";
-                }
-                mdName += to_utf8(name/*, size*/);
+                hr = NameForTypeDef(mdClass, pImport, mdName, args);
+                mdName += ".";
             }
+            mdName += to_utf8(name/*, size*/);
         }
-        else if (TypeFromToken(mb) == mdtMemberRef)
+    }
+    else if (TypeFromToken(mb) == mdtMemberRef)
+    {
+        mdTypeDef mdClass;
+        ULONG size;
+        hr = pImport->GetMemberRefProps(mb, &mdClass,
+                                        name, _countof(name), &size,
+                                        NULL, NULL);
+        if (SUCCEEDED (hr))
         {
-            mdTypeDef mdClass;
-            ULONG size;
-            hr = pImport->GetMemberRefProps(mb, &mdClass,
-                                            name, _countof(name), &size,
-                                            NULL, NULL);
-            if (SUCCEEDED (hr))
+            if (TypeFromToken(mdClass) == mdtTypeRef && bClassName)
             {
-                if (TypeFromToken(mdClass) == mdtTypeRef && bClassName)
-                {
-                    ToRelease<IMDInternalImport> pMDI;
-                    hr = GetMDInternalFromImport(pImport, &pMDI);
-                    if (SUCCEEDED(hr))
-                    {
-                        LPCSTR sznamespace = 0;
-                        LPCSTR szname = 0;
-                        if (SUCCEEDED(pMDI->GetNameOfTypeRef(mdClass, &sznamespace, &szname)))
-                            mdName = std::string(sznamespace) + "." + std::string(szname) + ".";
-                    }
-                }
-                else if (TypeFromToken(mdClass) == mdtTypeDef && bClassName)
+                ToRelease<IMDInternalImport> pMDI;
+                hr = GetMDInternalFromImport(pImport, &pMDI);
+                if (SUCCEEDED(hr))
                 {
-                    hr = NameForTypeDef(mdClass, pImport, mdName, args);
-                    mdName += ".";
+                    LPCSTR sznamespace = 0;
+                    LPCSTR szname = 0;
+                    if (SUCCEEDED(pMDI->GetNameOfTypeRef(mdClass, &sznamespace, &szname)))
+                        mdName = std::string(sznamespace) + "." + std::string(szname) + ".";
                 }
-                mdName += to_utf8(name/*, size*/);
             }
-        }
-        else if (TypeFromToken(mb) == mdtTypeRef)
-        {
-            ToRelease<IMDInternalImport> pMDI;
-            hr = GetMDInternalFromImport(pImport, &pMDI);
-            if (SUCCEEDED(hr))
+            else if (TypeFromToken(mdClass) == mdtTypeDef && bClassName)
             {
-                LPCSTR sznamespace = 0;
-                LPCSTR szname = 0;
-                if (SUCCEEDED(pMDI->GetNameOfTypeRef(mdtTypeRef, &sznamespace, &szname)))
-                    mdName = std::string(sznamespace) + "." + std::string(szname);
+                hr = NameForTypeDef(mdClass, pImport, mdName, args);
+                mdName += ".";
             }
+            mdName += to_utf8(name/*, size*/);
         }
-        else
+    }
+    else if (TypeFromToken(mb) == mdtTypeRef)
+    {
+        ToRelease<IMDInternalImport> pMDI;
+        hr = GetMDInternalFromImport(pImport, &pMDI);
+        if (SUCCEEDED(hr))
         {
-            //ExtOut ("Unsupported token type\n");
-            hr = E_FAIL;
+            LPCSTR sznamespace = 0;
+            LPCSTR szname = 0;
+            if (SUCCEEDED(pMDI->GetNameOfTypeRef(mdtTypeRef, &sznamespace, &szname)))
+                mdName = std::string(sznamespace) + "." + std::string(szname);
         }
     }
-    PAL_CPP_CATCH_ALL
+    else
     {
-            hr = E_FAIL;
+        //ExtOut ("Unsupported token type\n");
+        hr = E_FAIL;
     }
-    PAL_CPP_ENDTRY
+
     if (SUCCEEDED(hr))
     {
         mdName = RenameToCSharp(mdName);