Skip to content

Commit 800cf0e

Browse files
MichalStrehovskyMichalStrehovsky
committed
Fix test failures
1 parent 699d0f4 commit 800cf0e

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ protected virtual ComputedInstanceFieldLayout ComputeInstanceFieldLayout(Metadat
174174
return ComputeExplicitFieldLayout(type, numInstanceFields);
175175
}
176176
// Sequential layout has to be respected for blittable types only. We use approximation and respect it for
177-
// all types without GC references (ie C# unmanaged types).
178-
else if (type.IsSequentialLayout && !type.ContainsGCPointers)
177+
// all types without GC references (ie C# unmanaged types). Universal canonical instances might be blittable.
178+
else if (type.IsSequentialLayout && (type.IsCanonicalSubtype(CanonicalFormKind.Universal) || !type.ContainsGCPointers))
179179
{
180180
return ComputeSequentialFieldLayout(type, numInstanceFields);
181181
}

‎src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/ArchitectureSpecificFieldLayoutTests.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@ public void TestAlignmentBehavior_LongIntEnumStruct()
9999

100100
Assert.Equal(0x20, tX64.InstanceByteCountUnaligned.AsInt);
101101
Assert.Equal(0x20, tARM.InstanceByteCountUnaligned.AsInt);
102-
Assert.Equal(0x20, tX86.InstanceByteCountUnaligned.AsInt);
102+
Assert.Equal(0x18, tX86.InstanceByteCountUnaligned.AsInt);
103103

104104
Assert.Equal(0x20, tX64.InstanceByteCount.AsInt);
105105
Assert.Equal(0x20, tARM.InstanceByteCount.AsInt);
106-
Assert.Equal(0x20, tX86.InstanceByteCount.AsInt);
106+
Assert.Equal(0x18, tX86.InstanceByteCount.AsInt);
107107

108108
Assert.Equal(0x8, tX64.InstanceFieldAlignment.AsInt);
109109
Assert.Equal(0x8, tARM.InstanceFieldAlignment.AsInt);
110-
Assert.Equal(0x8, tX86.InstanceFieldAlignment.AsInt);
110+
Assert.Equal(0x4, tX86.InstanceFieldAlignment.AsInt);
111111

112112
Assert.Equal(0x20, tX64.InstanceFieldSize.AsInt);
113113
Assert.Equal(0x20, tARM.InstanceFieldSize.AsInt);
114-
Assert.Equal(0x20, tX86.InstanceFieldSize.AsInt);
114+
Assert.Equal(0x18, tX86.InstanceFieldSize.AsInt);
115115

116116
Assert.Equal(0x0, tX64.GetField("_1").Offset.AsInt);
117117
Assert.Equal(0x0, tARM.GetField("_1").Offset.AsInt);
@@ -123,18 +123,18 @@ public void TestAlignmentBehavior_LongIntEnumStruct()
123123

124124
Assert.Equal(0x10, tX64.GetField("_3").Offset.AsInt);
125125
Assert.Equal(0x10, tARM.GetField("_3").Offset.AsInt);
126-
Assert.Equal(0x10, tX86.GetField("_3").Offset.AsInt);
126+
Assert.Equal(0xC, tX86.GetField("_3").Offset.AsInt);
127127

128128
Assert.Equal(0x18, tX64.GetField("_4").Offset.AsInt);
129129
Assert.Equal(0x18, tARM.GetField("_4").Offset.AsInt);
130-
Assert.Equal(0x18, tX86.GetField("_4").Offset.AsInt);
130+
Assert.Equal(0x14, tX86.GetField("_4").Offset.AsInt);
131131

132132
MetadataType tX64FieldStruct = _testModuleX64.GetType(_namespace, _type + "FieldStruct");
133133
MetadataType tX86FieldStruct = _testModuleX86.GetType(_namespace, _type + "FieldStruct");
134134
MetadataType tARMFieldStruct = _testModuleARM.GetType(_namespace, _type + "FieldStruct");
135135

136136
Assert.Equal(0x8, tX64FieldStruct.GetField("_struct").Offset.AsInt);
137-
Assert.Equal(0x8, tX86FieldStruct.GetField("_struct").Offset.AsInt);
137+
Assert.Equal(0x4, tX86FieldStruct.GetField("_struct").Offset.AsInt);
138138
Assert.Equal(0x8, tARMFieldStruct.GetField("_struct").Offset.AsInt);
139139
}
140140

