Skip to content

[release/7.0] Set AssemblyName.ProcessorArchitecture for compatibility. #81101

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
carlossanlop merged 5 commits into from
Feb 8, 2023
Merged

[release/7.0] Set AssemblyName.ProcessorArchitecture for compatibility. #81101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
733ef8c
Set AssemblyName.ProcessorArchitecture for compatibility.
VSadov Jan 12, 2023
c22d17f
Simplified ProcArch computation.
VSadov Jan 18, 2023
3338acc
Make GetAssemblyName test more robust (#80878)
VSadov Jan 20, 2023
b133270
undo AssemblyName.CoreCLR change
VSadov Jan 24, 2023
6decafc
Library servicing steps.
VSadov Jan 25, 2023
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
Prev Previous commit
Next Next commit
Simplified ProcArch computation.
  • Loading branch information
@VSadov
VSadov authored and github-actions committed Jan 24, 2023
commit c22d17fbe89125e89fc1fbfd4289c2890bf60fc3
55 changes: 25 additions & 30 deletions src/coreclr/System.Private.CoreLib/src/System/Reflection/AssemblyName.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,46 +106,41 @@ internal AssemblyNameFlags RawFlags
internal void SetProcArchIndex(PortableExecutableKinds pek, ImageFileMachine ifm)
{
#pragma warning disable SYSLIB0037 // AssemblyName.ProcessorArchitecture is obsolete
ProcessorArchitecture = CalculateProcArchIndex(pek, ifm, _flags);
ProcessorArchitecture = CalculateProcArch(pek, ifm, _flags);
#pragma warning restore SYSLIB0037
}

private static ProcessorArchitecture CalculateProcArchIndex(PortableExecutableKinds pek, ImageFileMachine ifm, AssemblyNameFlags flags)
private static ProcessorArchitecture CalculateProcArch(PortableExecutableKinds pek, ImageFileMachine ifm, AssemblyNameFlags aFlags)
{
if (((uint)flags & 0xF0) == 0x70)
// 0x70 specifies "reference assembly".
// For these, CLR wants to return None as arch so they can be always loaded, regardless of process type.
if (((uint)aFlags & 0xF0) == 0x70)
return ProcessorArchitecture.None;

if ((pek & PortableExecutableKinds.PE32Plus) == PortableExecutableKinds.PE32Plus)
switch (ifm)
{
switch (ifm)
{
case ImageFileMachine.IA64:
return ProcessorArchitecture.IA64;
case ImageFileMachine.AMD64:
return ProcessorArchitecture.Amd64;
case ImageFileMachine.I386:
if ((pek & PortableExecutableKinds.ILOnly) == PortableExecutableKinds.ILOnly)
case ImageFileMachine.IA64:
return ProcessorArchitecture.IA64;
case ImageFileMachine.ARM:
return ProcessorArchitecture.Arm;
case ImageFileMachine.AMD64:
return ProcessorArchitecture.Amd64;
case ImageFileMachine.I386:
{
if ((pek & PortableExecutableKinds.ILOnly) != 0 &&
(pek & PortableExecutableKinds.Required32Bit) == 0)
{
// platform neutral.
return ProcessorArchitecture.MSIL;
break;
}
}
else
{
if (ifm == ImageFileMachine.I386)
{
if ((pek & PortableExecutableKinds.Required32Bit) == PortableExecutableKinds.Required32Bit)
return ProcessorArchitecture.X86;
}

if ((pek & PortableExecutableKinds.ILOnly) == PortableExecutableKinds.ILOnly)
return ProcessorArchitecture.MSIL;

return ProcessorArchitecture.X86;
}
if (ifm == ImageFileMachine.ARM)
{
return ProcessorArchitecture.Arm;
}
// requires x86
return ProcessorArchitecture.X86;
}
}

// ProcessorArchitecture is a legacy API and does not cover other Machine kinds.
// For example ARM64 is not expressible
return ProcessorArchitecture.None;
}

Expand Down
80 changes: 27 additions & 53 deletions ...s/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.netstandard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,9 @@ public static unsafe AssemblyName GetAssemblyName(string assemblyFile)
MetadataReader mdReader = peReader.GetMetadataReader(MetadataReaderOptions.None);
AssemblyName assemblyName = mdReader.GetAssemblyDefinition().GetAssemblyName();

GetPEKind(peReader, out PortableExecutableKinds peKind, out ImageFileMachine machine);
AssemblyFlags aFlags = mdReader.AssemblyTable.GetFlags();
#pragma warning disable SYSLIB0037 // AssemblyName.ProcessorArchitecture is obsolete
assemblyName.ProcessorArchitecture = CalculateProcArchIndex(peKind, machine, aFlags);
assemblyName.ProcessorArchitecture = CalculateProcArch(peReader, aFlags);
#pragma warning restore SYSLIB0037

return assemblyName;
Expand All @@ -108,64 +107,39 @@ public static unsafe AssemblyName GetAssemblyName(string assemblyFile)
}
}

