[IRGen] Fix some is-stable-ABI marker bits. (#14004)

* Don't emit "stable ABI masquerading as legacy ABI" bit state yet.
* Don't unconditionally emit bit value 1 in generic class templates.

rdar://36612173

Author: Greg Parker

lib/IRGen/GenMeta.cpp

@@ -3422,6 +3422,12 @@ namespace {
     void addClassFlags() {
       auto flags = ClassFlags();
 
+#if !SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
+      // FIXME: Remove this after enabling stable ABI.
+      // This bit is NOT conditioned on UseDarwinPreStableABIBit.
+      flags |= ClassFlags::IsSwiftPreStableABI;
+#endif
+
       // Set a flag if the class uses Swift refcounting.
       auto type = Target->getDeclaredType()->getCanonicalType();
       if (getReferenceCountingForType(IGM, type)
@@ -3940,7 +3946,12 @@ namespace {
       // The rodata pointer will be instantiated here.
       // Make sure we at least set the 'is Swift class' bit, though.
       ClassRODataPtrOffset = getNextOffsetFromTemplateHeader();
-      B.addInt(IGM.MetadataKindTy, 1);
+      if (!IGM.ObjCInterop) {
+        // FIXME: Remove null data altogether rdar://problem/18801263
+        B.addInt(IGM.MetadataKindTy, 1);
+      } else {
+        B.addInt(IGM.MetadataKindTy, IGM.UseDarwinPreStableABIBit ? 1 : 2);
+      }
     }
 
     void addDependentData() {

test/IRGen/generic_types.swift

@@ -24,7 +24,7 @@
 // CHECK-objc-SAME:   %swift.opaque* @_objc_empty_cache,
 // CHECK-SAME:   %swift.opaque* null,
 // CHECK-SAME:   i64 {{1|2}},
-// CHECK-SAME:   i32 2,
+// CHECK-SAME:   i32 {{3|2}},
 // CHECK-SAME:   i32 0,
 // CHECK-SAME:   i32 24,
 // CHECK-SAME:   i16 7,
@@ -53,7 +53,7 @@
 // CHECK-objc-SAME:   %swift.opaque* @_objc_empty_cache,
 // CHECK-SAME:   %swift.opaque* null,
 // CHECK-SAME:   i64 {{1|2}},
-// CHECK-SAME:   i32 2,
+// CHECK-SAME:   i32 {{3|2}},
 // CHECK-SAME:   i32 0,
 // CHECK-SAME:   i32 24,
 // CHECK-SAME:   i16 7,
@@ -75,7 +75,7 @@
 // CHECK-objc-SAME:   %swift.opaque* @_objc_empty_cache,
 // CHECK-SAME:   %swift.opaque* null,
 // CHECK-SAME:   i64 {{1|2}},
-// CHECK-SAME:   i32 2,
+// CHECK-SAME:   i32 {{3|2}},
 // CHECK-SAME:   i32 0,
 // CHECK-SAME:   i32 24,
 // CHECK-SAME:   i16 7,
@@ -97,7 +97,7 @@
 // CHECK-objc-SAME:   %swift.opaque* @_objc_empty_cache,
 // CHECK-SAME:   %swift.opaque* null,
 // CHECK-SAME:   i64 {{1|2}},
-// CHECK-SAME:   i32 2,
+// CHECK-SAME:   i32 {{3|2}},
 // CHECK-SAME:   i32 0,
 // CHECK-SAME:   i32 24,
 // CHECK-SAME:   i16 7,

test/IRGen/ivar_destroyer.sil

@@ -15,7 +15,7 @@
 // \ CHECK:   [[OPAQUE]]* @_objc_empty_cache,
 // \ CHECK:   [[OPAQUE]]* null,
 // \ CHECK:   i64 add (i64 ptrtoint ({{.*}}* @_DATA__TtC14ivar_destroyer17NonTrivialDerived to i64), i64 {{1|2}}),
-// \ CHECK:   i32 2,
+// \ CHECK:   i32 {{3|2}},
 // \ CHECK:   i32 0,
 // \ CHECK:   i32 24,
 // \ CHECK:   i16 7,

test/IRGen/objc_attr_NSManaged.sil

@@ -27,7 +27,7 @@ sil_vtable X {}
 // The getter/setter should not show up in the Swift metadata.
 /* FIXME: sil_vtable parser picks the wrong 'init' overload. Both vtable entries
    ought to be nonnull here. rdar://problem/19572342 */
-// CHECK: @"$S19objc_attr_NSManaged10SwiftGizmoCMf" = internal global <{ {{.*}} }> <{ void (%T19objc_attr_NSManaged10SwiftGizmoC*)* @"$S19objc_attr_NSManaged10SwiftGizmoCfD", i8** @"$SBOWV", i64 ptrtoint (%objc_class* @"OBJC_METACLASS_$__TtC19objc_attr_NSManaged10SwiftGizmo" to i64), %objc_class* @"OBJC_CLASS_$_Gizmo", %swift.opaque* @_objc_empty_cache, %swift.opaque* null, i64 add (i64 ptrtoint ({ i32, i32, i32, i32, i8*, i8*, { i32, i32, [2 x { i8*, i8*, i8* }] }*, i8*, i8*, i8*, { i32, i32, [1 x { i8*, i8* }] }* }* @_DATA__TtC19objc_attr_NSManaged10SwiftGizmo to i64), i64 {{1|2}}), i32 0, i32 0, i32 8, i16 7, i16 0, i32 112, i32 16, {{.*}}* @"$S19objc_attr_NSManaged10SwiftGizmoCMn", i8* null, %T19objc_attr_NSManaged10SwiftGizmoC* (i64, %T19objc_attr_NSManaged10SwiftGizmoC*)* @"$S19objc_attr_NSManaged10SwiftGizmoC7bellsOnACSi_tcfc", i8* bitcast (void ()* @swift_deletedMethodError to i8*) }>
+// CHECK: @"$S19objc_attr_NSManaged10SwiftGizmoCMf" = internal global <{ {{.*}} }> <{ void (%T19objc_attr_NSManaged10SwiftGizmoC*)* @"$S19objc_attr_NSManaged10SwiftGizmoCfD", i8** @"$SBOWV", i64 ptrtoint (%objc_class* @"OBJC_METACLASS_$__TtC19objc_attr_NSManaged10SwiftGizmo" to i64), %objc_class* @"OBJC_CLASS_$_Gizmo", %swift.opaque* @_objc_empty_cache, %swift.opaque* null, i64 add (i64 ptrtoint ({ i32, i32, i32, i32, i8*, i8*, { i32, i32, [2 x { i8*, i8*, i8* }] }*, i8*, i8*, i8*, { i32, i32, [1 x { i8*, i8* }] }* }* @_DATA__TtC19objc_attr_NSManaged10SwiftGizmo to i64), i64 {{1|2}}), i32 {{1|0}}, i32 0, i32 8, i16 7, i16 0, i32 112, i32 16, {{.*}}* @"$S19objc_attr_NSManaged10SwiftGizmoCMn", i8* null, %T19objc_attr_NSManaged10SwiftGizmoC* (i64, %T19objc_attr_NSManaged10SwiftGizmoC*)* @"$S19objc_attr_NSManaged10SwiftGizmoC7bellsOnACSi_tcfc", i8* bitcast (void ()* @swift_deletedMethodError to i8*) }>
 
 @objc class SwiftGizmo : Gizmo {
   @objc @NSManaged var x: X

test/IRGen/vtable.sil

@@ -27,7 +27,7 @@ sil @$S6vtable1CCfD : $@convention(method) (@owned C) -> ()
 // CHECK-objc: %swift.opaque* @_objc_empty_cache,
 // CHECK-objc: %swift.opaque* null,
 // CHECK-objc: i64 add (i64 ptrtoint ({ i32, i32, i32, i32, i8*, i8*, i8*, i8*, i8*, i8*, i8* }* @_DATA__TtC6vtable1C to i64), i64 {{1|2}}),
-// CHECK-objc: i32 2, i32 0, i32 16, i16 7, i16 0,
+// CHECK-objc: i32 {{3|2}}, i32 0, i32 16, i16 7, i16 0,
 // CHECK-objc: i32 112, i32 16,
 // CHECK-objc: @"$S6vtable1CCMn"
 // CHECK-objc: [[C]]* (%swift.type*)* @"$S6vtable1CCACycACmcfC",
@@ -42,7 +42,7 @@ sil @$S6vtable1CCfD : $@convention(method) (@owned C) -> ()
 // CHECK-native: %swift.opaque* null,
 // CHECK-native: %swift.opaque* null,
 // CHECK-native: i64 1,
-// CHECK-native: i32 2, i32 0, i32 16, i16 7, i16 0,
+// CHECK-native: i32 {{3|2}}, i32 0, i32 16, i16 7, i16 0,
 // CHECK-native: i32 112, i32 16,
 // CHECK-native: @"$S6vtable1CCMn"
 // CHECK-native: [[C]]* (%swift.type*)* @"$S6vtable1CCACycACmcfC",