-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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
Bump Explicit-layout value types with no fields to at minimum 1 byte size. #63975
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
fea6664
Bump Explicit-layout value types with no fields to at minimum 1 byte …
jkoritzinsky 24a2c68
Add class tests
jkoritzinsky 584e2d0
Update src/tests/Loader/classloader/explicitlayout/Regressions/empty/…
jkoritzinsky 4d3f078
Add missing using.
jkoritzinsky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
src/tests/Loader/classloader/explicitlayout/Regressions/empty/explicitStruct_empty.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System; | ||
using System.Runtime.CompilerServices; | ||
using System.Runtime.InteropServices; | ||
using Xunit; | ||
|
||
[StructLayout(LayoutKind.Explicit)] | ||
public struct S | ||
{ | ||
} | ||
|
||
[StructLayout(LayoutKind.Explicit)] | ||
public struct S2 | ||
{ | ||
} | ||
|
||
[StructLayout(LayoutKind.Explicit)] | ||
public class C | ||
{ | ||
} | ||
|
||
[StructLayout(LayoutKind.Explicit)] | ||
public class C2 | ||
{ | ||
} | ||
|
||
public class Test_explicitStruct_empty | ||
{ | ||
// Mark as no-inlining so any test failures will show the right stack trace even after | ||
// we consolidate test assemblies. | ||
[Fact] | ||
[MethodImpl(MethodImplOptions.NoInlining)] | ||
public static void EmptyExplicitStructCanBeLoadedAndCreated() | ||
{ | ||
S s = new S(); | ||
} | ||
|
||
[Fact] | ||
[MethodImpl(MethodImplOptions.NoInlining)] | ||
public static void EmptyExplicitStructCanBeLoadedAndCreatedThroughReflection() | ||
{ | ||
object s = Activator.CreateInstance(Type.GetType("S2")); | ||
} | ||
|
||
[Fact] | ||
[MethodImpl(MethodImplOptions.NoInlining)] | ||
public static void EmptyExplicitClassCanBeLoadedAndCreated() | ||
{ | ||
C c = new C(); | ||
} | ||
|
||
[Fact] | ||
[MethodImpl(MethodImplOptions.NoInlining)] | ||
public static void EmptyExplicitClassCanBeLoadedAndCreatedThroughReflection() | ||
{ | ||
object c = Activator.CreateInstance(Type.GetType("C2")); | ||
} | ||
} |
5 changes: 5 additions & 0 deletions
5
src/tests/Loader/classloader/explicitlayout/Regressions/empty/explicitStruct_empty.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
<ItemGroup> | ||
<Compile Include="explicitStruct_empty.cs" /> | ||
</ItemGroup> | ||
</Project> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just for my education - does the same logic hold for zero-sized classes with explicit layout i.o.w. should we be also testing correct behavior in the presence of inheritance?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe zero-sized classes are already bumped up to at least 1-byte elsewhere, but to make sure I've added some more test cases to make sure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't need to specifically validate inheritance as it will end up down the same code path as the non-inheritance case.