Remove unused IsCXXAware and IgnoreSysRoots option from HeaderSearchOptions::Entry.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@89035 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 16 insertions, 23 deletions

diff --git a/include/clang/Frontend/HeaderSearchOptions.h b/include/clang/Frontend/HeaderSearchOptions.h
index 500663b82c..2edc7e1f4a 100644
--- a/include/clang/Frontend/HeaderSearchOptions.h
+++ b/include/clang/Frontend/HeaderSearchOptions.h
@@ -33,17 +33,13 @@ public:
   struct Entry {
     std::string Path;
     frontend::IncludeDirGroup Group;
-    unsigned IsCXXAware : 1;
     unsigned IsUserSupplied : 1;
     unsigned IsFramework : 1;
-    unsigned IgnoreSysRoot : 1;
 
     Entry(llvm::StringRef _Path, frontend::IncludeDirGroup _Group,
-          bool _IsCXXAware, bool _IsUserSupplied, bool _IsFramework,
-          bool _IgnoreSysRoot)
-      : Path(_Path), Group(_Group), IsCXXAware(_IsCXXAware),
-        IsUserSupplied(_IsUserSupplied), IsFramework(_IsFramework),
-        IgnoreSysRoot(_IgnoreSysRoot) {}
+          bool _IsUserSupplied, bool _IsFramework)
+      : Path(_Path), Group(_Group), IsUserSupplied(_IsUserSupplied),
+        IsFramework(_IsFramework) {}
   };
 
   /// If non-empty, the directory to use as a "virtual system root" for include
@@ -81,10 +77,8 @@ public:
 
   /// AddPath - Add the \arg Path path to the specified \arg Group list.
   void AddPath(llvm::StringRef Path, frontend::IncludeDirGroup Group,
-               bool IsCXXAware, bool IsUserSupplied,
-               bool IsFramework, bool IgnoreSysRoot = false) {
-    UserEntries.push_back(Entry(Path, Group, IsCXXAware, IsUserSupplied,
-                                IsFramework, IgnoreSysRoot));
+               bool IsUserSupplied, bool IsFramework) {
+    UserEntries.push_back(Entry(Path, Group, IsUserSupplied, IsFramework));
   }
 };
 
diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
index 5964a26deb..e752e3ec7b 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
+++ b/lib/Frontend/InitHeaderSearch.cpp
@@ -630,8 +630,8 @@ void clang::ApplyHeaderSearchOptions(HeaderSearch &HS,
   // Add the user defined entries.
   for (unsigned i = 0, e = HSOpts.UserEntries.size(); i != e; ++i) {
     const HeaderSearchOptions::Entry &E = HSOpts.UserEntries[i];
-    Init.AddPath(E.Path, E.Group, E.IsCXXAware, E.IsUserSupplied, E.IsFramework,
-                 E.IgnoreSysRoot);
+    Init.AddPath(E.Path, E.Group, false, E.IsUserSupplied, E.IsFramework,
+                 false);
   }
 
   // Add entries from CPATH and friends.
diff --git a/tools/clang-cc/Options.cpp b/tools/clang-cc/Options.cpp
index 1dccafd526..bcda7c7e5a 100644
--- a/tools/clang-cc/Options.cpp
+++ b/tools/clang-cc/Options.cpp
@@ -920,32 +920,31 @@ void clang::InitializeHeaderSearchOptions(HeaderSearchOptions &Opts,
   unsigned Iidx = 0, Fidx = 0;
   while (Iidx < I_dirs.size() && Fidx < F_dirs.size()) {
     if (I_dirs.getPosition(Iidx) < F_dirs.getPosition(Fidx)) {
-      Opts.AddPath(I_dirs[Iidx], frontend::Angled, false, true, false);
+      Opts.AddPath(I_dirs[Iidx], frontend::Angled, true, false);
       ++Iidx;
     } else {
-      Opts.AddPath(F_dirs[Fidx], frontend::Angled, false, true, true);
+      Opts.AddPath(F_dirs[Fidx], frontend::Angled, true, true);
       ++Fidx;
     }
   }
 
   // Consume what's left from whatever list was longer.
   for (; Iidx != I_dirs.size(); ++Iidx)
-    Opts.AddPath(I_dirs[Iidx], frontend::Angled, false, true, false);
+    Opts.AddPath(I_dirs[Iidx], frontend::Angled, true, false);
   for (; Fidx != F_dirs.size(); ++Fidx)
-    Opts.AddPath(F_dirs[Fidx], frontend::Angled, false, true, true);
+    Opts.AddPath(F_dirs[Fidx], frontend::Angled, true, true);
 
   // Handle -idirafter... options.
   for (unsigned i = 0, e = idirafter_dirs.size(); i != e; ++i)
-    Opts.AddPath(idirafter_dirs[i], frontend::After,
-        false, true, false);
+    Opts.AddPath(idirafter_dirs[i], frontend::After, true, false);
 
   // Handle -iquote... options.
   for (unsigned i = 0, e = iquote_dirs.size(); i != e; ++i)
-    Opts.AddPath(iquote_dirs[i], frontend::Quoted, false, true, false);
+    Opts.AddPath(iquote_dirs[i], frontend::Quoted, true, false);
 
   // Handle -isystem... options.
   for (unsigned i = 0, e = isystem_dirs.size(); i != e; ++i)
-    Opts.AddPath(isystem_dirs[i], frontend::System, false, true, false);
+    Opts.AddPath(isystem_dirs[i], frontend::System, true, false);
 
   // Walk the -iprefix/-iwithprefix/-iwithprefixbefore argument lists in
   // parallel, processing the values in order of occurance to get the right
@@ -974,12 +973,12 @@ void clang::InitializeHeaderSearchOptions(HeaderSearchOptions &Opts,
                   iwithprefix_vals.getPosition(iwithprefix_idx) <
                   iwithprefixbefore_vals.getPosition(iwithprefixbefore_idx))) {
         Opts.AddPath(Prefix+iwithprefix_vals[iwithprefix_idx],
-                     frontend::System, false, false, false);
+                     frontend::System, false, false);
         ++iwithprefix_idx;
         iwithprefix_done = iwithprefix_idx == iwithprefix_vals.size();
       } else {
         Opts.AddPath(Prefix+iwithprefixbefore_vals[iwithprefixbefore_idx],
-                     frontend::Angled, false, false, false);
+                     frontend::Angled, false, false);
         ++iwithprefixbefore_idx;
         iwithprefixbefore_done =
           iwithprefixbefore_idx == iwithprefixbefore_vals.size();