Model ObjCHeader Inputs

These inputs were previously modeled as Swift files, which would lead to bizarre situations where parts of the pipeline expecting Swift inputs actually wound up parsing Objective-C.

Author: CodaFi

include/swift/Frontend/FrontendInputsAndOutputs.h

@@ -153,6 +153,7 @@ class FrontendInputsAndOutputs {
   bool shouldTreatAsLLVM() const;
   bool shouldTreatAsSIL() const;
   bool shouldTreatAsModuleInterface() const;
+  bool shouldTreatAsObjCHeader() const;
 
   bool areAllNonPrimariesSIB() const;
 

include/swift/Frontend/InputFile.h

@@ -26,7 +26,8 @@ enum class InputFileKind {
   SwiftLibrary,
   SwiftModuleInterface,
   SIL,
-  LLVM
+  LLVM,
+  ObjCHeader,
 };
 
 // Inputs may include buffers that override contents, and eventually should

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -423,6 +423,8 @@ bool ArgsToFrontendOptionsConverter::setUpInputKindAndImmediateArgs() {
     Opts.InputKind = InputFileKind::SIL;
   else if (Opts.InputsAndOutputs.shouldTreatAsLLVM())
     Opts.InputKind = InputFileKind::LLVM;
+  else if (Opts.InputsAndOutputs.shouldTreatAsObjCHeader())
+    Opts.InputKind = InputFileKind::ObjCHeader;
   else if (Opts.InputsAndOutputs.shouldTreatAsModuleInterface())
     Opts.InputKind = InputFileKind::SwiftModuleInterface;
   else if (Args.hasArg(OPT_parse_as_library))

lib/Frontend/CompilerInvocation.cpp

@@ -238,6 +238,7 @@ SourceFileKind CompilerInvocation::getSourceFileKind() const {
     return SourceFileKind::SIL;
   case InputFileKind::None:
   case InputFileKind::LLVM:
+  case InputFileKind::ObjCHeader:
     llvm_unreachable("Trying to convert from unsupported InputFileKind");
   }
 

lib/Frontend/Frontend.cpp

@@ -586,6 +586,7 @@ static bool shouldTreatSingleInputAsMain(InputFileKind inputKind) {
     return true;
   case InputFileKind::SwiftLibrary:
   case InputFileKind::LLVM:
+  case InputFileKind::ObjCHeader:
   case InputFileKind::None:
     return false;
   }

lib/Frontend/FrontendInputsAndOutputs.cpp

@@ -199,6 +199,19 @@ bool FrontendInputsAndOutputs::shouldTreatAsSIL() const {
   llvm_unreachable("Either all primaries or none must end with .sil");
 }
 
+bool FrontendInputsAndOutputs::shouldTreatAsObjCHeader() const {
+  if (hasSingleInput()) {
+    StringRef InputExt = llvm::sys::path::extension(getFilenameOfFirstInput());
+    switch (file_types::lookupTypeForExtension(InputExt)) {
+    case file_types::TY_ObjCHeader:
+      return true;
+    default:
+      return false;
+    }
+  }
+  return false;
+}
+
 bool FrontendInputsAndOutputs::areAllNonPrimariesSIB() const {
   for (const InputFile &input : AllInputs) {
     if (input.isPrimary())

lib/FrontendTool/TBD.cpp

@@ -69,6 +69,7 @@ bool swift::inputFileKindCanHaveTBDValidated(InputFileKind kind) {
   case InputFileKind::None:
   case InputFileKind::SIL:
   case InputFileKind::LLVM:
+  case InputFileKind::ObjCHeader:
     return false;
   }
   llvm_unreachable("unhandled kind");