---

yaml
---
r: 349325
b: refs/heads/master-next
c: c56421c
h: refs/heads/master
i:
  349323: 5ce2ebc

Author: rintaro

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 9eb4c216ee097ce01650f14452d6d0b258d3e09e
+refs/heads/master-next: c56421c5be1c32481f710d635daf03027f6a2171
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Parse/ParseDecl.cpp

@@ -3468,7 +3468,8 @@ void Parser::diagnoseConsecutiveIDs(StringRef First, SourceLoc FirstLoc,
 
   diagnose(Tok, diag::repeated_identifier, DeclKindName);
   auto Second = Tok.getText();
-  auto SecondLoc = consumeToken();
+  auto SecondLoc = Tok.getLoc();
+  ignoreToken();
 
   SourceRange FixRange(FirstLoc, SecondLoc);
   // Provide two fix-its: a direct concatenation of the two identifiers

branches/master-next/test/Syntax/round_trip_misc.swift

@@ -28,6 +28,9 @@ do {
 do {
   typealias Alias = A & B & C.D<>
 }
+do {
+  typealias boo bar = Int
+}
 
 // Orphan '}' at top level
 }