Skip to content

Reenable disabled nativeaot warnings and fix the issues #95698

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
merged 5 commits into from
Dec 9, 2023
Merged

Reenable disabled nativeaot warnings and fix the issues #95698

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
178ad51
Reenable disabled nativeaot warnings and fix the issues
akoeplinger Dec 6, 2023
4d859fa
Use string.Contains() in XplatEventLogger.cs instead of string.IndexOf()
akoeplinger Dec 6, 2023
814f2cd
Use sequential StructLayout in TransitionBlock instead
akoeplinger Dec 7, 2023
74b07fc
PR feedback
akoeplinger Dec 7, 2023
9cf425e
PR feedback, remove IDE0065
akoeplinger Dec 7, 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
4 changes: 2 additions & 2 deletions src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<EnableDefaultItems>false</EnableDefaultItems>
Expand Down Expand Up @@ -47,7 +47,7 @@
<InformationalVersion Condition="'$(PreReleaseVersionLabel)' == 'servicing'">$(ProductVersion)</InformationalVersion>
<InformationalVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</InformationalVersion>
<!-- AD0001 : https://github.com/dotnet/runtime/issues/90356 -->
<NoWarn>$(NoWarn),0419,0649,CA2249,CA1830;AD0001</NoWarn>
<NoWarn>$(NoWarn),0419,0649;AD0001</NoWarn>
<Nullable>enable</Nullable>

<!-- Ignore all previous constants since SPCL is sensitive to what is defined and the Sdk adds some by default -->
Expand Down
230 changes: 116 additions & 114 deletions src/coreclr/nativeaot/Common/src/Internal/Runtime/TransitionBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,65 +44,67 @@
// provided with information mapping that argument into registers and/or stack locations.

using System;
using System.Runtime.InteropServices;

