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

1 files changed, 9 insertions, 10 deletions

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();