Commit 43d1838
authored
Fix C++/CLI applications which use __declspec(appdomain) (#110367)
* 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 testcase1 parent fdb68dd commit 43d1838
File tree
2 files changed
+24
-5
lines changed- src
- coreclr/vm
- tests/Interop/IJW/IjwNativeCallingManagedDll
2 files changed
+24
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4316 | 4316 | | |
4317 | 4317 | | |
4318 | 4318 | | |
4319 | | - | |
| 4319 | + | |
| 4320 | + | |
| 4321 | + | |
| 4322 | + | |
4320 | 4323 | | |
4321 | 4324 | | |
4322 | 4325 | | |
| |||
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