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

Fix for COM Weakreference test failure under JIT stress. #79476

Merged
merged 2 commits into from
Dec 10, 2022
Merged

Fix for COM Weakreference test failure under JIT stress. #79476

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf34b9e
Prevent methods from inlining when relying on life time of their locals.
VSadov Dec 9, 2022
7d76380
refactor local functions.
VSadov Dec 9, 2022
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
67 changes: 36 additions & 31 deletions src/tests/Interop/COM/ComWrappers/WeakReference/WeakReferenceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.CompilerServices;

namespace ComWrappersTests
{
using System;
Expand Down Expand Up @@ -132,28 +134,30 @@ private static void ValidateWeakReferenceState(WeakReference<WeakReferenceableWr
Assert.Equal(sourceWrappers.Registration, target.Registration);
}

private static (WeakReference<WeakReferenceableWrapper>, IntPtr) GetWeakReference(TestComWrappers cw)
private static void ValidateNativeWeakReference(TestComWrappers cw)
{
IntPtr objRaw = WeakReferenceNative.CreateWeakReferencableObject();
var obj = (WeakReferenceableWrapper)cw.GetOrCreateObjectForComInstance(objRaw, CreateObjectFlags.None);
var wr = new WeakReference<WeakReferenceableWrapper>(obj);
ValidateWeakReferenceState(wr, expectedIsAlive: true, cw);
GC.KeepAlive(obj);
return (wr, objRaw);
}
[MethodImpl(MethodImplOptions.NoInlining)]
static (WeakReference<WeakReferenceableWrapper>, IntPtr) GetWeakReference(TestComWrappers cw)
{
IntPtr objRaw = WeakReferenceNative.CreateWeakReferencableObject();
var obj = (WeakReferenceableWrapper)cw.GetOrCreateObjectForComInstance(objRaw, CreateObjectFlags.None);
var wr = new WeakReference<WeakReferenceableWrapper>(obj);
ValidateWeakReferenceState(wr, expectedIsAlive: true, cw);
GC.KeepAlive(obj);
return (wr, objRaw);
}

private static IntPtr SetWeakReferenceTarget(WeakReference<WeakReferenceableWrapper> wr, TestComWrappers cw)
{
IntPtr objRaw = WeakReferenceNative.CreateWeakReferencableObject();
var obj = (WeakReferenceableWrapper)cw.GetOrCreateObjectForComInstance(objRaw, CreateObjectFlags.None);
wr.SetTarget(obj);
ValidateWeakReferenceState(wr, expectedIsAlive: true, cw);
GC.KeepAlive(obj);
return objRaw;
}
[MethodImpl(MethodImplOptions.NoInlining)]
static IntPtr SetWeakReferenceTarget(WeakReference<WeakReferenceableWrapper> wr, TestComWrappers cw)
{
IntPtr objRaw = WeakReferenceNative.CreateWeakReferencableObject();
var obj = (WeakReferenceableWrapper)cw.GetOrCreateObjectForComInstance(objRaw, CreateObjectFlags.None);
wr.SetTarget(obj);
ValidateWeakReferenceState(wr, expectedIsAlive: true, cw);
GC.KeepAlive(obj);
return objRaw;
}

private static void ValidateNativeWeakReference(TestComWrappers cw)
{
Console.WriteLine($" -- Validate weak reference creation");
var (weakRef, nativeRef) = GetWeakReference(cw);

Expand Down Expand Up @@ -220,20 +224,20 @@ static void ValidateLocalInstance()

static void ValidateNonComWrappers()
{
Console.WriteLine($"Running {nameof(ValidateNonComWrappers)}...");

(WeakReference, IntPtr) GetWeakReference()
[MethodImpl(MethodImplOptions.NoInlining)]
static (WeakReference, IntPtr) GetWeakReference()
{
IntPtr objRaw = WeakReferenceNative.CreateWeakReferencableObject();
var obj = Marshal.GetObjectForIUnknown(objRaw);
return (new WeakReference(obj), objRaw);
}

bool HasTarget(WeakReference wr)
static bool HasTarget(WeakReference wr)
{
return wr.Target != null;
}

Console.WriteLine($"Running {nameof(ValidateNonComWrappers)}...");
var (weakRef, nativeRef) = GetWeakReference();
GC.Collect();
GC.WaitForPendingFinalizers();
Expand All @@ -254,6 +258,15 @@ bool HasTarget(WeakReference wr)

static void ValidateAggregatedWeakReference()
{
[MethodImpl(MethodImplOptions.NoInlining)]
static (GCHandle handle, WeakReference<DerivedObject>) GetWeakReference()
{
DerivedObject obj = new DerivedObject(TestComWrappers.TrackerSupportInstance);
// We use an explicit weak GC handle here to enable us to validate that we are using "weak" GCHandle
// semantics with the weak reference.
return (GCHandle.Alloc(obj, GCHandleType.Weak), new WeakReference<DerivedObject>(obj));
}

Console.WriteLine("Validate weak reference with aggregation.");
var (handle, weakRef) = GetWeakReference();

Expand All @@ -262,14 +275,6 @@ static void ValidateAggregatedWeakReference()

Assert.Null(handle.Target);
Assert.False(weakRef.TryGetTarget(out _));

static (GCHandle handle, WeakReference<DerivedObject>) GetWeakReference()
{
DerivedObject obj = new DerivedObject(TestComWrappers.TrackerSupportInstance);
// We use an explicit weak GC handle here to enable us to validate that we are using "weak" GCHandle
// semantics with the weak reference.
return (GCHandle.Alloc(obj, GCHandleType.Weak), new WeakReference<DerivedObject>(obj));
}
}

static int Main()
Expand Down