Revert "Merge pull request #41831 from hyp/unify-header"

include/swift/AST/DiagnosticsFrontend.def

@@ -118,7 +118,9 @@ ERROR(error_mode_cannot_emit_dependencies,none,
 ERROR(error_mode_cannot_emit_reference_dependencies,none,
       "this mode does not support emitting reference dependency files", ())
 ERROR(error_mode_cannot_emit_header,none,
-      "this mode does not support emitting Objective-C or C++ headers", ())
+      "this mode does not support emitting Objective-C headers", ())
+ERROR(error_mode_cannot_emit_cxx_header,none,
+      "this mode does not support emitting C++ headers", ())
 ERROR(error_mode_cannot_emit_loaded_module_trace,none,
       "this mode does not support emitting the loaded module trace", ())
 ERROR(error_mode_cannot_emit_module,none,

include/swift/Basic/FileTypes.def

@@ -59,7 +59,8 @@ TYPE("raw-sib",             RawSIB,                    "sib",             "")
 TYPE("llvm-ir",             LLVM_IR,                   "ll",              "")
 TYPE("llvm-bc",             LLVM_BC,                   "bc",              "")
 TYPE("diagnostics",         SerializedDiagnostics,     "dia",             "")
-TYPE("clang-header",        ClangHeader,               "h",               "")
+TYPE("objc-header",         ObjCHeader,                "h",               "")
+TYPE("cxx-header",          CXXHeader,                 "h",               "")
 TYPE("swift-dependencies",  SwiftDeps,                 "swiftdeps",       "")
 TYPE("external-swift-dependencies", ExternalSwiftDeps,  "swiftdeps.external",  "")
 TYPE("remap",               Remapping,                 "remap",           "")

include/swift/Basic/SupplementaryOutputPaths.h

@@ -20,17 +20,27 @@
 
 namespace swift {
 struct SupplementaryOutputPaths {
-  /// The path to which we should emit a header file that exposes the Swift
-  /// declarations to C, Objective-C and C++ clients for the module.
+  /// The path to which we should emit an Objective-C header for the module.
   ///
   /// Currently only makes sense when the compiler has whole module knowledge.
   /// The modes for which it makes sense incuide both WMO and the "merge
   /// modules" job that happens after the normal compilation jobs. That's where
   /// the header is emitted in single-file mode, since it needs whole-module
   /// information.
   ///
-  /// \sa swift::printAsClangHeader
-  std::string ClangHeaderOutputPath;
+  /// \sa swift::printAsObjC
+  std::string ObjCHeaderOutputPath;
+
+  /// The path to which we should emit a C++ header for the module.
+  ///
+  /// Currently only makes sense when the compiler has whole module knowledge.
+  /// The modes for which it makes sense include both WMO and the "merge
+  /// modules" job that happens after the normal compilation jobs. That's where
+  /// the header is emitted in single-file mode, since it needs whole-module
+  /// information.
+  ///
+  /// \sa swift::printAsCXX
+  std::string CxxHeaderOutputPath;
 
   /// The path to which we should emit a serialized module.
   /// It is valid whenever there are any inputs.
@@ -160,8 +170,10 @@ struct SupplementaryOutputPaths {
 
   /// Apply a given function for each existing (non-empty string) supplementary output
   void forEachSetOutput(llvm::function_ref<void(const std::string&)> fn) const {
-    if (!ClangHeaderOutputPath.empty())
-      fn(ClangHeaderOutputPath);
+    if (!ObjCHeaderOutputPath.empty())
+      fn(ObjCHeaderOutputPath);
+    if (!CxxHeaderOutputPath.empty())
+      fn(CxxHeaderOutputPath);
     if (!ModuleOutputPath.empty())
       fn(ModuleOutputPath); 
     if (!ModuleSourceInfoOutputPath.empty())
@@ -197,8 +209,9 @@ struct SupplementaryOutputPaths {
   }
 
   bool empty() const {
-    return ClangHeaderOutputPath.empty() && ModuleOutputPath.empty() &&
-           ModuleDocOutputPath.empty() && DependenciesFilePath.empty() &&
+    return ObjCHeaderOutputPath.empty() && CxxHeaderOutputPath.empty() &&
+           ModuleOutputPath.empty() && ModuleDocOutputPath.empty() &&
+           DependenciesFilePath.empty() &&
            ReferenceDependenciesFilePath.empty() &&
            SerializedDiagnosticsPath.empty() && LoadedModuleTracePath.empty() &&
            TBDPath.empty() && ModuleInterfaceOutputPath.empty() &&

include/swift/Frontend/Frontend.h

@@ -392,7 +392,8 @@ class CompilerInvocation {
 
   std::string getOutputFilenameForAtMostOnePrimary() const;
   std::string getMainInputFilenameForDebugInfoForAtMostOnePrimary() const;
-  std::string getClangHeaderOutputPathForAtMostOnePrimary() const;
+  std::string getObjCHeaderOutputPathForAtMostOnePrimary() const;
+  std::string getCxxHeaderOutputPathForAtMostOnePrimary() const;
   std::string getModuleOutputPathForAtMostOnePrimary() const;
   std::string
   getReferenceDependenciesFilePathForPrimary(StringRef filename) const;

include/swift/Frontend/FrontendInputsAndOutputs.h

@@ -249,7 +249,8 @@ class FrontendInputsAndOutputs {
 
   bool hasDependenciesPath() const;
   bool hasReferenceDependenciesPath() const;
-  bool hasClangHeaderOutputPath() const;
+  bool hasObjCHeaderOutputPath() const;
+  bool hasCxxHeaderOutputPath() const;
   bool hasLoadedModuleTracePath() const;
   bool hasModuleOutputPath() const;
   bool hasModuleDocOutputPath() const;

include/swift/Option/Options.td

@@ -532,11 +532,13 @@ def emit_objc_header_path : Separate<["-"], "emit-objc-header-path">,
          SupplementaryOutput]>,
   MetaVarName<"<path>">, HelpText<"Emit an Objective-C header file to <path>">;
 
-def emit_clang_header_path : Separate<["-"], "emit-clang-header-path">,
-  Flags<[FrontendOption, NoDriverOption, NoInteractiveOption, ArgumentIsPath,
+def emit_cxx_header : Flag<["-"], "emit-cxx-header">,
+  Flags<[FrontendOption, NoInteractiveOption, SupplementaryOutput]>,
+  HelpText<"Emit a C++ header file">;
+def emit_cxx_header_path : Separate<["-"], "emit-cxx-header-path">,
+  Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath,
          SupplementaryOutput]>,
-  HelpText<"Emit an Objective-C and C++ header file to <path>">,
-  Alias<emit_objc_header_path>;
+  MetaVarName<"<path>">, HelpText<"Emit a C++ header file to <path>">;
 
 def static : Flag<["-"], "static">,
   Flags<[FrontendOption, ModuleInterfaceOption, NoInteractiveOption]>,

include/swift/PrintAsClang/PrintAsClang.h

@@ -21,18 +21,16 @@ namespace swift {
   class ModuleDecl;
   class ValueDecl;
 
-  /// Print the exposed declarations in a module into a Clang header.
+  /// Print the Objective-C-compatible declarations in a module as a Clang
+  /// header.
   ///
-  /// The Objective-C compatible declarations are printed into a block that
-  /// ensures that those declarations are only usable when the header is
-  /// compiled in Objective-C mode.
-  ///  The C++ compatible declarations are printed into a block that ensures
-  ///  that those declarations are only usable when the header is compiled in
-  ///  C++ mode.
+  /// Returns true on error.
+  bool printAsObjC(raw_ostream &out, ModuleDecl *M, StringRef bridgingHeader);
+
+  /// Print the C++-compatible declarations in a module as a Clang header.
   ///
   /// Returns true on error.
-  bool printAsClangHeader(raw_ostream &out, ModuleDecl *M,
-                          StringRef bridgingHeader);
+  bool printAsCXX(raw_ostream &os, ModuleDecl *M);
 }
 
 #endif

lib/Basic/FileTypes.cpp

@@ -73,7 +73,8 @@ bool file_types::isTextual(ID Id) {
   case file_types::TY_ASTDump:
   case file_types::TY_RawSIL:
   case file_types::TY_LLVM_IR:
-  case file_types::TY_ClangHeader:
+  case file_types::TY_ObjCHeader:
+  case file_types::TY_CXXHeader:
   case file_types::TY_AutolinkFile:
   case file_types::TY_ImportedModules:
   case file_types::TY_TBD:
@@ -131,7 +132,8 @@ bool file_types::isAfterLLVM(ID Id) {
   case file_types::TY_Dependencies:
   case file_types::TY_ASTDump:
   case file_types::TY_RawSIL:
-  case file_types::TY_ClangHeader:
+  case file_types::TY_ObjCHeader:
+  case file_types::TY_CXXHeader:
   case file_types::TY_AutolinkFile:
   case file_types::TY_Image:
   case file_types::TY_dSYM:
@@ -181,7 +183,8 @@ bool file_types::isPartOfSwiftCompilation(ID Id) {
   case file_types::TY_LLVM_BC:
   case file_types::TY_Object:
   case file_types::TY_Dependencies:
-  case file_types::TY_ClangHeader:
+  case file_types::TY_ObjCHeader:
+  case file_types::TY_CXXHeader:
   case file_types::TY_AutolinkFile:
   case file_types::TY_PCH:
   case file_types::TY_ImportedModules:

lib/Driver/Driver.cpp

@@ -1981,7 +1981,8 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
       if (Arg *A = Args.getLastArg(options::OPT_import_objc_header)) {
         StringRef Value = A->getValue();
         auto Ty = TC.lookupTypeForExtension(llvm::sys::path::extension(Value));
-        if (Ty == file_types::TY_ClangHeader) {
+        if (Ty == file_types::TY_ObjCHeader ||
+            Ty == file_types::TY_CXXHeader) {
           auto *HeaderInput = C.createAction<InputAction>(*A, Ty);
           StringRef PersistentPCHDir;
           if (const Arg *A = Args.getLastArg(options::OPT_pch_output_dir)) {
@@ -2064,7 +2065,8 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
       case file_types::TY_LLVM_IR:
       case file_types::TY_LLVM_BC:
       case file_types::TY_SerializedDiagnostics:
-      case file_types::TY_ClangHeader:
+      case file_types::TY_ObjCHeader:
+      case file_types::TY_CXXHeader:
       case file_types::TY_ClangModuleFile:
       case file_types::TY_SwiftDeps:
       case file_types::TY_ExternalSwiftDeps:
@@ -3478,12 +3480,12 @@ void Driver::chooseObjectiveCHeaderOutputPath(Compilation &C,
                                               StringRef workingDirectory,
                                               CommandOutput *Output) const {
 
-  if (hasExistingAdditionalOutput(*Output, file_types::TY_ClangHeader))
+  if (hasExistingAdditionalOutput(*Output, file_types::TY_ObjCHeader))
     return;
 
   StringRef ObjCHeaderPath;
   if (OutputMap) {
-    auto iter = OutputMap->find(file_types::TY_ClangHeader);
+    auto iter = OutputMap->find(file_types::TY_ObjCHeader);
     if (iter != OutputMap->end())
       ObjCHeaderPath = iter->second;
   }
@@ -3493,13 +3495,13 @@ void Driver::chooseObjectiveCHeaderOutputPath(Compilation &C,
       ObjCHeaderPath = A->getValue();
 
   if (!ObjCHeaderPath.empty()) {
-    Output->setAdditionalOutputForType(file_types::TY_ClangHeader,
+    Output->setAdditionalOutputForType(file_types::TY_ObjCHeader,
                                        ObjCHeaderPath);
   } else {
     // Put the header next to the primary output file.
     // FIXME: That's not correct if the user /just/ passed -emit-header
     // and not -emit-module.
-    addAuxiliaryOutput(C, *Output, file_types::TY_ClangHeader,
+    addAuxiliaryOutput(C, *Output, file_types::TY_ObjCHeader,
                        /*output file map*/ nullptr, workingDirectory);
   }
 }

lib/Driver/ToolChains.cpp

@@ -675,7 +675,8 @@ const char *ToolChain::JobContext::computeFrontendModeForCompile() const {
   case file_types::TY_Dependencies:
   case file_types::TY_SwiftModuleDocFile:
   case file_types::TY_SerializedDiagnostics:
-  case file_types::TY_ClangHeader:
+  case file_types::TY_ObjCHeader:
+  case file_types::TY_CXXHeader:
   case file_types::TY_Image:
   case file_types::TY_SwiftDeps:
   case file_types::TY_ExternalSwiftDeps:
@@ -814,7 +815,7 @@ void ToolChain::JobContext::addFrontendSupplementaryOutputArguments(
                    file_types::TY_SerializedDiagnostics,
                    "-serialize-diagnostics-path");
 
-  if (addOutputsOfType(arguments, Output, Args, file_types::ID::TY_ClangHeader,
+  if (addOutputsOfType(arguments, Output, Args, file_types::ID::TY_ObjCHeader,
                        "-emit-objc-header-path")) {
     assert(OI.CompilerMode == OutputInfo::Mode::SingleCompile &&
            "The Swift tool should only emit an Obj-C header in single compile"
@@ -935,7 +936,8 @@ ToolChain::constructInvocation(const BackendJobAction &job,
     case file_types::TY_Dependencies:
     case file_types::TY_SwiftModuleDocFile:
     case file_types::TY_SerializedDiagnostics:
-    case file_types::TY_ClangHeader:
+    case file_types::TY_ObjCHeader:
+    case file_types::TY_CXXHeader:
     case file_types::TY_Image:
     case file_types::TY_SwiftDeps:
     case file_types::TY_ExternalSwiftDeps:
@@ -1098,7 +1100,7 @@ ToolChain::constructInvocation(const MergeModuleJobAction &job,
                    file_types::TY_SerializedDiagnostics,
                    "-serialize-diagnostics-path");
   addOutputsOfType(Arguments, context.Output, context.Args,
-                   file_types::TY_ClangHeader, "-emit-objc-header-path");
+                   file_types::TY_ObjCHeader, "-emit-objc-header-path");
   addOutputsOfType(Arguments, context.Output, context.Args, file_types::TY_TBD,
                    "-emit-tbd-path");
 
@@ -1307,7 +1309,7 @@ ToolChain::constructInvocation(const GeneratePCHJobAction &job,
                    file_types::TY_SerializedDiagnostics,
                    "-serialize-diagnostics-path");
 
-  addInputsOfType(Arguments, context.InputActions, file_types::TY_ClangHeader);
+  addInputsOfType(Arguments, context.InputActions, file_types::TY_ObjCHeader);
   context.Args.AddLastArg(Arguments, options::OPT_index_store_path);
 
   if (job.isPersistentPCH()) {

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -625,10 +625,15 @@ bool ArgsToFrontendOptionsConverter::checkUnusedSupplementaryOutputPaths()
     return true;
   }
   if (!FrontendOptions::canActionEmitClangHeader(Opts.RequestedAction) &&
-      Opts.InputsAndOutputs.hasClangHeaderOutputPath()) {
+      Opts.InputsAndOutputs.hasObjCHeaderOutputPath()) {
     Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_header);
     return true;
   }
+  if (!FrontendOptions::canActionEmitClangHeader(Opts.RequestedAction) &&
+      Opts.InputsAndOutputs.hasCxxHeaderOutputPath()) {
+    Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_cxx_header);
+    return true;
+  }
   if (!FrontendOptions::canActionEmitLoadedModuleTrace(Opts.RequestedAction) &&
       Opts.InputsAndOutputs.hasLoadedModuleTracePath()) {
     Diags.diagnose(SourceLoc(),

lib/Frontend/ArgsToFrontendOutputsConverter.cpp

@@ -308,8 +308,10 @@ Optional<std::vector<SupplementaryOutputPaths>>
 SupplementaryOutputPathsComputer::getSupplementaryOutputPathsFromArguments()
     const {
 
-  auto clangHeaderOutput = getSupplementaryFilenamesFromArguments(
+  auto objCHeaderOutput = getSupplementaryFilenamesFromArguments(
       options::OPT_emit_objc_header_path);
+  auto cxxHeaderOutput =
+      getSupplementaryFilenamesFromArguments(options::OPT_emit_cxx_header_path);
   auto moduleOutput =
       getSupplementaryFilenamesFromArguments(options::OPT_emit_module_path);
   auto moduleDocOutput =
@@ -339,8 +341,8 @@ SupplementaryOutputPathsComputer::getSupplementaryOutputPathsFromArguments()
       options::OPT_emit_module_semantic_info_path);
   auto optRecordOutput = getSupplementaryFilenamesFromArguments(
       options::OPT_save_optimization_record_path);
-  if (!clangHeaderOutput || !moduleOutput || !moduleDocOutput ||
-      !dependenciesFile || !referenceDependenciesFile ||
+  if (!objCHeaderOutput || !cxxHeaderOutput || !moduleOutput ||
+      !moduleDocOutput || !dependenciesFile || !referenceDependenciesFile ||
       !serializedDiagnostics || !fixItsOutput || !loadedModuleTrace || !TBD ||
       !moduleInterfaceOutput || !privateModuleInterfaceOutput ||
       !moduleSourceInfoOutput || !moduleSummaryOutput || !abiDescriptorOutput ||
@@ -353,7 +355,8 @@ SupplementaryOutputPathsComputer::getSupplementaryOutputPathsFromArguments()
       InputsAndOutputs.countOfFilesProducingSupplementaryOutput();
   for (unsigned i = 0; i < N; ++i) {
     SupplementaryOutputPaths sop;
-    sop.ClangHeaderOutputPath = (*clangHeaderOutput)[i];
+    sop.ObjCHeaderOutputPath = (*objCHeaderOutput)[i];
+    sop.CxxHeaderOutputPath = (*cxxHeaderOutput)[i];
     sop.ModuleOutputPath = (*moduleOutput)[i];
     sop.ModuleDocOutputPath = (*moduleDocOutput)[i];
     sop.DependenciesFilePath = (*dependenciesFile)[i];
@@ -434,9 +437,14 @@ SupplementaryOutputPathsComputer::computeOutputPathsForOneInput(
   // There is no non-path form of -emit-fixits-path
   auto fixItsOutputPath = pathsFromArguments.FixItsOutputPath;
 
-  auto clangHeaderOutputPath = determineSupplementaryOutputFilename(
-      OPT_emit_objc_header, pathsFromArguments.ClangHeaderOutputPath,
-      file_types::TY_ClangHeader, "",
+  auto objcHeaderOutputPath = determineSupplementaryOutputFilename(
+      OPT_emit_objc_header, pathsFromArguments.ObjCHeaderOutputPath,
+      file_types::TY_ObjCHeader, "",
+      defaultSupplementaryOutputPathExcludingExtension);
+
+  auto cxxHeaderOutputPath = determineSupplementaryOutputFilename(
+      OPT_emit_cxx_header, pathsFromArguments.CxxHeaderOutputPath,
+      file_types::TY_CXXHeader, "",
       defaultSupplementaryOutputPathExcludingExtension);
 
   auto loadedModuleTracePath = determineSupplementaryOutputFilename(
@@ -492,7 +500,8 @@ SupplementaryOutputPathsComputer::computeOutputPathsForOneInput(
       defaultSupplementaryOutputPathExcludingExtension);
 
   SupplementaryOutputPaths sop;
-  sop.ClangHeaderOutputPath = clangHeaderOutputPath;
+  sop.ObjCHeaderOutputPath = objcHeaderOutputPath;
+  sop.CxxHeaderOutputPath = cxxHeaderOutputPath;
   sop.ModuleOutputPath = moduleOutputPath;
   sop.ModuleDocOutputPath = moduleDocOutputPath;
   sop.DependenciesFilePath = dependenciesFilePath;
@@ -577,7 +586,8 @@ createFromTypeToPathMap(const TypeToPathMap *map) {
   if (!map)
     return paths;
   const std::pair<file_types::ID, std::string &> typesAndStrings[] = {
-      {file_types::TY_ClangHeader, paths.ClangHeaderOutputPath},
+      {file_types::TY_ObjCHeader, paths.ObjCHeaderOutputPath},
+      {file_types::TY_CXXHeader, paths.CxxHeaderOutputPath},
       {file_types::TY_SwiftModuleFile, paths.ModuleOutputPath},
       {file_types::TY_SwiftModuleDocFile, paths.ModuleDocOutputPath},
       {file_types::TY_SwiftSourceInfoFile, paths.ModuleSourceInfoOutputPath},
@@ -605,17 +615,17 @@ createFromTypeToPathMap(const TypeToPathMap *map) {
 
 Optional<std::vector<SupplementaryOutputPaths>>
 SupplementaryOutputPathsComputer::readSupplementaryOutputFileMap() const {
-  if (Arg *A = Args.getLastArg(options::OPT_emit_objc_header_path,
-                               options::OPT_emit_module_path,
-                               options::OPT_emit_module_doc_path,
-                               options::OPT_emit_dependencies_path,
-                               options::OPT_emit_reference_dependencies_path,
-                               options::OPT_serialize_diagnostics_path,
-                               options::OPT_emit_loaded_module_trace_path,
-                               options::OPT_emit_module_interface_path,
-                               options::OPT_emit_private_module_interface_path,
-                               options::OPT_emit_module_source_info_path,
-                               options::OPT_emit_tbd_path)) {
+  if (Arg *A = Args.getLastArg(
+          options::OPT_emit_objc_header_path, options::OPT_emit_cxx_header_path,
+          options::OPT_emit_module_path, options::OPT_emit_module_doc_path,
+          options::OPT_emit_dependencies_path,
+          options::OPT_emit_reference_dependencies_path,
+          options::OPT_serialize_diagnostics_path,
+          options::OPT_emit_loaded_module_trace_path,
+          options::OPT_emit_module_interface_path,
+          options::OPT_emit_private_module_interface_path,
+          options::OPT_emit_module_source_info_path,
+          options::OPT_emit_tbd_path)) {
     Diags.diagnose(SourceLoc(),
                    diag::error_cannot_have_supplementary_outputs,
                    A->getSpelling(), "-supplementary-output-file-map");