maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[arcmt] Copy the diagnostics so we don't have to worry about invaliding iterators from the diagnostic list. 

Should fix http://llvm.org/PR15500

llvm-svn: 178500
This commit is contained in:
Argyrios Kyrtzidis 2013-04-01 21:12:30 +00:00
parent 6674c703b6
commit d2c0abad2b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/ARCMigrate/TransProtectedScope.cpp
View File

@ -109,7 +109,12 @@ public:
SourceRange BodyRange = BodyCtx.getTopStmt()->getSourceRange();
const CapturedDiagList &DiagList = Pass.getDiags();
CapturedDiagList::iterator I = DiagList.begin(), E = DiagList.end();
// Copy the diagnostics so we don't have to worry about invaliding iterators
// from the diagnostic list.
SmallVector<StoredDiagnostic, 16> StoredDiags;
StoredDiags.append(DiagList.begin(), DiagList.end());
SmallVectorImpl<StoredDiagnostic>::iterator
I = StoredDiags.begin(), E = StoredDiags.end();
while (I != E) {
if (I->getID() == diag::err_switch_into_protected_scope &&
isInRange(I->getLocation(), BodyRange)) {
@ -120,8 +125,9 @@ public:
}
}
void handleProtectedScopeError(CapturedDiagList::iterator &DiagI,
CapturedDiagList::iterator DiagE) {
void handleProtectedScopeError(
SmallVectorImpl<StoredDiagnostic>::iterator &DiagI,
SmallVectorImpl<StoredDiagnostic>::iterator DiagE){
Transaction Trans(Pass.TA);
assert(DiagI->getID() == diag::err_switch_into_protected_scope);
SourceLocation ErrLoc = DiagI->getLocation();