Skip to content
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

Jump to bottom

Add GC.KeepAlive to COM paths in WeakReference #88537

Merged
merged 3 commits into from
Jul 12, 2023
Merged

Add GC.KeepAlive to COM paths in WeakReference #88537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb1dedf
Reenable GCStress WeakReferenceTest
markples Jun 27, 2023
cf357e6
Add GC.KeepAlive to COM paths in WeakReference
markples Jul 7, 2023
4d8a681
Merge remote-tracking branch 'origin/w81362' into wr-keepalive
markples Jul 7, 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
17 changes: 15 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/WeakReference.T.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ public void SetTarget(T target)
if ((th & ComAwareBit) != 0 || comInfo != null)
{
ComAwareWeakReference.SetTarget(ref _taggedHandle, target, comInfo);

// must keep the instance alive as long as we use the handle.
GC.KeepAlive(this);

return;
}
#endif
Expand All @@ -133,13 +137,22 @@ private T? Target
if (th == 0)
return default;

T? target;

#if FEATURE_COMINTEROP || FEATURE_COMWRAPPERS
if ((th & ComAwareBit) != 0)
return Unsafe.As<T?>(ComAwareWeakReference.GetTarget(th));
{
target = Unsafe.As<T?>(ComAwareWeakReference.GetTarget(th));

// must keep the instance alive as long as we use the handle.
GC.KeepAlive(this);

return target;
}
#endif

// unsafe cast is ok as the handle cannot be destroyed and recycled while we keep the instance alive
T? target = Unsafe.As<T?>(GCHandle.InternalGet(th));
target = Unsafe.As<T?>(GCHandle.InternalGet(th));

// must keep the instance alive as long as we use the handle.
GC.KeepAlive(this);
Expand Down
17 changes: 15 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/WeakReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,22 @@ public virtual object? Target
if (th == 0)
return default;

object? target;

#if FEATURE_COMINTEROP || FEATURE_COMWRAPPERS
if ((th & ComAwareBit) != 0)
return ComAwareWeakReference.GetTarget(th);
{
target = ComAwareWeakReference.GetTarget(th);

// must keep the instance alive as long as we use the handle.
GC.KeepAlive(this);

return target;
}
#endif

// unsafe cast is ok as the handle cannot be destroyed and recycled while we keep the instance alive
object? target = GCHandle.InternalGet(th);
target = GCHandle.InternalGet(th);

// must keep the instance alive as long as we use the handle.
GC.KeepAlive(this);
Expand All @@ -186,6 +195,10 @@ public virtual object? Target
if ((th & ComAwareBit) != 0 || comInfo != null)
{
ComAwareWeakReference.SetTarget(ref _taggedHandle, value, comInfo);

// must keep the instance alive as long as we use the handle.
GC.KeepAlive(this);

return;
}
#endif
Expand Down
2 changes: 0 additions & 2 deletions src/tests/Interop/COM/ComWrappers/WeakReference/WeakReferenceTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<!-- Registers global instances of ComWrappers -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- Temporarily disabled due to https://github.com/dotnet/runtime/issues/81362 -->
<GCStressIncompatible>true</GCStressIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="WeakReferenceTest.cs" />
Expand Down
Loading