diff options
author | Nico Weber <nicolasweber@gmx.de> | 2013-12-21 00:49:51 +0000 |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2013-12-21 00:49:51 +0000 |
commit | 7607fce11254436da15f30305a791de9755bedc7 (patch) | |
tree | 1982c8324bdf9336f646e06e524a9ff0b174e9d4 /clang/test | |
parent | 2658ea9e907a9da7ed8efc2ac9c82c0790ef99be (diff) | |
download | bcm5719-llvm-7607fce11254436da15f30305a791de9755bedc7.tar.gz bcm5719-llvm-7607fce11254436da15f30305a791de9755bedc7.zip |
Don't mark record decls invalid when one of its methods is invalid, PR18284.
Without this patch, record decls with invalid out-of-line method delcs would
sometimes be marked invalid, but not always. With this patch, they are
consistently never marked invalid.
(The code to do this was added in
http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20100809/033154.html
, but the test from that revision is still passing.)
As far as I can tell, this was the only place where a class was marked invalid
after its definition was complete.
llvm-svn: 197848
Diffstat (limited to 'clang/test')
-rw-r--r-- | clang/test/SemaCXX/constructor-initializer.cpp | 5 | ||||
-rw-r--r-- | clang/test/SemaCXX/pr13394-crash-on-invalid.cpp | 4 | ||||
-rw-r--r-- | clang/test/SemaCXX/pr18284-crash-on-invalid.cpp | 24 |
3 files changed, 28 insertions, 5 deletions
diff --git a/clang/test/SemaCXX/constructor-initializer.cpp b/clang/test/SemaCXX/constructor-initializer.cpp index 17576328c11..697f718eabb 100644 --- a/clang/test/SemaCXX/constructor-initializer.cpp +++ b/clang/test/SemaCXX/constructor-initializer.cpp @@ -232,15 +232,14 @@ namespace PR7402 { // <rdar://problem/8308215>: don't crash. // Lots of questionable recovery here; errors can change. namespace test3 { - class A : public std::exception {}; // expected-error {{undeclared identifier}} expected-error {{expected class name}} expected-note 4 {{candidate}} + class A : public std::exception {}; // expected-error {{undeclared identifier}} expected-error {{expected class name}} expected-note 2 {{candidate}} class B : public A { public: B(const String& s, int e=0) // expected-error {{unknown type name}} : A(e), m_String(s) , m_ErrorStr(__null) {} // expected-error {{no matching constructor}} expected-error {{does not name}} B(const B& e) : A(e), m_String(e.m_String), m_ErrorStr(__null) { // expected-error {{does not name}} \ - // expected-error {{no member named 'm_String' in 'test3::B'}} \ - // expected-error {{no matching}} + // expected-error {{no member named 'm_String' in 'test3::B'}} } }; } diff --git a/clang/test/SemaCXX/pr13394-crash-on-invalid.cpp b/clang/test/SemaCXX/pr13394-crash-on-invalid.cpp index 42b6508c713..304ee92f6a8 100644 --- a/clang/test/SemaCXX/pr13394-crash-on-invalid.cpp +++ b/clang/test/SemaCXX/pr13394-crash-on-invalid.cpp @@ -8,12 +8,12 @@ namespace stretch_v1 { } namespace gatekeeper_v1 { namespace gatekeeper_factory_v1 { - struct closure_t { // expected-note {{'closure_t' declared here}} + struct closure_t { // expected-note {{'closure_t' declared here}} expected-note {{'gatekeeper_factory_v1::closure_t' declared here}} gatekeeper_v1::closure_t* create(); // expected-error {{no type named 'closure_t' in namespace 'gatekeeper_v1'; did you mean simply 'closure_t'?}} }; } // FIXME: Typo correction should remove the 'gatekeeper_v1::' name specifier - gatekeeper_v1::closure_t *x; // expected-error-re {{no type named 'closure_t' in namespace 'gatekeeper_v1'{{$}}}} + gatekeeper_v1::closure_t *x; // expected-error {{no type named 'closure_t' in namespace 'gatekeeper_v1'; did you mean 'gatekeeper_factory_v1::closure_t'}} } namespace Foo { diff --git a/clang/test/SemaCXX/pr18284-crash-on-invalid.cpp b/clang/test/SemaCXX/pr18284-crash-on-invalid.cpp new file mode 100644 index 00000000000..5b1cb21f4bb --- /dev/null +++ b/clang/test/SemaCXX/pr18284-crash-on-invalid.cpp @@ -0,0 +1,24 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s +// Don't crash (PR18284). + +namespace n1 { +class A { }; +class C { A a; }; + +A::RunTest() {} // expected-error {{C++ requires a type specifier for all declarations}} + +void f() { + new C; +} +} // namespace n1 + +namespace n2 { +class A { }; +class C : public A { }; + +A::RunTest() {} // expected-error {{C++ requires a type specifier for all declarations}} + +void f() { + new C; +} +} // namespace n2 |