Rename stuff in PCHBitCodes.h
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@111475 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 8d79d6c..8448f42 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -1411,7 +1411,7 @@
ASTReader::ReadASTBlock(PerFileData &F) {
llvm::BitstreamCursor &Stream = F.Stream;
- if (Stream.EnterSubBlock(pch::PCH_BLOCK_ID)) {
+ if (Stream.EnterSubBlock(pch::AST_BLOCK_ID)) {
Error("malformed block record in AST file");
return Failure;
}
@@ -1484,7 +1484,7 @@
Record.clear();
const char *BlobStart = 0;
unsigned BlobLen = 0;
- switch ((pch::PCHRecordTypes)Stream.ReadRecord(Code, Record,
+ switch ((pch::ASTRecordTypes)Stream.ReadRecord(Code, Record,
&BlobStart, &BlobLen)) {
default: // Default behavior: ignore.
break;
@@ -1923,7 +1923,7 @@
return Failure;
}
break;
- case pch::PCH_BLOCK_ID:
+ case pch::AST_BLOCK_ID:
switch (ReadASTBlock(F)) {
case Success:
break;
@@ -2109,8 +2109,8 @@
// We only know the AST subblock ID.
switch (BlockID) {
- case pch::PCH_BLOCK_ID:
- if (Stream.EnterSubBlock(pch::PCH_BLOCK_ID)) {
+ case pch::AST_BLOCK_ID:
+ if (Stream.EnterSubBlock(pch::AST_BLOCK_ID)) {
Diags.Report(diag::err_fe_pch_malformed_block) << ASTFileName;
return std::string();
}
diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp
index 2293260..af954c8 100644
--- a/lib/Serialization/ASTWriter.cpp
+++ b/lib/Serialization/ASTWriter.cpp
@@ -614,7 +614,7 @@
#define RECORD(X) EmitRecordID(pch::X, #X, Stream, Record)
// AST Top-Level Block.
- BLOCK(PCH_BLOCK);
+ BLOCK(AST_BLOCK);
RECORD(ORIGINAL_FILE_NAME);
RECORD(TYPE_OFFSET);
RECORD(DECL_OFFSET);
@@ -2119,7 +2119,7 @@
// Write the remaining AST contents.
RecordData Record;
- Stream.EnterSubblock(pch::PCH_BLOCK_ID, 5);
+ Stream.EnterSubblock(pch::AST_BLOCK_ID, 5);
WriteMetadata(Context, isysroot);
WriteLanguageOptions(Context.getLangOptions());
if (StatCalls && !isysroot)
@@ -2238,7 +2238,7 @@
Preprocessor &PP = SemaRef.PP;
RecordData Record;
- Stream.EnterSubblock(pch::PCH_BLOCK_ID, 5);
+ Stream.EnterSubblock(pch::AST_BLOCK_ID, 5);
WriteMetadata(Context, isysroot);
if (StatCalls && !isysroot)
WriteStatCache(*StatCalls);