[cfe-commits] r70248 - in /cfe/trunk: lib/Sema/SemaDeclCXX.cpp test/SemaCXX/exceptions.cpp

Sebastian Redl sebastian.redl at getdesigned.at
Mon Apr 27 14:03:30 PDT 2009


Author: cornedbee
Date: Mon Apr 27 16:03:30 2009
New Revision: 70248

URL: http://llvm.org/viewvc/llvm-project?rev=70248&view=rev
Log:
Don't allow catch declarations to name an abstract class

Modified:
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp
    cfe/trunk/test/SemaCXX/exceptions.cpp

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=70248&r1=70247&r2=70248&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Mon Apr 27 16:03:30 2009
@@ -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.

Modified: cfe/trunk/test/SemaCXX/exceptions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/exceptions.cpp?rev=70248&r1=70247&r2=70248&view=diff

==============================================================================
--- cfe/trunk/test/SemaCXX/exceptions.cpp (original)
+++ cfe/trunk/test/SemaCXX/exceptions.cpp Mon Apr 27 16:03:30 2009
@@ -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'}}
   }





More information about the cfe-commits mailing list