wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the PCH reader use the diagnostics system for its complaints. 

llvm-svn: 70330
This commit is contained in:
Douglas Gregor 2009-04-28 21:53:25 +00:00
parent 8577f62622
commit 6f00bf8ceb
4 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticFrontendKinds.td
View File

@ -129,4 +129,6 @@ def warn_macro_name_used_in_pch : Warning<
def warn_pch_compiler_options_mismatch : Warning< def warn_pch_compiler_options_mismatch : Warning<
"compiler options used when building the precompiled header differ from " "compiler options used when building the precompiled header differ from "
"the options used when using the precompiled header">; "the options used when using the precompiled header">;
def err_not_a_pch_file : Error<
"'%0' does not appear to be a precompiled header file">, DefaultFatal;
} }

6
clang/include/clang/Frontend/PCHReader.h
View File

@ -312,6 +312,12 @@ private:
void LoadedDecl(unsigned Index, Decl *D); void LoadedDecl(unsigned Index, Decl *D);
Decl *ReadDeclRecord(uint64_t Offset, unsigned Index); Decl *ReadDeclRecord(uint64_t Offset, unsigned Index);
/// \brief Produce an error diagnostic and return true.
///
/// This routine should only be used for fatal errors that have to
/// do with non-routine failures (e.g., corrupted PCH file).
bool Error(const char *Msg);
PCHReader(const PCHReader&); // do not implement PCHReader(const PCHReader&); // do not implement
PCHReader &operator=(const PCHReader &); // do not implement PCHReader &operator=(const PCHReader &); // do not implement

88
clang/lib/Frontend/PCHReader.cpp
View File

