Merge pull request #78786 from swiftlang/egorzhdan/6.1-enum-resilience

🍒[cxx-interop] Assume that plain-C enums are resilient

Author: egorzhdan

lib/Sema/TypeCheckAccess.cpp

@@ -1887,6 +1887,8 @@ bool isFragileClangDecl(const clang::Decl *decl) {
     return isFragileClangType(pd->getType());
   if (auto *typedefDecl = dyn_cast<clang::TypedefNameDecl>(decl))
     return isFragileClangType(typedefDecl->getUnderlyingType());
+  if (auto *enumDecl = dyn_cast<clang::EnumDecl>(decl))
+    return enumDecl->isScoped();
   if (auto *rd = dyn_cast<clang::RecordDecl>(decl)) {
     auto cxxRecordDecl = dyn_cast<clang::CXXRecordDecl>(rd);
     if (!cxxRecordDecl)

test/Interop/Cxx/library-evolution/Inputs/my_c_header.h

@@ -1,3 +1,11 @@
 struct MyCStruct {
   int x;
 };
+
+enum MyCEnum {
+  MCE_One, MCE_Two
+};
+
+enum MyCFixedEnum : unsigned {
+  MCFE_One, MCFE_Two
+};

test/Interop/Cxx/library-evolution/allow-c-in-cxx-mode-in-evolving-libraries.swift

@@ -17,6 +17,14 @@ public:
     void method() const;
 };
 
+enum CEnum {
+    a, b
+};
+
+enum class CxxEnum {
+    aa, bb
+};
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -36,6 +44,12 @@ import CxxModule
 public func useCStruct(_ x: CStruct) {
 }
 
+public func useCEnum(_ x: CEnum) {
+}
+
+public func useCxxEnum(_ x: CxxEnum) { // expected-error {{cannot use enum 'CxxEnum' here; C++ types from imported module 'CxxModule' do not support library evolution}}
+}
+
 // expected-error@+1 {{cannot use struct 'CxxStruct' here; C++ types from imported module 'CxxModule' do not support library evolution}}
 public func usesCxxStruct(_ x: CxxStruct) {
 }

test/Interop/Cxx/library-evolution/allow-c-in-cxx-mode-in-interfaces.swift

@@ -32,10 +32,20 @@ extension MyCStruct {
   }
 }
 
+public func getMyCEnum() -> MyCEnum {
+  return MCE_One
+}
+
+public func getMyCFixedEnum() -> MyCFixedEnum {
+  return MCFE_One
+}
+
 //--- main.swift
 
 import UsesCLibrary
 
 let _ = getMyCStruct()
 let _ = getMyCStruct().y
 let _ = getMyCStruct().anotherInstanceOfSelf
+let _ = getMyCEnum()
+let _ = getMyCFixedEnum()