Fix setting of ResolutionFailed flag on boot (#1353)

nanoframework · Jun 6, 2019 · 2e794f2 · 2e794f2
1 parent 4ef6b64
commit 2e794f2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/CLR/Startup/CLRStartup.cpp b/src/CLR/Startup/CLRStartup.cpp
@@ -107,7 +107,7 @@ struct Settings
     {
         NANOCLR_HEADER();
 
-        // cler flag, in case EE wasn't restarted
+        // clear flag (in case EE wasn't restarted)
         CLR_EE_DBG_CLR(StateResolutionFailed);
 
 #if !defined(BUILD_RTM)
@@ -141,8 +141,11 @@ struct Settings
         {
             CLR_Debug::Printf( "Error: %08x\r\n", hr );
 
-            // exception occurred in assembly loading or type resolution
-            CLR_EE_DBG_SET(StateResolutionFailed);
+            if(hr == CLR_E_TYPE_UNAVAILABLE)
+            {
+                // exception occurred during type resolution
+                CLR_EE_DBG_SET(StateResolutionFailed);
+            }
         }
 #endif
 

diff --git a/targets/os/win32/nanoCLR/CLRStartup.cpp b/targets/os/win32/nanoCLR/CLRStartup.cpp
@@ -123,6 +123,9 @@ struct Settings
     {
         NANOCLR_HEADER();
 
+        // clear flag (in case EE wasn't restarted)
+        CLR_EE_DBG_CLR(StateResolutionFailed);
+
 #if defined(_WIN32)
         CLR_RT_StringVector vec;
 
@@ -219,7 +222,16 @@ struct Settings
         NANOCLR_CLEANUP();
 
 #if !defined(BUILD_RTM)
-        if(FAILED(hr)) CLR_Debug::Printf( "Error: %08x\r\n", hr );
+        if(FAILED(hr))
+        {
+            CLR_Debug::Printf( "Error: %08x\r\n", hr );
+
+            if(hr == CLR_E_TYPE_UNAVAILABLE)
+            {
+                // exception occurred during type resolution
+                CLR_EE_DBG_SET(StateResolutionFailed);
+            }
+        }
 #endif
 
         NANOCLR_CLEANUP_END();