commit 0b0369a6b3778af0c2abebe18ef00082bcf42d78
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Jun 28 09:31:34 2010 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Jun 28 09:31:34 2010 +0000
tree 7e3b1c3f43506427b4fa9f89679539e6db5edca8
parent 2d69ec7a7232aa9fd804c3392650f74a8d65c55d

Fix various bugs in recent commits for C++ PCH.

llvm-svn: 106995

clang/lib/Frontend/PCHReader.cpp

diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp
index c220e26..3864624 100644
--- a/clang/lib/Frontend/PCHReader.cpp
+++ b/clang/lib/Frontend/PCHReader.cpp
@@ -3012,8 +3012,11 @@
     return TemplateArgument(GetType(Record[Idx++]));
   case TemplateArgument::Declaration:
     return TemplateArgument(GetDecl(Record[Idx++]));
-  case TemplateArgument::Integral:
-    return TemplateArgument(ReadAPSInt(Record, Idx), GetType(Record[Idx++]));
+  case TemplateArgument::Integral: {
+    llvm::APSInt Value = ReadAPSInt(Record, Idx);
+    QualType T = GetType(Record[Idx++]);
+    return TemplateArgument(Value, T);
+  }
   case TemplateArgument::Template:
     return TemplateArgument(ReadTemplateName(Record, Idx));
   case TemplateArgument::Expression: