IRGen: Move generic class dependent data to appear before the address point

Author: slavapestov

lib/IRGen/GenMeta.cpp

@@ -2916,6 +2916,8 @@ namespace {
       auto privateDataField =
         B.addPlaceholderWithSize(privateDataInit->getType());
 
+      asImpl().addDependentData();
+
       // Lay out the template data.
       super::layout();
 
@@ -2929,8 +2931,6 @@ namespace {
         asImpl().addDependentValueWitnessTablePattern();
       }
 
-      asImpl().addDependentData();
-
       // Fill in the header:
 
       //   Metadata *(*CreateFunction)(GenericMetadata *, const void*);

test/IRGen/generic_classes.sil

@@ -341,20 +341,20 @@ entry(%c : $RootGeneric<Int32>):
 // CHECK-objc:   [[METADATA_ARRAY:%.*]] = bitcast %swift.type* [[METADATA]] to i8**
 // CHECK-objc:   [[T0:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 0
 // CHECK-objc:   [[T1:%.*]] = bitcast i8** [[T0]] to %objc_class**
-// CHECK-objc:   [[T0:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 25
+// CHECK-objc:   [[T0:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 -25
 // CHECK-objc:   [[METACLASS:%.*]] = bitcast i8** [[T0]] to %objc_class*
 // CHECK-objc:   store %objc_class* [[METACLASS]], %objc_class** [[T1]], align 8
 //   Set up the instance rodata pointer.
 // CHECK-objc:   [[T0:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 4
 // CHECK-objc:   [[T1:%.*]] = bitcast i8** [[T0]] to i64*
-// CHECK-objc:   [[RODATA:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 30
+// CHECK-objc:   [[RODATA:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 -20
 // CHECK-objc:   [[T2:%.*]] = ptrtoint i8** [[RODATA]] to i64
 // CHECK-objc:   [[T3:%.*]] = or i64 [[T2]], 1
 // CHECK-objc:   store i64 [[T3]], i64* [[T1]], align 8
 //   Set up the class rodata pointer.
-// CHECK-objc:   [[T0:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 29
+// CHECK-objc:   [[T0:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 -21
 // CHECK-objc:   [[T1:%.*]] = bitcast i8** [[T0]] to i64*
-// CHECK-objc:   [[META_RODATA:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 39
+// CHECK-objc:   [[META_RODATA:%.*]] = getelementptr inbounds i8*, i8** [[METADATA_ARRAY]], i32 -11
 // CHECK-objc:   [[T2:%.*]] = ptrtoint i8** [[META_RODATA]] to i64
 // CHECK-objc:   store i64 [[T2]], i64* [[T1]], align 8
 //   Initialize our own dependent field offsets.

test/IRGen/generic_types.swift

@@ -13,7 +13,7 @@
 // CHECK-native-SAME: i32 160,
 // CHECK-objc-SAME:   i32 344,
 // CHECK-SAME:   i16 1,
-// CHECK-SAME:   i16 16,
+// CHECK-SAME:   i16 200,
 // CHECK-SAME:   [{{[0-9]+}} x i8*] zeroinitializer,
 // CHECK-SAME:   void ([[A]]*)* @_T013generic_types1ACfD,
 // CHECK-SAME:   i8** @_T0BoWV,
@@ -39,7 +39,7 @@
 // CHECK-native-SAME: i32 152,
 // CHECK-objc-SAME:   i32 336,
 // CHECK-SAME:   i16 1,
-// CHECK-SAME:   i16 16,
+// CHECK-SAME:   i16 200,
 // CHECK-SAME:   [{{[0-9]+}} x i8*] zeroinitializer,
 // CHECK-SAME:   void ([[B]]*)* @_T013generic_types1BCfD,
 // CHECK-SAME:   i8** @_T0BoWV,