};
}
-bool ASTReader::isAcceptableASTFile(StringRef Filename,
- FileManager &FileMgr,
- const LangOptions &LangOpts,
- const TargetOptions &TargetOpts,
- const PreprocessorOptions &PPOpts) {
+bool ASTReader::readASTFileControlBlock(StringRef Filename,
+ FileManager &FileMgr,
+ ASTReaderListener &Listener) {
// Open the AST file.
std::string ErrStr;
OwningPtr<llvm::MemoryBuffer> Buffer;
Buffer.reset(FileMgr.getBufferForFile(Filename, &ErrStr));
if (!Buffer) {
- return false;
+ return true;
}
// Initialize the stream
Stream.Read(8) != 'P' ||
Stream.Read(8) != 'C' ||
Stream.Read(8) != 'H') {
- return false;
+ return true;
}
- SimplePCHValidator Validator(LangOpts, TargetOpts, PPOpts, FileMgr);
RecordData Record;
bool InControlBlock = false;
while (!Stream.AtEndOfStream()) {
switch (BlockID) {
case CONTROL_BLOCK_ID:
if (Stream.EnterSubBlock(CONTROL_BLOCK_ID)) {
- return false;
+ return true;
} else {
InControlBlock = true;
}
default:
if (Stream.SkipBlock())
- return false;
+ return true;
break;
}
continue;
if (Code == llvm::bitc::END_BLOCK) {
if (Stream.ReadBlockEnd()) {
- return false;
+ return true;
}
+
InControlBlock = false;
continue;
}
switch ((ControlRecordTypes)RecCode) {
case METADATA: {
if (Record[0] != VERSION_MAJOR) {
- return false;
+ return true;
}
const std::string &CurBranch = getClangFullRepositoryVersion();
StringRef ASTBranch(BlobStart, BlobLen);
if (StringRef(CurBranch) != ASTBranch)
- return false;
+ return true;
break;
}
case LANGUAGE_OPTIONS:
- if (ParseLanguageOptions(Record, false, Validator))
- return false;
+ if (ParseLanguageOptions(Record, false, Listener))
+ return true;
break;
case TARGET_OPTIONS:
- if (ParseTargetOptions(Record, false, Validator))
- return false;
+ if (ParseTargetOptions(Record, false, Listener))
+ return true;
break;
case DIAGNOSTIC_OPTIONS:
- if (ParseDiagnosticOptions(Record, false, Validator))
- return false;
+ if (ParseDiagnosticOptions(Record, false, Listener))
+ return true;
break;
case FILE_SYSTEM_OPTIONS:
- if (ParseFileSystemOptions(Record, false, Validator))
- return false;
+ if (ParseFileSystemOptions(Record, false, Listener))
+ return true;
break;
case HEADER_SEARCH_OPTIONS:
- if (ParseHeaderSearchOptions(Record, false, Validator))
- return false;
+ if (ParseHeaderSearchOptions(Record, false, Listener))
+ return true;
break;
case PREPROCESSOR_OPTIONS: {
std::string IgnoredSuggestedPredefines;
- if (ParsePreprocessorOptions(Record, false, Validator,
+ if (ParsePreprocessorOptions(Record, false, Listener,
IgnoredSuggestedPredefines))
- return false;
+ return true;
break;
}
}
}
- return true;
+ return false;
+}
+
+
+bool ASTReader::isAcceptableASTFile(StringRef Filename,
+ FileManager &FileMgr,
+ const LangOptions &LangOpts,
+ const TargetOptions &TargetOpts,
+ const PreprocessorOptions &PPOpts) {
+ SimplePCHValidator validator(LangOpts, TargetOpts, PPOpts, FileMgr);
+ return !readASTFileControlBlock(Filename, FileMgr, validator);
}
bool ASTReader::ReadSubmoduleBlock(ModuleFile &F) {