diff options
Diffstat (limited to 'lib/Sema/JumpDiagnostics.cpp')
| -rw-r--r-- | lib/Sema/JumpDiagnostics.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/Sema/JumpDiagnostics.cpp b/lib/Sema/JumpDiagnostics.cpp index 58a7862370cc0..a7495e8e04825 100644 --- a/lib/Sema/JumpDiagnostics.cpp +++ b/lib/Sema/JumpDiagnostics.cpp @@ -299,7 +299,7 @@ void JumpScopeChecker::BuildScopeInformation(Stmt *S, auto *CS = cast<ObjCForCollectionStmt>(S); unsigned Diag = diag::note_protected_by_objc_fast_enumeration; unsigned NewParentScope = Scopes.size(); - Scopes.push_back(GotoScope(ParentScope, Diag, 0, S->getLocStart())); + Scopes.push_back(GotoScope(ParentScope, Diag, 0, S->getBeginLoc())); BuildScopeInformation(CS->getBody(), NewParentScope); return; } @@ -353,16 +353,16 @@ void JumpScopeChecker::BuildScopeInformation(Stmt *S, // Cannot jump into the middle of the condition. unsigned NewParentScope = Scopes.size(); - Scopes.push_back(GotoScope(ParentScope, Diag, 0, IS->getLocStart())); + Scopes.push_back(GotoScope(ParentScope, Diag, 0, IS->getBeginLoc())); BuildScopeInformation(IS->getCond(), NewParentScope); // Jumps into either arm of an 'if constexpr' are not allowed. NewParentScope = Scopes.size(); - Scopes.push_back(GotoScope(ParentScope, Diag, 0, IS->getLocStart())); + Scopes.push_back(GotoScope(ParentScope, Diag, 0, IS->getBeginLoc())); BuildScopeInformation(IS->getThen(), NewParentScope); if (Stmt *Else = IS->getElse()) { NewParentScope = Scopes.size(); - Scopes.push_back(GotoScope(ParentScope, Diag, 0, IS->getLocStart())); + Scopes.push_back(GotoScope(ParentScope, Diag, 0, IS->getBeginLoc())); BuildScopeInformation(Else, NewParentScope); } return; @@ -619,11 +619,11 @@ void JumpScopeChecker::VerifyJumps() { continue; SourceLocation Loc; if (CaseStmt *CS = dyn_cast<CaseStmt>(SC)) - Loc = CS->getLocStart(); + Loc = CS->getBeginLoc(); else if (DefaultStmt *DS = dyn_cast<DefaultStmt>(SC)) - Loc = DS->getLocStart(); + Loc = DS->getBeginLoc(); else - Loc = SC->getLocStart(); + Loc = SC->getBeginLoc(); CheckJump(SS, SC, Loc, diag::err_switch_into_protected_scope, 0, diag::warn_cxx98_compat_switch_into_protected_scope); } @@ -863,7 +863,7 @@ void JumpScopeChecker::CheckJump(Stmt *From, Stmt *To, SourceLocation DiagLoc, // less nested scope. Check if it crosses a __finally along the way. for (unsigned I = FromScope; I > ToScope; I = Scopes[I].ParentScope) { if (Scopes[I].InDiag == diag::note_protected_by_seh_finally) { - S.Diag(From->getLocStart(), diag::warn_jump_out_of_seh_finally); + S.Diag(From->getBeginLoc(), diag::warn_jump_out_of_seh_finally); break; } } |