Merge pull request #4543 from dotnet/nmirror

Merge nmirror to master

1 files changed, 9 insertions, 4 deletions

diff --git a/src/ILCompiler.Compiler/src/Compiler/ILStreamReader.cs b/src/ILCompiler.Compiler/src/Compiler/ILStreamReader.cs
index 9d30c702c..e27edb3b2 100644
--- a/src/ILCompiler.Compiler/src/Compiler/ILStreamReader.cs
+++ b/src/ILCompiler.Compiler/src/Compiler/ILStreamReader.cs
@@ -175,14 +175,19 @@ namespace Internal.Compiler
         public bool TryReadLdtokenAsTypeSystemEntity(out TypeSystemEntity entity)
         {
             int token;
-            if (!TryReadLdtoken(out token))
+            bool tokenResolved;
+            try
             {
+                tokenResolved = TryReadLdtoken(out token);
+                entity = tokenResolved ?(TypeSystemEntity)_methodIL.GetObject(token) : null;
+            }
+            catch (TypeSystemException.TypeLoadException)
+            {
+                tokenResolved = false;
                 entity = null;
-                return false;
             }
 
-            entity = (TypeSystemEntity)_methodIL.GetObject(token);
-            return true;
+            return tokenResolved;
         }
 
         public TypeSystemEntity ReadLdtokenAsTypeSystemEntity()