Skip to content

Commit d49ab3a

Browse files
committed
A couple 32-bit correctness fixes
Fixes rdar://105453258
1 parent 075150c commit d49ab3a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

test/IRGen/run_variadic_generics.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ entry(%intIndex : $Builtin.Word):
353353
// CHECK-LL: [[METADATA_ADDRESS:%[^,]+]] = getelementptr inbounds %swift.type*, %swift.type** [[METADATA_PACK]], i{{(32|64)}} [[INDEX]]
354354
// CHECK-LL: [[METADATA:%[^,]+]] = load %swift.type*, %swift.type** [[METADATA_ADDRESS]]
355355
// CHECK-LL: [[WTABLE_ADDRESS:%[^,]+]] = getelementptr inbounds i8**, i8*** [[WTABLE_PACK]], i{{(32|64)}} [[INDEX]]
356-
// CHECK-LL: [[WTABLE:%[^,]+]] = load i8**, i8*** [[WTABLE_ADDRESS]], align 8
356+
// CHECK-LL: [[WTABLE:%[^,]+]] = load i8**, i8*** [[WTABLE_ADDRESS]], align
357357
// CHECK-LL: call swiftcc void @printGenericType(%swift.type* [[METADATA]], %swift.type* [[METADATA]])
358358
sil @direct_access_from_parameter_with_conformance : $<T_1... : P> (Builtin.Word) -> () {
359359
entry(%intIndex : $Builtin.Word):

test/IRGen/variadic_generics.sil

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ bb0(%pack : $*Pack{Int, repeat each T, Int}, %value : $Int):
108108
}
109109

110110
// CHECK-LABEL: define {{.*}}@test_pack_alloc_1_dynamic(
111-
// CHECK-SAME: i{{(32|64)}} [[PACK_SIZE:%[^,]+]]
112-
// CHECK: [[SIZE:%[^,]+]] = add i64 [[PACK_SIZE]], [[PACK_SIZE]]
111+
// CHECK-SAME: [[INT]] [[PACK_SIZE:%[^,]+]]
112+
// CHECK: [[SIZE:%[^,]+]] = add [[INT]] [[PACK_SIZE]], [[PACK_SIZE]]
113113
// CHECK: [[SP_SAVE:%[^,]+]] = call i8* @llvm.stacksave()
114-
// CHECK: alloca %swift.opaque*, i{{(32|64)}} [[SIZE]]
114+
// CHECK: alloca %swift.opaque*, [[INT]] [[SIZE]]
115115
// CHECK: call void @llvm.stackrestore(i8* [[SP_SAVE]])
116116
sil @test_pack_alloc_1_dynamic : $<T...> () -> () {
117117
// Control flow so that stack saving/restoring is emitted
@@ -151,7 +151,7 @@ entry(%addr : $*T):
151151
// CHECK: [[UNCAST_METADATA:%[^,]+]] = extractvalue %swift.metadata_response [[RESPONSE]], 0
152152
// CHECK: [[METADATA:%[^,]+]] = bitcast %swift.type* [[UNCAST_METADATA]] to %swift.tuple_type*
153153
// CHECK: [[OFFSET_PTR:%[^,]+]] = getelementptr inbounds %swift.tuple_type, %swift.tuple_type* [[METADATA]], i{{(64|32)}} 0, i32 3, i{{(64|32)}} [[INDEX]]
154-
// CHECK: [[OFFSET:%[^,]+]] = load i32, i32* [[OFFSET_PTR]], align 8
154+
// CHECK: [[OFFSET:%[^,]+]] = load i32, i32* [[OFFSET_PTR]], align
155155
// CHECK: [[CAST_TUPLE_ADDR:%[^,]+]] = bitcast <{ %TSS }>* [[TUPLE_ADDR]] to i8*
156156
// CHECK: [[UNCAST_ELEMENT_ADDR:%[^,]+]] = getelementptr inbounds i8, i8* [[CAST_TUPLE_ADDR]], i32 [[OFFSET]]
157157
// CHECK: [[ELEMENT_ADDR:%[^,]+]] = bitcast i8* [[UNCAST_ELEMENT_ADDR]] to %swift.opaque*

0 commit comments

Comments
 (0)