Use getMetadataLayout offset instead of manual gep

Author: zoecarver

lib/IRGen/GenStruct.cpp

@@ -413,17 +413,11 @@ namespace {
     }
 
     llvm::Value *getOffsetForIndex(IRGenFunction &IGF, unsigned index) override {
-      // TODO: do this with StructMetadataLayout::getFieldOffset
-
-      // Get the field offset vector from the struct metadata.
-      llvm::Value *metadata = IGF.emitTypeMetadataRefForLayout(TheStruct);
-      Address fieldVector = emitAddressOfFieldOffsetVector(IGF, metadata,
-                                    TheStruct.getStructOrBoundGenericStruct());
-      
-      // Grab the indexed offset.
-      fieldVector = IGF.Builder.CreateConstArrayGEP(fieldVector, index,
-                                                    IGF.IGM.getPointerSize());
-      return IGF.Builder.CreateLoad(fieldVector);
+      auto &structLayout =
+          IGF.IGM.getMetadataLayout(TheStruct.getStructOrBoundGenericStruct());
+      auto offset =
+          structLayout.getFieldOffsetVectorOffset().offsetBy(IGF, Size(index));
+      return offset.getAsValue(IGF);
     }
 
     MemberAccessStrategy getFieldAccessStrategy(IRGenModule &IGM,

test/IRGen/generic_structs.sil

@@ -157,34 +157,29 @@ struct ComplexDynamic<U, V> {
 // CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @explode_complex_dynamic
 sil @explode_complex_dynamic : $<A, B> (@in ComplexDynamic<A, B>, @inout Byteful, @inout A, @inout B, @inout Chareth) -> () {
 entry(%0 : $*ComplexDynamic<A, B>, %1 : $*Byteful, %2 : $*A, %3 : $*B, %4 : $*Chareth):
-  %a = struct_element_addr %0 : $*ComplexDynamic<A, B>, #ComplexDynamic.a2
+  // CHECK: [[A:%.*]] = getelementptr inbounds %T15generic_structs14ComplexDynamicV, %T15generic_structs14ComplexDynamicV* %0
+  // CHECK: [[PTR1:%.*]] = bitcast %T15generic_structs14ComplexDynamicV* %0
+  // CHECK-NEXT: [[EL:%.*]] = getelementptr inbounds i8, i8* [[PTR1]]
+  // CHECK-NEXT: [[B:%.*]] = bitcast i8* [[EL]] to %swift.opaque*
 
-  // CHECK: [[METADATA:%.*]] = bitcast %swift.type* {{%.*}} to i32*
-  // CHECK: [[FIELD_OFFSET_VECTOR:%.*]] = getelementptr inbounds i32, i32* [[METADATA]], i64 8
-  // CHECK: [[FIELD_OFFSET_ADDR:%.*]] = getelementptr inbounds i32, i32* [[FIELD_OFFSET_VECTOR]], i32 2
-  // CHECK: [[FIELD_OFFSET:%.*]] = load i32, i32* [[FIELD_OFFSET_ADDR]], align 8
-  // CHECK: [[BYTES:%.*]] = bitcast %T15generic_structs14ComplexDynamicV* %0 to i8*
-  // CHECK: [[BYTE_OFFSET:%.*]] = getelementptr inbounds i8, i8* [[BYTES]], i32 [[FIELD_OFFSET]]
-  // CHECK: bitcast i8* [[BYTE_OFFSET]] to %swift.opaque*
+  %a = struct_element_addr %0 : $*ComplexDynamic<A, B>, #ComplexDynamic.a2
   %b = struct_element_addr %0 : $*ComplexDynamic<A, B>, #ComplexDynamic.b
-
-  // CHECK: [[METADATA:%.*]] = bitcast %swift.type* {{%.*}} to i32*
-  // CHECK: [[FIELD_OFFSET_VECTOR:%.*]] = getelementptr inbounds i32, i32* [[METADATA]], i64 8
-  // CHECK: [[FIELD_OFFSET_ADDR:%.*]] = getelementptr inbounds i32, i32* [[FIELD_OFFSET_VECTOR]], i32 3
-  // CHECK: [[FIELD_OFFSET:%.*]] = load i32, i32* [[FIELD_OFFSET_ADDR]], align 8
-  // CHECK: [[BYTES:%.*]] = bitcast %T15generic_structs14ComplexDynamicV* %0 to i8*
-  // CHECK: [[BYTE_OFFSET:%.*]] = getelementptr inbounds i8, i8* [[BYTES]], i32 [[FIELD_OFFSET]]
-  // CHECK: bitcast i8* [[BYTE_OFFSET]] to %T15generic_structs13SingleDynamicV
+  
+  // CHECK: [[PTR2:%.*]] = bitcast %T15generic_structs14ComplexDynamicV* %0
+  // CHECK-NEXT: [[C_PTR:%.*]] = getelementptr inbounds i8, i8* [[PTR2]], i64 35
+  // CHECK-NEXT: [[C:%.*]] = bitcast i8* [[C_PTR]] to %T15generic_structs13SingleDynamicV*
+  // CHECK-NEXT: [[C_X:%.*]] = bitcast %T15generic_structs13SingleDynamicV* [[C]] to %swift.opaque*
+  
+  // CHECK: [[PTR3:%.*]] = bitcast %T15generic_structs14ComplexDynamicV* %0
+  // CHECK-NEXT: [[D_PTR:%.*]] = getelementptr inbounds i8, i8* [[PTR3]], i64 36
+  // CHECK-NEXT: [[D:%.*]] = bitcast i8* [[D_PTR]] to %T15generic_structs7CharethV*
+  
+  // CHECK: call %T15generic_structs7BytefulV* @"$s15generic_structs7BytefulVWOf"(%T15generic_structs7BytefulV* [[A]], %T15generic_structs7BytefulV* %1)
+  // CHECK: call %swift.opaque* %assignWithCopy(%swift.opaque* %2, %swift.opaque* [[B]], %swift.type* %A)
+  // CHECK: call %swift.opaque* %assignWithCopy3(%swift.opaque* %3, %swift.opaque* [[C_X]], %swift.type* %B)
+  // CHECK: call %T15generic_structs7CharethV* @"$s15generic_structs7CharethVWOf"(%T15generic_structs7CharethV* [[D]], %T15generic_structs7CharethV* %4)
   %5 = struct_element_addr %0 : $*ComplexDynamic<A, B>, #ComplexDynamic.c
   %c = struct_element_addr %5 : $*SingleDynamic<B>, #SingleDynamic.x
-
-  // CHECK: [[METADATA:%.*]] = bitcast %swift.type* {{%.*}} to i32*
-  // CHECK: [[FIELD_OFFSET_VECTOR:%.*]] = getelementptr inbounds i32, i32* [[METADATA]], i64 8
-  // CHECK: [[FIELD_OFFSET_ADDR:%.*]] = getelementptr inbounds i32, i32* [[FIELD_OFFSET_VECTOR]], i32 4
-  // CHECK: [[FIELD_OFFSET:%.*]] = load i32, i32* [[FIELD_OFFSET_ADDR]], align 8
-  // CHECK: [[BYTES:%.*]] = bitcast %T15generic_structs14ComplexDynamicV* %0 to i8*
-  // CHECK: [[BYTE_OFFSET:%.*]] = getelementptr inbounds i8, i8* [[BYTES]], i32 [[FIELD_OFFSET]]
-  // CHECK: bitcast i8* [[BYTE_OFFSET]] to %T15generic_structs7CharethV
   %d = struct_element_addr %0 : $*ComplexDynamic<A, B>, #ComplexDynamic.d
   copy_addr %a to %1 : $*Byteful
   copy_addr %b to %2 : $*A

test/IRGen/generic_structs.swift

@@ -39,12 +39,19 @@ public struct GenericStruct<T : Proto> {
 }
 
 // CHECK-LABEL: define{{.*}} swiftcc void @"$s15generic_structs13GenericStructVACyxGycfC"
-// CHECK:  [[T0:%.*]] = call swiftcc %swift.metadata_response @"$s15generic_structs13GenericStructVMa"([[INT]] 0, %swift.type* %T, i8** %T.Proto)
-// CHECK:  [[TYPE:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
-// CHECK:  [[PTR:%.*]] = bitcast %swift.type* [[TYPE]] to [[INT_32]]*
-// CHECK:  [[FIELDOFFSETS:%.*]] = getelementptr inbounds [[INT_32]], [[INT_32]]* [[PTR]], [[INT]] [[IDX:4|8]]
-// CHECK:  [[FIELDOFFSET:%.*]] = getelementptr inbounds [[INT_32]], [[INT_32]]* [[FIELDOFFSETS]], i32 2
-// CHECK:  [[OFFSET:%.*]] = load [[INT_32]], [[INT_32]]* [[FIELDOFFSET]]
-// CHECK:  [[ADDROFOPT:%.*]] = getelementptr inbounds i8, i8* {{.*}}, [[INT_32]] [[OFFSET]]
-// CHECK:  [[OPTPTR:%.*]] = bitcast i8* [[ADDROFOPT]] to %TSq*
-// CHECK:  call %TSq* @"$sxSg15generic_structs5ProtoRzlWOb"(%TSq* {{.*}}, %TSq* [[OPTPTR]]
+// CHECK: [[VTABLE:%.*]] = bitcast i8** %.valueWitnesses to %swift.vwtable*
+// CHECK-NEXT: [[SIZE_PTR:%.*]] = getelementptr inbounds %swift.vwtable, %swift.vwtable* [[VTABLE]]
+// CHECK-NEXT: [[SIZE:%.*]] = load i64, i64* [[SIZE_PTR]]
+// CHECK-NEXT: [[EMPTY_PTR:%.*]] = alloca i8, i64 [[SIZE]]
+// CHECK-NEXT: call void @llvm.lifetime.start.p0i8({{.*}} [[EMPTY_PTR]])
+// CHECK-NEXT: [[EMPTY:%.*]] = bitcast i8* [[EMPTY_PTR]]  to %TSq*
+
+// CHECK: [[SELF_PTR:%.*]] = bitcast i8* %self to %T15generic_structs13GenericStructV*
+
+// CHECK: [[SELF_RAW_PTR:%.*]] = bitcast %T15generic_structs13GenericStructV* [[SELF_PTR]] to i8*
+// CHECK-NEXT: [[OPT_PTR:%.*]] = getelementptr inbounds i8, i8* [[SELF_RAW_PTR]]
+// CHECK-NEXT: [[OPTIONAL:%.*]] = bitcast i8* [[OPT_PTR]] to %TSq*
+// CHECK-NEXT: [[METADATA:%.*]] = call swiftcc %swift.metadata_response @"$sSqMa"(i64 0, %swift.type* %T)
+// CHECK-NEXT: [[META_VAL:%.*]] = extractvalue %swift.metadata_response [[METADATA]], 0
+// CHECK: %26 = call %TSq* @"$sxSg15generic_structs5ProtoRzlWOb"(%TSq* [[EMPTY]], %TSq* [[OPTIONAL]]
+// CHECK: %27 = call %T15generic_structs13GenericStructV* @"$s15generic_structs13GenericStructVyxGAA5ProtoRzlWOb"(%T15generic_structs13GenericStructV* [[SELF_PTR]], %T15generic_structs13GenericStructV* %0

test/IRGen/struct_resilience.swift

@@ -60,21 +60,14 @@ public func functionWithResilientTypesSize(_ s: __owned Size, f: (__owned Size)
 // Make sure we use a type metadata accessor function, and load indirect
 // field offsets from it.
 
-// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @"$s17struct_resilience35functionWithResilientTypesRectangleyy010resilient_A00G0VF"(%T16resilient_struct9RectangleV* noalias nocapture)
+// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @"$s17struct_resilience35functionWithResilientTypesRectangleyy010resilient_A00G0VF"
 public func functionWithResilientTypesRectangle(_ r: Rectangle) {
-// CHECK: entry:
-// CHECK-NEXT: [[TMP:%.*]] = call swiftcc %swift.metadata_response @"$s16resilient_struct9RectangleVMa"([[INT]] 0)
-// CHECK-NEXT: [[METADATA:%.*]] = extractvalue %swift.metadata_response [[TMP]], 0
-// CHECK-NEXT: [[METADATA_ADDR:%.*]] = bitcast %swift.type* [[METADATA]] to i32*
-// CHECK-NEXT: [[FIELD_OFFSET_VECTOR:%.*]] = getelementptr inbounds i32, i32* [[METADATA_ADDR]], [[INT]] [[IDX:2|4]]
-// CHECK-NEXT: [[FIELD_OFFSET_PTR:%.*]] = getelementptr inbounds i32, i32* [[FIELD_OFFSET_VECTOR]], i32 2
-// CHECK-NEXT: [[FIELD_OFFSET:%.*]] = load i32, i32* [[FIELD_OFFSET_PTR]]
-// CHECK-NEXT: [[STRUCT_ADDR:%.*]] = bitcast %T16resilient_struct9RectangleV* %0 to i8*
-// CHECK-NEXT: [[FIELD_ADDR:%.*]] = getelementptr inbounds i8, i8* [[STRUCT_ADDR]], i32 [[FIELD_OFFSET]]
-// CHECK-NEXT: [[FIELD_PTR:%.*]] = bitcast i8* [[FIELD_ADDR]] to %TSi*
-// CHECK-NEXT: [[FIELD_PAYLOAD_PTR:%.*]] = getelementptr inbounds %TSi, %TSi* [[FIELD_PTR]], i32 0, i32 0
-// CHECK-NEXT: [[FIELD_PAYLOAD:%.*]] = load [[INT]], [[INT]]* [[FIELD_PAYLOAD_PTR]]
-
+  // CHECK: entry:
+  // CHECK-NEXT: [[PTR:%.*]] = bitcast %T16resilient_struct9RectangleV* %0
+  // CHECK-NEXT: [[E:%.*]] = getelementptr inbounds {{.*}} [[PTR]]
+  // CHECK-NEXT: [[COLOR_PTR:%.*]] = bitcast {{.*}} [[E]]
+  // CHECK-NEXT: [[COLOR_VAL:%.*]] = getelementptr inbounds %TSi, %TSi* [[COLOR_PTR]]
+  // CHECK-NEXT: [[COLOR:%.*]] = load {{.*}} [[COLOR_VAL]]
   _ = r.color
 
 // CHECK-NEXT: ret void
@@ -145,18 +138,13 @@ public struct StructWithResilientStorage {
 // metadata when accessing stored properties.
 
 // CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc {{i32|i64}} @"$s17struct_resilience26StructWithResilientStorageV1nSivg"(%T17struct_resilience26StructWithResilientStorageV* {{.*}})
-// CHECK:      [[TMP:%.*]] = call swiftcc %swift.metadata_response @"$s17struct_resilience26StructWithResilientStorageVMa"([[INT]] 0)
-// CHECK:      [[METADATA:%.*]] = extractvalue %swift.metadata_response [[TMP]], 0
-// CHECK-NEXT: [[METADATA_ADDR:%.*]] = bitcast %swift.type* [[METADATA]] to i32*
-// CHECK-NEXT: [[FIELD_OFFSET_VECTOR:%.*]] = getelementptr inbounds i32, i32* [[METADATA_ADDR]], [[INT]] [[IDX:2|4]]
-// CHECK-NEXT: [[FIELD_OFFSET_PTR:%.*]] = getelementptr inbounds i32, i32* [[FIELD_OFFSET_VECTOR]], i32 2
-// CHECK-NEXT: [[FIELD_OFFSET:%.*]] = load i32, i32* [[FIELD_OFFSET_PTR]]
-// CHECK-NEXT: [[STRUCT_ADDR:%.*]] = bitcast %T17struct_resilience26StructWithResilientStorageV* %0 to i8*
-// CHECK-NEXT: [[FIELD_ADDR:%.*]] = getelementptr inbounds i8, i8* [[STRUCT_ADDR]], i32 [[FIELD_OFFSET]]
-// CHECK-NEXT: [[FIELD_PTR:%.*]] = bitcast i8* [[FIELD_ADDR]] to %TSi*
-// CHECK-NEXT: [[FIELD_PAYLOAD_PTR:%.*]] = getelementptr inbounds %TSi, %TSi* [[FIELD_PTR]], i32 0, i32 0
-// CHECK-NEXT: [[FIELD_PAYLOAD:%.*]] = load [[INT]], [[INT]]* [[FIELD_PAYLOAD_PTR]]
-// CHECK-NEXT: ret [[INT]] [[FIELD_PAYLOAD]]
+// CHECK: entry:
+// CHECK-NEXT: [[PTR:%.*]] = bitcast %T17struct_resilience26StructWithResilientStorageV* %0
+// CHECK-NEXT: [[E:%.*]] = getelementptr inbounds {{.*}} [[PTR]]
+// CHECK-NEXT: [[N:%.*]] = bitcast {{.*}} [[E]]
+// CHECK-NEXT: [[N_VAL_PTR:%.*]] = getelementptr inbounds %TSi, %TSi* [[N]]
+// CHECK-NEXT: [[N_VAL:%.*]] = load [[INT]], [[INT]]* [[N_VAL_PTR]]
+// CHECK-NEXT: ret [[INT]] [[N_VAL]]
 
 
 // Indirect enums with resilient payloads are still fixed-size.