Revert "Separate the C++ and Objective-C generated header output types."

This reverts commit c7a5049.

Author: hyp

include/swift/Basic/FileTypes.def

@@ -60,7 +60,6 @@ TYPE("llvm-ir",             LLVM_IR,                   "ll",              "")
 TYPE("llvm-bc",             LLVM_BC,                   "bc",              "")
 TYPE("diagnostics",         SerializedDiagnostics,     "dia",             "")
 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",           "")

lib/Basic/FileTypes.cpp

@@ -74,7 +74,6 @@ bool file_types::isTextual(ID Id) {
   case file_types::TY_RawSIL:
   case file_types::TY_LLVM_IR:
   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:
@@ -133,7 +132,6 @@ bool file_types::isAfterLLVM(ID Id) {
   case file_types::TY_ASTDump:
   case file_types::TY_RawSIL:
   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:
@@ -184,7 +182,6 @@ bool file_types::isPartOfSwiftCompilation(ID Id) {
   case file_types::TY_Object:
   case file_types::TY_Dependencies:
   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,8 +1981,7 @@ 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_ObjCHeader ||
-            Ty == file_types::TY_CXXHeader) {
+        if (Ty == file_types::TY_ObjCHeader) {
           auto *HeaderInput = C.createAction<InputAction>(*A, Ty);
           StringRef PersistentPCHDir;
           if (const Arg *A = Args.getLastArg(options::OPT_pch_output_dir)) {
@@ -2066,7 +2065,6 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
       case file_types::TY_LLVM_BC:
       case file_types::TY_SerializedDiagnostics:
       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:

lib/Driver/ToolChains.cpp

@@ -676,7 +676,6 @@ const char *ToolChain::JobContext::computeFrontendModeForCompile() const {
   case file_types::TY_SwiftModuleDocFile:
   case file_types::TY_SerializedDiagnostics:
   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:
@@ -937,7 +936,6 @@ ToolChain::constructInvocation(const BackendJobAction &job,
     case file_types::TY_SwiftModuleDocFile:
     case file_types::TY_SerializedDiagnostics:
     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:

lib/Frontend/ArgsToFrontendOutputsConverter.cpp

@@ -444,7 +444,7 @@ SupplementaryOutputPathsComputer::computeOutputPathsForOneInput(
 
   auto cxxHeaderOutputPath = determineSupplementaryOutputFilename(
       OPT_emit_cxx_header, pathsFromArguments.CxxHeaderOutputPath,
-      file_types::TY_CXXHeader, "",
+      file_types::TY_ObjCHeader, "",
       defaultSupplementaryOutputPathExcludingExtension);
 
   auto loadedModuleTracePath = determineSupplementaryOutputFilename(
@@ -587,7 +587,7 @@ createFromTypeToPathMap(const TypeToPathMap *map) {
     return paths;
   const std::pair<file_types::ID, std::string &> typesAndStrings[] = {
       {file_types::TY_ObjCHeader, paths.ObjCHeaderOutputPath},
-      {file_types::TY_CXXHeader, paths.CxxHeaderOutputPath},
+      {file_types::TY_ObjCHeader, paths.CxxHeaderOutputPath},
       {file_types::TY_SwiftModuleFile, paths.ModuleOutputPath},
       {file_types::TY_SwiftModuleDocFile, paths.ModuleDocOutputPath},
       {file_types::TY_SwiftSourceInfoFile, paths.ModuleSourceInfoOutputPath},