@ -313,8 +313,10 @@ typedef OnDiskChainedHashTable<PCHIdentifierLookupTrait>
PCHIdentifierLookupTable; PCHIdentifierLookupTable;
// FIXME: use the diagnostics machinery // FIXME: use the diagnostics machinery
static bool Error(const char *Str) { bool PCHReader::Error(const char *Msg) {
std::fprintf(stderr, "%s\n", Str); Diagnostic &Diags = PP.getDiagnostics();
unsigned DiagID = Diags.getCustomDiagID(Diagnostic::Fatal, Msg);
Diag(DiagID);
return true; return true;
} }
@ -708,13 +710,13 @@ PCHReader::PCHReadResult PCHReader::ReadSourceManagerBlock() {
// The stream itself is going to skip over the source manager block. // The stream itself is going to skip over the source manager block.
if (Stream.SkipBlock()) { if (Stream.SkipBlock()) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return Failure; return Failure;
} }
// Enter the source manager block. // Enter the source manager block.
if (SLocEntryCursor.EnterSubBlock(pch::SOURCE_MANAGER_BLOCK_ID)) { if (SLocEntryCursor.EnterSubBlock(pch::SOURCE_MANAGER_BLOCK_ID)) {
Error("Malformed source manager block record"); Error("malformed source manager block record in PCH file");
return Failure; return Failure;
} }
@ -725,7 +727,7 @@ PCHReader::PCHReadResult PCHReader::ReadSourceManagerBlock() {
unsigned Code = SLocEntryCursor.ReadCode(); unsigned Code = SLocEntryCursor.ReadCode();
if (Code == llvm::bitc::END_BLOCK) { if (Code == llvm::bitc::END_BLOCK) {
if (SLocEntryCursor.ReadBlockEnd()) { if (SLocEntryCursor.ReadBlockEnd()) {
Error("Error at end of Source Manager block"); Error("error at end of Source Manager block in PCH file");
return Failure; return Failure;
} }
return Success; return Success;
@ -735,7 +737,7 @@ PCHReader::PCHReadResult PCHReader::ReadSourceManagerBlock() {
// No known subblocks, always skip them. // No known subblocks, always skip them.
SLocEntryCursor.ReadSubBlockID(); SLocEntryCursor.ReadSubBlockID();
if (SLocEntryCursor.SkipBlock()) { if (SLocEntryCursor.SkipBlock()) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return Failure; return Failure;
} }
continue; continue;
@ -868,7 +870,7 @@ PCHReader::PCHReadResult PCHReader::ReadSLocEntryRecord(unsigned ID) {
bool PCHReader::ReadBlockAbbrevs(llvm::BitstreamCursor &Cursor, bool PCHReader::ReadBlockAbbrevs(llvm::BitstreamCursor &Cursor,
unsigned BlockID) { unsigned BlockID) {
if (Cursor.EnterSubBlock(BlockID)) { if (Cursor.EnterSubBlock(BlockID)) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return Failure; return Failure;
} }
@ -902,7 +904,7 @@ void PCHReader::ReadMacroRecord(uint64_t Offset) {
// No known subblocks, always skip them. // No known subblocks, always skip them.
Stream.ReadSubBlockID(); Stream.ReadSubBlockID();
if (Stream.SkipBlock()) { if (Stream.SkipBlock()) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return; return;
} }
continue; continue;
@ -928,7 +930,7 @@ void PCHReader::ReadMacroRecord(uint64_t Offset) {
IdentifierInfo *II = DecodeIdentifierInfo(Record[0]); IdentifierInfo *II = DecodeIdentifierInfo(Record[0]);
if (II == 0) { if (II == 0) {
Error("Macro must have a name"); Error("macro must have a name in PCH file");
return; return;
} }
SourceLocation Loc = SourceLocation::getFromRawEncoding(Record[1]); SourceLocation Loc = SourceLocation::getFromRawEncoding(Record[1]);
@ -987,7 +989,7 @@ void PCHReader::ReadMacroRecord(uint64_t Offset) {
PCHReader::PCHReadResult PCHReader::PCHReadResult
PCHReader::ReadPCHBlock() { PCHReader::ReadPCHBlock() {
if (Stream.EnterSubBlock(pch::PCH_BLOCK_ID)) { if (Stream.EnterSubBlock(pch::PCH_BLOCK_ID)) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return Failure; return Failure;
} }
@ -997,7 +999,7 @@ PCHReader::ReadPCHBlock() {
unsigned Code = Stream.ReadCode(); unsigned Code = Stream.ReadCode();
if (Code == llvm::bitc::END_BLOCK) { if (Code == llvm::bitc::END_BLOCK) {
if (Stream.ReadBlockEnd()) { if (Stream.ReadBlockEnd()) {
Error("Error at end of module block"); Error("error at end of module block in PCH file");
return Failure; return Failure;
} }
@ -1009,7 +1011,7 @@ PCHReader::ReadPCHBlock() {
case pch::TYPES_BLOCK_ID: // Skip types block (lazily loaded) case pch::TYPES_BLOCK_ID: // Skip types block (lazily loaded)
default: // Skip unknown content. default: // Skip unknown content.
if (Stream.SkipBlock()) { if (Stream.SkipBlock()) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return Failure; return Failure;
} }
break; break;
@ -1023,14 +1025,14 @@ PCHReader::ReadPCHBlock() {
if (Stream.SkipBlock() || // Skip with the main cursor. if (Stream.SkipBlock() || // Skip with the main cursor.
// Read the abbrevs. // Read the abbrevs.
ReadBlockAbbrevs(DeclsCursor, pch::DECLS_BLOCK_ID)) { ReadBlockAbbrevs(DeclsCursor, pch::DECLS_BLOCK_ID)) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return Failure; return Failure;
} }
break; break;
case pch::PREPROCESSOR_BLOCK_ID: case pch::PREPROCESSOR_BLOCK_ID:
if (Stream.SkipBlock()) { if (Stream.SkipBlock()) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return Failure; return Failure;
} }
break; break;
@ -1041,7 +1043,7 @@ PCHReader::ReadPCHBlock() {
break; break;
case Failure: case Failure:
Error("Malformed source manager block"); Error("malformed source manager block in PCH file");
return Failure; return Failure;
case IgnorePCH: case IgnorePCH:
@ -1068,7 +1070,7 @@ PCHReader::ReadPCHBlock() {
case pch::TYPE_OFFSET: case pch::TYPE_OFFSET:
if (!TypesLoaded.empty()) { if (!TypesLoaded.empty()) {
Error("Duplicate TYPE_OFFSET record in PCH file"); Error("duplicate TYPE_OFFSET record in PCH file");
return Failure; return Failure;
} }
TypeOffsets = (const uint32_t *)BlobStart; TypeOffsets = (const uint32_t *)BlobStart;
@ -1077,7 +1079,7 @@ PCHReader::ReadPCHBlock() {
case pch::DECL_OFFSET: case pch::DECL_OFFSET:
if (!DeclsLoaded.empty()) { if (!DeclsLoaded.empty()) {
Error("Duplicate DECL_OFFSET record in PCH file"); Error("duplicate DECL_OFFSET record in PCH file");
return Failure; return Failure;
} }
DeclOffsets = (const uint32_t *)BlobStart; DeclOffsets = (const uint32_t *)BlobStart;
@ -1120,7 +1122,7 @@ PCHReader::ReadPCHBlock() {
case pch::IDENTIFIER_OFFSET: case pch::IDENTIFIER_OFFSET:
if (!IdentifiersLoaded.empty()) { if (!IdentifiersLoaded.empty()) {
Error("Duplicate IDENTIFIER_OFFSET record in PCH file"); Error("duplicate IDENTIFIER_OFFSET record in PCH file");
return Failure; return Failure;
} }
IdentifierOffsets = (const uint32_t *)BlobStart; IdentifierOffsets = (const uint32_t *)BlobStart;
@ -1130,7 +1132,7 @@ PCHReader::ReadPCHBlock() {
case pch::EXTERNAL_DEFINITIONS: case pch::EXTERNAL_DEFINITIONS:
if (!ExternalDefinitions.empty()) { if (!ExternalDefinitions.empty()) {
Error("Duplicate EXTERNAL_DEFINITIONS record in PCH file"); Error("duplicate EXTERNAL_DEFINITIONS record in PCH file");
return Failure; return Failure;
} }
ExternalDefinitions.swap(Record); ExternalDefinitions.swap(Record);
@ -1149,7 +1151,7 @@ PCHReader::ReadPCHBlock() {
case pch::TENTATIVE_DEFINITIONS: case pch::TENTATIVE_DEFINITIONS:
if (!TentativeDefinitions.empty()) { if (!TentativeDefinitions.empty()) {
Error("Duplicate TENTATIVE_DEFINITIONS record in PCH file"); Error("duplicate TENTATIVE_DEFINITIONS record in PCH file");
return Failure; return Failure;
} }
TentativeDefinitions.swap(Record); TentativeDefinitions.swap(Record);
@ -1157,7 +1159,7 @@ PCHReader::ReadPCHBlock() {
case pch::LOCALLY_SCOPED_EXTERNAL_DECLS: case pch::LOCALLY_SCOPED_EXTERNAL_DECLS:
if (!LocallyScopedExternalDecls.empty()) { if (!LocallyScopedExternalDecls.empty()) {
Error("Duplicate LOCALLY_SCOPED_EXTERNAL_DECLS record in PCH file"); Error("duplicate LOCALLY_SCOPED_EXTERNAL_DECLS record in PCH file");
return Failure; return Failure;
} }
LocallyScopedExternalDecls.swap(Record); LocallyScopedExternalDecls.swap(Record);
@ -1210,7 +1212,7 @@ PCHReader::ReadPCHBlock() {
case pch::EXT_VECTOR_DECLS: case pch::EXT_VECTOR_DECLS:
if (!ExtVectorDecls.empty()) { if (!ExtVectorDecls.empty()) {
Error("Duplicate EXT_VECTOR_DECLS record in PCH file"); Error("duplicate EXT_VECTOR_DECLS record in PCH file");
return Failure; return Failure;
} }
ExtVectorDecls.swap(Record); ExtVectorDecls.swap(Record);
@ -1218,14 +1220,14 @@ PCHReader::ReadPCHBlock() {
case pch::OBJC_CATEGORY_IMPLEMENTATIONS: case pch::OBJC_CATEGORY_IMPLEMENTATIONS:
if (!ObjCCategoryImpls.empty()) { if (!ObjCCategoryImpls.empty()) {
Error("Duplicate OBJC_CATEGORY_IMPLEMENTATIONS record in PCH file"); Error("duplicate OBJC_CATEGORY_IMPLEMENTATIONS record in PCH file");
return Failure; return Failure;
} }
ObjCCategoryImpls.swap(Record); ObjCCategoryImpls.swap(Record);
break; break;
} }
} }
Error("Premature end of bitstream"); Error("premature end of bitstream in PCH file");
return Failure; return Failure;
} }
@ -1251,15 +1253,15 @@ PCHReader::PCHReadResult PCHReader::ReadPCH(const std::string &FileName) {
Stream.Read(8) != 'P' || Stream.Read(8) != 'P' ||
Stream.Read(8) != 'C' || Stream.Read(8) != 'C' ||
Stream.Read(8) != 'H') { Stream.Read(8) != 'H') {
Error("Not a PCH file"); Diag(diag::err_not_a_pch_file) << FileName;
return IgnorePCH; return Failure;
} }
while (!Stream.AtEndOfStream()) { while (!Stream.AtEndOfStream()) {
unsigned Code = Stream.ReadCode(); unsigned Code = Stream.ReadCode();
if (Code != llvm::bitc::ENTER_SUBBLOCK) { if (Code != llvm::bitc::ENTER_SUBBLOCK) {
Error("Invalid record at top-level"); Error("invalid record at top-level of PCH file");
return Failure; return Failure;
} }
@ -1269,7 +1271,7 @@ PCHReader::PCHReadResult PCHReader::ReadPCH(const std::string &FileName) {
switch (BlockID) { switch (BlockID) {
case llvm::bitc::BLOCKINFO_BLOCK_ID: case llvm::bitc::BLOCKINFO_BLOCK_ID:
if (Stream.ReadBlockInfoBlock()) { if (Stream.ReadBlockInfoBlock()) {
Error("Malformed BlockInfoBlock"); Error("malformed BlockInfoBlock in PCH file");
return Failure; return Failure;
} }
break; break;
@ -1298,7 +1300,7 @@ PCHReader::PCHReadResult PCHReader::ReadPCH(const std::string &FileName) {
break; break;
default: default:
if (Stream.SkipBlock()) { if (Stream.SkipBlock()) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return Failure; return Failure;
} }
break; break;
@ -1553,7 +1555,7 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) {
case pch::TYPE_VECTOR: { case pch::TYPE_VECTOR: {
if (Record.size() != 2) { if (Record.size() != 2) {
Error("Incorrect encoding of vector type in PCH file"); Error("incorrect encoding of vector type in PCH file");
return QualType(); return QualType();
} }
@ -1564,7 +1566,7 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) {
case pch::TYPE_EXT_VECTOR: { case pch::TYPE_EXT_VECTOR: {
if (Record.size() != 2) { if (Record.size() != 2) {
Error("Incorrect encoding of extended vector type in PCH file"); Error("incorrect encoding of extended vector type in PCH file");
return QualType(); return QualType();
} }
@ -1575,7 +1577,7 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) {
case pch::TYPE_FUNCTION_NO_PROTO: { case pch::TYPE_FUNCTION_NO_PROTO: {
if (Record.size() != 1) { if (Record.size() != 1) {
Error("Incorrect encoding of no-proto function type"); Error("incorrect encoding of no-proto function type");
return QualType(); return QualType();
} }
QualType ResultType = GetType(Record[0]); QualType ResultType = GetType(Record[0]);
@ -1596,7 +1598,7 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) {
} }
case pch::TYPE_TYPEDEF: case pch::TYPE_TYPEDEF:
assert(Record.size() == 1 && "Incorrect encoding of typedef type"); assert(Record.size() == 1 && "incorrect encoding of typedef type");
return Context->getTypeDeclType(cast<TypedefDecl>(GetDecl(Record[0]))); return Context->getTypeDeclType(cast<TypedefDecl>(GetDecl(Record[0])));
case pch::TYPE_TYPEOF_EXPR: case pch::TYPE_TYPEOF_EXPR:
@ -1604,7 +1606,7 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) {
case pch::TYPE_TYPEOF: { case pch::TYPE_TYPEOF: {
if (Record.size() != 1) { if (Record.size() != 1) {
Error("Incorrect encoding of typeof(type) in PCH file"); Error("incorrect encoding of typeof(type) in PCH file");
return QualType(); return QualType();
} }
QualType UnderlyingType = GetType(Record[0]); QualType UnderlyingType = GetType(Record[0]);
@ -1612,15 +1614,15 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) {
} }
case pch::TYPE_RECORD: case pch::TYPE_RECORD:
assert(Record.size() == 1 && "Incorrect encoding of record type"); assert(Record.size() == 1 && "incorrect encoding of record type");
return Context->getTypeDeclType(cast<RecordDecl>(GetDecl(Record[0]))); return Context->getTypeDeclType(cast<RecordDecl>(GetDecl(Record[0])));
case pch::TYPE_ENUM: case pch::TYPE_ENUM:
assert(Record.size() == 1 && "Incorrect encoding of enum type"); assert(Record.size() == 1 && "incorrect encoding of enum type");
return Context->getTypeDeclType(cast<EnumDecl>(GetDecl(Record[0]))); return Context->getTypeDeclType(cast<EnumDecl>(GetDecl(Record[0])));
case pch::TYPE_OBJC_INTERFACE: case pch::TYPE_OBJC_INTERFACE:
assert(Record.size() == 1 && "Incorrect encoding of objc interface type"); assert(Record.size() == 1 && "incorrect encoding of objc interface type");
return Context->getObjCInterfaceType( return Context->getObjCInterfaceType(
cast<ObjCInterfaceDecl>(GetDecl(Record[0]))); cast<ObjCInterfaceDecl>(GetDecl(Record[0])));
@ -1700,7 +1702,7 @@ Decl *PCHReader::GetDecl(pch::DeclID ID) {
return 0; return 0;
if (ID > DeclsLoaded.size()) { if (ID > DeclsLoaded.size()) {
Error("Declaration ID out-of-range for PCH file"); Error("declaration ID out-of-range for PCH file");
return 0; return 0;
} }
@ -1952,7 +1954,7 @@ PCHReader::ReadMethodPool(Selector Sel) {
void PCHReader::SetIdentifierInfo(unsigned ID, IdentifierInfo *II) { void PCHReader::SetIdentifierInfo(unsigned ID, IdentifierInfo *II) {
assert(ID && "Non-zero identifier ID required"); assert(ID && "Non-zero identifier ID required");
assert(ID <= IdentifiersLoaded.size() && "Identifier ID out of range"); assert(ID <= IdentifiersLoaded.size() && "identifier ID out of range");
IdentifiersLoaded[ID - 1] = II; IdentifiersLoaded[ID - 1] = II;
} }
@ -1961,7 +1963,7 @@ IdentifierInfo *PCHReader::DecodeIdentifierInfo(unsigned ID) {
return 0; return 0;
if (!IdentifierTableData || IdentifiersLoaded.empty()) { if (!IdentifierTableData || IdentifiersLoaded.empty()) {
Error("No identifier table in PCH file"); Error("no identifier table in PCH file");
return 0; return 0;
} }
@ -1990,13 +1992,11 @@ Selector PCHReader::DecodeSelector(unsigned ID) {
if (ID == 0) if (ID == 0)
return Selector(); return Selector();
if (!MethodPoolLookupTableData) { if (!MethodPoolLookupTableData)
Error("No selector table in PCH file");
return Selector(); return Selector();
}
if (ID > TotalNumSelectors) { if (ID > TotalNumSelectors) {
Error("Selector ID out of range"); Error("selector ID out of range in PCH file");
return Selector(); return Selector();
} }

10
clang/lib/Frontend/PCHReaderStmt.cpp
View File

@ -16,12 +16,6 @@
#include "clang/AST/StmtVisitor.h" #include "clang/AST/StmtVisitor.h"
using namespace clang; using namespace clang;
// FIXME: use the diagnostics machinery
static bool Error(const char *Str) {
std::fprintf(stderr, "%s\n", Str);
return true;
}
namespace { namespace {
class PCHStmtReader : public StmtVisitor<PCHStmtReader, unsigned> { class PCHStmtReader : public StmtVisitor<PCHStmtReader, unsigned> {
PCHReader &Reader; PCHReader &Reader;
@ -830,7 +824,7 @@ Stmt *PCHReader::ReadStmt(llvm::BitstreamCursor &Cursor) {
unsigned Code = Cursor.ReadCode(); unsigned Code = Cursor.ReadCode();
if (Code == llvm::bitc::END_BLOCK) { if (Code == llvm::bitc::END_BLOCK) {
if (Cursor.ReadBlockEnd()) { if (Cursor.ReadBlockEnd()) {
Error("Error at end of Source Manager block"); Error("error at end of block in PCH file");
return 0; return 0;
} }
break; break;
@ -840,7 +834,7 @@ Stmt *PCHReader::ReadStmt(llvm::BitstreamCursor &Cursor) {
// No known subblocks, always skip them. // No known subblocks, always skip them.
Cursor.ReadSubBlockID(); Cursor.ReadSubBlockID();
if (Cursor.SkipBlock()) { if (Cursor.SkipBlock()) {
Error("Malformed block record"); Error("malformed block record in PCH file");
return 0; return 0;
} }
continue; continue;