Parse: Fix repeat/while error recovery path

We were creating an ErrorExpr whose source range overlaps with
the following statement, which is now flagged by ASTScope.

Author: slavapestov

lib/Parse/ParseDecl.cpp

@@ -6000,7 +6000,7 @@ Parser::parseDeclVar(ParseDeclOptions Flags,
     // up in Decls to be returned to caller.
     if (topLevelDecl) {
       PBD->setDeclContext(topLevelDecl);
-      auto range = PBD->getSourceRange();
+      auto range = PBD->getSourceRangeIncludingAttrs();
       topLevelDecl->setBody(BraceStmt::create(Context, range.Start,
                                               ASTNode(PBD), range.End, true));
       Decls.insert(Decls.begin()+NumDeclsInResult, topLevelDecl);

lib/Parse/ParseStmt.cpp

@@ -1876,9 +1876,8 @@ ParserResult<Stmt> Parser::parseStmtRepeat(LabeledStmtInfo labelInfo) {
 
   ParserResult<Expr> condition;
   if (Tok.is(tok::l_brace)) {
-    SourceLoc lbraceLoc = Tok.getLoc();
     diagnose(whileLoc, diag::missing_condition_after_while);
-    condition = makeParserErrorResult(new (Context) ErrorExpr(lbraceLoc));
+    condition = makeParserErrorResult(new (Context) ErrorExpr(whileLoc));
   } else {
     condition = parseExpr(diag::expected_expr_repeat_while);
     status |= condition;