namespace Internal.Runtime
{
#if TARGET_AMD64
#pragma warning disable 0169
#if UNIX_AMD64_ABI
struct ReturnBlock
[StructLayout(LayoutKind.Sequential)]
internal struct ReturnBlock
{
IntPtr returnValue;
IntPtr returnValue2;
private IntPtr returnValue;
private IntPtr returnValue2;
}

struct ArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct ArgumentRegisters
{
IntPtr rdi;
IntPtr rsi;
IntPtr rdx;
IntPtr rcx;
IntPtr r8;
IntPtr r9;
private IntPtr rdi;
private IntPtr rsi;
private IntPtr rdx;
private IntPtr rcx;
private IntPtr r8;
private IntPtr r9;
}
#else // UNIX_AMD64_ABI
struct ReturnBlock
[StructLayout(LayoutKind.Sequential)]
internal struct ReturnBlock
{
IntPtr returnValue;
private IntPtr returnValue;
}

struct ArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct ArgumentRegisters
{
IntPtr rdx;
IntPtr rcx;
IntPtr r8;
IntPtr r9;
private IntPtr rdx;
private IntPtr rcx;
private IntPtr r8;
private IntPtr r9;
}
#endif // UNIX_AMD64_ABI
#pragma warning restore 0169

#pragma warning disable 0169
struct M128A
[StructLayout(LayoutKind.Sequential)]
internal struct M128A
{
IntPtr a;
IntPtr b;
private IntPtr a;
private IntPtr b;
}
struct FloatArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct FloatArgumentRegisters
{
M128A d0;
M128A d1;
M128A d2;
M128A d3;
private M128A d0;
private M128A d1;
private M128A d2;
private M128A d3;
#if UNIX_AMD64_ABI
M128A d4;
M128A d5;
M128A d6;
M128A d7;
private M128A d4;
private M128A d5;
private M128A d6;
private M128A d7;
#endif
}
#pragma warning restore 0169

struct ArchitectureConstants
internal struct ArchitectureConstants
{
// To avoid corner case bugs, limit maximum size of the arguments with sufficient margin
public const int MAX_ARG_SIZE = 0xFFFFFF;
Expand All @@ -121,48 +123,47 @@ struct ArchitectureConstants
public static int StackElemSize(int size) { return (((size) + STACK_ELEM_SIZE - 1) & ~(STACK_ELEM_SIZE - 1)); }
}
#elif TARGET_ARM64
#pragma warning disable 0169
struct ReturnBlock
[StructLayout(LayoutKind.Sequential)]
internal struct ReturnBlock
{
IntPtr returnValue;
IntPtr returnValue2;
IntPtr returnValue3;
IntPtr returnValue4;
private IntPtr returnValue;
private IntPtr returnValue2;
private IntPtr returnValue3;
private IntPtr returnValue4;
}

struct ArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct ArgumentRegisters
{
IntPtr x0;
IntPtr x1;
IntPtr x2;
IntPtr x3;
IntPtr x4;
IntPtr x5;
IntPtr x6;
IntPtr x7;
IntPtr x8;
private IntPtr x0;
private IntPtr x1;
private IntPtr x2;
private IntPtr x3;
private IntPtr x4;
private IntPtr x5;
private IntPtr x6;
private IntPtr x7;
private IntPtr x8;
public static unsafe int GetOffsetOfx8()
{
return sizeof(IntPtr) * 8;
}
}
#pragma warning restore 0169

#pragma warning disable 0169
struct FloatArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct FloatArgumentRegisters
{
double d0;
double d1;
double d2;
double d3;
double d4;
double d5;
double d6;
double d7;
private double d0;
private double d1;
private double d2;
private double d3;
private double d4;
private double d5;
private double d6;
private double d7;
}
#pragma warning restore 0169

struct ArchitectureConstants
internal struct ArchitectureConstants
{
// To avoid corner case bugs, limit maximum size of the arguments with sufficient margin
public const int MAX_ARG_SIZE = 0xFFFFFF;
Expand All @@ -177,14 +178,15 @@ struct ArchitectureConstants
public static int StackElemSize(int size) { return (((size) + STACK_ELEM_SIZE - 1) & ~(STACK_ELEM_SIZE - 1)); }
}
#elif TARGET_X86
#pragma warning disable 0169, 0649
struct ReturnBlock
[StructLayout(LayoutKind.Sequential)]
internal struct ReturnBlock
{
public IntPtr returnValue;
public IntPtr returnValue2;
}

struct ArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct ArgumentRegisters
{
public IntPtr edx;
public static unsafe int GetOffsetOfEdx()
Expand All @@ -198,12 +200,12 @@ public static unsafe int GetOffsetOfEcx()
}
}
// This struct isn't used by x86, but exists for compatibility with the definition of the CallDescrData struct
struct FloatArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct FloatArgumentRegisters
{
}
#pragma warning restore 0169, 0649

struct ArchitectureConstants
internal struct ArchitectureConstants
{
// To avoid corner case bugs, limit maximum size of the arguments with sufficient margin
public const int MAX_ARG_SIZE = 0xFFFFFF;
Expand All @@ -217,41 +219,42 @@ struct ArchitectureConstants
public static int StackElemSize(int size) { return (((size) + STACK_ELEM_SIZE - 1) & ~(STACK_ELEM_SIZE - 1)); }
}
#elif TARGET_ARM
#pragma warning disable 0169
struct ReturnBlock
[StructLayout(LayoutKind.Sequential)]
internal struct ReturnBlock
{
IntPtr returnValue;
IntPtr returnValue2;
IntPtr returnValue3;
IntPtr returnValue4;
IntPtr returnValue5;
IntPtr returnValue6;
IntPtr returnValue7;
IntPtr returnValue8;
private IntPtr returnValue;
private IntPtr returnValue2;
private IntPtr returnValue3;
private IntPtr returnValue4;
private IntPtr returnValue5;
private IntPtr returnValue6;
private IntPtr returnValue7;
private IntPtr returnValue8;
}

