Revert "[InstallAPI] Add --extra* and --exclude* cli options for header input (#86522)"

This reverts commit b7d8c61. And
This reverts commit 2d40f17.

It caused a build failure i'll need to reproduce.
` error: could not convert ‘Rule’ from ‘llvm::Regex’ to ‘llvm::Expected<llvm::Regex>’`

Author: cyndyishida

clang/include/clang/Basic/DiagnosticInstallAPIKinds.td

@@ -15,9 +15,6 @@ let CategoryName = "Command line" in {
 def err_cannot_write_file : Error<"cannot write file '%0': %1">;
 def err_no_install_name : Error<"no install name specified: add -install_name <path>">;
 def err_no_output_file: Error<"no output file specified">;
-def err_no_such_header_file : Error<"no such %select{public|private|project}1 header file: '%0'">;
-def warn_no_such_excluded_header_file : Warning<"no such excluded %select{public|private}0 header file: '%1'">, InGroup<InstallAPIViolation>;
-def warn_glob_did_not_match: Warning<"glob '%0' did not match any header file">, InGroup<InstallAPIViolation>;
 } // end of command line category.
 
 let CategoryName = "Verification" in {

clang/include/clang/InstallAPI/HeaderFile.h

@@ -13,9 +13,7 @@
 #ifndef LLVM_CLANG_INSTALLAPI_HEADERFILE_H
 #define LLVM_CLANG_INSTALLAPI_HEADERFILE_H
 
-#include "clang/Basic/FileManager.h"
 #include "clang/Basic/LangStandard.h"
-#include "clang/InstallAPI/MachO.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Regex.h"
@@ -58,10 +56,6 @@ class HeaderFile {
   std::string IncludeName;
   /// Supported language mode for header.
   std::optional<clang::Language> Language;
-  /// Exclude header file from processing.
-  bool Excluded{false};
-  /// Add header file to processing.
-  bool Extra{false};
 
 public:
   HeaderFile() = delete;
@@ -77,48 +71,17 @@ class HeaderFile {
   StringRef getIncludeName() const { return IncludeName; }
   StringRef getPath() const { return FullPath; }
 
-  void setExtra(bool V = true) { Extra = V; }
-  void setExcluded(bool V = true) { Excluded = V; }
-  bool isExtra() const { return Extra; }
-  bool isExcluded() const { return Excluded; }
-
   bool useIncludeName() const {
     return Type != HeaderType::Project && !IncludeName.empty();
   }
 
   bool operator==(const HeaderFile &Other) const {
-    return std::tie(Type, FullPath, IncludeName, Language, Excluded, Extra) ==
+    return std::tie(Type, FullPath, IncludeName, Language) ==
            std::tie(Other.Type, Other.FullPath, Other.IncludeName,
-                    Other.Language, Other.Excluded, Other.Extra);
+                    Other.Language);
   }
 };
 
-/// Glob that represents a pattern of header files to retreive.
-class HeaderGlob {
-private:
-  std::string GlobString;
-  llvm::Regex Rule;
-  HeaderType Type;
-  bool FoundMatch{false};
-
-public:
-  HeaderGlob(StringRef GlobString, llvm::Regex &&, HeaderType Type);
-
-  /// Create a header glob from string for the header access level.
-  static llvm::Expected<std::unique_ptr<HeaderGlob>>
-  create(StringRef GlobString, HeaderType Type);
-
-  /// Query if provided header matches glob.
-  bool match(const HeaderFile &Header);
-
-  /// Query if a header was matched in the glob, used primarily for error
-  /// reporting.
-  bool didMatch() { return FoundMatch; }
-
-  /// Provide back input glob string.
-  StringRef str() { return GlobString; }
-};
-
 /// Assemble expected way header will be included by clients.
 /// As in what maps inside the brackets of `#include <IncludeName.h>`
 /// For example,
@@ -130,19 +93,6 @@ class HeaderGlob {
 std::optional<std::string> createIncludeHeaderName(const StringRef FullPath);
 using HeaderSeq = std::vector<HeaderFile>;
 
-/// Determine if Path is a header file.
-/// It does not touch the file system.
-///
-/// \param  Path File path to file.
-bool isHeaderFile(StringRef Path);
-
-/// Given input directory, collect all header files.
-///
-/// \param FM FileManager for finding input files.
-/// \param Directory Path to directory file.
-llvm::Expected<PathSeq> enumerateFiles(clang::FileManager &FM,
-                                       StringRef Directory);
-
 } // namespace clang::installapi
 
 #endif // LLVM_CLANG_INSTALLAPI_HEADERFILE_H

clang/include/clang/InstallAPI/MachO.h

@@ -40,7 +40,6 @@ using SymbolSet = llvm::MachO::SymbolSet;
 using SimpleSymbol = llvm::MachO::SimpleSymbol;
 using FileType = llvm::MachO::FileType;
 using PackedVersion = llvm::MachO::PackedVersion;
-using PathSeq = llvm::MachO::PathSeq;
 using Target = llvm::MachO::Target;
 using TargetList = llvm::MachO::TargetList;
 

clang/lib/InstallAPI/Frontend.cpp

@@ -138,8 +138,6 @@ std::unique_ptr<MemoryBuffer> createInputBuffer(InstallAPIContext &Ctx) {
   SmallString<4096> Contents;
   raw_svector_ostream OS(Contents);
   for (const HeaderFile &H : Ctx.InputHeaders) {
-    if (H.isExcluded())
-      continue;
     if (H.getType() != Ctx.Type)
       continue;
     if (Ctx.LangMode == Language::C || Ctx.LangMode == Language::CXX)

clang/lib/InstallAPI/HeaderFile.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/InstallAPI/HeaderFile.h"
-#include "llvm/TextAPI/Utils.h"
 
 using namespace llvm;
 namespace clang::installapi {
@@ -35,54 +34,4 @@ std::optional<std::string> createIncludeHeaderName(const StringRef FullPath) {
   return Matches[1].drop_front(Matches[1].rfind('/') + 1).str() + "/" +
          Matches[3].str();
 }
-
-bool isHeaderFile(StringRef Path) {
-  return StringSwitch<bool>(sys::path::extension(Path))
-      .Cases(".h", ".H", ".hh", ".hpp", ".hxx", true)
-      .Default(false);
-}
-
-llvm::Expected<PathSeq> enumerateFiles(FileManager &FM, StringRef Directory) {
-  PathSeq Files;
-  std::error_code EC;
-  auto &FS = FM.getVirtualFileSystem();
-  for (llvm::vfs::recursive_directory_iterator i(FS, Directory, EC), ie;
-       i != ie; i.increment(EC)) {
-    if (EC)
-      return errorCodeToError(EC);
-
-    // Skip files that do not exist. This usually happens for broken symlinks.
-    if (FS.status(i->path()) == std::errc::no_such_file_or_directory)
-      continue;
-
-    StringRef Path = i->path();
-    if (isHeaderFile(Path))
-      Files.emplace_back(Path);
-  }
-
-  return Files;
-}
-
-HeaderGlob::HeaderGlob(StringRef GlobString, Regex &&Rule, HeaderType Type)
-    : GlobString(GlobString), Rule(std::move(Rule)), Type(Type) {}
-
-bool HeaderGlob::match(const HeaderFile &Header) {
-  if (Header.getType() != Type)
-    return false;
-
-  bool Match = Rule.match(Header.getPath());
-  if (Match)
-    FoundMatch = true;
-  return Match;
-}
-
-Expected<std::unique_ptr<HeaderGlob>> HeaderGlob::create(StringRef GlobString,
-                                                         HeaderType Type) {
-  auto Rule = MachO::createRegexFromGlob(GlobString);
-  if (!Rule)
-    return Rule.takeError();
-
-  return std::make_unique<HeaderGlob>(GlobString, std::move(*Rule), Type);
-}
-
 } // namespace clang::installapi