---

yaml
---
r: 348943
b: refs/heads/master
c: ebbc9c8
h: refs/heads/master
i:
  348941: e04c26c
  348939: 8ef3a5d
  348935: d53a009
  348927: 6164303

Author: rintaro

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bb08667bf5fa6305491e2026bd123f422575c9c0
+refs/heads/master: ebbc9c837f5f209caed937dae636cbe9c523a01f
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Parse/Parser.cpp

@@ -755,6 +755,7 @@ void Parser::skipSingle() {
 }
 
 void Parser::ignoreToken() {
+  assert(!Tok.is(tok::eof) && "Lexing eof token");
   ParsedTriviaList Skipped;
   Skipped.reserve(LeadingTrivia.size() + TrailingTrivia.size() + 1 + 2);
   std::move(LeadingTrivia.begin(), LeadingTrivia.end(),
@@ -764,7 +765,7 @@ void Parser::ignoreToken() {
             std::back_inserter(Skipped));
 
   TokReceiver->receive(Tok);
-  consumeTokenWithoutFeedingReceiver();
+  L->lex(Tok, LeadingTrivia, TrailingTrivia);
 
   std::move(LeadingTrivia.begin(), LeadingTrivia.end(),
             std::back_inserter(Skipped));

trunk/test/Parse/recovery.swift

@@ -511,7 +511,7 @@ struct ErrorInFunctionSignatureResultArrayType5 {
 
 
 struct ErrorInFunctionSignatureResultArrayType11 { // expected-note{{in declaration of 'ErrorInFunctionSignatureResultArrayType11'}}
-  func foo() -> Int[(a){a++}] { // expected-error {{consecutive declarations on a line must be separated by ';'}} {{21-21=;}} expected-error {{expected ']' in array type}} expected-note {{to match this opening '['}} expected-error {{expected '{' in body of function declaration}} expected-error {{expected declaration}}
+  func foo() -> Int[(a){a++}] { // expected-error {{consecutive declarations on a line must be separated by ';'}} {{20-20=;}} expected-error {{expected ']' in array type}} expected-note {{to match this opening '['}} expected-error {{expected '{' in body of function declaration}} expected-error {{expected declaration}}
   }
 }