Skip to content

[release/9.0-preview7] Fix throwing exception when calling RunClassConstructor on a generic type with a static constructor #105535

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 5 commits into from
Jul 26, 2024
Merged

[release/9.0-preview7] Fix throwing exception when calling RunClassConstructor on a generic type with a static constructor #105535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf60557
Fix throwing exception when calling RunClassConstructor on a generic …
steveisok Jul 25, 2024
957a18d
PR feedback
steveisok Jul 25, 2024
3397783
Apply suggestions from code review
jkotas Jul 25, 2024
0e89f8b
More feedback
steveisok Jul 25, 2024
3c03366
Shouldn't wing it
steveisok Jul 25, 2024
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
2 changes: 2 additions & 0 deletions src/coreclr/vm/methodtable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3768,6 +3768,8 @@ void MethodTable::CheckRunClassInitThrowing()
if (IsSharedByGenericInstantiations())
return;

_ASSERTE(!ContainsGenericVariables());

EnsureStaticDataAllocated();
DoRunClassInitThrowing();
}
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/vm/reflectioninvocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,8 @@ extern "C" void QCALLTYPE ReflectionInvocation_RunClassConstructor(QCall::TypeHa
return;

MethodTable *pMT = typeHnd.AsMethodTable();
if (pMT->IsClassInited())
// The ContainsGenericVariables check is to preserve back-compat where we assume the generic type is already initialized
if (pMT->IsClassInited() || pMT->ContainsGenericVariables())
return;

BEGIN_QCALL;
Expand Down
12 changes: 11 additions & 1 deletion ...Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading;
using Xunit;

namespace System.Runtime.CompilerServices.Tests
Expand Down Expand Up @@ -101,7 +102,8 @@ public static void RunClassConstructor()
RuntimeTypeHandle t = typeof(HasCctor).TypeHandle;
RuntimeHelpers.RunClassConstructor(t);
Assert.Equal("Hello", HasCctorReceiver.S);
return;
// Should not throw
RuntimeHelpers.RunClassConstructor(typeof(GenericHasCctor<>).TypeHandle);
}

internal class HasCctor
Expand All @@ -117,6 +119,14 @@ internal class HasCctorReceiver
public static string S;
}

internal class GenericHasCctor<T>
{
static GenericHasCctor()
{
Thread.Yield(); // Make sure the preinitialization optimization doesn't eat this.
}
}

[Fact]
public static void PrepareMethod()
{
Expand Down