# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1622859504 -32400
# Node ID 0d4b2609c30f188f395cd5c8c25ac5e948e69dd1
# Parent  d6e4c9eda2cc88eae829cd0225758bd59cdfa20e
...

diff -r d6e4c9eda2cc -r 0d4b2609c30f clang/lib/Parse/ParseCbC.cpp
--- a/clang/lib/Parse/ParseCbC.cpp	Fri Jun 04 23:22:07 2021 +0900
+++ b/clang/lib/Parse/ParseCbC.cpp	Sat Jun 05 11:18:24 2021 +0900
@@ -244,7 +244,7 @@
   Token TokSave = Tok;
   SourceLocation PLocSave = PrevTokLocation;
   // jmp_buf env_buf;   --> int env_buf[64];
-  Tok = PP.ReadFromString("int env_buf[64];",Loc);
+  PP.ReadFromString("int env_buf[64];",Loc);
   ConsumeAnyToken();
   // innerRes = CreateDeclStmt(bufII, false, false, 64, DeclSpec::TST_typename, CreateIdentifierInfo("int", Loc));
   StmtVector Stmts;
@@ -326,6 +326,8 @@
      PP.AnnotateCachedTokens(LHSToken);
      LHS = getExprAnnotation(LHSToken);
   } else if (Classification.getKind() == Sema::NC_NonType) {
+     Token Tok;
+     Tok.startToken();
      Tok.setKind(tok::annot_non_type);
      setNonTypeAnnotation(Tok, Classification.getNonTypeDecl());
      Tok.setLocation(Loc);