Rename pch::SVN_BRANCH_REVISION to pch::VERSION_CONTROL_BRANCH_REVISION.

llvm-svn: 94214
This commit is contained in:
Ted Kremenek 2010-01-22 20:59:36 +00:00
parent 2377a0e0ea
commit 17437130e9
3 changed files with 8 additions and 8 deletions

View File

@ -30,7 +30,7 @@ namespace clang {
/// designed for the previous version could not support reading
/// the new version), this number should be increased.
///
/// Version 3 of PCH files also requires that the Subversion branch and
/// Version 3 of PCH files also requires that the version control branch and
/// revision match exactly, since there is no backward compatibility of
/// PCH files at this time.
const unsigned VERSION_MAJOR = 3;
@ -219,9 +219,9 @@ namespace clang {
/// comments were encountered in the source code.
COMMENT_RANGES = 20,
/// \brief Record code for the Subversion branch and revision information
/// of the compiler used to build this PCH file.
SVN_BRANCH_REVISION = 21
/// \brief Record code for the version control branch and revision
/// information of the compiler used to build this PCH file.
VERSION_CONTROL_BRANCH_REVISION = 21
};
/// \brief Record types used within a source manager block.

View File

@ -1399,7 +1399,7 @@ PCHReader::ReadPCHBlock() {
NumComments = BlobLen / sizeof(SourceRange);
break;
case pch::SVN_BRANCH_REVISION: {
case pch::VERSION_CONTROL_BRANCH_REVISION: {
unsigned CurRevision = getClangSubversionRevision();
if (Record[0] && CurRevision && Record[0] != CurRevision) {
Diag(Record[0] < CurRevision? diag::warn_pch_version_too_old

View File

@ -543,7 +543,7 @@ void PCHWriter::WriteBlockInfoBlock() {
RECORD(STAT_CACHE);
RECORD(EXT_VECTOR_DECLS);
RECORD(COMMENT_RANGES);
RECORD(SVN_BRANCH_REVISION);
RECORD(VERSION_CONTROL_BRANCH_REVISION);
// SourceManager Block.
BLOCK(SOURCE_MANAGER_BLOCK);
@ -709,12 +709,12 @@ void PCHWriter::WriteMetadata(ASTContext &Context, const char *isysroot) {
// Subversion branch/version information.
BitCodeAbbrev *SvnAbbrev = new BitCodeAbbrev();
SvnAbbrev->Add(BitCodeAbbrevOp(pch::SVN_BRANCH_REVISION));
SvnAbbrev->Add(BitCodeAbbrevOp(pch::VERSION_CONTROL_BRANCH_REVISION));
SvnAbbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); // SVN revision
SvnAbbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob)); // SVN branch/tag
unsigned SvnAbbrevCode = Stream.EmitAbbrev(SvnAbbrev);
Record.clear();
Record.push_back(pch::SVN_BRANCH_REVISION);
Record.push_back(pch::VERSION_CONTROL_BRANCH_REVISION);
Record.push_back(getClangSubversionRevision());
Stream.EmitRecordWithBlob(SvnAbbrevCode, Record, getClangRepositoryPath());
}