Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove class constraint from Interlocked.{Compare}Exchange #104558

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 9 commits into from
Jul 19, 2024
Merged

Remove class constraint from Interlocked.{Compare}Exchange #104558

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7ec916e
Remove class constraint from Interlocked.{Compare}Exchange
stephentoub Jul 17, 2024
51901b7
Update Interlocked.cs
MichalStrehovsky Jul 17, 2024
4a83109
Address PR feedback
stephentoub Jul 17, 2024
116f650
Use signed types and skip intrinsifying floating-point
stephentoub Jul 17, 2024
b439797
Fix asserts in NI_System_Threading_Interlocked_Exchange handling
stephentoub Jul 18, 2024
58e341d
Merge remote-tracking branch 'upstream/main' into interlockedgeneric
stephentoub Jul 18, 2024
1d192f9
Merge remote-tracking branch 'upstream/main' into interlockedgeneric
stephentoub Jul 18, 2024
2674bfc
Fix crossgen and ilc
MichalStrehovsky Jul 19, 2024
22b3c7a
Merge branch 'main' into interlockedgeneric
stephentoub Jul 19, 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
Prev Previous commit
Next Next commit
Fix crossgen and ilc
  • Loading branch information
@MichalStrehovsky
MichalStrehovsky committed Jul 19, 2024
commit 2674bfcd6e7c2471d2816e4a104aa8ae1c5773fb
12 changes: 6 additions & 6 deletions src/coreclr/tools/Common/TypeSystem/IL/NativeAotILProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ private static MethodIL TryGetIntrinsicMethodIL(MethodDesc method)

switch (owningType.Name)
{
case "Interlocked":
{
if (owningType.Namespace == "System.Threading")
return InterlockedIntrinsics.EmitIL(method);
}
break;
case "Unsafe":
{
if (owningType.Namespace == "System.Runtime.CompilerServices")
Expand Down Expand Up @@ -108,6 +102,12 @@ private static MethodIL TryGetPerInstantiationIntrinsicMethodIL(MethodDesc metho

switch (owningType.Name)
{
case "Interlocked":
{
if (owningType.Namespace == "System.Threading")
return InterlockedIntrinsics.EmitIL(method);
}
break;
case "Activator":
{
TypeSystemContext context = owningType.Context;
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/tools/Common/TypeSystem/IL/Stubs/InterlockedIntrinsics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public static MethodIL EmitIL(
MethodDesc method)
{
Debug.Assert(((MetadataType)method.OwningType).Name == "Interlocked");
Debug.Assert(!method.IsGenericMethodDefinition);

if (method.HasInstantiation && method.Name == "CompareExchange")
{
Expand Down
10 changes: 5 additions & 5 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/IL/ReadyToRunILProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ private MethodIL TryGetIntrinsicMethodIL(MethodDesc method)
return UnsafeIntrinsics.EmitIL(method);
}

if (mdType.Name == "Interlocked" && mdType.Namespace == "System.Threading")
{
return InterlockedIntrinsics.EmitIL(_compilationModuleGroup, method);
}

return null;
}

Expand All @@ -114,6 +109,11 @@ private MethodIL TryGetPerInstantiationIntrinsicMethodIL(MethodDesc method)
return TryGetIntrinsicMethodILForActivator(method);
}

if (mdType.Name == "Interlocked" && mdType.Namespace == "System.Threading")
{
return InterlockedIntrinsics.EmitIL(_compilationModuleGroup, method);
}

return null;
}

Expand Down