Commit 5b8b063
[release/9.0-staging] Fix C++/CLI applications which use __declspec(appdomain) (#110495)
* Do not eagerly allocate static variable space while loading the assembly in use. This avoids possible recursive loading issues found in C++/CLI codebases. Repurpose the NativeCallingManaged test to subsume this particular regression test case.
Fix #110365
* Fix testcase
* Deal with DomainAssembly instead of Assembly
---------
Co-authored-by: David Wrighton <davidwr@microsoft.com>
Co-authored-by: Jeff Schwartz <jeffschw@microsoft.com>1 parent 726bb80 commit 5b8b063
2 files changed
Lines changed: 24 additions & 5 deletions
File tree
- src
- coreclr/vm
- tests/Interop/IJW/IjwNativeCallingManagedDll
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4360 | 4360 | | |
4361 | 4361 | | |
4362 | 4362 | | |
4363 | | - | |
| 4363 | + | |
| 4364 | + | |
| 4365 | + | |
| 4366 | + | |
4364 | 4367 | | |
4365 | 4368 | | |
4366 | 4369 | | |
| |||
Lines changed: 20 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
20 | 34 | | |
21 | 35 | | |
22 | | - | |
23 | | - | |
24 | 36 | | |
25 | 37 | | |
26 | 38 | | |
| |||
29 | 41 | | |
30 | 42 | | |
31 | 43 | | |
32 | | - | |
| 44 | + | |
| 45 | + | |
33 | 46 | | |
34 | 47 | | |
35 | 48 | | |
36 | 49 | | |
37 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
38 | 54 | | |
39 | 55 | | |
40 | 56 | | |
| |||
0 commit comments