Commit 842b6a8
authored
[mono][interp] Fix invocation of finally clauses with tiering enabled (#69909)
When unwinding the stack during EH, we first populate a StackFrameInfo with various data, like native_offset and jinfo. Let's assume this data is for an untiered method. If this frame has multiple finally clauses that need to be invoked, a finally invocation could tier up the InterpFrame that it is executing. The future finally invocations would use the IPs from the previously resolved untiered method. This change makes the interpreter receive only the clause index (in interp_run_finally) so we correctly resolve the native offsets of the handler.1 parent c0227b4 commit 842b6a8
File tree
4 files changed
+7
-6
lines changed- src/mono/mono/mini
- interp
4 files changed
+7
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
105 | | - | |
| 105 | + | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7390 | 7390 | | |
7391 | 7391 | | |
7392 | 7392 | | |
7393 | | - | |
| 7393 | + | |
7394 | 7394 | | |
7395 | 7395 | | |
| 7396 | + | |
7396 | 7397 | | |
7397 | 7398 | | |
7398 | 7399 | | |
7399 | 7400 | | |
7400 | 7401 | | |
7401 | | - | |
7402 | | - | |
| 7402 | + | |
| 7403 | + | |
7403 | 7404 | | |
7404 | 7405 | | |
7405 | 7406 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2576 | 2576 | | |
2577 | 2577 | | |
2578 | 2578 | | |
2579 | | - | |
| 2579 | + | |
2580 | 2580 | | |
2581 | 2581 | | |
2582 | 2582 | | |
| |||
0 commit comments