Don't allow catch declarations to name an abstract class
llvm-svn: 70248
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index bc87c67..87a518b 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -2577,6 +2577,11 @@
RequireCompleteType(Begin, BaseType, DK))
Invalid = true;
+ if (!Invalid && RequireNonAbstractType(Begin, ExDeclType,
+ diag::err_abstract_type_in_decl,
+ AbstractVariableType))
+ Invalid = true;
+
// FIXME: Need to test for ability to copy-construct and destroy the
// exception variable.
// FIXME: Need to check for abstract classes.
diff --git a/clang/test/SemaCXX/exceptions.cpp b/clang/test/SemaCXX/exceptions.cpp
index 508f23d..42973eb 100644
--- a/clang/test/SemaCXX/exceptions.cpp
+++ b/clang/test/SemaCXX/exceptions.cpp
@@ -2,6 +2,8 @@
struct A; // expected-note 4 {{forward declaration of 'struct A'}}
+struct Abstract { virtual void f() = 0; }; // expected-note {{pure virtual function 'f'}}
+
void trys() {
try {
} catch(int i) { // expected-note {{previous definition}}
@@ -12,6 +14,7 @@
} catch(A a) { // expected-error {{cannot catch incomplete type 'struct A'}}
} catch(A *a) { // expected-error {{cannot catch pointer to incomplete type 'struct A'}}
} catch(A &a) { // expected-error {{cannot catch reference to incomplete type 'struct A'}}
+ } catch(Abstract) { // expected-error {{variable type 'Abstract' is an abstract class}}
} catch(...) {
int j = i; // expected-error {{use of undeclared identifier 'i'}}
}