Commit 737e35e
authored
Fix Win64 exception propagation in NativeCallable methods (#33653)
A recent change has removed the UMThunkStub usage for native callable
methods. That has broken handling of exceptions propagated from the
managed native callable method into the native caller in case there were
explicit frames below the native frame, like during the GC stress 3.
This change fixes it by unwinding the explicit frames upto the native
frame during the 2nd pass of exception handling when exception unwinding
passes through the frame of a native callable method and isn't handled
there.1 parent bedc8d5 commit 737e35e
1 file changed
Lines changed: 19 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
818 | 818 | | |
819 | 819 | | |
820 | 820 | | |
| 821 | + | |
| 822 | + | |
821 | 823 | | |
822 | 824 | | |
823 | 825 | | |
| |||
1262 | 1264 | | |
1263 | 1265 | | |
1264 | 1266 | | |
| 1267 | + | |
| 1268 | + | |
| 1269 | + | |
| 1270 | + | |
| 1271 | + | |
| 1272 | + | |
| 1273 | + | |
| 1274 | + | |
| 1275 | + | |
| 1276 | + | |
| 1277 | + | |
| 1278 | + | |
| 1279 | + | |
| 1280 | + | |
| 1281 | + | |
| 1282 | + | |
1265 | 1283 | | |
1266 | 1284 | | |
1267 | 1285 | | |
| |||
5824 | 5842 | | |
5825 | 5843 | | |
5826 | 5844 | | |
5827 | | - | |
| 5845 | + | |
5828 | 5846 | | |
5829 | 5847 | | |
5830 | 5848 | | |
| |||
0 commit comments