summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2013-01-30 00:34:26 +0000
committerDaniel Dunbar <daniel@zuster.org>2013-01-30 00:34:26 +0000
commit5368173f12b6abe4f45d1d48aa45a50c98fd35fc (patch)
tree61530475ace094edd927aa881f9f6f984ebbcce9
parent325e86946382f1ffa46cf249f7726541f2834f22 (diff)
downloadbcm5719-llvm-5368173f12b6abe4f45d1d48aa45a50c98fd35fc.tar.gz
bcm5719-llvm-5368173f12b6abe4f45d1d48aa45a50c98fd35fc.zip
[Frontend] Remove HeaderSearchOptions::Entry::IsInternal, which is unused.
llvm-svn: 173866
-rw-r--r--clang/include/clang/Lex/HeaderSearchOptions.h18
-rw-r--r--clang/lib/Frontend/CompilerInvocation.cpp3
-rw-r--r--clang/lib/Serialization/ASTReader.cpp4
-rw-r--r--clang/lib/Serialization/ASTWriter.cpp1
4 files changed, 7 insertions, 19 deletions
diff --git a/clang/include/clang/Lex/HeaderSearchOptions.h b/clang/include/clang/Lex/HeaderSearchOptions.h
index d739dc2afa2..8fecd65726f 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 49f89d4c79e..f49f30d8780 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 c07e1e9982f..ac86d41eb14 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<frontend::IncludeDirGroup>(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 0499f5c6f47..25e3d52f370 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<unsigned>(Entry.Group));
Record.push_back(Entry.IsFramework);
Record.push_back(Entry.IgnoreSysRoot);
- Record.push_back(Entry.IsInternal);
}
// System header prefixes.
OpenPOWER on IntegriCloud