[release/8.0] Implement support for InlineArray in the trimmer#92107

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 2 commits into from
Sep 15, 2023
Merged

[release/8.0] Implement support for InlineArray in the trimmer #92107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da62c0f
Implement support for InlineArray in the trimmer
vitek-karas Sep 14, 2023
2537ec6
Update src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineA…
vitek-karas Sep 14, 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
5 changes: 5 additions & 0 deletions src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,11 @@ public static IEnumerable<object[]> Generics ()
return TestNamesBySuiteName ();
}

public static IEnumerable<object[]> InlineArrays ()
{
return TestNamesBySuiteName();
}

public static IEnumerable<object[]> LinkXml()
{
return TestNamesBySuiteName();
Expand Down
7 changes: 7 additions & 0 deletions src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,13 @@ public void Generics (string t)
Run (t);
}

[Theory]
[MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
public void InlineArrays(string t)
{
Run(t);
}

[Theory]
[MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
public void LinkXml (string t)
Expand Down
2 changes: 2 additions & 0 deletions ...oreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,9 +129,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

yield return Path.Combine (referenceDir, "mscorlib.dll");
yield return Path.Combine (referenceDir, "System.Collections.dll");
yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
yield return Path.Combine (referenceDir, "System.Console.dll");
yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
yield return Path.Combine (referenceDir, "System.Memory.dll");
yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
yield return Path.Combine (referenceDir, "System.Runtime.dll");
yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down
16 changes: 14 additions & 2 deletions src/tools/illink/src/linker/Linker.Steps/MarkStep.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3317,11 +3317,23 @@ void MarkImplicitlyUsedFields (TypeDefinition type)
if (type?.HasFields != true)
return;

// keep fields for types with explicit layoutand for enums
if (!type.IsAutoLayout || type.IsEnum)
// keep fields for types with explicit layout, for enums and for InlineArray types
if (!type.IsAutoLayout || type.IsEnum || TypeIsInlineArrayType(type))
MarkFields (type, includeStatic: type.IsEnum, reason: new DependencyInfo (DependencyKind.MemberOfType, type));
}

static bool TypeIsInlineArrayType(TypeDefinition type)
{
if (!type.IsValueType)
return false;

foreach (var customAttribute in type.CustomAttributes)
if (customAttribute.AttributeType.IsTypeOf ("System.Runtime.CompilerServices", "InlineArrayAttribute"))
return true;

return false;
}

protected virtual void MarkRequirementsForInstantiatedTypes (TypeDefinition type)
{
if (Annotations.IsInstantiated (type))
Expand Down
6 changes: 6 additions & 0 deletions src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,12 @@ public Task GenericParameterDataFlow ()
return RunTest (nameof (GenericParameterDataFlow));
}

[Fact]
public Task InlineArrayDataflow ()
{
return RunTest ();
}

[Fact]
public Task MakeGenericDataFlow ()
{
Expand Down
20 changes: 20 additions & 0 deletions src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/InlineArraysTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests
{
public sealed partial class InlineArraysTests : LinkerTestBase
{
protected override string TestSuiteName => "InlineArrays";

[Fact]
public Task InlineArray ()
{
return RunTest (nameof (InlineArray));
}

}
}
77 changes: 77 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineArrayDataflow.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.DataFlow
{
[SkipKeptItemsValidation]
[ExpectedNoWarnings]
public class InlineArrayDataflow
{
public static void Main()
{
AccessPrimitiveTypeArray ();
AccessUnannotatedTypeArray ();
AccessAnnotatedTypeArray ();
}

public int TestProperty { get; set; }

[InlineArray (5)]
struct PrimitiveTypeArray
{
public BindingFlags value;
}

// This case will fallback to not understanding the binding flags and will end up marking all properties
static void AccessPrimitiveTypeArray ()
{
PrimitiveTypeArray a = new PrimitiveTypeArray ();
ref var item = ref a[1];
item = BindingFlags.Public;

typeof (InlineArrayDataflow).GetProperty (nameof (TestProperty), a[1]);
}

[InlineArray (5)]
struct UnannotatedTypeArray
{
public Type value;
}

// Analyzer doesn't understand inline arrays currently - so it doesn't produce a warning here
[ExpectedWarning ("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
static void AccessUnannotatedTypeArray ()
{
UnannotatedTypeArray a = new UnannotatedTypeArray ();
ref var item = ref a[2];
item = typeof (InlineArrayDataflow);

a[2].GetProperty (nameof (TestProperty));
}

[InlineArray (5)]
struct AnnotatedTypeArray
{
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)]
public Type value;
}

// Currently tracking of annotations on inline array values is not implemented
[ExpectedWarning("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
static void AccessAnnotatedTypeArray ()
{
AnnotatedTypeArray a = new AnnotatedTypeArray ();
ref var item = ref a[3];
item = typeof (InlineArrayDataflow);

a[3].GetProperty (nameof (TestProperty));
}
}
}
86 changes: 86 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/InlineArrays/InlineArray.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Collections.Immutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.InlineArrays
{
[ExpectedNoWarnings]
public class InlineArray
{
public static void Main()
{
InlineArrayUsage.Test ();
CollectionLiteralsOfArrays.Test ();
}

[Kept]
class InlineArrayUsage
{
// NativeAOT will remove most of the struct type information as it's not needed
// in the generated native code. Eventually we might come up with a better test infra to validate this.
[Kept (By = Tool.Trimmer)]
public struct StructWithFixedBuffer
{
[Kept (By = Tool.Trimmer)]
public FixedBuffer Buffer;

[Kept (By = Tool.Trimmer)]
[KeptAttributeAttribute (typeof(InlineArrayAttribute), By = Tool.Trimmer)]
[InlineArray (8)]
public partial struct FixedBuffer
{
[Kept (By = Tool.Trimmer)]
public int e0;
}
}

[Kept (By = Tool.Trimmer)]
public struct StructWithAutoLayoutBuffer
{
[Kept (By = Tool.Trimmer)]
public AutoLayoutBuffer Buffer;

[Kept (By = Tool.Trimmer)]
[KeptAttributeAttribute (typeof (InlineArrayAttribute), By = Tool.Trimmer)]
[InlineArray (8)]
[StructLayout (LayoutKind.Auto)]
public struct AutoLayoutBuffer
{
[Kept (By = Tool.Trimmer)]
public int e0;
}
}

[Kept]
public static void Test ()
{
var s = new StructWithFixedBuffer ();
s.Buffer[0] = 5;

var sa = new StructWithAutoLayoutBuffer ();
_ = sa.Buffer[1];
}
}

[Kept]
[KeptMember (".cctor()")]
class CollectionLiteralsOfArrays
{
[Kept]
public static readonly ImmutableArray<string> ImmutableValues = ["one", "two"];
[Kept]
public static readonly string[] ArrayValues = ["one", "two"];

[Kept]
public static void Test()
{
_ = CollectionLiteralsOfArrays.ImmutableValues[0];
_ = CollectionLiteralsOfArrays.ArrayValues[1];
}
}
}
}
5 changes: 5 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests/TestCases/TestDatabase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ public static IEnumerable<TestCaseData> InheritanceVirtualMethodsTests ()
return NUnitCasesBySuiteName ("Inheritance.VirtualMethods");
}

public static IEnumerable<TestCaseData> InlineArrayTests ()
{
return NUnitCasesBySuiteName ("InlineArrays");
}

public static IEnumerable<TestCaseData> InteropTests ()
{
return NUnitCasesBySuiteName ("Interop");
Expand Down
6 changes: 6 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests/TestCases/TestSuites.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,12 @@ public void InheritanceVirtualMethodsTests (TestCase testCase)
Run (testCase);
}

[TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InlineArrayTests))]
public void InlineArrayTests (TestCase testCase)
{
Run (testCase);
}

[TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InteropTests))]
public void InteropTests (TestCase testCase)
{
Expand Down
2 changes: 2 additions & 0 deletions ...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

yield return Path.Combine (referenceDir, "mscorlib.dll");
yield return Path.Combine (referenceDir, "System.Collections.dll");
yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
yield return Path.Combine (referenceDir, "System.Console.dll");
yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
yield return Path.Combine (referenceDir, "System.Memory.dll");
yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
yield return Path.Combine (referenceDir, "System.Runtime.dll");
yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[release/8.0] Implement support for InlineArray in the trimmer#92107

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 2 commits into

from

Sep 15, 2023
 Merged


[release/8.0] Implement support for InlineArray in the trimmer
#92107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da62c0f

Implement support for InlineArray in the trimmer


vitek-karas Sep 14, 2023
2537ec6

Update src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineA…


vitek-karas Sep 14, 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


5 changes: 5 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,11 @@ public static IEnumerable<object[]> Generics ()
 return TestNamesBySuiteName ();
 }

 public static IEnumerable<object[]> InlineArrays ()
 {
 return TestNamesBySuiteName();
 }

 public static IEnumerable<object[]> LinkXml()
 {
 return TestNamesBySuiteName();
Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,13 @@ public void Generics (string t)
 Run (t);
 }

 [Theory]
 [MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
 public void InlineArrays(string t)
 {
 Run(t);
 }

 [Theory]
 [MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
 public void LinkXml (string t)
Expand Down

2 changes: 2 additions & 0 deletions
...oreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,9 +129,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

16 changes: 14 additions & 2 deletions
src/tools/illink/src/linker/Linker.Steps/MarkStep.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3317,11 +3317,23 @@ void MarkImplicitlyUsedFields (TypeDefinition type)
 if (type?.HasFields != true)
 return;

 // keep fields for types with explicit layoutand for enums
 if (!type.IsAutoLayout || type.IsEnum)
 // keep fields for types with explicit layout, for enums and for InlineArray types
 if (!type.IsAutoLayout || type.IsEnum || TypeIsInlineArrayType(type))
 MarkFields (type, includeStatic: type.IsEnum, reason: new DependencyInfo (DependencyKind.MemberOfType, type));
 }

 static bool TypeIsInlineArrayType(TypeDefinition type)
 {
 if (!type.IsValueType)
 return false;

 foreach (var customAttribute in type.CustomAttributes)
 if (customAttribute.AttributeType.IsTypeOf ("System.Runtime.CompilerServices", "InlineArrayAttribute"))
 return true;

 return false;
 }

 protected virtual void MarkRequirementsForInstantiatedTypes (TypeDefinition type)
 {
 if (Annotations.IsInstantiated (type))
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,12 @@ public Task GenericParameterDataFlow ()
 return RunTest (nameof (GenericParameterDataFlow));
 }

 [Fact]
 public Task InlineArrayDataflow ()
 {
 return RunTest ();
 }

 [Fact]
 public Task MakeGenericDataFlow ()
 {
Expand Down

20 changes: 20 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/InlineArraysTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests
{
	public sealed partial class InlineArraysTests : LinkerTestBase
	{
 protected override string TestSuiteName => "InlineArrays";

 [Fact]
 public Task InlineArray ()
 {
 return RunTest (nameof (InlineArray));
 }

	}
}

77 changes: 77 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineArrayDataflow.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.DataFlow
{
	[SkipKeptItemsValidation]
	[ExpectedNoWarnings]
	public class InlineArrayDataflow
	{
 public static void Main()
 {
 AccessPrimitiveTypeArray ();
 AccessUnannotatedTypeArray ();
 AccessAnnotatedTypeArray ();
 }

 public int TestProperty { get; set; }

 [InlineArray (5)]
 struct PrimitiveTypeArray
 {
 public BindingFlags value;
 }

 // This case will fallback to not understanding the binding flags and will end up marking all properties
 static void AccessPrimitiveTypeArray ()
 {
 PrimitiveTypeArray a = new PrimitiveTypeArray ();
 ref var item = ref a[1];
 item = BindingFlags.Public;

 typeof (InlineArrayDataflow).GetProperty (nameof (TestProperty), a[1]);
 }

 [InlineArray (5)]
 struct UnannotatedTypeArray
 {
 public Type value;
 }

 // Analyzer doesn't understand inline arrays currently - so it doesn't produce a warning here
 [ExpectedWarning ("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessUnannotatedTypeArray ()
 {
 UnannotatedTypeArray a = new UnannotatedTypeArray ();
 ref var item = ref a[2];
 item = typeof (InlineArrayDataflow);

 a[2].GetProperty (nameof (TestProperty));
 }

 [InlineArray (5)]
 struct AnnotatedTypeArray
 {
 [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)]
 public Type value;
 }

 // Currently tracking of annotations on inline array values is not implemented
 [ExpectedWarning("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessAnnotatedTypeArray ()
 {
 AnnotatedTypeArray a = new AnnotatedTypeArray ();
 ref var item = ref a[3];
 item = typeof (InlineArrayDataflow);

 a[3].GetProperty (nameof (TestProperty));
 }
	}
}

86 changes: 86 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/InlineArrays/InlineArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Collections.Immutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.InlineArrays
{
	[ExpectedNoWarnings]
	public class InlineArray
	{
 public static void Main()
 {
 InlineArrayUsage.Test ();
 CollectionLiteralsOfArrays.Test ();
 }

 [Kept]
 class InlineArrayUsage
 {
 // NativeAOT will remove most of the struct type information as it's not needed
 // in the generated native code. Eventually we might come up with a better test infra to validate this.
 [Kept (By = Tool.Trimmer)]
 public struct StructWithFixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public FixedBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof(InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 public partial struct FixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept (By = Tool.Trimmer)]
 public struct StructWithAutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public AutoLayoutBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof (InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 [StructLayout (LayoutKind.Auto)]
 public struct AutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept]
 public static void Test ()
 {
 var s = new StructWithFixedBuffer ();
 s.Buffer[0] = 5;

 var sa = new StructWithAutoLayoutBuffer ();
 _ = sa.Buffer[1];
 }
 }

 [Kept]
 [KeptMember (".cctor()")]
 class CollectionLiteralsOfArrays
 {
 [Kept]
 public static readonly ImmutableArray<string> ImmutableValues = ["one", "two"];
 [Kept]
 public static readonly string[] ArrayValues = ["one", "two"];

 [Kept]
 public static void Test()
 {
 _ = CollectionLiteralsOfArrays.ImmutableValues[0];
 _ = CollectionLiteralsOfArrays.ArrayValues[1];
 }
 }
	}
}

5 changes: 5 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ public static IEnumerable<TestCaseData> InheritanceVirtualMethodsTests ()
 return NUnitCasesBySuiteName ("Inheritance.VirtualMethods");
 }

 public static IEnumerable<TestCaseData> InlineArrayTests ()
 {
 return NUnitCasesBySuiteName ("InlineArrays");
 }

 public static IEnumerable<TestCaseData> InteropTests ()
 {
 return NUnitCasesBySuiteName ("Interop");
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,12 @@ public void InheritanceVirtualMethodsTests (TestCase testCase)
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InlineArrayTests))]
 public void InlineArrayTests (TestCase testCase)
 {
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InteropTests))]
 public void InteropTests (TestCase testCase)
 {
Expand Down

2 changes: 2 additions & 0 deletions
...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Implement support for InlineArray in the trimmer#92107

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 2 commits into

from

Sep 15, 2023
 Merged


[release/8.0] Implement support for InlineArray in the trimmer
#92107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da62c0f

Implement support for InlineArray in the trimmer


vitek-karas Sep 14, 2023
2537ec6

Update src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineA…


vitek-karas Sep 14, 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


5 changes: 5 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,11 @@ public static IEnumerable<object[]> Generics ()
 return TestNamesBySuiteName ();
 }

 public static IEnumerable<object[]> InlineArrays ()
 {
 return TestNamesBySuiteName();
 }

 public static IEnumerable<object[]> LinkXml()
 {
 return TestNamesBySuiteName();
Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,13 @@ public void Generics (string t)
 Run (t);
 }

 [Theory]
 [MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
 public void InlineArrays(string t)
 {
 Run(t);
 }

 [Theory]
 [MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
 public void LinkXml (string t)
Expand Down

2 changes: 2 additions & 0 deletions
...oreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,9 +129,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

16 changes: 14 additions & 2 deletions
src/tools/illink/src/linker/Linker.Steps/MarkStep.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3317,11 +3317,23 @@ void MarkImplicitlyUsedFields (TypeDefinition type)
 if (type?.HasFields != true)
 return;

 // keep fields for types with explicit layoutand for enums
 if (!type.IsAutoLayout || type.IsEnum)
 // keep fields for types with explicit layout, for enums and for InlineArray types
 if (!type.IsAutoLayout || type.IsEnum || TypeIsInlineArrayType(type))
 MarkFields (type, includeStatic: type.IsEnum, reason: new DependencyInfo (DependencyKind.MemberOfType, type));
 }

 static bool TypeIsInlineArrayType(TypeDefinition type)
 {
 if (!type.IsValueType)
 return false;

 foreach (var customAttribute in type.CustomAttributes)
 if (customAttribute.AttributeType.IsTypeOf ("System.Runtime.CompilerServices", "InlineArrayAttribute"))
 return true;

 return false;
 }

 protected virtual void MarkRequirementsForInstantiatedTypes (TypeDefinition type)
 {
 if (Annotations.IsInstantiated (type))
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,12 @@ public Task GenericParameterDataFlow ()
 return RunTest (nameof (GenericParameterDataFlow));
 }

 [Fact]
 public Task InlineArrayDataflow ()
 {
 return RunTest ();
 }

 [Fact]
 public Task MakeGenericDataFlow ()
 {
Expand Down

20 changes: 20 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/InlineArraysTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests
{
	public sealed partial class InlineArraysTests : LinkerTestBase
	{
 protected override string TestSuiteName => "InlineArrays";

 [Fact]
 public Task InlineArray ()
 {
 return RunTest (nameof (InlineArray));
 }

	}
}

77 changes: 77 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineArrayDataflow.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.DataFlow
{
	[SkipKeptItemsValidation]
	[ExpectedNoWarnings]
	public class InlineArrayDataflow
	{
 public static void Main()
 {
 AccessPrimitiveTypeArray ();
 AccessUnannotatedTypeArray ();
 AccessAnnotatedTypeArray ();
 }

 public int TestProperty { get; set; }

 [InlineArray (5)]
 struct PrimitiveTypeArray
 {
 public BindingFlags value;
 }

 // This case will fallback to not understanding the binding flags and will end up marking all properties
 static void AccessPrimitiveTypeArray ()
 {
 PrimitiveTypeArray a = new PrimitiveTypeArray ();
 ref var item = ref a[1];
 item = BindingFlags.Public;

 typeof (InlineArrayDataflow).GetProperty (nameof (TestProperty), a[1]);
 }

 [InlineArray (5)]
 struct UnannotatedTypeArray
 {
 public Type value;
 }

 // Analyzer doesn't understand inline arrays currently - so it doesn't produce a warning here
 [ExpectedWarning ("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessUnannotatedTypeArray ()
 {
 UnannotatedTypeArray a = new UnannotatedTypeArray ();
 ref var item = ref a[2];
 item = typeof (InlineArrayDataflow);

 a[2].GetProperty (nameof (TestProperty));
 }

 [InlineArray (5)]
 struct AnnotatedTypeArray
 {
 [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)]
 public Type value;
 }

 // Currently tracking of annotations on inline array values is not implemented
 [ExpectedWarning("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessAnnotatedTypeArray ()
 {
 AnnotatedTypeArray a = new AnnotatedTypeArray ();
 ref var item = ref a[3];
 item = typeof (InlineArrayDataflow);

 a[3].GetProperty (nameof (TestProperty));
 }
	}
}

86 changes: 86 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/InlineArrays/InlineArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Collections.Immutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.InlineArrays
{
	[ExpectedNoWarnings]
	public class InlineArray
	{
 public static void Main()
 {
 InlineArrayUsage.Test ();
 CollectionLiteralsOfArrays.Test ();
 }

 [Kept]
 class InlineArrayUsage
 {
 // NativeAOT will remove most of the struct type information as it's not needed
 // in the generated native code. Eventually we might come up with a better test infra to validate this.
 [Kept (By = Tool.Trimmer)]
 public struct StructWithFixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public FixedBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof(InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 public partial struct FixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept (By = Tool.Trimmer)]
 public struct StructWithAutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public AutoLayoutBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof (InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 [StructLayout (LayoutKind.Auto)]
 public struct AutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept]
 public static void Test ()
 {
 var s = new StructWithFixedBuffer ();
 s.Buffer[0] = 5;

 var sa = new StructWithAutoLayoutBuffer ();
 _ = sa.Buffer[1];
 }
 }

 [Kept]
 [KeptMember (".cctor()")]
 class CollectionLiteralsOfArrays
 {
 [Kept]
 public static readonly ImmutableArray<string> ImmutableValues = ["one", "two"];
 [Kept]
 public static readonly string[] ArrayValues = ["one", "two"];

 [Kept]
 public static void Test()
 {
 _ = CollectionLiteralsOfArrays.ImmutableValues[0];
 _ = CollectionLiteralsOfArrays.ArrayValues[1];
 }
 }
	}
}

5 changes: 5 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ public static IEnumerable<TestCaseData> InheritanceVirtualMethodsTests ()
 return NUnitCasesBySuiteName ("Inheritance.VirtualMethods");
 }

 public static IEnumerable<TestCaseData> InlineArrayTests ()
 {
 return NUnitCasesBySuiteName ("InlineArrays");
 }

 public static IEnumerable<TestCaseData> InteropTests ()
 {
 return NUnitCasesBySuiteName ("Interop");
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,12 @@ public void InheritanceVirtualMethodsTests (TestCase testCase)
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InlineArrayTests))]
 public void InlineArrayTests (TestCase testCase)
 {
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InteropTests))]
 public void InteropTests (TestCase testCase)
 {
Expand Down

2 changes: 2 additions & 0 deletions
...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Implement support for InlineArray in the trimmer#92107

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 2 commits into

from

Sep 15, 2023
 Merged


[release/8.0] Implement support for InlineArray in the trimmer
#92107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da62c0f

Implement support for InlineArray in the trimmer


vitek-karas Sep 14, 2023
2537ec6

Update src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineA…


vitek-karas Sep 14, 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


5 changes: 5 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,11 @@ public static IEnumerable<object[]> Generics ()
 return TestNamesBySuiteName ();
 }

 public static IEnumerable<object[]> InlineArrays ()
 {
 return TestNamesBySuiteName();
 }

 public static IEnumerable<object[]> LinkXml()
 {
 return TestNamesBySuiteName();
Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,13 @@ public void Generics (string t)
 Run (t);
 }

 [Theory]
 [MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
 public void InlineArrays(string t)
 {
 Run(t);
 }

 [Theory]
 [MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
 public void LinkXml (string t)
Expand Down

2 changes: 2 additions & 0 deletions
...oreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,9 +129,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

16 changes: 14 additions & 2 deletions
src/tools/illink/src/linker/Linker.Steps/MarkStep.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3317,11 +3317,23 @@ void MarkImplicitlyUsedFields (TypeDefinition type)
 if (type?.HasFields != true)
 return;

 // keep fields for types with explicit layoutand for enums
 if (!type.IsAutoLayout || type.IsEnum)
 // keep fields for types with explicit layout, for enums and for InlineArray types
 if (!type.IsAutoLayout || type.IsEnum || TypeIsInlineArrayType(type))
 MarkFields (type, includeStatic: type.IsEnum, reason: new DependencyInfo (DependencyKind.MemberOfType, type));
 }

 static bool TypeIsInlineArrayType(TypeDefinition type)
 {
 if (!type.IsValueType)
 return false;

 foreach (var customAttribute in type.CustomAttributes)
 if (customAttribute.AttributeType.IsTypeOf ("System.Runtime.CompilerServices", "InlineArrayAttribute"))
 return true;

 return false;
 }

 protected virtual void MarkRequirementsForInstantiatedTypes (TypeDefinition type)
 {
 if (Annotations.IsInstantiated (type))
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,12 @@ public Task GenericParameterDataFlow ()
 return RunTest (nameof (GenericParameterDataFlow));
 }

 [Fact]
 public Task InlineArrayDataflow ()
 {
 return RunTest ();
 }

 [Fact]
 public Task MakeGenericDataFlow ()
 {
Expand Down

20 changes: 20 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/InlineArraysTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests
{
	public sealed partial class InlineArraysTests : LinkerTestBase
	{
 protected override string TestSuiteName => "InlineArrays";

 [Fact]
 public Task InlineArray ()
 {
 return RunTest (nameof (InlineArray));
 }

	}
}

77 changes: 77 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineArrayDataflow.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.DataFlow
{
	[SkipKeptItemsValidation]
	[ExpectedNoWarnings]
	public class InlineArrayDataflow
	{
 public static void Main()
 {
 AccessPrimitiveTypeArray ();
 AccessUnannotatedTypeArray ();
 AccessAnnotatedTypeArray ();
 }

 public int TestProperty { get; set; }

 [InlineArray (5)]
 struct PrimitiveTypeArray
 {
 public BindingFlags value;
 }

 // This case will fallback to not understanding the binding flags and will end up marking all properties
 static void AccessPrimitiveTypeArray ()
 {
 PrimitiveTypeArray a = new PrimitiveTypeArray ();
 ref var item = ref a[1];
 item = BindingFlags.Public;

 typeof (InlineArrayDataflow).GetProperty (nameof (TestProperty), a[1]);
 }

 [InlineArray (5)]
 struct UnannotatedTypeArray
 {
 public Type value;
 }

 // Analyzer doesn't understand inline arrays currently - so it doesn't produce a warning here
 [ExpectedWarning ("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessUnannotatedTypeArray ()
 {
 UnannotatedTypeArray a = new UnannotatedTypeArray ();
 ref var item = ref a[2];
 item = typeof (InlineArrayDataflow);

 a[2].GetProperty (nameof (TestProperty));
 }

 [InlineArray (5)]
 struct AnnotatedTypeArray
 {
 [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)]
 public Type value;
 }

 // Currently tracking of annotations on inline array values is not implemented
 [ExpectedWarning("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessAnnotatedTypeArray ()
 {
 AnnotatedTypeArray a = new AnnotatedTypeArray ();
 ref var item = ref a[3];
 item = typeof (InlineArrayDataflow);

 a[3].GetProperty (nameof (TestProperty));
 }
	}
}

86 changes: 86 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/InlineArrays/InlineArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Collections.Immutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.InlineArrays
{
	[ExpectedNoWarnings]
	public class InlineArray
	{
 public static void Main()
 {
 InlineArrayUsage.Test ();
 CollectionLiteralsOfArrays.Test ();
 }

 [Kept]
 class InlineArrayUsage
 {
 // NativeAOT will remove most of the struct type information as it's not needed
 // in the generated native code. Eventually we might come up with a better test infra to validate this.
 [Kept (By = Tool.Trimmer)]
 public struct StructWithFixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public FixedBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof(InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 public partial struct FixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept (By = Tool.Trimmer)]
 public struct StructWithAutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public AutoLayoutBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof (InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 [StructLayout (LayoutKind.Auto)]
 public struct AutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept]
 public static void Test ()
 {
 var s = new StructWithFixedBuffer ();
 s.Buffer[0] = 5;

 var sa = new StructWithAutoLayoutBuffer ();
 _ = sa.Buffer[1];
 }
 }

 [Kept]
 [KeptMember (".cctor()")]
 class CollectionLiteralsOfArrays
 {
 [Kept]
 public static readonly ImmutableArray<string> ImmutableValues = ["one", "two"];
 [Kept]
 public static readonly string[] ArrayValues = ["one", "two"];

 [Kept]
 public static void Test()
 {
 _ = CollectionLiteralsOfArrays.ImmutableValues[0];
 _ = CollectionLiteralsOfArrays.ArrayValues[1];
 }
 }
	}
}

5 changes: 5 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ public static IEnumerable<TestCaseData> InheritanceVirtualMethodsTests ()
 return NUnitCasesBySuiteName ("Inheritance.VirtualMethods");
 }

 public static IEnumerable<TestCaseData> InlineArrayTests ()
 {
 return NUnitCasesBySuiteName ("InlineArrays");
 }

 public static IEnumerable<TestCaseData> InteropTests ()
 {
 return NUnitCasesBySuiteName ("Interop");
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,12 @@ public void InheritanceVirtualMethodsTests (TestCase testCase)
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InlineArrayTests))]
 public void InlineArrayTests (TestCase testCase)
 {
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InteropTests))]
 public void InteropTests (TestCase testCase)
 {
Expand Down

2 changes: 2 additions & 0 deletions
...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[release/8.0] Implement support for InlineArray in the trimmer#92107

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 2 commits into

from

Sep 15, 2023
 Merged


[release/8.0] Implement support for InlineArray in the trimmer
#92107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da62c0f

Implement support for InlineArray in the trimmer


vitek-karas Sep 14, 2023
2537ec6

Update src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineA…


vitek-karas Sep 14, 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


5 changes: 5 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,11 @@ public static IEnumerable<object[]> Generics ()
 return TestNamesBySuiteName ();
 }

 public static IEnumerable<object[]> InlineArrays ()
 {
 return TestNamesBySuiteName();
 }

 public static IEnumerable<object[]> LinkXml()
 {
 return TestNamesBySuiteName();
Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,13 @@ public void Generics (string t)
 Run (t);
 }

 [Theory]
 [MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
 public void InlineArrays(string t)
 {
 Run(t);
 }

 [Theory]
 [MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
 public void LinkXml (string t)
Expand Down

2 changes: 2 additions & 0 deletions
...oreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,9 +129,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

16 changes: 14 additions & 2 deletions
src/tools/illink/src/linker/Linker.Steps/MarkStep.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3317,11 +3317,23 @@ void MarkImplicitlyUsedFields (TypeDefinition type)
 if (type?.HasFields != true)
 return;

 // keep fields for types with explicit layoutand for enums
 if (!type.IsAutoLayout || type.IsEnum)
 // keep fields for types with explicit layout, for enums and for InlineArray types
 if (!type.IsAutoLayout || type.IsEnum || TypeIsInlineArrayType(type))
 MarkFields (type, includeStatic: type.IsEnum, reason: new DependencyInfo (DependencyKind.MemberOfType, type));
 }

 static bool TypeIsInlineArrayType(TypeDefinition type)
 {
 if (!type.IsValueType)
 return false;

 foreach (var customAttribute in type.CustomAttributes)
 if (customAttribute.AttributeType.IsTypeOf ("System.Runtime.CompilerServices", "InlineArrayAttribute"))
 return true;

 return false;
 }

 protected virtual void MarkRequirementsForInstantiatedTypes (TypeDefinition type)
 {
 if (Annotations.IsInstantiated (type))
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,12 @@ public Task GenericParameterDataFlow ()
 return RunTest (nameof (GenericParameterDataFlow));
 }

 [Fact]
 public Task InlineArrayDataflow ()
 {
 return RunTest ();
 }

 [Fact]
 public Task MakeGenericDataFlow ()
 {
Expand Down

20 changes: 20 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/InlineArraysTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests
{
	public sealed partial class InlineArraysTests : LinkerTestBase
	{
 protected override string TestSuiteName => "InlineArrays";

 [Fact]
 public Task InlineArray ()
 {
 return RunTest (nameof (InlineArray));
 }

	}
}

77 changes: 77 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineArrayDataflow.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.DataFlow
{
	[SkipKeptItemsValidation]
	[ExpectedNoWarnings]
	public class InlineArrayDataflow
	{
 public static void Main()
 {
 AccessPrimitiveTypeArray ();
 AccessUnannotatedTypeArray ();
 AccessAnnotatedTypeArray ();
 }

 public int TestProperty { get; set; }

 [InlineArray (5)]
 struct PrimitiveTypeArray
 {
 public BindingFlags value;
 }

 // This case will fallback to not understanding the binding flags and will end up marking all properties
 static void AccessPrimitiveTypeArray ()
 {
 PrimitiveTypeArray a = new PrimitiveTypeArray ();
 ref var item = ref a[1];
 item = BindingFlags.Public;

 typeof (InlineArrayDataflow).GetProperty (nameof (TestProperty), a[1]);
 }

 [InlineArray (5)]
 struct UnannotatedTypeArray
 {
 public Type value;
 }

 // Analyzer doesn't understand inline arrays currently - so it doesn't produce a warning here
 [ExpectedWarning ("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessUnannotatedTypeArray ()
 {
 UnannotatedTypeArray a = new UnannotatedTypeArray ();
 ref var item = ref a[2];
 item = typeof (InlineArrayDataflow);

 a[2].GetProperty (nameof (TestProperty));
 }

 [InlineArray (5)]
 struct AnnotatedTypeArray
 {
 [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)]
 public Type value;
 }

 // Currently tracking of annotations on inline array values is not implemented
 [ExpectedWarning("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessAnnotatedTypeArray ()
 {
 AnnotatedTypeArray a = new AnnotatedTypeArray ();
 ref var item = ref a[3];
 item = typeof (InlineArrayDataflow);

 a[3].GetProperty (nameof (TestProperty));
 }
	}
}

86 changes: 86 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/InlineArrays/InlineArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Collections.Immutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.InlineArrays
{
	[ExpectedNoWarnings]
	public class InlineArray
	{
 public static void Main()
 {
 InlineArrayUsage.Test ();
 CollectionLiteralsOfArrays.Test ();
 }

 [Kept]
 class InlineArrayUsage
 {
 // NativeAOT will remove most of the struct type information as it's not needed
 // in the generated native code. Eventually we might come up with a better test infra to validate this.
 [Kept (By = Tool.Trimmer)]
 public struct StructWithFixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public FixedBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof(InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 public partial struct FixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept (By = Tool.Trimmer)]
 public struct StructWithAutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public AutoLayoutBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof (InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 [StructLayout (LayoutKind.Auto)]
 public struct AutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept]
 public static void Test ()
 {
 var s = new StructWithFixedBuffer ();
 s.Buffer[0] = 5;

 var sa = new StructWithAutoLayoutBuffer ();
 _ = sa.Buffer[1];
 }
 }

 [Kept]
 [KeptMember (".cctor()")]
 class CollectionLiteralsOfArrays
 {
 [Kept]
 public static readonly ImmutableArray<string> ImmutableValues = ["one", "two"];
 [Kept]
 public static readonly string[] ArrayValues = ["one", "two"];

 [Kept]
 public static void Test()
 {
 _ = CollectionLiteralsOfArrays.ImmutableValues[0];
 _ = CollectionLiteralsOfArrays.ArrayValues[1];
 }
 }
	}
}

5 changes: 5 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ public static IEnumerable<TestCaseData> InheritanceVirtualMethodsTests ()
 return NUnitCasesBySuiteName ("Inheritance.VirtualMethods");
 }

 public static IEnumerable<TestCaseData> InlineArrayTests ()
 {
 return NUnitCasesBySuiteName ("InlineArrays");
 }

 public static IEnumerable<TestCaseData> InteropTests ()
 {
 return NUnitCasesBySuiteName ("Interop");
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,12 @@ public void InheritanceVirtualMethodsTests (TestCase testCase)
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InlineArrayTests))]
 public void InlineArrayTests (TestCase testCase)
 {
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InteropTests))]
 public void InteropTests (TestCase testCase)
 {
Expand Down

2 changes: 2 additions & 0 deletions
...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Implement support for InlineArray in the trimmer#92107

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 2 commits into

from

Sep 15, 2023
 Merged


[release/8.0] Implement support for InlineArray in the trimmer
#92107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da62c0f

Implement support for InlineArray in the trimmer


vitek-karas Sep 14, 2023
2537ec6

Update src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineA…


vitek-karas Sep 14, 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


5 changes: 5 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,11 @@ public static IEnumerable<object[]> Generics ()
 return TestNamesBySuiteName ();
 }

 public static IEnumerable<object[]> InlineArrays ()
 {
 return TestNamesBySuiteName();
 }

 public static IEnumerable<object[]> LinkXml()
 {
 return TestNamesBySuiteName();
Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,13 @@ public void Generics (string t)
 Run (t);
 }

 [Theory]
 [MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
 public void InlineArrays(string t)
 {
 Run(t);
 }

 [Theory]
 [MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
 public void LinkXml (string t)
Expand Down

2 changes: 2 additions & 0 deletions
...oreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,9 +129,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

16 changes: 14 additions & 2 deletions
src/tools/illink/src/linker/Linker.Steps/MarkStep.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3317,11 +3317,23 @@ void MarkImplicitlyUsedFields (TypeDefinition type)
 if (type?.HasFields != true)
 return;

 // keep fields for types with explicit layoutand for enums
 if (!type.IsAutoLayout || type.IsEnum)
 // keep fields for types with explicit layout, for enums and for InlineArray types
 if (!type.IsAutoLayout || type.IsEnum || TypeIsInlineArrayType(type))
 MarkFields (type, includeStatic: type.IsEnum, reason: new DependencyInfo (DependencyKind.MemberOfType, type));
 }

 static bool TypeIsInlineArrayType(TypeDefinition type)
 {
 if (!type.IsValueType)
 return false;

 foreach (var customAttribute in type.CustomAttributes)
 if (customAttribute.AttributeType.IsTypeOf ("System.Runtime.CompilerServices", "InlineArrayAttribute"))
 return true;

 return false;
 }

 protected virtual void MarkRequirementsForInstantiatedTypes (TypeDefinition type)
 {
 if (Annotations.IsInstantiated (type))
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,12 @@ public Task GenericParameterDataFlow ()
 return RunTest (nameof (GenericParameterDataFlow));
 }

 [Fact]
 public Task InlineArrayDataflow ()
 {
 return RunTest ();
 }

 [Fact]
 public Task MakeGenericDataFlow ()
 {
Expand Down

20 changes: 20 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/InlineArraysTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests
{
	public sealed partial class InlineArraysTests : LinkerTestBase
	{
 protected override string TestSuiteName => "InlineArrays";

 [Fact]
 public Task InlineArray ()
 {
 return RunTest (nameof (InlineArray));
 }

	}
}

77 changes: 77 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineArrayDataflow.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.DataFlow
{
	[SkipKeptItemsValidation]
	[ExpectedNoWarnings]
	public class InlineArrayDataflow
	{
 public static void Main()
 {
 AccessPrimitiveTypeArray ();
 AccessUnannotatedTypeArray ();
 AccessAnnotatedTypeArray ();
 }

 public int TestProperty { get; set; }

 [InlineArray (5)]
 struct PrimitiveTypeArray
 {
 public BindingFlags value;
 }

 // This case will fallback to not understanding the binding flags and will end up marking all properties
 static void AccessPrimitiveTypeArray ()
 {
 PrimitiveTypeArray a = new PrimitiveTypeArray ();
 ref var item = ref a[1];
 item = BindingFlags.Public;

 typeof (InlineArrayDataflow).GetProperty (nameof (TestProperty), a[1]);
 }

 [InlineArray (5)]
 struct UnannotatedTypeArray
 {
 public Type value;
 }

 // Analyzer doesn't understand inline arrays currently - so it doesn't produce a warning here
 [ExpectedWarning ("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessUnannotatedTypeArray ()
 {
 UnannotatedTypeArray a = new UnannotatedTypeArray ();
 ref var item = ref a[2];
 item = typeof (InlineArrayDataflow);

 a[2].GetProperty (nameof (TestProperty));
 }

 [InlineArray (5)]
 struct AnnotatedTypeArray
 {
 [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)]
 public Type value;
 }

 // Currently tracking of annotations on inline array values is not implemented
 [ExpectedWarning("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessAnnotatedTypeArray ()
 {
 AnnotatedTypeArray a = new AnnotatedTypeArray ();
 ref var item = ref a[3];
 item = typeof (InlineArrayDataflow);

 a[3].GetProperty (nameof (TestProperty));
 }
	}
}

86 changes: 86 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/InlineArrays/InlineArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Collections.Immutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.InlineArrays
{
	[ExpectedNoWarnings]
	public class InlineArray
	{
 public static void Main()
 {
 InlineArrayUsage.Test ();
 CollectionLiteralsOfArrays.Test ();
 }

 [Kept]
 class InlineArrayUsage
 {
 // NativeAOT will remove most of the struct type information as it's not needed
 // in the generated native code. Eventually we might come up with a better test infra to validate this.
 [Kept (By = Tool.Trimmer)]
 public struct StructWithFixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public FixedBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof(InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 public partial struct FixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept (By = Tool.Trimmer)]
 public struct StructWithAutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public AutoLayoutBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof (InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 [StructLayout (LayoutKind.Auto)]
 public struct AutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept]
 public static void Test ()
 {
 var s = new StructWithFixedBuffer ();
 s.Buffer[0] = 5;

 var sa = new StructWithAutoLayoutBuffer ();
 _ = sa.Buffer[1];
 }
 }

 [Kept]
 [KeptMember (".cctor()")]
 class CollectionLiteralsOfArrays
 {
 [Kept]
 public static readonly ImmutableArray<string> ImmutableValues = ["one", "two"];
 [Kept]
 public static readonly string[] ArrayValues = ["one", "two"];

 [Kept]
 public static void Test()
 {
 _ = CollectionLiteralsOfArrays.ImmutableValues[0];
 _ = CollectionLiteralsOfArrays.ArrayValues[1];
 }
 }
	}
}

5 changes: 5 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ public static IEnumerable<TestCaseData> InheritanceVirtualMethodsTests ()
 return NUnitCasesBySuiteName ("Inheritance.VirtualMethods");
 }

 public static IEnumerable<TestCaseData> InlineArrayTests ()
 {
 return NUnitCasesBySuiteName ("InlineArrays");
 }

 public static IEnumerable<TestCaseData> InteropTests ()
 {
 return NUnitCasesBySuiteName ("Interop");
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,12 @@ public void InheritanceVirtualMethodsTests (TestCase testCase)
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InlineArrayTests))]
 public void InlineArrayTests (TestCase testCase)
 {
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InteropTests))]
 public void InteropTests (TestCase testCase)
 {
Expand Down

2 changes: 2 additions & 0 deletions
...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Implement support for InlineArray in the trimmer#92107

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 2 commits into

from

Sep 15, 2023
 Merged


[release/8.0] Implement support for InlineArray in the trimmer
#92107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da62c0f

Implement support for InlineArray in the trimmer


vitek-karas Sep 14, 2023
2537ec6

Update src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineA…


vitek-karas Sep 14, 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


5 changes: 5 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,11 @@ public static IEnumerable<object[]> Generics ()
 return TestNamesBySuiteName ();
 }

 public static IEnumerable<object[]> InlineArrays ()
 {
 return TestNamesBySuiteName();
 }

 public static IEnumerable<object[]> LinkXml()
 {
 return TestNamesBySuiteName();
Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,13 @@ public void Generics (string t)
 Run (t);
 }

 [Theory]
 [MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
 public void InlineArrays(string t)
 {
 Run(t);
 }

 [Theory]
 [MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
 public void LinkXml (string t)
Expand Down

2 changes: 2 additions & 0 deletions
...oreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,9 +129,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

16 changes: 14 additions & 2 deletions
src/tools/illink/src/linker/Linker.Steps/MarkStep.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3317,11 +3317,23 @@ void MarkImplicitlyUsedFields (TypeDefinition type)
 if (type?.HasFields != true)
 return;

 // keep fields for types with explicit layoutand for enums
 if (!type.IsAutoLayout || type.IsEnum)
 // keep fields for types with explicit layout, for enums and for InlineArray types
 if (!type.IsAutoLayout || type.IsEnum || TypeIsInlineArrayType(type))
 MarkFields (type, includeStatic: type.IsEnum, reason: new DependencyInfo (DependencyKind.MemberOfType, type));
 }

 static bool TypeIsInlineArrayType(TypeDefinition type)
 {
 if (!type.IsValueType)
 return false;

 foreach (var customAttribute in type.CustomAttributes)
 if (customAttribute.AttributeType.IsTypeOf ("System.Runtime.CompilerServices", "InlineArrayAttribute"))
 return true;

 return false;
 }

 protected virtual void MarkRequirementsForInstantiatedTypes (TypeDefinition type)
 {
 if (Annotations.IsInstantiated (type))
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,12 @@ public Task GenericParameterDataFlow ()
 return RunTest (nameof (GenericParameterDataFlow));
 }

 [Fact]
 public Task InlineArrayDataflow ()
 {
 return RunTest ();
 }

 [Fact]
 public Task MakeGenericDataFlow ()
 {
Expand Down

20 changes: 20 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/InlineArraysTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests
{
	public sealed partial class InlineArraysTests : LinkerTestBase
	{
 protected override string TestSuiteName => "InlineArrays";

 [Fact]
 public Task InlineArray ()
 {
 return RunTest (nameof (InlineArray));
 }

	}
}

77 changes: 77 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineArrayDataflow.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.DataFlow
{
	[SkipKeptItemsValidation]
	[ExpectedNoWarnings]
	public class InlineArrayDataflow
	{
 public static void Main()
 {
 AccessPrimitiveTypeArray ();
 AccessUnannotatedTypeArray ();
 AccessAnnotatedTypeArray ();
 }

 public int TestProperty { get; set; }

 [InlineArray (5)]
 struct PrimitiveTypeArray
 {
 public BindingFlags value;
 }

 // This case will fallback to not understanding the binding flags and will end up marking all properties
 static void AccessPrimitiveTypeArray ()
 {
 PrimitiveTypeArray a = new PrimitiveTypeArray ();
 ref var item = ref a[1];
 item = BindingFlags.Public;

 typeof (InlineArrayDataflow).GetProperty (nameof (TestProperty), a[1]);
 }

 [InlineArray (5)]
 struct UnannotatedTypeArray
 {
 public Type value;
 }

 // Analyzer doesn't understand inline arrays currently - so it doesn't produce a warning here
 [ExpectedWarning ("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessUnannotatedTypeArray ()
 {
 UnannotatedTypeArray a = new UnannotatedTypeArray ();
 ref var item = ref a[2];
 item = typeof (InlineArrayDataflow);

 a[2].GetProperty (nameof (TestProperty));
 }

 [InlineArray (5)]
 struct AnnotatedTypeArray
 {
 [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)]
 public Type value;
 }

 // Currently tracking of annotations on inline array values is not implemented
 [ExpectedWarning("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessAnnotatedTypeArray ()
 {
 AnnotatedTypeArray a = new AnnotatedTypeArray ();
 ref var item = ref a[3];
 item = typeof (InlineArrayDataflow);

 a[3].GetProperty (nameof (TestProperty));
 }
	}
}

86 changes: 86 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/InlineArrays/InlineArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Collections.Immutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.InlineArrays
{
	[ExpectedNoWarnings]
	public class InlineArray
	{
 public static void Main()
 {
 InlineArrayUsage.Test ();
 CollectionLiteralsOfArrays.Test ();
 }

 [Kept]
 class InlineArrayUsage
 {
 // NativeAOT will remove most of the struct type information as it's not needed
 // in the generated native code. Eventually we might come up with a better test infra to validate this.
 [Kept (By = Tool.Trimmer)]
 public struct StructWithFixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public FixedBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof(InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 public partial struct FixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept (By = Tool.Trimmer)]
 public struct StructWithAutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public AutoLayoutBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof (InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 [StructLayout (LayoutKind.Auto)]
 public struct AutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept]
 public static void Test ()
 {
 var s = new StructWithFixedBuffer ();
 s.Buffer[0] = 5;

 var sa = new StructWithAutoLayoutBuffer ();
 _ = sa.Buffer[1];
 }
 }

 [Kept]
 [KeptMember (".cctor()")]
 class CollectionLiteralsOfArrays
 {
 [Kept]
 public static readonly ImmutableArray<string> ImmutableValues = ["one", "two"];
 [Kept]
 public static readonly string[] ArrayValues = ["one", "two"];

 [Kept]
 public static void Test()
 {
 _ = CollectionLiteralsOfArrays.ImmutableValues[0];
 _ = CollectionLiteralsOfArrays.ArrayValues[1];
 }
 }
	}
}

5 changes: 5 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ public static IEnumerable<TestCaseData> InheritanceVirtualMethodsTests ()
 return NUnitCasesBySuiteName ("Inheritance.VirtualMethods");
 }

 public static IEnumerable<TestCaseData> InlineArrayTests ()
 {
 return NUnitCasesBySuiteName ("InlineArrays");
 }

 public static IEnumerable<TestCaseData> InteropTests ()
 {
 return NUnitCasesBySuiteName ("Interop");
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,12 @@ public void InheritanceVirtualMethodsTests (TestCase testCase)
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InlineArrayTests))]
 public void InlineArrayTests (TestCase testCase)
 {
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InteropTests))]
 public void InteropTests (TestCase testCase)
 {
Expand Down

2 changes: 2 additions & 0 deletions
...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[release/8.0] Implement support for InlineArray in the trimmer#92107

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 2 commits into

from

Sep 15, 2023
 Merged


[release/8.0] Implement support for InlineArray in the trimmer
#92107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
da62c0f

Implement support for InlineArray in the trimmer


vitek-karas Sep 14, 2023
2537ec6

Update src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineA…


vitek-karas Sep 14, 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


5 changes: 5 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,11 @@ public static IEnumerable<object[]> Generics ()
 return TestNamesBySuiteName ();
 }

 public static IEnumerable<object[]> InlineArrays ()
 {
 return TestNamesBySuiteName();
 }

 public static IEnumerable<object[]> LinkXml()
 {
 return TestNamesBySuiteName();
Expand Down

7 changes: 7 additions & 0 deletions
src/coreclr/tools/aot/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,13 @@ public void Generics (string t)
 Run (t);
 }

 [Theory]
 [MemberData(nameof(TestDatabase.InlineArrays), MemberType = typeof(TestDatabase))]
 public void InlineArrays(string t)
 {
 Run(t);
 }

 [Theory]
 [MemberData (nameof (TestDatabase.LinkXml), MemberType = typeof (TestDatabase))]
 public void LinkXml (string t)