‎src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/GCPointerMapTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ public void TestInstanceMap()
4141
{
4242
var map = GCPointerMap.FromInstanceLayout(classWithStringField);
4343
Assert.Equal(4, map.Size);
44-
Assert.Equal("0010", map.ToString());
44+
Assert.Equal("0100", map.ToString());
4545
}
4646

4747
{
4848
var map = GCPointerMap.FromInstanceLayout(mixedStruct);
4949
Assert.Equal(5, map.Size);
50-
Assert.Equal("01001", map.ToString());
50+
Assert.Equal("11000", map.ToString());
5151
}
5252

5353
{
@@ -60,13 +60,13 @@ public void TestInstanceMap()
6060
{
6161
var map = GCPointerMap.FromInstanceLayout(doubleMixedStructLayout);
6262
Assert.Equal(10, map.Size);
63-
Assert.Equal("0100101001", map.ToString());
63+
Assert.Equal("1100011000", map.ToString());
6464
}
6565

6666
{
6767
var map = GCPointerMap.FromInstanceLayout(explicitlyFarPointer);
6868
Assert.Equal(117, map.Size);
69-
Assert.Equal("100000000000000000000000000000000000000000000000000000000000000010000000000000001000000000000000000000000000000001001", map.ToString());
69+
Assert.Equal("100000000000000000000000000000000000000000000000000000000000000010000000000000001000000000000000000000000000000011000", map.ToString());
7070
}
7171

7272
{

‎src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/InstanceFieldLayoutTests.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -150,22 +150,22 @@ public void TestSequentialTypeLayout()
150150
switch (f.Name)
151151
{
152152
case "MyInt":
153-
Assert.Equal(0x8, f.Offset.AsInt);
153+
Assert.Equal(0x20, f.Offset.AsInt);
154154
break;
155155
case "MyBool":
156-
Assert.Equal(0xC, f.Offset.AsInt);
156+
Assert.Equal(0x26, f.Offset.AsInt);
157157
break;
158158
case "MyChar":
159-
Assert.Equal(0xE, f.Offset.AsInt);
159+
Assert.Equal(0x24, f.Offset.AsInt);
160160
break;
161161
case "MyString":
162-
Assert.Equal(0x10, f.Offset.AsInt);
162+
Assert.Equal(0x8, f.Offset.AsInt);
163163
break;
164164
case "MyByteArray":
165-
Assert.Equal(0x18, f.Offset.AsInt);
165+
Assert.Equal(0x10, f.Offset.AsInt);
166166
break;
167167
case "MyClass1SelfRef":
168-
Assert.Equal(0x20, f.Offset.AsInt);
168+
Assert.Equal(0x18, f.Offset.AsInt);
169169
break;
170170
default:
171171
Assert.True(false);
@@ -226,19 +226,19 @@ public void TestSequentialTypeLayoutStruct()
226226
switch (f.Name)
227227
{
228228
case "b1":
229-
Assert.Equal(0x0, f.Offset.AsInt);
229+
Assert.Equal(0xC, f.Offset.AsInt);
230230
break;
231231
case "b2":
232-
Assert.Equal(0x1, f.Offset.AsInt);
232+
Assert.Equal(0xD, f.Offset.AsInt);
233233
break;
234234
case "b3":
235-
Assert.Equal(0x2, f.Offset.AsInt);
235+
Assert.Equal(0xE, f.Offset.AsInt);
236236
break;
237237
case "i1":
238-
Assert.Equal(0x4, f.Offset.AsInt);
238+
Assert.Equal(0x8, f.Offset.AsInt);
239239
break;
240240
case "s1":
241-
Assert.Equal(0x8, f.Offset.AsInt);
241+
Assert.Equal(0x0, f.Offset.AsInt);
242242
break;
243243
default:
244244
Assert.True(false);
@@ -269,10 +269,10 @@ public void TestSequentialTypeLayoutStructEmbedded()
269269
switch (f.Name)
270270
{
271271
case "MyStruct0":
272-
Assert.Equal(0x0, f.Offset.AsInt);
272+
Assert.Equal(0x8, f.Offset.AsInt);
273273
break;
274274
case "MyBool":
275-
Assert.Equal(0x10, f.Offset.AsInt);
275+
Assert.Equal(0x0, f.Offset.AsInt);
276276
break;
277277
default:
278278
Assert.True(false);

0 commit comments

Comments
 (0)