Merge pull request swiftlang#33917 from CodaFi/taking-a-header

(Re)-Disable End Of Pipeline Actions for ObjC Actions

Author: CodaFi

include/swift/Basic/SourceManager.h

@@ -169,7 +169,7 @@ class SourceManager {
 
   /// Returns a buffer ID for a previously added buffer with the given
   /// buffer identifier, or None if there is no such buffer.
-  Optional<unsigned> getIDForBufferIdentifier(StringRef BufIdentifier);
+  Optional<unsigned> getIDForBufferIdentifier(StringRef BufIdentifier) const;
 
   /// Returns the identifier for the buffer with the given ID.
   ///

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/FrontendOptions.h

@@ -304,6 +304,9 @@ class FrontendOptions {
   /// \return true if the given action requires input files to be provided.
   static bool doesActionRequireInputs(ActionType action);
 
+  /// \return true if the given action requires input files to be provided.
+  static bool doesActionPerformEndOfPipelineActions(ActionType action);
+
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.
   llvm::hash_code getPCHHashComponents() 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/Basic/SourceLoc.cpp

@@ -152,9 +152,8 @@ SourceManager::getVirtualFile(SourceLoc Loc) const {
   return nullptr;
 }
 
-
-Optional<unsigned> SourceManager::getIDForBufferIdentifier(
-    StringRef BufIdentifier) {
+Optional<unsigned>
+SourceManager::getIDForBufferIdentifier(StringRef BufIdentifier) const {
   auto It = BufIdentIDMap.find(BufIdentifier);
   if (It == BufIdentIDMap.end())
     return None;

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/Frontend/FrontendOptions.cpp

@@ -42,8 +42,8 @@ bool FrontendOptions::needsProperModuleName(ActionType action) {
   case ActionType::DumpScopeMaps:
   case ActionType::DumpTypeRefinementContexts:
   case ActionType::DumpPCM:
-    return false;
   case ActionType::EmitPCH:
+    return false;
   case ActionType::EmitSILGen:
   case ActionType::EmitSIL:
   case ActionType::EmitSIBGen:
@@ -171,6 +171,47 @@ bool FrontendOptions::doesActionRequireInputs(ActionType action) {
   llvm_unreachable("Unknown ActionType");
 }
 
+bool FrontendOptions::doesActionPerformEndOfPipelineActions(ActionType action) {
+  switch (action) {
+  case ActionType::NoneAction:
+  case ActionType::PrintVersion:
+  case ActionType::EmitPCH:
+  case ActionType::EmitPCM:
+  case ActionType::DumpPCM:
+    return false;
+  case ActionType::REPL:
+  case ActionType::Parse:
+  case ActionType::DumpParse:
+  case ActionType::EmitSyntax:
+  case ActionType::DumpInterfaceHash:
+  case ActionType::EmitImportedModules:
+  case ActionType::ScanDependencies:
+  case ActionType::ScanClangDependencies:
+  case ActionType::CompileModuleFromInterface:
+  case ActionType::TypecheckModuleFromInterface:
+  case ActionType::ResolveImports:
+  case ActionType::Typecheck:
+  case ActionType::DumpAST:
+  case ActionType::PrintAST:
+  case ActionType::DumpScopeMaps:
+  case ActionType::DumpTypeRefinementContexts:
+  case ActionType::EmitSILGen:
+  case ActionType::EmitSIL:
+  case ActionType::EmitModuleOnly:
+  case ActionType::MergeModules:
+  case ActionType::EmitSIBGen:
+  case ActionType::EmitSIB:
+  case ActionType::Immediate:
+  case ActionType::EmitAssembly:
+  case ActionType::EmitIR:
+  case ActionType::EmitBC:
+  case ActionType::EmitObject:
+  case ActionType::DumpTypeInfo:
+    return true;
+  }
+  llvm_unreachable("Unknown ActionType");
+}
+
 void FrontendOptions::forAllOutputPaths(
     const InputFile &input, llvm::function_ref<void(StringRef)> fn) const {
   if (RequestedAction != FrontendOptions::ActionType::EmitModuleOnly &&