Merge pull request #71962 from augusto2112/embedded-flag

[DebugInfo] Emit embedded swift into DW_AT_APPLE_flags

Author: augusto2112

include/swift/AST/IRGenOptions.h

@@ -602,7 +602,8 @@ class IRGenOptions {
   }
 
   std::string getDebugFlags(StringRef PrivateDiscriminator,
-                            bool EnableCXXInterop) const {
+                            bool EnableCXXInterop,
+                            bool EnableEmbeddedSwift) const {
     std::string Flags = DebugFlags;
     if (!PrivateDiscriminator.empty()) {
       if (!Flags.empty())
@@ -614,6 +615,12 @@ class IRGenOptions {
         Flags += " ";
       Flags += "-enable-experimental-cxx-interop";
     }
+    if (EnableEmbeddedSwift) {
+      if (!Flags.empty())
+        Flags += " ";
+      Flags += "-enable-embedded-swift";
+    }
+
     return Flags;
   }
 

lib/IRGen/IRGenDebugInfo.cpp

@@ -2380,9 +2380,12 @@ IRGenDebugInfoImpl::IRGenDebugInfoImpl(const IRGenOptions &Opts,
 
   bool EnableCXXInterop =
       IGM.getSILModule().getASTContext().LangOpts.EnableCXXInterop;
+  bool EnableEmbeddedSwift =
+      IGM.getSILModule().getASTContext().LangOpts.hasFeature(Feature::Embedded);
   TheCU = DBuilder.createCompileUnit(
       Lang, MainFile, Producer, Opts.shouldOptimize(),
-      Opts.getDebugFlags(PD, EnableCXXInterop), MajorRuntimeVersion, SplitName,
+      Opts.getDebugFlags(PD, EnableCXXInterop, EnableEmbeddedSwift),
+      MajorRuntimeVersion, SplitName,
       Opts.DebugInfoLevel > IRGenDebugInfoLevel::LineTables
           ? llvm::DICompileUnit::FullDebug
           : llvm::DICompileUnit::LineTablesOnly,

lib/IRGen/IRGenModule.cpp

@@ -122,14 +122,16 @@ static clang::CodeGenerator *createClangCodeGenerator(ASTContext &Context,
     CGO.DebugCompilationDir = Opts.DebugCompilationDir;
     CGO.DwarfVersion = Opts.DWARFVersion;
     CGO.DwarfDebugFlags =
-        Opts.getDebugFlags(PD, Context.LangOpts.EnableCXXInterop);
+        Opts.getDebugFlags(PD, Context.LangOpts.EnableCXXInterop,
+                           Context.LangOpts.hasFeature(Feature::Embedded));
     break;
   case IRGenDebugInfoFormat::CodeView:
     CGO.EmitCodeView = true;
     CGO.DebugCompilationDir = Opts.DebugCompilationDir;
     // This actually contains the debug flags for codeview.
     CGO.DwarfDebugFlags =
-        Opts.getDebugFlags(PD, Context.LangOpts.EnableCXXInterop);
+        Opts.getDebugFlags(PD, Context.LangOpts.EnableCXXInterop,
+                           Context.LangOpts.hasFeature(Feature::Embedded));
     break;
   }
   if (!Opts.TrapFuncName.empty()) {

test/DebugInfo/embedded.swift

@@ -0,0 +1,10 @@
+// Check that the "-enable-embedded-swift" is stored as a flag in the 
+// Compile Unit.
+
+// RUN: %target-swift-frontend -emit-ir -enable-experimental-feature Embedded -g %s -o - | %FileCheck %s
+
+// REQUIRES: swift_in_compiler
+// REQUIRES: executable_test
+// REQUIRES: OS=macosx
+
+// CHECK:          !DICompileUnit({{.*}}flags: "-enable-embedded-swift"