private static void GetPEKind(PEReader peReader, out PortableExecutableKinds peKind, out ImageFileMachine machine)
private static ProcessorArchitecture CalculateProcArch(PEReader peReader, AssemblyFlags aFlags)
{
PEHeaders peHeaders = peReader.PEHeaders;
PEMagic peMagic = peHeaders.PEHeader!.Magic;
Machine coffMachine = peHeaders.CoffHeader.Machine;
CorFlags corFlags = peHeaders.CorHeader!.Flags;

peKind = default;
if ((corFlags & CorFlags.ILOnly) != 0)
peKind |= PortableExecutableKinds.ILOnly;

if ((corFlags & CorFlags.Prefers32Bit) != 0)
peKind |= PortableExecutableKinds.Preferred32Bit;
else if ((corFlags & CorFlags.Requires32Bit) != 0)
peKind |= PortableExecutableKinds.Required32Bit;

if (peMagic == PEMagic.PE32Plus)
peKind |= PortableExecutableKinds.PE32Plus;

machine = (ImageFileMachine)coffMachine;
}

private static ProcessorArchitecture CalculateProcArchIndex(PortableExecutableKinds pek, ImageFileMachine ifm, AssemblyFlags flags)
{
if (((uint)flags & 0xF0) == 0x70)
// 0x70 specifies "reference assembly".
// For these, CLR wants to return None as arch so they can be always loaded, regardless of process type.
if (((uint)aFlags & 0xF0) == 0x70)
return ProcessorArchitecture.None;

if ((pek & PortableExecutableKinds.PE32Plus) == PortableExecutableKinds.PE32Plus)
PEHeaders peHeaders = peReader.PEHeaders;
switch (peHeaders.CoffHeader.Machine)
{
switch (ifm)
{
case ImageFileMachine.IA64:
return ProcessorArchitecture.IA64;
case ImageFileMachine.AMD64:
return ProcessorArchitecture.Amd64;
case ImageFileMachine.I386:
if ((pek & PortableExecutableKinds.ILOnly) == PortableExecutableKinds.ILOnly)
case Machine.IA64:
return ProcessorArchitecture.IA64;
case Machine.Arm:
return ProcessorArchitecture.Arm;
case Machine.Amd64:
return ProcessorArchitecture.Amd64;
case Machine.I386:
{
CorFlags flags = peHeaders.CorHeader!.Flags;
if ((flags & CorFlags.ILOnly) != 0 &&
(flags & CorFlags.Requires32Bit) == 0)
{
// platform neutral.
return ProcessorArchitecture.MSIL;
break;
}
}
else
{
if (ifm == ImageFileMachine.I386)
{
if ((pek & PortableExecutableKinds.Required32Bit) == PortableExecutableKinds.Required32Bit)
return ProcessorArchitecture.X86;

if ((pek & PortableExecutableKinds.ILOnly) == PortableExecutableKinds.ILOnly)
return ProcessorArchitecture.MSIL;
}

return ProcessorArchitecture.X86;
}
if (ifm == ImageFileMachine.ARM)
{
return ProcessorArchitecture.Arm;
}
// requires x86
return ProcessorArchitecture.X86;
}
}

// ProcessorArchitecture is a legacy API and does not cover other Machine kinds.
// For example ARM64 is not expressible
return ProcessorArchitecture.None;
}

Expand Down