[cfe-commits] r160855 - in /cfe/trunk: lib/Sema/SemaLookup.cpp test/SemaCXX/pr13394-crash-on-invalid.cpp
Benjamin Kramer
benny.kra at googlemail.com
Fri Jul 27 03:21:08 PDT 2012
Author: d0k
Date: Fri Jul 27 05:21:08 2012
New Revision: 160855
URL: http://llvm.org/viewvc/llvm-project?rev=160855&view=rev
Log:
Fix PR13394: Erasing from a vector changes the end of the vector, so make sure we always have the right end.
Added:
cfe/trunk/test/SemaCXX/pr13394-crash-on-invalid.cpp
Modified:
cfe/trunk/lib/Sema/SemaLookup.cpp
Modified: cfe/trunk/lib/Sema/SemaLookup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=160855&r1=160854&r2=160855&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaLookup.cpp (original)
+++ cfe/trunk/lib/Sema/SemaLookup.cpp Fri Jul 27 05:21:08 2012
@@ -3895,13 +3895,13 @@
// 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;
}
Added: cfe/trunk/test/SemaCXX/pr13394-crash-on-invalid.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/pr13394-crash-on-invalid.cpp?rev=160855&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/pr13394-crash-on-invalid.cpp (added)
+++ cfe/trunk/test/SemaCXX/pr13394-crash-on-invalid.cpp Fri Jul 27 05:21:08 2012
@@ -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}}
+}
More information about the cfe-commits
mailing list