diff --git a/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs b/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs index 6e2751fd5916ea..d5818b5aecc428 100644 --- a/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs +++ b/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs @@ -290,9 +290,8 @@ private string ComputeMangledTypeName(TypeDesc type) mangledName = GetMangledTypeName(((PointerType)type).ParameterType) + NestMangledName("Pointer"); break; case TypeFlags.FunctionPointer: - // TODO: need to also encode calling convention (or all modopts?) var fnPtrType = (FunctionPointerType)type; - mangledName = "__FnPtr" + EnterNameScopeSequence; + mangledName = "__FnPtr_" + ((int)fnPtrType.Signature.Flags).ToString("X2") + EnterNameScopeSequence; mangledName += GetMangledTypeName(fnPtrType.Signature.ReturnType); mangledName += EnterNameScopeSequence; diff --git a/src/tests/issues.targets b/src/tests/issues.targets index adea69250d10c0..5ea0e184af010d 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -874,9 +874,6 @@ https://github.com/dotnet/runtime/issues/81103 - - https://github.com/dotnet/runtime/issues/81106 -