diff options
| author | Jason Merrill <jason@redhat.com> | 2012-01-13 10:49:29 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-01-13 10:49:29 -0500 |
| commit | 4ce7d589feeb878cbd482f4b03b369698dab0528 (patch) | |
| tree | 4f543fbd28a7735e0bdbe3e8028803e5fbccd71e /gcc | |
| parent | 8395e28bbfa2e57acf4a31d3b2ca6e0f1be6a962 (diff) | |
| download | gcc-4ce7d589feeb878cbd482f4b03b369698dab0528.zip gcc-4ce7d589feeb878cbd482f4b03b369698dab0528.tar.gz gcc-4ce7d589feeb878cbd482f4b03b369698dab0528.tar.bz2 | |
re PR c++/51620 ([c++0x] [4.6/4.7 Regression] ICE with private destructor)
PR c++/51620
* class.c (build_vtbl_initializer): Use __cxa_deleted_virtual.
From-SVN: r183155
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/class.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/defaulted34.C | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/virtual3.C | 11 |
5 files changed, 44 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 978df51..58210f1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-13 Jason Merrill <jason@redhat.com> + + PR c++/51620 + * class.c (build_vtbl_initializer): Use __cxa_deleted_virtual. + 2012-01-12 Jason Merrill <jason@redhat.com> PR c++/51714 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 58c89d3..9b957fe 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -8352,6 +8352,18 @@ build_vtbl_initializer (tree binfo, init = abort_fndecl_addr; } } + /* Likewise for deleted virtuals. */ + else if (DECL_DELETED_FN (fn_original)) + { + fn = get_identifier ("__cxa_deleted_virtual"); + if (!get_global_value_if_present (fn, &fn)) + fn = push_library_fn (fn, (build_function_type_list + (void_type_node, NULL_TREE)), + NULL_TREE); + if (!TARGET_VTABLE_USES_DESCRIPTORS) + init = fold_convert (vfunc_ptr_type_node, + build_fold_addr_expr (fn)); + } else { if (!integer_zerop (delta) || vcall_index) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cbee6be..2778556 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-01-13 Jason Merrill <jason@redhat.com> + + PR c++/51620 + * g++.dg/cpp0x/defaulted34.C: New. + * g++.dg/template/virtual3.C: New. + 2012-01-13 Richard Guenther <rguenther@suse.de> PR middle-end/8081 diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted34.C b/gcc/testsuite/g++.dg/cpp0x/defaulted34.C new file mode 100644 index 0000000..0821992 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted34.C @@ -0,0 +1,10 @@ +// { dg-options -std=c++0x } +// { dg-final { scan-assembler "__cxa_deleted_virtual" } } + +struct A +{ + virtual void f(); + virtual ~A() = delete; +}; + +void A::f() {} diff --git a/gcc/testsuite/g++.dg/template/virtual3.C b/gcc/testsuite/g++.dg/template/virtual3.C new file mode 100644 index 0000000..9fcfc45 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/virtual3.C @@ -0,0 +1,11 @@ +// PR c++/51620 + +template<int> class A +{ + virtual ~A(); // { dg-error "non-deleted|private" } +}; + +struct B : A<0>, A<1> // { dg-error "deleted|context" } +{ + B() {} // { dg-error "context" } +}; |