Add EH filters for generic catch(T) blocks #72721

EgorBo · 2022-07-23T16:43:50Z

Closes #67806
Closes #70400

This PR emits single-block EH filters in front of catch clauses which require runtime lookup for Exception objects

Adds generic exceptions support for NativeAOT

…ntime-1 into nativeaot-eh-generic-exception

src/coreclr/jit/jiteh.cpp

src/tests/nativeaot/SmokeTests/Exceptions/GenericExceptions.cs

EgorBo · 2022-07-24T12:22:01Z

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr jitstressregs, runtime-coreclr gcstress0x3-gcstress0xc, runtime-coreclr crossgen2

azure-pipelines · 2022-07-24T12:22:36Z

Azure Pipelines successfully started running 5 pipeline(s).

jkotas · 2022-07-24T13:19:01Z

/azp run runtime-extra-platforms

azure-pipelines · 2022-07-24T13:19:27Z

Azure Pipelines successfully started running 1 pipeline(s).

src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs

src/tests/nativeaot/SmokeTests/Exceptions/GenericExceptions.cs

EgorBo · 2022-07-24T21:07:10Z

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr jitstressregs, runtime-coreclr gcstress0x3-gcstress0xc, runtime-coreclr crossgen2, runtime-extra-platforms

azure-pipelines · 2022-07-24T21:07:50Z

Azure Pipelines successfully started running 6 pipeline(s).

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs

src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.cs

Co-authored-by: Adeel Mujahid <[email protected]>

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs

src/coreclr/vm/codeman.cpp

src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs

jkotas

Thank you!

…r.cs Co-authored-by: Jan Kotas <[email protected]>

…neric-exception

src/coreclr/jit/jiteh.cpp

EgorBo · 2022-07-26T15:27:47Z

@dotnet/jit-contrib @AndyAyersMS PTAL jit side
Last run of outerloop/stress pipelines didn't find any issues (https://github.com/dotnet/runtime/runs/7492786872)

AndyAyersMS · 2022-07-28T20:16:44Z

src/coreclr/jit/jiteh.cpp

+            lvaTable[tempNum].lvType = TYP_REF;
+            GenTree* argAsg          = gtNewTempAssign(tempNum, arg);
+            arg                      = gtNewLclvNode(tempNum, TYP_REF);
+            filterBb->bbStkTempsIn   = tempNum;


Nit -- you don't need to set this.

Suggested change

filterBb->bbStkTempsIn = tempNum;

hm.. I think I had to actually, let me see if CI is happy then

Co-authored-by: Andy Ayers <[email protected]>

EgorBo · 2022-07-28T20:43:50Z

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr jitstressregs, runtime-coreclr gcstress0x3-gcstress0xc, runtime-coreclr crossgen2

azure-pipelines · 2022-07-28T20:44:27Z

Azure Pipelines successfully started running 5 pipeline(s).

EgorBo added 2 commits July 23, 2022 18:12

NativeAOT: Implement a fake EH filter for generic exceptions

8d9b3ef

Add smoke test

7d4bcbd

ghost added the area-NativeAOT-coreclr label Jul 23, 2022

ghost assigned EgorBo Jul 23, 2022

EgorBo added 3 commits July 23, 2022 19:24

Update GenericExceptions.cs

39752c7

CI test

3a045da

Merge branch 'nativeaot-eh-generic-exception' of github.com:EgorBo/ru…

fd57c28

…ntime-1 into nativeaot-eh-generic-exception

jkotas reviewed Jul 23, 2022

View reviewed changes

src/coreclr/jit/jiteh.cpp Outdated Show resolved Hide resolved

jkotas reviewed Jul 23, 2022

View reviewed changes

src/coreclr/jit/jiteh.cpp Outdated Show resolved Hide resolved

EgorBo added 4 commits July 23, 2022 23:10

Address feedback & fix AVE

f24208a

Clean up

f7c55a7

Fix runtime lookup for NativeAOT & Crossgen

861c6c3

Another attempt to fix runtime lookup (now should be working)

8a72927

am11 reviewed Jul 24, 2022

View reviewed changes

src/tests/nativeaot/SmokeTests/Exceptions/GenericExceptions.cs Outdated Show resolved Hide resolved

Remove tests from issues.targets

58d3b77

EgorBo marked this pull request as ready for review July 24, 2022 12:20