Expand Down

2 changes: 2 additions & 0 deletions
...oreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,9 +129,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down

16 changes: 14 additions & 2 deletions
src/tools/illink/src/linker/Linker.Steps/MarkStep.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3317,11 +3317,23 @@ void MarkImplicitlyUsedFields (TypeDefinition type)
 if (type?.HasFields != true)
 return;

 // keep fields for types with explicit layoutand for enums
 if (!type.IsAutoLayout || type.IsEnum)
 // keep fields for types with explicit layout, for enums and for InlineArray types
 if (!type.IsAutoLayout || type.IsEnum || TypeIsInlineArrayType(type))
 MarkFields (type, includeStatic: type.IsEnum, reason: new DependencyInfo (DependencyKind.MemberOfType, type));
 }

 static bool TypeIsInlineArrayType(TypeDefinition type)
 {
 if (!type.IsValueType)
 return false;

 foreach (var customAttribute in type.CustomAttributes)
 if (customAttribute.AttributeType.IsTypeOf ("System.Runtime.CompilerServices", "InlineArrayAttribute"))
 return true;

 return false;
 }

 protected virtual void MarkRequirementsForInstantiatedTypes (TypeDefinition type)
 {
 if (Annotations.IsInstantiated (type))
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,6 +149,12 @@ public Task GenericParameterDataFlow ()
 return RunTest (nameof (GenericParameterDataFlow));
 }

 [Fact]
 public Task InlineArrayDataflow ()
 {
 return RunTest ();
 }

 [Fact]
 public Task MakeGenericDataFlow ()
 {
Expand Down

20 changes: 20 additions & 0 deletions
src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/InlineArraysTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests
{
	public sealed partial class InlineArraysTests : LinkerTestBase
	{
 protected override string TestSuiteName => "InlineArrays";

 [Fact]
 public Task InlineArray ()
 {
 return RunTest (nameof (InlineArray));
 }

	}
}

77 changes: 77 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/InlineArrayDataflow.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.DataFlow
{
	[SkipKeptItemsValidation]
	[ExpectedNoWarnings]
	public class InlineArrayDataflow
	{
 public static void Main()
 {
 AccessPrimitiveTypeArray ();
 AccessUnannotatedTypeArray ();
 AccessAnnotatedTypeArray ();
 }

 public int TestProperty { get; set; }

 [InlineArray (5)]
 struct PrimitiveTypeArray
 {
 public BindingFlags value;
 }

 // This case will fallback to not understanding the binding flags and will end up marking all properties
 static void AccessPrimitiveTypeArray ()
 {
 PrimitiveTypeArray a = new PrimitiveTypeArray ();
 ref var item = ref a[1];
 item = BindingFlags.Public;

 typeof (InlineArrayDataflow).GetProperty (nameof (TestProperty), a[1]);
 }

 [InlineArray (5)]
 struct UnannotatedTypeArray
 {
 public Type value;
 }

 // Analyzer doesn't understand inline arrays currently - so it doesn't produce a warning here
 [ExpectedWarning ("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessUnannotatedTypeArray ()
 {
 UnannotatedTypeArray a = new UnannotatedTypeArray ();
 ref var item = ref a[2];
 item = typeof (InlineArrayDataflow);

 a[2].GetProperty (nameof (TestProperty));
 }

 [InlineArray (5)]
 struct AnnotatedTypeArray
 {
 [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)]
 public Type value;
 }

 // Currently tracking of annotations on inline array values is not implemented
 [ExpectedWarning("IL2065", "GetProperty", ProducedBy = Tool.Trimmer | Tool.NativeAot)]
 static void AccessAnnotatedTypeArray ()
 {
 AnnotatedTypeArray a = new AnnotatedTypeArray ();
 ref var item = ref a[3];
 item = typeof (InlineArrayDataflow);

 a[3].GetProperty (nameof (TestProperty));
 }
	}
}

86 changes: 86 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests.Cases/InlineArrays/InlineArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Collections.Immutable;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Mono.Linker.Tests.Cases.Expectations.Assertions;

namespace Mono.Linker.Tests.Cases.InlineArrays
{
	[ExpectedNoWarnings]
	public class InlineArray
	{
 public static void Main()
 {
 InlineArrayUsage.Test ();
 CollectionLiteralsOfArrays.Test ();
 }

 [Kept]
 class InlineArrayUsage
 {
 // NativeAOT will remove most of the struct type information as it's not needed
 // in the generated native code. Eventually we might come up with a better test infra to validate this.
 [Kept (By = Tool.Trimmer)]
 public struct StructWithFixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public FixedBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof(InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 public partial struct FixedBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept (By = Tool.Trimmer)]
 public struct StructWithAutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public AutoLayoutBuffer Buffer;

 [Kept (By = Tool.Trimmer)]
 [KeptAttributeAttribute (typeof (InlineArrayAttribute), By = Tool.Trimmer)]
 [InlineArray (8)]
 [StructLayout (LayoutKind.Auto)]
 public struct AutoLayoutBuffer
 {
 [Kept (By = Tool.Trimmer)]
 public int e0;
 }
 }

 [Kept]
 public static void Test ()
 {
 var s = new StructWithFixedBuffer ();
 s.Buffer[0] = 5;

 var sa = new StructWithAutoLayoutBuffer ();
 _ = sa.Buffer[1];
 }
 }

 [Kept]
 [KeptMember (".cctor()")]
 class CollectionLiteralsOfArrays
 {
 [Kept]
 public static readonly ImmutableArray<string> ImmutableValues = ["one", "two"];
 [Kept]
 public static readonly string[] ArrayValues = ["one", "two"];

 [Kept]
 public static void Test()
 {
 _ = CollectionLiteralsOfArrays.ImmutableValues[0];
 _ = CollectionLiteralsOfArrays.ArrayValues[1];
 }
 }
	}
}

5 changes: 5 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestDatabase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ public static IEnumerable<TestCaseData> InheritanceVirtualMethodsTests ()
 return NUnitCasesBySuiteName ("Inheritance.VirtualMethods");
 }

 public static IEnumerable<TestCaseData> InlineArrayTests ()
 {
 return NUnitCasesBySuiteName ("InlineArrays");
 }

 public static IEnumerable<TestCaseData> InteropTests ()
 {
 return NUnitCasesBySuiteName ("Interop");
Expand Down

6 changes: 6 additions & 0 deletions
src/tools/illink/test/Mono.Linker.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,12 @@ public void InheritanceVirtualMethodsTests (TestCase testCase)
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InlineArrayTests))]
 public void InlineArrayTests (TestCase testCase)
 {
 Run (testCase);
 }

 [TestCaseSource (typeof (TestDatabase), nameof (TestDatabase.InteropTests))]
 public void InteropTests (TestCase testCase)
 {
Expand Down

2 changes: 2 additions & 0 deletions
...ools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseCompilationMetadataProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,11 @@ public virtual IEnumerable<string> GetCommonReferencedAssemblies (NPath workingD

 yield return Path.Combine (referenceDir, "mscorlib.dll");
 yield return Path.Combine (referenceDir, "System.Collections.dll");
 yield return Path.Combine (referenceDir, "System.Collections.Immutable.dll");
 yield return Path.Combine (referenceDir, "System.ComponentModel.TypeConverter.dll");
 yield return Path.Combine (referenceDir, "System.Console.dll");
 yield return Path.Combine (referenceDir, "System.Linq.Expressions.dll");
 yield return Path.Combine (referenceDir, "System.Memory.dll");
 yield return Path.Combine (referenceDir, "System.ObjectModel.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.dll");
 yield return Path.Combine (referenceDir, "System.Runtime.Extensions.dll");
Expand Down