From: Anders Carlsson Date: Mon, 23 Mar 2009 17:49:10 +0000 (+0000) Subject: It's an error to try to allocate an abstract object using new. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9bbe49f513080b3307e88bdee0d383f4b8c1d4e;p=clang It's an error to try to allocate an abstract object using new. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67542 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 699c3db7b8..b00f47cf8a 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -220,7 +220,9 @@ def err_static_assert_expression_is_not_constant : Error< def err_static_assert_failed : Error<"static_assert failed \"%0\"">; def err_abstract_type_in_decl : Error< - "%select{return|parameter|variable|field}0 type %1 is an abstract class">; + "%select{return|parameter|variable|field}1 type %0 is an abstract class">; +def err_allocation_of_abstract_type : Error< + "allocation of an object of abstract type %0">; def note_pure_virtual_function : Note< "pure virtual function %0">; diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 8bc5a6073b..e8702bcea1 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -1634,7 +1634,8 @@ public: SourceLocation Loc, SourceRange Range); std::string getAmbiguousPathsDisplayString(BasePaths &Paths); - bool RequireNonAbstractType(SourceLocation Loc, QualType T, unsigned SelID); + bool RequireNonAbstractType(SourceLocation Loc, QualType T, + unsigned DiagID, unsigned SelID); //===--------------------------------------------------------------------===// // C++ Overloaded Operators [C++ 13.5] diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index bcb21c33ce..c964daf6fd 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -1641,7 +1641,9 @@ Sema::ActOnVariableDeclarator(Scope* S, Declarator& D, DeclContext* DC, } // The variable can not have an abstract class type. - if (RequireNonAbstractType(D.getIdentifierLoc(), R, 2 /* variable type */)) + if (RequireNonAbstractType(D.getIdentifierLoc(), R, + diag::err_abstract_type_in_decl, + 2 /* variable type */)) InvalidDecl = true; // The variable can not @@ -1815,6 +1817,7 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, // Check that the return type is not an abstract class type. if (RequireNonAbstractType(D.getIdentifierLoc(), R->getAsFunctionType()->getResultType(), + diag::err_abstract_type_in_decl, 0 /* return type */)) InvalidDecl = true; @@ -1996,6 +1999,7 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, // Function parameters cannot have abstract class types. if (RequireNonAbstractType(PVD->getLocation(), PVD->getType(), + diag::err_abstract_type_in_decl, 1 /* parameter type */)) InvalidDecl = true; Params.push_back(PVD); @@ -3534,7 +3538,8 @@ FieldDecl *Sema::CheckFieldDecl(DeclarationName Name, QualType T, } // Fields can not have abstract class types - if (RequireNonAbstractType(Loc, T, 3 /* field type */)) + if (RequireNonAbstractType(Loc, T, diag::err_abstract_type_in_decl, + 3 /* field type */)) InvalidDecl = true; // If this is declared as a bit-field, check the bit-field. diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 6be2052fdf..ad2dba7ce4 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -784,7 +784,7 @@ namespace { } bool Sema::RequireNonAbstractType(SourceLocation Loc, QualType T, - unsigned SelID) { + unsigned DiagID, unsigned SelID) { if (!getLangOptions().CPlusPlus) return false; @@ -800,7 +800,7 @@ bool Sema::RequireNonAbstractType(SourceLocation Loc, QualType T, if (!RD->isAbstract()) return false; - Diag(Loc, diag::err_abstract_type_in_decl) << SelID << RD->getDeclName(); + Diag(Loc, DiagID) << RD->getDeclName() << SelID; // Check if we've already emitted the list of pure virtual functions for this // class. diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index b3d94c372d..ac36a1f22d 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -238,6 +238,10 @@ Sema::ActOnCXXNew(SourceLocation StartLoc, bool UseGlobal, if (CheckAllocatedType(AllocType, D)) return ExprError(); + if (RequireNonAbstractType(D.getSourceRange().getBegin(), AllocType, + diag::err_allocation_of_abstract_type, 0)) + return ExprError(); + QualType ResultType = AllocType->isDependentType() ? Context.DependentTy : Context.getPointerType(AllocType); diff --git a/test/SemaCXX/abstract.cpp b/test/SemaCXX/abstract.cpp index e3c7651efb..1b6099ae7a 100644 --- a/test/SemaCXX/abstract.cpp +++ b/test/SemaCXX/abstract.cpp @@ -25,6 +25,8 @@ class E : D { static_assert(!__is_abstract(E), "E inherits from an abstract class but implements f"); +C *d = new C; // expected-error {{allocation of an object of abstract type 'C'}} + C c; // expected-error {{variable type 'C' is an abstract class}} void t1(C c); // expected-error {{parameter type 'C' is an abstract class}} void t2(C); // expected-error {{parameter type 'C' is an abstract class}} @@ -32,3 +34,4 @@ void t2(C); // expected-error {{parameter type 'C' is an abstract class}} struct S { C c; // expected-error {{field type 'C' is an abstract class}} }; +