Skip to content
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

Jump to bottom

Remove 'mangleName' parameter in PENamedTypeSymbolNonGeneric #62813

Merged
merged 3 commits into from
Jul 21, 2022
Merged

Remove 'mangleName' parameter in PENamedTypeSymbolNonGeneric #62813

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54d7d3c
Update PENamedTypeSymbol.cs
RikkiGibson Jul 21, 2022
77a35e4
fixup call sites
RikkiGibson Jul 21, 2022
4d73d11
Update PENamedTypeSymbol.cs
RikkiGibson Jul 21, 2022
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
23 changes: 8 additions & 15 deletions src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,11 @@ internal static PENamedTypeSymbol Create(

GetGenericInfo(moduleSymbol, handle, out genericParameterHandles, out arity, out mrEx);

bool mangleName;
PENamedTypeSymbol result;

if (arity == 0)
{
result = new PENamedTypeSymbolNonGeneric(moduleSymbol, containingNamespace, handle, emittedNamespaceName, out mangleName);
result = new PENamedTypeSymbolNonGeneric(moduleSymbol, containingNamespace, handle, emittedNamespaceName);
}
else
{
Expand All @@ -193,8 +192,7 @@ internal static PENamedTypeSymbol Create(
handle,
emittedNamespaceName,
genericParameterHandles,
arity,
out mangleName);
arity);
}

if (mrEx != null)
Expand Down Expand Up @@ -240,12 +238,11 @@ internal static PENamedTypeSymbol Create(
arity = (ushort)(metadataArity - containerMetadataArity);
}

bool mangleName;
PENamedTypeSymbol result;

if (metadataArity == 0)
{
result = new PENamedTypeSymbolNonGeneric(moduleSymbol, containingType, handle, null, out mangleName);
result = new PENamedTypeSymbolNonGeneric(moduleSymbol, containingType, handle, null);
}
else
{
Expand All @@ -255,8 +252,7 @@ internal static PENamedTypeSymbol Create(
handle,
null,
genericParameterHandles,
arity,
out mangleName);
arity);
}

if (mrEx != null || metadataArity < containerMetadataArity)
Expand Down Expand Up @@ -2415,9 +2411,8 @@ internal PENamedTypeSymbolNonGeneric(
PEModuleSymbol moduleSymbol,
NamespaceOrTypeSymbol container,
TypeDefinitionHandle handle,
string emittedNamespaceName,
out bool mangleName) :
base(moduleSymbol, container, handle, emittedNamespaceName, 0, out mangleName)
string emittedNamespaceName) :
base(moduleSymbol, container, handle, emittedNamespaceName, 0, out _)
{
}

Expand Down Expand Up @@ -2487,15 +2482,13 @@ internal PENamedTypeSymbolGeneric(
TypeDefinitionHandle handle,
string emittedNamespaceName,
GenericParameterHandleCollection genericParameterHandles,
ushort arity,
out bool mangleName
)
ushort arity)
: base(moduleSymbol,
container,
handle,
emittedNamespaceName,
arity,
out mangleName)
out bool mangleName)
{
Debug.Assert(genericParameterHandles.Count > 0);
_arity = arity;
Expand Down