Merge pull request #64391 from hyp/eng/no-aeic-var

[interop][SwiftToCxx] do not expose @alwaysEmitIntoClient properties to C++

Author: hyp

lib/AST/SwiftNameTranslation.cpp

@@ -205,17 +205,17 @@ swift::cxx_translation::getDeclRepresentation(const ValueDecl *VD) {
   if (getActorIsolation(const_cast<ValueDecl *>(VD)).isActorIsolated())
     return {Unsupported, UnrepresentableIsolatedInActor};
   Optional<CanGenericSignature> genericSignature;
+  // Don't expose @_alwaysEmitIntoClient decls as they require their
+  // bodies to be emitted into client.
+  if (VD->getAttrs().hasAttribute<AlwaysEmitIntoClientAttr>())
+    return {Unsupported, UnrepresentableRequiresClientEmission};
   if (auto *AFD = dyn_cast<AbstractFunctionDecl>(VD)) {
     if (AFD->hasAsync())
       return {Unsupported, UnrepresentableAsync};
     if (AFD->hasThrows() &&
         !AFD->getASTContext().LangOpts.hasFeature(
             Feature::GenerateBindingsForThrowingFunctionsInCXX))
       return {Unsupported, UnrepresentableThrows};
-    // Don't expose @_alwaysEmitIntoClient functions as they require their
-    // bodies to be emitted into client.
-    if (AFD->getAttrs().hasAttribute<AlwaysEmitIntoClientAttr>())
-      return {Unsupported, UnrepresentableRequiresClientEmission};
     if (AFD->isGeneric())
       genericSignature = AFD->getGenericSignature().getCanonicalSignature();
   }

test/Interop/SwiftToCxx/stdlib/string/string-in-cxx-execution.cpp

@@ -3,11 +3,18 @@
 
 // RUN: %target-swift-frontend -typecheck %t/print-string.swift -typecheck -module-name Stringer -enable-experimental-cxx-interop -emit-clang-header-path %t/Stringer.h
 
-// RUN: %target-interop-build-clangxx -std=gnu++20 -c %t/string-conversions.cpp -I %t -o %t/swift-stdlib-execution.o
+// RUN: %target-interop-build-clangxx -std=gnu++20 -c %t/string-conversions.cpp -I %t -o %t/swift-stdlib-execution.o -DDEBUG=1
 // RUN: %target-build-swift %t/print-string.swift -o %t/swift-stdlib-execution -Xlinker %t/swift-stdlib-execution.o -module-name Stringer -Xfrontend -entry-point-function-name -Xfrontend swiftMain %target-cxx-lib
 // RUN: %target-codesign %t/swift-stdlib-execution
 // RUN: %target-run %t/swift-stdlib-execution | %FileCheck %s
 
+// Ensure that this works in optimized mode:
+
+// RUN: %target-interop-build-clangxx -std=gnu++20 -c %t/string-conversions.cpp -I %t -o %t/swift-stdlib-execution-opt.o -O
+// RUN: %target-build-swift %t/print-string.swift -o %t/swift-stdlib-execution-opt -Xlinker %t/swift-stdlib-execution-opt.o -module-name Stringer -Xfrontend -entry-point-function-name -Xfrontend swiftMain %target-cxx-lib -O
+// RUN: %target-codesign %t/swift-stdlib-execution-opt
+// RUN: %target-run %t/swift-stdlib-execution-opt | %FileCheck %s
+
 // REQUIRES: executable_test
 
 //--- print-string.swift

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

@@ -77,7 +77,6 @@
 // CHECK:  SWIFT_INLINE_THUNK void append(const String& other)
 // CHECK:  SWIFT_INLINE_THUNK UTF8View getUtf8() const SWIFT_SYMBOL({{.*}});
 // CHECK-NEXT:  SWIFT_INLINE_THUNK void setUtf8(const UTF8View& newValue) SWIFT_SYMBOL({{.*}});
-// CHECK:  SWIFT_INLINE_THUNK bool isContiguousUTF8() const SWIFT_SYMBOL({{.*}});
 // CHECK:  #if defined(__OBJC__)
 // CHECK-NEXT:  SWIFT_INLINE_THUNK operator NSString * _Nonnull () const noexcept {
 // CHECK-NEXT:    return (__bridge_transfer NSString *)(_impl::$sSS10FoundationE19_bridgeToObjectiveCSo8NSStringCyF(_impl::swift_interop_passDirect_Swift_String(_getOpaquePointer())));

test/Interop/SwiftToCxx/unsupported/unsupported-funcs-in-cxx.swift

@@ -8,6 +8,7 @@
 // CHECK-NOT: unsupported
 // CHECK: HasMethods
 // CHECK: supported
+// CHECK-NOT: unsupported
 
 public func supported() {}
 
@@ -36,4 +37,10 @@ public struct HasMethods {
             return 42
         }
     }
+
+    @_expose(Cxx) // expected-error {{property 'unsupportedAEICProp' can not be exposed to C++ as it requires code to be emitted into client}}
+    @_alwaysEmitIntoClient
+    public var unsupportedAEICProp: Bool {
+        return false
+    }
 }