EgorBo requested a review from MichalStrehovsky as a code owner July 24, 2022 12:20

EgorBo changed the title ~~NativeAOT: Generic exceptions~~ Add EH filters for generic catch(T) blocks Jul 24, 2022

jkotas reviewed Jul 24, 2022

View reviewed changes

src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs Outdated Show resolved Hide resolved

jkotas reviewed Jul 24, 2022

View reviewed changes

src/tests/nativeaot/SmokeTests/Exceptions/GenericExceptions.cs Outdated Show resolved Hide resolved

Move fgCreateFiltersForGenericExceptions to fgAddInternal

54763a7

EgorBo force-pushed the nativeaot-eh-generic-exception branch from 9d9e2ea to 54763a7 Compare July 24, 2022 16:40

EgorBo added 2 commits July 24, 2022 21:40

simplify runtime lookup

a32b92a

Address feedback

3668e25

jkotas reviewed Jul 25, 2022

View reviewed changes

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs Show resolved Hide resolved

EgorBo added 3 commits July 25, 2022 22:05

Add Jan's IL test

bee1fb3

Address feedback (NativeAOT's part is not finished yet)

10ca969

remove dead code

79e87b8

am11 reviewed Jul 25, 2022

View reviewed changes

src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.cs Outdated Show resolved Hide resolved

EgorBo and others added 3 commits July 25, 2022 23:39

Update src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.cs

5420035

Co-authored-by: Adeel Mujahid <[email protected]>

Fix test

9cf10d2

NativeAOT fix

fd3130e

jkotas reviewed Jul 25, 2022

View reviewed changes

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs Outdated Show resolved Hide resolved

EgorBo added 2 commits July 26, 2022 00:00

remove "variance" block

22f2520

Address feedback

9110e5f

jkotas reviewed Jul 25, 2022

View reviewed changes

src/coreclr/vm/codeman.cpp Show resolved Hide resolved

EgorBo added 2 commits July 26, 2022 00:25

Remove IsPolyType

d3c01cb

rename csproj to ilproj

aaa075e

jkotas reviewed Jul 26, 2022

View reviewed changes

src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs Outdated Show resolved Hide resolved

jkotas approved these changes Jul 26, 2022

View reviewed changes

Update src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanne…

98ce006

…r.cs Co-authored-by: Jan Kotas <[email protected]>

EgorBo mentioned this pull request Jul 26, 2022

GenericCatchInterfaceProgram fails on mono #72827

Closed

EgorBo added 2 commits July 26, 2022 06:19

Disable test on mono

5c7c157

Merge branch 'main' of github.com:dotnet/runtime into nativeaot-eh-ge…

40ca568

…neric-exception

jakobbotsch reviewed Jul 26, 2022

View reviewed changes

src/coreclr/jit/jiteh.cpp Show resolved Hide resolved

AndyAyersMS approved these changes Jul 28, 2022

View reviewed changes

Update src/coreclr/jit/jiteh.cpp

d13147d

Co-authored-by: Andy Ayers <[email protected]>

EgorBo merged commit 4cd3e78 into dotnet:main Jul 29, 2022

EgorBo deleted the nativeaot-eh-generic-exception branch July 29, 2022 21:29

ghost locked as resolved and limited conversation to collaborators Aug 29, 2022

Add EH filters for generic catch(T) blocks #72721

Add EH filters for generic catch(T) blocks #72721

Uh oh!

Conversation

EgorBo commented Jul 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EgorBo commented Jul 24, 2022

Uh oh!

azure-pipelines bot commented Jul 24, 2022

Uh oh!

jkotas commented Jul 24, 2022

Uh oh!

azure-pipelines bot commented Jul 24, 2022

Uh oh!

Uh oh!

Uh oh!

EgorBo commented Jul 24, 2022

Uh oh!

azure-pipelines bot commented Jul 24, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkotas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

EgorBo commented Jul 26, 2022

Uh oh!

AndyAyersMS Jul 28, 2022

Choose a reason for hiding this comment

Uh oh!

EgorBo Jul 28, 2022

Choose a reason for hiding this comment

Uh oh!

EgorBo commented Jul 28, 2022

Uh oh!

azure-pipelines bot commented Jul 28, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

EgorBo commented Jul 23, 2022 •

edited

Loading