Skip to content

Commit 565cd48

Browse files
committed
Backport of PR #81122 to .NET 7.0, revert change to issues.targets
Based on tactical discussion with Fan and Sam I have backported the PR #81122 including the removal of the issues.targets entry for function pointer tests as an extra commit on top of the backport of Fan's PR #80855. Thanks Tomas
1 parent 3bd7685 commit 565cd48

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,8 @@ private string ComputeMangledTypeName(TypeDesc type)
303303
mangledName = GetMangledTypeName(((PointerType)type).ParameterType) + NestMangledName("Pointer");
304304
break;
305305
case TypeFlags.FunctionPointer:
306-
// TODO: need to also encode calling convention (or all modopts?)
307306
var fnPtrType = (FunctionPointerType)type;
308-
mangledName = "__FnPtr" + EnterNameScopeSequence;
307+
mangledName = "__FnPtr_" + ((int)fnPtrType.Signature.Flags).ToString("X2") + EnterNameScopeSequence;
309308
mangledName += GetMangledTypeName(fnPtrType.Signature.ReturnType);
310309

311310
mangledName += EnterNameScopeSequence;

src/tests/issues.targets

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -919,9 +919,6 @@
919919
<ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/hugeexpr1/*">
920920
<Issue>https://github.com/dotnet/runtime/issues/62881</Issue>
921921
</ExcludeList>
922-
<ExcludeList Include = "$(XunitTestBinBase)/Loader/classloader/Casting/Functionpointer/**">
923-
<Issue>https://github.com/dotnet/runtime/issues/81106</Issue>
924-
</ExcludeList>
925922
</ItemGroup>
926923

927924
<!-- All OSX targets on NativeAOT -->

0 commit comments

Comments
 (0)