diff --git a/clang/include/clang/Lex/HeaderSearchOptions.h b/clang/include/clang/Lex/HeaderSearchOptions.h index d739dc2afa2b..8fecd65726f8 100644 --- a/clang/include/clang/Lex/HeaderSearchOptions.h +++ b/clang/include/clang/Lex/HeaderSearchOptions.h @@ -52,17 +52,10 @@ public: /// path. unsigned IgnoreSysRoot : 1; - /// \brief True if this entry is an internal search path. - /// - /// This typically indicates that users didn't directly provide it, but - /// instead it was provided by a compatibility layer for a particular - /// system. - unsigned IsInternal : 1; - - Entry(StringRef path, frontend::IncludeDirGroup group, - bool isFramework, bool ignoreSysRoot, bool isInternal) + Entry(StringRef path, frontend::IncludeDirGroup group, bool isFramework, + bool ignoreSysRoot) : Path(path), Group(group), IsFramework(isFramework), - IgnoreSysRoot(ignoreSysRoot), IsInternal(isInternal) {} + IgnoreSysRoot(ignoreSysRoot) {} }; struct SystemHeaderPrefix { @@ -123,9 +116,8 @@ public: /// AddPath - Add the \p Path path to the specified \p Group list. void AddPath(StringRef Path, frontend::IncludeDirGroup Group, - bool IsFramework, bool IgnoreSysRoot, bool IsInternal = false) { - UserEntries.push_back(Entry(Path, Group, IsFramework, - IgnoreSysRoot, IsInternal)); + bool IsFramework, bool IgnoreSysRoot) { + UserEntries.push_back(Entry(Path, Group, IsFramework, IgnoreSysRoot)); } /// AddSystemHeaderPrefix - Override whether \#include directives naming a diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 49f89d4c79ee..f49f30d87809 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -889,8 +889,7 @@ static void ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args) { frontend::IncludeDirGroup Group = frontend::System; if ((*I)->getOption().matches(OPT_internal_externc_isystem)) Group = frontend::ExternCSystem; - Opts.AddPath((*I)->getValue(), Group, false, /*IgnoreSysRoot=*/true, - /*IsInternal=*/true); + Opts.AddPath((*I)->getValue(), Group, false, true); } // Add the path prefixes which are implicitly treated as being system headers. diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index c07e1e9982f3..ac86d41eb14f 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -3691,10 +3691,8 @@ bool ASTReader::ParseHeaderSearchOptions(const RecordData &Record, = static_cast(Record[Idx++]); bool IsFramework = Record[Idx++]; bool IgnoreSysRoot = Record[Idx++]; - bool IsInternal = Record[Idx++]; HSOpts.UserEntries.push_back( - HeaderSearchOptions::Entry(Path, Group, IsFramework, IgnoreSysRoot, - IsInternal)); + HeaderSearchOptions::Entry(Path, Group, IsFramework, IgnoreSysRoot)); } // System header prefixes. diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 0499f5c6f473..25e3d52f370a 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -1114,7 +1114,6 @@ void ASTWriter::WriteControlBlock(Preprocessor &PP, ASTContext &Context, Record.push_back(static_cast(Entry.Group)); Record.push_back(Entry.IsFramework); Record.push_back(Entry.IgnoreSysRoot); - Record.push_back(Entry.IsInternal); } // System header prefixes.