Skip to content

Fixing COM Aggregation and XAML reference tracking on .NET AOT #90283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Aug 13, 2023
Merged

Fixing COM Aggregation and XAML reference tracking on .NET AOT #90283

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2eb4451
Add initial changes for COM Aggregation and XAML reference tracking i…
manodasanW Aug 3, 2023
ecb0a57
Progress on getting tests passing.
manodasanW Aug 7, 2023
540bab6
Fix dependency list to avoid allocations
manodasanW Aug 8, 2023
e5f09b9
Fix issues with finalizer races and issues with allocating memory dur…
manodasanW Aug 9, 2023
fde5e82
Minor cleanup
manodasanW Aug 9, 2023
e40e7df
Apply suggestions from code review
manodasanW Aug 10, 2023
4eab90f
PR feedback
manodasanW Aug 10, 2023
9cee39c
Fix builds on non Windows
manodasanW Aug 10, 2023
18db1a6
PR feedback and functions for weak reference support
manodasanW Aug 11, 2023
0be8752
Fix string resource
manodasanW Aug 11, 2023
193e54c
Bring back foreach loop
manodasanW Aug 11, 2023
1c33cf1
Add COM weak reference support
manodasanW Aug 11, 2023
8d8aea2
PR feedback on seperating reference tracker object fields.
manodasanW Aug 11, 2023
ab324a5
Try to fix linux build.
manodasanW Aug 11, 2023
032b7d3
Attempt to resolve build error with increaze in binary size
manodasanW Aug 11, 2023
be22058
PR feedback
manodasanW Aug 12, 2023
a686197
PR feedback
manodasanW Aug 12, 2023
7252203
Apply suggestions from code review
manodasanW Aug 12, 2023
117480a
PR feedback
manodasanW Aug 12, 2023
a190775
Fix potential memory leak in aggregated scenario
manodasanW Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/coreclr/nativeaot/Runtime/GCHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ COOP_PINVOKE_HELPER(int32_t, RhSetGcLatencyMode, (int32_t newLatencyMode))
return GCHeapUtilities::GetGCHeap()->SetGcLatencyMode(newLatencyMode);
}

COOP_PINVOKE_HELPER(FC_BOOL_RET, RhIsPromoted, (OBJECTREF obj))
{
FC_RETURN_BOOL(GCHeapUtilities::GetGCHeap()->IsPromoted(obj));
}

COOP_PINVOKE_HELPER(FC_BOOL_RET, RhIsServerGc, ())
{
FC_RETURN_BOOL(GCHeapUtilities::IsServerHeap());
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
<Compile Include="System\Runtime\InteropServices\Marshal.NativeAot.cs" />
<Compile Include="System\Runtime\InteropServices\Marshal.Com.cs" Condition="'$(FeatureCominterop)' == 'true'" />
<Compile Include="System\Runtime\InteropServices\MemoryMarshal.NativeAot.cs" />
<Compile Include="System\Runtime\InteropServices\TrackerObjectManager.NativeAot.cs" Condition="'$(FeatureComWrappers)' == 'true'" />
<Compile Include="System\Runtime\InteropServices\ObjectiveCMarshal.NativeAot.cs" Condition="'$(FeatureObjCMarshal)' == 'true'" />
<Compile Include="System\Runtime\InteropServices\UnsafeGCHandle.cs" />
<Compile Include="System\Runtime\Intrinsics\X86\X86Base.NativeAot.cs" Condition="'$(SupportsX86Intrinsics)' == 'true'" />
Expand Down Expand Up @@ -273,6 +274,9 @@
<Compile Include="$(CommonPath)\Interop\Windows\Ole32\Interop.CoGetApartmentType.cs">
<Link>Interop\Windows\Ole32\Interop.CoGetApartmentType.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\Ole32\Interop.CoGetContextToken.cs">
<Link>Interop\Windows\Ole32\Interop.CoGetContextToken.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\OleAut32\Interop.VariantClear.cs">
<Link>Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
</Compile>
Expand Down
454 changes: 421 additions & 33 deletions ...iveaot/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.NativeAot.cs
View file
Open in desktop

Large diffs are not rendered by default.

Loading