Skip to content

Commit

Permalink
Address PR feedback and fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephentoub
stephentoub committed Dec 10, 2022
1 parent 0804eab commit f90cce2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 189 deletions.
199 changes: 26 additions & 173 deletions src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenReadOnlySpanConstructionTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2658,179 +2658,32 @@ public static int M()
";
var compilation = CreateCompilation(csharp, targetFramework: TargetFramework.NetCoreApp, options: TestOptions.UnsafeReleaseDll);
var verifier = CompileAndVerify(compilation, verify: Verification.Skipped);
verifier.VerifyTypeIL("<PrivateImplementationDetails>", @"
.class private auto ansi sealed '<PrivateImplementationDetails>'
extends [System.Runtime]System.Object
{
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = (
01 00 00 00
)
// Nested Types
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=8_Align=2'
extends [System.Runtime]System.ValueType
{
.pack 2
.size 8
} // end of class __StaticArrayInitTypeSize=8_Align=2
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=8_Align=4'
extends [System.Runtime]System.ValueType
{
.pack 4
.size 8
} // end of class __StaticArrayInitTypeSize=8_Align=4
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=8_Align=8'
extends [System.Runtime]System.ValueType
{
.pack 8
.size 8
} // end of class __StaticArrayInitTypeSize=8_Align=8
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=16'
extends [System.Runtime]System.ValueType
{
.pack 1
.size 16
} // end of class __StaticArrayInitTypeSize=16
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=16_Align=2'
extends [System.Runtime]System.ValueType
{
.pack 2
.size 16
} // end of class __StaticArrayInitTypeSize=16_Align=2
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=16_Align=4'
extends [System.Runtime]System.ValueType
{
.pack 4
.size 16
} // end of class __StaticArrayInitTypeSize=16_Align=4
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=16_Align=8'
extends [System.Runtime]System.ValueType
{
.pack 8
.size 16
} // end of class __StaticArrayInitTypeSize=16_Align=8
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=24'
extends [System.Runtime]System.ValueType
{
.pack 1
.size 24
} // end of class __StaticArrayInitTypeSize=24
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=24_Align=2'
extends [System.Runtime]System.ValueType
{
.pack 2
.size 24
} // end of class __StaticArrayInitTypeSize=24_Align=2
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=24_Align=4'
extends [System.Runtime]System.ValueType
{
.pack 4
.size 24
} // end of class __StaticArrayInitTypeSize=24_Align=4
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=24_Align=8'
extends [System.Runtime]System.ValueType
{
.pack 8
.size 24
} // end of class __StaticArrayInitTypeSize=24_Align=8
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=32'
extends [System.Runtime]System.ValueType
{
.pack 1
.size 32
} // end of class __StaticArrayInitTypeSize=32
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=32_Align=2'
extends [System.Runtime]System.ValueType
{
.pack 2
.size 32
} // end of class __StaticArrayInitTypeSize=32_Align=2
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=32_Align=4'
extends [System.Runtime]System.ValueType
{
.pack 4
.size 32
} // end of class __StaticArrayInitTypeSize=32_Align=4
.class nested private explicit ansi sealed '__StaticArrayInitTypeSize=32_Align=8'
extends [System.Runtime]System.ValueType
{
.pack 8
.size 32
} // end of class __StaticArrayInitTypeSize=32_Align=8
// Fields
.field assembly static initonly int64 '12A3AE445661CE5DEE78D0650D33362DEC29C4F82AF05E7E57FB595BBBACF0CA' at I_00003358
.data cil I_00003358 = bytearray (
ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=8_Align=2' '12A3AE445661CE5DEE78D0650D33362DEC29C4F82AF05E7E57FB595BBBACF0CA2' at I_00003360
.data cil I_00003360 = bytearray (
ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=8_Align=4' '12A3AE445661CE5DEE78D0650D33362DEC29C4F82AF05E7E57FB595BBBACF0CA4' at I_00003368
.data cil I_00003368 = bytearray (
ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=8_Align=8' '12A3AE445661CE5DEE78D0650D33362DEC29C4F82AF05E7E57FB595BBBACF0CA8' at I_00003370
.data cil I_00003370 = bytearray (
ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=24' '44A5F7891570E5631E8C91C85186E6633F4AB5364F644040B2A00126A07985B6' at I_00003378
.data cil I_00003378 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=24_Align=2' '44A5F7891570E5631E8C91C85186E6633F4AB5364F644040B2A00126A07985B62' at I_00003390
.data cil I_00003390 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=24_Align=4' '44A5F7891570E5631E8C91C85186E6633F4AB5364F644040B2A00126A07985B64' at I_000033A8
.data cil I_000033A8 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=24_Align=8' '44A5F7891570E5631E8C91C85186E6633F4AB5364F644040B2A00126A07985B68' at I_000033C0
.data cil I_000033C0 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=16' '5AC6A5945F16500911219129984BA8B387A06F24FE383CE4E81A73294065461B' at I_000033D8
.data cil I_000033D8 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=16_Align=2' '5AC6A5945F16500911219129984BA8B387A06F24FE383CE4E81A73294065461B2' at I_000033E8
.data cil I_000033E8 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=16_Align=4' '5AC6A5945F16500911219129984BA8B387A06F24FE383CE4E81A73294065461B4' at I_000033F8
.data cil I_000033F8 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=16_Align=8' '5AC6A5945F16500911219129984BA8B387A06F24FE383CE4E81A73294065461B8' at I_00003408
.data cil I_00003408 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=32' AF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C4051 at I_00003418
.data cil I_00003418 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=32_Align=2' AF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C40512 at I_00003438
.data cil I_00003438 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=32_Align=4' AF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C40514 at I_00003458
.data cil I_00003458 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
)
.field assembly static initonly valuetype '<PrivateImplementationDetails>'/'__StaticArrayInitTypeSize=32_Align=8' AF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C40518 at I_00003478
.data cil I_00003478 = bytearray (
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
)
} // end of class <PrivateImplementationDetails>
");
verifier.VerifyTypeIL("<PrivateImplementationDetails>", il =>
{
string[] expected = new[]
{
"__StaticArrayInitTypeSize=8_Align=2",
"__StaticArrayInitTypeSize=8_Align=4",
"__StaticArrayInitTypeSize=8_Align=8",
"__StaticArrayInitTypeSize=16",
"__StaticArrayInitTypeSize=16_Align=2",
"__StaticArrayInitTypeSize=16_Align=4",
"__StaticArrayInitTypeSize=16_Align=8",
"__StaticArrayInitTypeSize=24",
"__StaticArrayInitTypeSize=24_Align=2",
"__StaticArrayInitTypeSize=24_Align=4",
"__StaticArrayInitTypeSize=24_Align=8",
"__StaticArrayInitTypeSize=32",
"__StaticArrayInitTypeSize=32_Align=2",
"__StaticArrayInitTypeSize=32_Align=4",
"__StaticArrayInitTypeSize=32_Align=8",
};
// .class nested private explicit ansi sealed 'TYPENAME'
string[] actual = Regex.Matches(il, @"\.class nested private explicit ansi sealed '([^']*?)'").Cast<Match>().Select(m => m.Groups[1].Value).ToArray();
Assert.Equal(expected, actual);
});
}
}
}
25 changes: 9 additions & 16 deletions src/Compilers/Core/Portable/CodeGen/PrivateImplementationDetails.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,30 +203,23 @@ Cci.PrimitiveTypeCode.Int32 or Cci.PrimitiveTypeCode.UInt32 or Cci.PrimitiveType
internal Cci.IFieldReference CreateDataField(ImmutableArray<byte> data, ushort alignment)
{
Debug.Assert(!IsFrozen);
Debug.Assert(alignment is 1 or 2 or 4 or 8);
Debug.Assert(data.Length != 1 || alignment == 1);

Cci.ITypeReference type = _proxyTypes.GetOrAdd(
((uint)data.Length, Alignment: alignment), key =>
{
// We need a type that's both the same size as the data and that has a .pack
// that matches the data's alignment requirements.
if (key.Size == 1)
{
// Data of size 1 must be a single element of one-byte-sized type,
// which has no alignment requirements.
Debug.Assert(alignment == 1);
if (_systemInt8Type is not null)
{
return _systemInt8Type;
}
}
else if (key.Alignment == 1)
// that matches the data's alignment requirements. If the size of the data
// is 1 byte, then the alignment will also be 1, and we can use byte as the type.
// If the size of the data is 2, 4, or 8 bytes, we can use short, int, or long rather than
// creating a custom type, but we can only do so if the required alignment is also 1, as
// these types have a .pack value of 1.
if (key.Alignment == 1)
{
// If the size of the data is 2, 4, or 8 bytes, we can use short, int, or long rather than
// creating a custom type, but we can only do so if the required alignment is also 1, as
// these types have a .pack value of 1.
switch (key.Size)
{
case 1 when _systemInt8Type is not null: return _systemInt8Type;
case 2 when _systemInt16Type is not null: return _systemInt16Type;
case 4 when _systemInt32Type is not null: return _systemInt32Type;
case 8 when _systemInt64Type is not null: return _systemInt64Type;
Expand Down

0 comments on commit f90cce2

Please sign in to comment.