Skip to content

Use new TypeName methods in runtime tools #115857

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
jkotas merged 5 commits into from
May 22, 2025
Merged

Use new TypeName methods in runtime tools #115857

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
6106b39
Initial plan for issue
Copilot May 22, 2025
4718b9b
Use new TypeName methods in runtime tools
Copilot May 22, 2025
6a03288
Address PR feedback: Move and inline variables in CustomAttributeType…
Copilot May 22, 2025
5b7f26b
Remove reference to TypeNameHelpers.cs in ILVerification.projitems
Copilot May 22, 2025
052f9c4
Fix escaping in type name resolution and remove unnecessary blank line
Copilot May 22, 2025
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
9 changes: 3 additions & 6 deletions src/coreclr/tools/Common/TypeSystem/Common/Utilities/CustomAttributeTypeNameParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,21 +179,18 @@ private TypeDesc GetSimpleTypeFromModule(TypeName typeName, ModuleDesc module)
TypeDesc type = GetSimpleTypeFromModule(typeName.DeclaringType, module);
if (type == null)
return null;
return ((MetadataType)type).GetNestedType(TypeNameHelpers.Unescape(typeName.Name));
return ((MetadataType)type).GetNestedType(TypeName.Unescape(typeName.Name));
}

string fullName = TypeNameHelpers.Unescape(typeName.FullName);

if (_canonGenericResolver != null)
{
string fullName = TypeName.Unescape(typeName.FullName);
TypeDesc canonType = _canonGenericResolver(module, fullName);
if (canonType != null)
return canonType;
}

(string typeNamespace, string name) = TypeNameHelpers.Split(fullName);

return module.GetType(typeNamespace, name, throwIfNotFound: false);
return module.GetType(TypeName.Unescape(typeName.Namespace), TypeName.Unescape(typeName.Name), throwIfNotFound: false);
}

private TypeDesc GetGenericType(TypeName typeName)
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/tools/ILVerification/ILVerification.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
<Compile Include="$(ToolsCommonPath)TypeSystem\Common\Utilities\CustomAttributeTypeNameParser.cs">
<Link>Utilities\CustomAttributeTypeNameParser.cs</Link>
</Compile>
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameHelpers.cs">
<Link>Utilities\TypeNameHelpers.cs</Link>
</Compile>
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
<Link>Utilities\ValueStringBuilder.cs</Link>
</Compile>
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,6 @@
<Compile Include="Compiler\Dataflow\TrimAnalysisMethodCallPattern.cs" />
<Compile Include="Compiler\Dataflow\TrimAnalysisPatternStore.cs" />
<Compile Include="Compiler\Dataflow\TrimAnalysisTokenAccessPattern.cs" />
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameHelpers.cs">
<Link>Utilities\TypeNameHelpers.cs</Link>
</Compile>
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
<Link>Utilities\ValueStringBuilder.cs</Link>
</Compile>
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<Compile Include="$(ToolsProjectRoot)illink/src/linker/Linker/TypeNameResolver.cs" />
<Compile Include="$(ToolsProjectRoot)illink/src/linker/Linker/ITryResolve.cs" />
<Compile Include="$(ToolsProjectRoot)illink/src/linker/Linker/ModuleDefinitionExtensions.cs" />
<Compile Include="$(LibrariesProjectRoot)/Common/src/System/Reflection/Metadata/TypeNameHelpers.cs" />
<Compile Include="$(LibrariesProjectRoot)/Common/src/System/Text/ValueStringBuilder.cs" />
</ItemGroup>

Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@
<Compile Include="..\..\Common\TypeSystem\Common\Utilities\CustomAttributeTypeNameParser.cs">
<Link>Utilities\CustomAttributeTypeNameParser.cs</Link>
</Compile>
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameHelpers.cs">
<Link>Utilities\TypeNameHelpers.cs</Link>
</Compile>
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
<Link>Utilities\ValueStringBuilder.cs</Link>
</Compile>
Expand Down
79 changes: 0 additions & 79 deletions src/libraries/Common/src/System/Reflection/Metadata/TypeNameHelpers.cs
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions src/tools/illink/src/linker/Linker/TypeNameResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using TypeName = System.Reflection.Metadata.TypeName;
using TypeNameParseOptions = System.Reflection.Metadata.TypeNameParseOptions;
using AssemblyNameInfo = System.Reflection.Metadata.AssemblyNameInfo;
using TypeNameHelpers = System.Reflection.Metadata.TypeNameHelpers;

#nullable enable

Expand Down Expand Up @@ -129,10 +128,10 @@ public bool TryResolveTypeName (
TypeDefinition? type = GetSimpleTypeFromModule (typeName.DeclaringType!, module);
if (type == null)
return null;
return GetNestedType (type, TypeNameHelpers.Unescape (typeName.Name));
return GetNestedType (type, TypeName.Unescape (typeName.Name));
}

return module.ResolveType (TypeNameHelpers.Unescape (typeName.FullName), _metadataResolver);
return module.ResolveType (TypeName.Unescape (typeName.FullName), _metadataResolver);
}

TypeDefinition? GetNestedType (TypeDefinition type, string nestedTypeName)
Expand Down
1 change: 0 additions & 1 deletion src/tools/illink/src/linker/Mono.Linker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
<ItemGroup>
<AdditionalFiles Include="BannedSymbols.txt" />
<Compile Remove="ref\**\*.cs" />
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameHelpers.cs" />
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs" />
</ItemGroup>

Expand Down
Loading