Skip to content

Only R2R public methods, methods that override public methods, and internal methods that aren't always inlined #75793

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
jkoritzinsky merged 14 commits into from
Nov 16, 2022
Merged

Only R2R public methods, methods that override public methods, and internal methods that aren't always inlined #75793

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5ef5bbc
Only R2R blittable IL stubs that aren't inlined
jkoritzinsky Sep 16, 2022
c96e0d0
Crossgen2's existing support for only emitting what's used already co…
jkoritzinsky Sep 22, 2022
d583b6c
Only R2R methods that are either publicly exposed or (to make sure we…
jkoritzinsky Sep 23, 2022
2a4a0ee
Root all virtual methods without any corresponding MethodImpl records…
jkoritzinsky Sep 29, 2022
2c11c6b
Handle PrivateScope/CompilerControlled visibility that is usable from IL
jkoritzinsky Sep 30, 2022
72a85d6
Root the main method of assemblies in addition to public surface area.
jkoritzinsky Oct 3, 2022
484ec47
Use ToArray in one more place
jkoritzinsky Oct 6, 2022
04fc951
PR feedback.
jkoritzinsky Oct 6, 2022
bdfd4df
Merge branch 'crossgen2-no-unused-pinvoke-gen' of github.com:jkoritzi…
jkoritzinsky Oct 6, 2022
6764e20
Move ILLInker "reference source" to the Common directory so we don't …
jkoritzinsky Oct 6, 2022
0f64a34
Based on feedback from @jkotas, only use the visibility policy if the…
jkoritzinsky Oct 12, 2022
949aa00
Merge branch 'main' of github.com:dotnet/runtime into crossgen2-no-un…
jkoritzinsky Nov 11, 2022
f188ad1
Add reference to ILLink.Shared from ILCompiler.ReadyToRun to fix build
jkoritzinsky Nov 12, 2022
32b44ea
Pull in the type system proxy to fix the crossgen2 build.
jkoritzinsky Nov 14, 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
Prev Previous commit
Pull in the type system proxy to fix the crossgen2 build.
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Nov 14, 2022
commit 32b44ea48036b441fb955ab08542fbb276298e9f
0 ...ompiler/Dataflow/GenericParameterProxy.cs → ...ompiler/Dataflow/GenericParameterProxy.cs
View file
Open in desktop
File renamed without changes.
0 ...Compiler/Compiler/Dataflow/MethodProxy.cs → ...s/Common/Compiler/Dataflow/MethodProxy.cs
View file
Open in desktop
File renamed without changes.
0 ...piler/Compiler/Dataflow/ParameterProxy.cs → ...ommon/Compiler/Dataflow/ParameterProxy.cs
View file
Open in desktop
File renamed without changes.
0 ...piler/Compiler/Dataflow/TypeExtensions.cs → ...ommon/Compiler/Dataflow/TypeExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...r.Compiler/Compiler/Dataflow/TypeProxy.cs → ...ols/Common/Compiler/Dataflow/TypeProxy.cs
View file
Open in desktop
File renamed without changes.
0 .../ReferenceSource/GenericParameterProxy.cs → .../ReferenceSource/GenericParameterProxy.cs
View file
Open in desktop
File renamed without changes.
0 ...r/Dataflow/ReferenceSource/MethodProxy.cs → ...n/Compiler/ReferenceSource/MethodProxy.cs
View file
Open in desktop
File renamed without changes.
0 ...ataflow/ReferenceSource/ParameterProxy.cs → ...ompiler/ReferenceSource/ParameterProxy.cs
View file
Open in desktop
File renamed without changes.
0 ...ler/Dataflow/ReferenceSource/TypeProxy.cs → ...mon/Compiler/ReferenceSource/TypeProxy.cs
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 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 @@ -267,6 +267,11 @@
<Compile Include="..\..\Common\Compiler\NativeAotNameMangler.cs" Link="Compiler\NativeAotNameMangler.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\DynamicallyAccessedMembersBinder.cs" Link="Compiler\Dataflow\DynamicallyAccessedMembersBinder.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\EcmaExtensions.cs" Link="Compiler\Dataflow\EcmaExtensions.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\GenericParameterProxy.cs" Link="Compiler\Dataflow\GenericParameterProxy.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\MethodProxy.cs" Link="Compiler\Dataflow\MethodProxy.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\ParameterProxy.cs" Link="Compiler\Dataflow\ParameterProxy.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\TypeProxy.cs" Link="Compiler\Dataflow\TypeProxy.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\TypeExtensions.cs" Link="Compiler\Dataflow\TypeExtensions.cs" />
<Compile Include="..\..\Common\Compiler\DependencyAnalysis\AssemblyStubNode.cs" Link="Compiler\DependencyAnalysis\AssemblyStubNode.cs" />
<Compile Include="..\..\Common\Compiler\DependencyAnalysis\CompilerComparer.cs" Link="Compiler\DependencyAnalysis\CompilerComparer.cs" />
<Compile Include="..\..\Common\Compiler\DependencyAnalysis\EmbeddedDataContainerNode.cs" Link="Compiler\DependencyAnalysis\EmbeddedDataContainerNode.cs" />
Expand Down Expand Up @@ -352,7 +357,6 @@
<Compile Include="Compiler\Dataflow\FieldValue.cs" />
<Compile Include="Compiler\Dataflow\FlowAnnotations.cs" />
<Compile Include="Compiler\Dataflow\GenericArgumentDataFlow.cs" />
<Compile Include="Compiler\Dataflow\GenericParameterProxy.cs" />
<Compile Include="Compiler\Dataflow\GenericParameterValue.cs" />
<Compile Include="Compiler\Dataflow\HandleCallAction.cs" />
<Compile Include="Compiler\Dataflow\HoistedLocalKey.cs" />
Expand All @@ -361,10 +365,8 @@
<Compile Include="Compiler\Dataflow\LocalVariableReferenceValue.cs" />
<Compile Include="Compiler\Dataflow\MethodBodyScanner.cs" />
<Compile Include="Compiler\Dataflow\MethodParameterValue.cs" />
<Compile Include="Compiler\Dataflow\MethodProxy.cs" />
<Compile Include="Compiler\Dataflow\MethodReturnValue.cs" />
<Compile Include="Compiler\Dataflow\Origin.cs" />
<Compile Include="Compiler\Dataflow\ParameterProxy.cs" />
<Compile Include="Compiler\Dataflow\ParameterReferenceValue.cs" />
<Compile Include="Compiler\Dataflow\ReferenceValue.cs" />
<Compile Include="Compiler\Dataflow\ReflectionMethodBodyScanner.cs" />
Expand All @@ -374,8 +376,6 @@
<Compile Include="Compiler\Dataflow\TrimAnalysisAssignmentPattern.cs" />
<Compile Include="Compiler\Dataflow\TrimAnalysisMethodCallPattern.cs" />
<Compile Include="Compiler\Dataflow\TrimAnalysisPatternStore.cs" />
<Compile Include="Compiler\Dataflow\TypeExtensions.cs" />
<Compile Include="Compiler\Dataflow\TypeProxy.cs" />
<Compile Include="Compiler\Dataflow\ValueNode.cs" />
<Compile Include="Compiler\DebugInformationProvider.cs" />
<Compile Include="Compiler\DependencyAnalysis\CustomAttributeMetadataNode.cs" />
Expand Down
22 changes: 20 additions & 2 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@
<GenerateDependencyFile>false</GenerateDependencyFile>
<Configurations>Debug;Release;Checked</Configurations>
<RunAnalyzers>false</RunAnalyzers>
<NoWarn Condition="'$(DotNetBuildFromSource)' == 'true'">$(NoWarn);CS8524</NoWarn>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\ILCompiler.DependencyAnalysisFramework\ILCompiler.DependencyAnalysisFramework.csproj" />
<ProjectReference Include="..\ILCompiler.Diagnostics\ILCompiler.Diagnostics.csproj" />
<ProjectReference Include="..\ILCompiler.TypeSystem\ILCompiler.TypeSystem.csproj" />

<PackageReference Condition="'$(DotNetBuildFromSource)' != 'true'" Include="StaticCs" Version="$(StaticCsVersion)">
<PrivateAssets>all</PrivateAssets>
<ExcludeAssets>contentfiles</ExcludeAssets> <!-- We include our own copy of the ClosedAttribute to work in source build -->
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -57,6 +63,11 @@
<Compile Include="..\..\Common\Compiler\NativeAotNameMangler.cs" Link="Compiler\NativeAotNameMangler.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\DynamicallyAccessedMembersBinder.cs" Link="Compiler\Dataflow\DynamicallyAccessedMembersBinder.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\EcmaExtensions.cs" Link="Compiler\Dataflow\EcmaExtensions.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\GenericParameterProxy.cs" Link="Compiler\Dataflow\GenericParameterProxy.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\MethodProxy.cs" Link="Compiler\Dataflow\MethodProxy.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\ParameterProxy.cs" Link="Compiler\Dataflow\ParameterProxy.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\TypeProxy.cs" Link="Compiler\Dataflow\TypeProxy.cs" />
<Compile Include="..\..\Common\Compiler\Dataflow\TypeExtensions.cs" Link="Compiler\Dataflow\TypeExtensions.cs" />
<Compile Include="..\..\Common\Compiler\DependencyAnalysis\AssemblyStubNode.cs" Link="Compiler\DependencyAnalysis\AssemblyStubNode.cs" />
<Compile Include="..\..\Common\Compiler\DependencyAnalysis\CompilerComparer.cs" Link="Compiler\DependencyAnalysis\CompilerComparer.cs" />
<Compile Include="..\..\Common\Compiler\DependencyAnalysis\EmbeddedDataContainerNode.cs" Link="Compiler\DependencyAnalysis\EmbeddedDataContainerNode.cs" />
Expand Down Expand Up @@ -118,7 +129,16 @@
<Compile Include="..\..\Common\TypeSystem\Interop\InteropTypes.cs" Link="Interop\InteropTypes.cs" />
<Compile Include="..\..\Common\TypeSystem\Interop\UnmanagedCallingConventions.cs" Link="Interop\UnmanagedCallingConventions.cs" />
<Compile Include="..\ILCompiler.Reflection.ReadyToRun\PEReaderExtensions.cs" Link="Reflection\PEReaderExtensions.cs" />
<Compile Include="..\ILLink.Shared\ClosedAttribute.cs" Link="ILLink.Shared\ClosedAttribute.cs" />
<Compile Include="..\ILLink.Shared\ParameterIndex.cs" Link="ILLink.Shared\ParameterIndex.cs" />
<Compile Include="..\ILLink.Shared\TrimAnalysis\ReferenceKind.cs" Link="ILLink.Shared\TrimAnalysis\ReferenceKind.cs" />
<Compile Include="..\ILLink.Shared\TypeSystemProxy\GenericParameterProxy.cs" Link="ILLink.Shared\TypeSystemProxy\GenericParameterProxy.cs" />
<Compile Include="..\ILLink.Shared\TypeSystemProxy\IMemberProxy.cs" Link="ILLink.Shared\TypeSystemProxy\IMemberProxy.cs" />
<Compile Include="..\ILLink.Shared\TypeSystemProxy\MethodProxy.cs" Link="ILLink.Shared\TypeSystemProxy\MethodProxy.cs" />
<Compile Include="..\ILLink.Shared\TypeSystemProxy\ParameterCollection.cs" Link="ILLink.Shared\TypeSystemProxy\ParameterCollection.cs" />
<Compile Include="..\ILLink.Shared\TypeSystemProxy\ParameterProxy.cs" Link="ILLink.Shared\TypeSystemProxy\ParameterProxy.cs" />
<Compile Include="..\ILLink.Shared\TypeSystemProxy\TypeProxy.cs" Link="ILLink.Shared\TypeSystemProxy\TypeProxy.cs" />
<Compile Include="..\ILLink.Shared\TypeSystemProxy\WellKnownType.cs" Link="ILLink.Shared\TypeSystemProxy\WellKnownType.cs" />
<Compile Include="Compiler\AssemblyExtensions.cs" />
<Compile Include="Compiler\DependencyAnalysis\ReadyToRun\DeferredTillPhaseNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ReadyToRun\ILBodyFixupSignature.cs" />
Expand Down Expand Up @@ -309,6 +329,4 @@
<Link>JitInterface\UnboxingMethodDesc.cs</Link>
</Compile>
</ItemGroup>

<Import Project="..\ILLink.Shared\ILLink.Shared.projitems" Label="Shared" />
</Project>