[mono][wasm] AOT more methods containing EH clauses #111318
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 tasks
WASM aot supports the `deopt` mode for a method, in which case the method will be aot compiled but the exception handlers are later invoked via the interpreter, if an exception is thrown. This is an alternative to fully interpreting the method in question. A problem can arise if an exception is caught inside a finally handler, because the start of the finally handler will be executed with AOT and then, once the exception is caught, the rest of the handler would be executed with the interprer. This is because the implementation of ENDFINALLY in the interpreter requires some information to have been initialized when the handler is called, initialization which is missing since the handler was called by AOT.
The original code referenced this issue, but the condition to detect this situation was very relaxed, including common cases like `try { try {} catch {} } finally { }`. This commit changes the check so it is only hit for scenarios like `try { } finally { try { } catch { } }`.
dcc14e8 to
86b4996
Compare
jeromelaban
added a commit
to unoplatform/Uno.DotnetRuntime.WebAssembly
that referenced
this pull request
Jan 13, 2025
This was referenced Jan 13, 2025
|
Do we also need to change the scope of IL trimming (of method body) to reap size benefits ? |
|
@pavelsavara I'd tend to think, given @BrzVlad's explanation of EH that because the runtime's need for IL for running EH blocks, this particular AOT condition change won't impact IL stripping. |
lewing
approved these changes
Jan 15, 2025
jeromelaban
added a commit
to unoplatform/Uno.DotnetRuntime.WebAssembly
that referenced
this pull request
Jan 20, 2025
* chore: Apply patch from dotnet/runtime#111318 * ci: Update artifacts steps * chore: Adjust patch * chore: Adjust ubuntu * chore: Adjust runners * chore: adjust net install * chore: Adjust net installer * chore: remove container
|
FYI, we're using this change in production and it's doing great so far. |
That's useful data. We'll take it in 10 and look at servicing |
I forgot to mention, it was backported to net8. |
This was referenced Jan 30, 2025
Open
This was referenced Feb 12, 2025
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WASM aot supports the
deoptmode for a method, in which case the method will be aot compiled but the exception handlers are later invoked via the interpreter, if an exception is thrown. This is an alternative to fully interpreting the method in question. A problem can arise if an exception is caught inside a finally handler, because the start of the finally handler will be executed with AOT and then, once the exception is caught, the rest of the handler would be executed with the interprer. This is because the implementation of ENDFINALLY in the interpreter requires some information to have been initialized when the handler is called, initialization which is missing since the handler was called by AOT.The original code referenced this issue, but the condition to detect this situation was very relaxed, including common cases like
try { try {} catch {} } finally { }. This commit changes the check so it is only hit for scenarios liketry { } finally { try { } catch { } }.fixes: #111281