intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-26 12:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR13394: Erasing from a vector changes the end of the vector, so make sure we always have the right end.

Browse Source 
llvm-svn: 160855
This commit is contained in:
Benjamin Kramer
2012-07-27 10:21:08 +00:00
parent 38862ecf79
commit a2dcac1095
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Sema/SemaLookup.cpp
View File

@@ -3895,13 +3895,13 @@ TypoCorrection Sema::CorrectTypo(const DeclarationNameInfo &TypoName,
// If a validator callback object was given, drop the correction
// unless it passes validation.
bool Viable = false;
for (TypoResultList::iterator RI = I->second.begin(), RIEnd = I->second.end();
RI != RIEnd; /* Increment in loop. */) {
for (TypoResultList::iterator RI = I->second.begin();
RI != I->second.end(); /* Increment in loop. */) {
TypoResultList::iterator Prev = RI;
++RI;
if (Prev->isResolved()) {
if (!isCandidateViable(CCC, *Prev))
I->second.erase(Prev);
RI = I->second.erase(Prev);
else
Viable = true;
}

16
clang/test/SemaCXX/pr13394-crash-on-invalid.cpp Normal file
View File

@@ -0,0 +1,16 @@
// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
// Don't crash (PR13394).
namespace stretch_v1 {
struct closure_t {
const stretch_v1::ops_t* d_methods; // expected-error {{no type named 'ops_t' in namespace 'stretch_v1'}}
};
}
namespace gatekeeper_v1 {
namespace gatekeeper_factory_v1 {
struct closure_t { // expected-note {{'closure_t' declared here}}
gatekeeper_v1::closure_t* create(); // expected-error {{no type named 'closure_t' in namespace 'gatekeeper_v1'; did you mean 'closure_t'?}}
};
}
gatekeeper_v1::closure_t *x; // expected-error {{no type named 'closure_t' in namespace 'gatekeeper_v1}}
}