For source location entries that describe instantiations, encode the
token length in the PCH file rather than trying (and failing) to
reconstruct it be getting the spelling token's length.

llvm-svn: 69191
diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp
index 083d0d6..5a01aee 100644
--- a/clang/lib/Frontend/PCHReader.cpp
+++ b/clang/lib/Frontend/PCHReader.cpp
@@ -612,9 +612,7 @@
                               SpellingLoc,
                               SourceLocation::getFromRawEncoding(Record[2]),
                               SourceLocation::getFromRawEncoding(Record[3]),
-                              Lexer::MeasureTokenLength(SpellingLoc, 
-                                                        SourceMgr,
-                                                        PP.getLangOptions()));
+                              Record[4]);
       break;
     }