Skip to content

Commit 16fd8fb

Browse files
Use new TypeName methods in runtime tools (#115857)
Replace the usage of the TypeNameHelpers utility class with the newer TypeName class methods and properties in the runtime tools. Co-authored-by: MichalStrehovsky <[email protected]> Co-authored-by: copilot-swe-agent[bot] <[email protected]>
1 parent 1c653e9 commit 16fd8fb

File tree

8 files changed

+5
-99
lines changed

8 files changed

+5
-99
lines changed

src/coreclr/tools/Common/TypeSystem/Common/Utilities/CustomAttributeTypeNameParser.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,21 +179,18 @@ private TypeDesc GetSimpleTypeFromModule(TypeName typeName, ModuleDesc module)
179179
TypeDesc type = GetSimpleTypeFromModule(typeName.DeclaringType, module);
180180
if (type == null)
181181
return null;
182-
return ((MetadataType)type).GetNestedType(TypeNameHelpers.Unescape(typeName.Name));
182+
return ((MetadataType)type).GetNestedType(TypeName.Unescape(typeName.Name));
183183
}
184184

185-
string fullName = TypeNameHelpers.Unescape(typeName.FullName);
186-
187185
if (_canonGenericResolver != null)
188186
{
187+
string fullName = TypeName.Unescape(typeName.FullName);
189188
TypeDesc canonType = _canonGenericResolver(module, fullName);
190189
if (canonType != null)
191190
return canonType;
192191
}
193192

194-
(string typeNamespace, string name) = TypeNameHelpers.Split(fullName);
195-
196-
return module.GetType(typeNamespace, name, throwIfNotFound: false);
193+
return module.GetType(TypeName.Unescape(typeName.Namespace), TypeName.Unescape(typeName.Name), throwIfNotFound: false);
197194
}
198195

199196
private TypeDesc GetGenericType(TypeName typeName)

src/coreclr/tools/ILVerification/ILVerification.projitems

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
<Compile Include="$(ToolsCommonPath)TypeSystem\Common\Utilities\CustomAttributeTypeNameParser.cs">
6767
<Link>Utilities\CustomAttributeTypeNameParser.cs</Link>
6868
</Compile>
69-
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameHelpers.cs">
70-
<Link>Utilities\TypeNameHelpers.cs</Link>
71-
</Compile>
7269
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
7370
<Link>Utilities\ValueStringBuilder.cs</Link>
7471
</Compile>

src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,6 @@
394394
<Compile Include="Compiler\Dataflow\TrimAnalysisMethodCallPattern.cs" />
395395
<Compile Include="Compiler\Dataflow\TrimAnalysisPatternStore.cs" />
396396
<Compile Include="Compiler\Dataflow\TrimAnalysisTokenAccessPattern.cs" />
397-
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameHelpers.cs">
398-
<Link>Utilities\TypeNameHelpers.cs</Link>
399-
</Compile>
400397
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
401398
<Link>Utilities\ValueStringBuilder.cs</Link>
402399
</Compile>

src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<Compile Include="$(ToolsProjectRoot)illink/src/linker/Linker/TypeNameResolver.cs" />
2929
<Compile Include="$(ToolsProjectRoot)illink/src/linker/Linker/ITryResolve.cs" />
3030
<Compile Include="$(ToolsProjectRoot)illink/src/linker/Linker/ModuleDefinitionExtensions.cs" />
31-
<Compile Include="$(LibrariesProjectRoot)/Common/src/System/Reflection/Metadata/TypeNameHelpers.cs" />
3231
<Compile Include="$(LibrariesProjectRoot)/Common/src/System/Text/ValueStringBuilder.cs" />
3332
</ItemGroup>
3433

src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,6 @@
198198
<Compile Include="..\..\Common\TypeSystem\Common\Utilities\CustomAttributeTypeNameParser.cs">
199199
<Link>Utilities\CustomAttributeTypeNameParser.cs</Link>
200200
</Compile>
201-
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameHelpers.cs">
202-
<Link>Utilities\TypeNameHelpers.cs</Link>
203-
</Compile>
204201
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs">
205202
<Link>Utilities\ValueStringBuilder.cs</Link>
206203
</Compile>

src/libraries/Common/src/System/Reflection/Metadata/TypeNameHelpers.cs

Lines changed: 0 additions & 79 deletions
This file was deleted.

src/tools/illink/src/linker/Linker/TypeNameResolver.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using TypeName = System.Reflection.Metadata.TypeName;
1010
using TypeNameParseOptions = System.Reflection.Metadata.TypeNameParseOptions;
1111
using AssemblyNameInfo = System.Reflection.Metadata.AssemblyNameInfo;
12-
using TypeNameHelpers = System.Reflection.Metadata.TypeNameHelpers;
1312

1413
#nullable enable
1514

@@ -129,10 +128,10 @@ public bool TryResolveTypeName (
129128
TypeDefinition? type = GetSimpleTypeFromModule (typeName.DeclaringType!, module);
130129
if (type == null)
131130
return null;
132-
return GetNestedType (type, TypeNameHelpers.Unescape (typeName.Name));
131+
return GetNestedType (type, TypeName.Unescape (typeName.Name));
133132
}
134133

135-
return module.ResolveType (TypeNameHelpers.Unescape (typeName.FullName), _metadataResolver);
134+
return module.ResolveType (TypeName.Unescape (typeName.FullName), _metadataResolver);
136135
}
137136

138137
TypeDefinition? GetNestedType (TypeDefinition type, string nestedTypeName)

src/tools/illink/src/linker/Mono.Linker.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<ItemGroup>
7575
<AdditionalFiles Include="BannedSymbols.txt" />
7676
<Compile Remove="ref\**\*.cs" />
77-
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Reflection\Metadata\TypeNameHelpers.cs" />
7877
<Compile Include="$(LibrariesProjectRoot)\Common\src\System\Text\ValueStringBuilder.cs" />
7978
</ItemGroup>
8079

0 commit comments

Comments
 (0)