A separate "indirect case" counter didn't properly distinguish generic indirect vs. non-generic indirect.

Counting indirect cases as regular non-empty cases is a better fit.

Author: tbkka

stdlib/public/RemoteInspection/TypeLowering.cpp

@@ -1960,7 +1960,6 @@ class EnumTypeInfoBuilder {
     unsigned NonPayloadCases = 0; // `case a`
     unsigned NonGenericEmptyPayloadCases = 0; // `case a(Void)` or `case b(Never)`
     unsigned NonGenericNonEmptyPayloadCases = 0; // `case a(Int)` or `case d([Int?])`
-    unsigned IndirectPayloadCases = 0; // `indirect case a(T)` or `indirect case a(Int)`
     unsigned GenericPayloadCases = 0; // `case a(T)` or `case a([String : (Int, T)])`
 
     // For a single-payload enum, this is the only payload
@@ -1985,14 +1984,21 @@ class EnumTypeInfoBuilder {
           // We don't have typeinfo; something is very broken.
           Invalid = true;
           return nullptr;
-        } else if (Case.Indirect) {
-          ++IndirectPayloadCases;
+	} else if (Case.Indirect) {
+	  // An indirect case is non-empty (it stores a pointer)
+	  // and acts like a non-generic (because the pointer has spare bits)
+	  ++NonGenericNonEmptyPayloadCases;
+          LastPayloadCaseTR = CaseTR;
         } else if (Case.Generic) {
+	  // Otherwise, we never consider spare bits from generic cases
           ++GenericPayloadCases;
           LastPayloadCaseTR = CaseTR;
         } else if (CaseTI->getSize() == 0) {
+	  // Needed to distinguish a "single-payload enum"
+	  // whose only case is empty.
           ++NonGenericEmptyPayloadCases;
         } else {
+	  // Finally, we consider spare bits from regular payloads
           ++NonGenericNonEmptyPayloadCases;
           LastPayloadCaseTR = CaseTR;
         }
@@ -2003,7 +2009,7 @@ class EnumTypeInfoBuilder {
     // same as cases with no payload, and generic cases are always considered
     // non-empty.
     unsigned EffectiveNoPayloadCases = NonPayloadCases + NonGenericEmptyPayloadCases;
-    unsigned EffectivePayloadCases = IndirectPayloadCases + GenericPayloadCases + NonGenericNonEmptyPayloadCases;
+    unsigned EffectivePayloadCases = GenericPayloadCases + NonGenericNonEmptyPayloadCases;
 
     if (Cases.empty()) {
       return TC.makeTypeInfo<EmptyEnumTypeInfo>(Cases);
@@ -2015,7 +2021,7 @@ class EnumTypeInfoBuilder {
     // with zero-sized payloads get treated for layout purposes as non-payload
     // cases.
     EnumKind Kind;
-    switch (IndirectPayloadCases + GenericPayloadCases + NonGenericEmptyPayloadCases + NonGenericNonEmptyPayloadCases) {
+    switch (GenericPayloadCases + NonGenericEmptyPayloadCases + NonGenericNonEmptyPayloadCases) {
     case 0: Kind = EnumKind::NoPayloadEnum; break;
     case 1: Kind = EnumKind::SinglePayloadEnum; break;
     default: Kind = EnumKind::MultiPayloadEnum; break;