Scan throw helper for unsupported EH (#1037)

Fixes #991.
dotnet · Apr 29, 2021 · 4a94374 · 4a94374
1 parent 28ddf89
commit 4a94374
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs
@@ -195,6 +195,17 @@ private void StartImportingBasicBlock(BasicBlock basicBlock)
                     MarkBasicBlock(_basicBlocks[region.HandlerOffset]);
                     if (region.Kind == ILExceptionRegionKind.Filter)
                         MarkBasicBlock(_basicBlocks[region.FilterOffset]);
+
+                    // Once https://github.com/dotnet/corert/issues/3460 is done, this should be deleted.
+                    // Throwing InvalidProgram is not great, but we want to do *something* if this happens
+                    // because doing nothing means problems at runtime. This is not worth piping a
+                    // a new exception with a fancy message for.
+                    if (region.Kind == ILExceptionRegionKind.Catch)
+                    {
+                        TypeDesc catchType = (TypeDesc)_methodIL.GetObject(region.ClassToken);
+                        if (catchType.IsRuntimeDeterminedSubtype)
+                            _dependencies.Add(_factory.MethodEntrypoint(_factory.TypeSystemContext.GetHelperEntryPoint("ThrowHelpers", "ThrowInvalidProgramException")), "Unsupported EH");
+                    }
                 }
             }