Merge pull request swiftlang#68530 from kubamracek/embedded-no-objc

[embedded] Disable Objective-C interop in embedded Swift

Author: kubamracek

include/swift/AST/DiagnosticsFrontend.def

@@ -558,6 +558,8 @@ ERROR(evolution_with_embedded,none,
       "Library evolution cannot be enabled with embedded Swift.", ())
 ERROR(wmo_with_embedded,none,
       "Whole module optimization (wmo) must be enabled with embedded Swift.", ())
+ERROR(objc_with_embedded,none,
+      "Objective-C interoperability cannot be enabled with embedded Swift.", ())
 
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

lib/Frontend/CompilerInvocation.cpp

@@ -1097,7 +1097,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
 
   Opts.EnableObjCInterop =
       Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop,
-                   Target.isOSDarwin());
+                   Target.isOSDarwin() && !Opts.hasFeature(Feature::Embedded));
 
   Opts.CForeignReferenceTypes =
       Args.hasArg(OPT_experimental_c_foreign_reference_types);
@@ -1325,7 +1325,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.UnavailableDeclOptimizationMode = UnavailableDeclOptimization::Complete;
     Opts.DisableImplicitStringProcessingModuleImport = true;
     Opts.DisableImplicitConcurrencyModuleImport = true;
-    Opts.EnableObjCInterop = false;
 
     if (FrontendOpts.EnableLibraryEvolution) {
       Diags.diagnose(SourceLoc(), diag::evolution_with_embedded);
@@ -1336,6 +1335,11 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
       Diags.diagnose(SourceLoc(), diag::wmo_with_embedded);
       HadError = true;
     }
+
+    if (Opts.EnableObjCInterop) {
+      Diags.diagnose(SourceLoc(), diag::objc_with_embedded);
+      HadError = true;
+    }
   }
 
   if (auto A = Args.getLastArg(OPT_checked_async_objc_bridging)) {

test/embedded/objc-with-embedded-diag.swift

@@ -0,0 +1,7 @@
+// RUN: %target-swift-frontend -parse-stdlib -target arm64-apple-macos11 -emit-ir %s -enable-experimental-feature Embedded
+// RUN: %target-swift-frontend -parse-stdlib -target arm64-apple-none -emit-ir %s -enable-experimental-feature Embedded
+// RUN: %target-swift-frontend -parse-stdlib -target arm64-apple-none-macho -emit-ir %s -enable-experimental-feature Embedded
+// RUN: not %target-swift-frontend -parse-stdlib -target arm64-apple-macos11 -emit-ir %s -enable-objc-interop -enable-experimental-feature Embedded 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -parse-stdlib -target arm64-apple-macos11 -emit-ir %s -disable-objc-interop -enable-experimental-feature Embedded
+
+// CHECK: error: Objective-C interoperability cannot be enabled with embedded Swift.

test/embedded/wmo-with-embedded-diag.swift

@@ -1,7 +1,7 @@
 // RUN: %target-swift-frontend -typecheck -parse-stdlib %s -enable-experimental-feature Embedded
 // RUN: not %target-swift-frontend -typecheck -parse-stdlib %s -primary-file %s -enable-experimental-feature Embedded 2>&1 | %FileCheck %s
 
-// RUN: %target-swiftc_driver -typecheck -parse-stdlib %s -enable-experimental-feature Embedded -wmo
-// RUN: not %target-swiftc_driver -typecheck -parse-stdlib %s -enable-experimental-feature Embedded 2>&1 | %FileCheck %s
+// RUN: %target-swiftc_driver -typecheck -parse-stdlib %s -Xfrontend -disable-objc-interop -enable-experimental-feature Embedded -wmo
+// RUN: not %target-swiftc_driver -typecheck -parse-stdlib %s -Xfrontend -disable-objc-interop -enable-experimental-feature Embedded 2>&1 | %FileCheck %s
 
 // CHECK: error: Whole module optimization (wmo) must be enabled with embedded Swift.