struct ArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct ArgumentRegisters
{
IntPtr r0;
IntPtr r1;
IntPtr r2;
IntPtr r3;
private IntPtr r0;
private IntPtr r1;
private IntPtr r2;
private IntPtr r3;
}

struct FloatArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct FloatArgumentRegisters
{
double d0;
double d1;
double d2;
double d3;
double d4;
double d5;
double d6;
double d7;
private double d0;
private double d1;
private double d2;
private double d3;
private double d4;
private double d5;
private double d6;
private double d7;
}
#pragma warning restore 0169

struct ArchitectureConstants
internal struct ArchitectureConstants
{
// To avoid corner case bugs, limit maximum size of the arguments with sufficient margin
public const int MAX_ARG_SIZE = 0xFFFFFF;
Expand All @@ -266,24 +269,25 @@ struct ArchitectureConstants
}

#elif TARGET_WASM
#pragma warning disable 0169
struct ReturnBlock
[StructLayout(LayoutKind.Sequential)]
internal struct ReturnBlock
{
IntPtr returnValue;
private IntPtr returnValue;
}

struct ArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct ArgumentRegisters
{
// No registers on WASM
}

struct FloatArgumentRegisters
[StructLayout(LayoutKind.Sequential)]
internal struct FloatArgumentRegisters
{
// No registers on WASM
}
#pragma warning restore 0169

struct ArchitectureConstants
internal struct ArchitectureConstants
{
// To avoid corner case bugs, limit maximum size of the arguments with sufficient margin
public const int MAX_ARG_SIZE = 0xFFFFFF;
Expand All @@ -302,10 +306,9 @@ struct ArchitectureConstants
// TransitionBlock is layout of stack frame of method call, saved argument registers and saved callee saved registers. Even though not
// all fields are used all the time, we use uniform form for simplicity.
//
[StructLayout(LayoutKind.Sequential)]
internal struct TransitionBlock
{
#pragma warning disable 0169,0649

#if TARGET_X86
public ArgumentRegisters m_argumentRegisters;
public static unsafe int GetOffsetOfArgumentRegisters()
Expand All @@ -317,8 +320,8 @@ public static unsafe int GetOffsetOfReturnValuesBlock()
{
return sizeof(ArgumentRegisters);
}
IntPtr m_ebp;
IntPtr m_ReturnAddress;
private IntPtr m_ebp;
private IntPtr m_ReturnAddress;
#elif TARGET_AMD64

#if UNIX_AMD64_ABI
Expand All @@ -334,17 +337,17 @@ public static unsafe int GetOffsetOfArgumentRegisters()
return sizeof(ReturnBlock);
}

IntPtr m_alignmentPadding;
IntPtr m_ReturnAddress;
private IntPtr m_alignmentPadding;
private IntPtr m_ReturnAddress;
#else // UNIX_AMD64_ABI
IntPtr m_returnBlockPadding;
ReturnBlock m_returnBlock;
private IntPtr m_returnBlockPadding;
public ReturnBlock m_returnBlock;
public static unsafe int GetOffsetOfReturnValuesBlock()
{
return sizeof(IntPtr);
}
IntPtr m_alignmentPadding;
IntPtr m_ReturnAddress;
private IntPtr m_alignmentPadding;
private IntPtr m_ReturnAddress;
public static unsafe int GetOffsetOfArgumentRegisters()
{
return sizeof(TransitionBlock);
Expand Down Expand Up @@ -392,7 +395,6 @@ public static unsafe int GetOffsetOfArgumentRegisters()
#else
#error Portability problem
#endif
#pragma warning restore 0169, 0649

// The transition block should define everything pushed by callee. The code assumes in number of places that
// end of the transition block is caller's stack pointer.
Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/nativeaot/Common/src/Internal/Runtime/TypeLoader/ExternalReferencesTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@

namespace Internal.Runtime.TypeLoader
{
#if TYPE_LOADER_IMPLEMENTATION
public
#else
internal
#endif
partial struct ExternalReferencesTable
{
private IntPtr _elements;
Expand Down
Loading