commit 0aa21c98a66e57e450435a565c26203d0fb109ac
author Douglas Gregor <dgregor@apple.com> Thu Oct 18 18:27:37 2012 +0000
committer Douglas Gregor <dgregor@apple.com> Thu Oct 18 18:27:37 2012 +0000
tree 6b17ac80805d0c76701f959a3ea4bde6aa178035
parent a83d529369813d28af9e445fe3b9ec1e5ed0a0b6

Collapse the "version control revision/tag" AST file record into the
metadata record, which already had other version information. Clean up
the block info block along the way.

llvm-svn: 166204

clang/lib/Serialization/ASTReader.cpp

diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 3d6d31d..019e7c1 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -1800,6 +1800,13 @@
       }
 
       RelocatablePCH = Record[4];
+
+      const std::string &CurBranch = getClangFullRepositoryVersion();
+      StringRef ASTBranch(BlobStart, BlobLen);
+      if (StringRef(CurBranch) != ASTBranch && !DisableValidation) {
+        Diag(diag::warn_pch_different_branch) << ASTBranch << CurBranch;
+        return IgnorePCH;
+      }
       break;
     }
 
@@ -1877,16 +1884,6 @@
         OriginalDir.assign(BlobStart, BlobLen);
       }
       break;
-
-    case VERSION_CONTROL_BRANCH_REVISION: {
-      const std::string &CurBranch = getClangFullRepositoryVersion();
-      StringRef ASTBranch(BlobStart, BlobLen);
-      if (StringRef(CurBranch) != ASTBranch && !DisableValidation) {
-        Diag(diag::warn_pch_different_branch) << ASTBranch << CurBranch;
-        return IgnorePCH;
-      }
-      break;
-    }
     }
   }
 
@@ -3069,7 +3066,7 @@
 
     unsigned BlockID = Stream.ReadSubBlockID();
 
-    // We only know the AST subblock ID.
+    // We only know the control subblock ID.
     switch (BlockID) {
     case llvm::bitc::BLOCKINFO_BLOCK_ID:
       if (Stream.ReadBlockInfoBlock()) {