[interop][SwiftToCxx] Attach SWIFT_SYMBOL to C++ enum case declarations

Author: hyp

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -731,6 +731,8 @@ class DeclAndTypePrinter::Implementation
       }
       os << "  } ";
       syntaxPrinter.printIdentifier(caseName);
+      if (elementDecl)
+        syntaxPrinter.printSymbolUSRAttribute(elementDecl);
       os << ";\n";
     };
 
@@ -742,6 +744,7 @@ class DeclAndTypePrinter::Implementation
           [&](const auto &pair) {
             os << "\n    ";
             syntaxPrinter.printIdentifier(pair.first->getNameStr());
+            syntaxPrinter.printSymbolUSRAttribute(pair.first);
           },
           ",");
       // TODO: allow custom name for this special case

test/Interop/SwiftToCxx/enums/resilient-enum-in-cxx.swift

@@ -66,8 +66,8 @@ public enum Empty {
 // CHECK-NEXT:    class SWIFT_SYMBOL("s:5Enums3FooO") Foo final {
 // CHECK-NEXT:    public:
 // CHECK:         enum class cases {
-// CHECK-NEXT:      a,
-// NEW_CASE-NEXT:   b,
+// CHECK-NEXT:      a SWIFT_SYMBOL("s:5Enums3FooO1ayACSdcACmF"),
+// NEW_CASE-NEXT:   b SWIFT_SYMBOL("s:5Enums3FooO1byACSicACmF"),
 // CHECK-NEXT:      unknownDefault
 // CHECK-NEXT:    }
 // CHECK:         inline const static struct _impl_unknownDefault {  // impl struct for case unknownDefault

test/Interop/SwiftToCxx/enums/swift-enum-implementation.swift

@@ -36,12 +36,12 @@ public struct S {
 
 // CHECK:      class SWIFT_SYMBOL("s:5Enums1EO") E final {
 // CHECK:        enum class cases {
-// CHECK-NEXT:     x,
-// CHECK-NEXT:     y,
-// CHECK-NEXT:     z,
-// CHECK-NEXT:     w,
-// CHECK-NEXT:     auto_,
-// CHECK-NEXT:     foobar
+// CHECK-NEXT:     x SWIFT_SYMBOL("s:5Enums1EO1xyACSdcACmF"),
+// CHECK-NEXT:     y SWIFT_SYMBOL("s:5Enums1EO1yyACSVSgcACmF"),
+// CHECK-NEXT:     z SWIFT_SYMBOL("s:5Enums1EO1zyAcA1SVcACmF"),
+// CHECK-NEXT:     w SWIFT_SYMBOL("s:5Enums1EO1wyACSi_tcACmF"),
+// CHECK-NEXT:     auto_ SWIFT_SYMBOL("s:5Enums1EO4autoyACSvcACmF"),
+// CHECK-NEXT:     foobar SWIFT_SYMBOL("s:5Enums1EO6foobaryA2CmF")
 // CHECK-NEXT:   };
 // CHECK-EMPTY:
 // CHECK-NEXT: #pragma clang diagnostic push
@@ -51,7 +51,7 @@ public struct S {
 // CHECK-NEXT:       return cases::x;
 // CHECK-NEXT:     }
 // CHECK-NEXT:     inline E operator()(double val) const;
-// CHECK-NEXT:   } x;
+// CHECK-NEXT:   } x SWIFT_SYMBOL("s:5Enums1EO1xyACSdcACmF");
 // CHECK-NEXT:   inline bool isX() const;
 // CHECK-NEXT:   inline double getX() const;
 // CHECK-EMPTY:
@@ -60,7 +60,7 @@ public struct S {
 // CHECK-NEXT:       return cases::y;
 // CHECK-NEXT:     }
 // CHECK-NEXT:     inline E operator()(void const * _Nullable val) const;
-// CHECK-NEXT:   } y;
+// CHECK-NEXT:   } y SWIFT_SYMBOL("s:5Enums1EO1yyACSVSgcACmF");
 // CHECK-NEXT:   inline bool isY() const;
 // CHECK-NEXT:   inline void const * _Nullable getY() const;
 // CHECK-EMPTY:
@@ -69,7 +69,7 @@ public struct S {
 // CHECK-NEXT:       return cases::z;
 // CHECK-NEXT:     }
 // CHECK-NEXT:     inline E operator()(const S& val) const;
-// CHECK-NEXT:   } z;
+// CHECK-NEXT:   } z SWIFT_SYMBOL("s:5Enums1EO1zyAcA1SVcACmF");
 // CHECK-NEXT:   inline bool isZ() const;
 // CHECK-NEXT:   inline S getZ() const;
 // CHECK-EMPTY:
@@ -78,7 +78,7 @@ public struct S {
 // CHECK-NEXT:       return cases::w;
 // CHECK-NEXT:     }
 // CHECK-NEXT:     inline E operator()(swift::Int val) const;
-// CHECK-NEXT:   } w;
+// CHECK-NEXT:   } w SWIFT_SYMBOL("s:5Enums1EO1wyACSi_tcACmF");
 // CHECK-NEXT:   inline bool isW() const;
 // CHECK-NEXT:   inline swift::Int getW() const;
 // CHECK-EMPTY:
@@ -87,7 +87,7 @@ public struct S {
 // CHECK-NEXT:       return cases::auto_;
 // CHECK-NEXT:     }
 // CHECK-NEXT:     inline E operator()(void * _Nonnull val) const;
-// CHECK-NEXT:   } auto_;
+// CHECK-NEXT:   } auto_ SWIFT_SYMBOL("s:5Enums1EO4autoyACSvcACmF");
 // CHECK-NEXT:   inline bool isAuto_() const;
 // CHECK-NEXT:   inline void * _Nonnull getAuto_() const;
 // CHECK-EMPTY:
@@ -96,7 +96,7 @@ public struct S {
 // CHECK-NEXT:       return cases::foobar;
 // CHECK-NEXT:     }
 // CHECK-NEXT:     inline E operator()() const;
-// CHECK-NEXT:   } foobar;
+// CHECK-NEXT:   } foobar SWIFT_SYMBOL("s:5Enums1EO6foobaryA2CmF");
 // CHECK-NEXT:   inline bool isFoobar() const;
 // CHECK-EMPTY:
 // CHECK-NEXT: #pragma clang diagnostic pop

test/Interop/SwiftToCxx/generics/generic-enum-in-cxx.swift

@@ -124,14 +124,14 @@ public func inoutConcreteOpt(_ x: inout GenericOpt<UInt16>) {
 // CHECK-NEXT: }
 
 // CHECK: enum class cases {
-// CHECK-NEXT:  some,
-// CHECK-NEXT:  none
+// CHECK-NEXT:  some SWIFT_SYMBOL("s:8Generics10GenericOptO4someyACyxGxcAEmlF"),
+// CHECK-NEXT:  none SWIFT_SYMBOL("s:8Generics10GenericOptO4noneyACyxGAEmlF")
 // CHECK-NEXT: };
 
 // CHECK: inline GenericOpt<T_0_0> operator()(const T_0_0& val) const;
-// CHECK-NEXT: } some;
+// CHECK-NEXT: } some SWIFT_SYMBOL("s:8Generics10GenericOptO4someyACyxGxcAEmlF");
 // CHECK: inline GenericOpt<T_0_0> operator()() const;
-// CHECK-NEXT: } none;
+// CHECK-NEXT: } none SWIFT_SYMBOL("s:8Generics10GenericOptO4noneyACyxGAEmlF");
 
 // CHECK: inline operator cases() const {
 // CHECK-NEXT:   switch (_getEnumTag()) {

test/Interop/SwiftToCxx/stdlib/swift-stdlib-in-cxx.swift

@@ -60,7 +60,7 @@
 // CHECK-NEXT: inline Optional(const Optional &other) {
 // CHECK: }
 // CHECK:   enum class cases {
-// CHECK-NEXT: some,
+// CHECK-NEXT: some SWIFT_SYMBOL({{.*}}),
 // CHECK-NEXT: none
 // CHECK-NEXT: };
 // CHECK: inline bool isSome() const;