From c97fb132552d3ad4135f244637cde57007e23722 Mon Sep 17 00:00:00 2001 From: paolo Date: Wed, 19 Mar 2014 18:21:52 +0000 Subject: [PATCH] /cp 2014-03-19 Paolo Carlini PR c++/51474 * call.c (build_new_method_call_1): Handle pure virtuals called by NSDMIs too. /testsuite 2014-03-19 Paolo Carlini PR c++/51474 * g++.dg/cpp0x/nsdmi-virtual2.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208686 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/call.c | 21 +++++++++++++-------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual2.C | 8 ++++++++ 4 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3cf68583fcc..655f6d4152b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-03-19 Paolo Carlini + + PR c++/51474 + * call.c (build_new_method_call_1): Handle pure virtuals called by + NSDMIs too. + 2014-03-17 Adam Butcher PR c++/60390 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 184e92226cc..877f6d9cf17 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -7828,15 +7828,20 @@ build_new_method_call_1 (tree instance, tree fns, vec **args, if (!(flags & LOOKUP_NONVIRTUAL) && DECL_PURE_VIRTUAL_P (fn) && instance == current_class_ref - && (DECL_CONSTRUCTOR_P (current_function_decl) - || DECL_DESTRUCTOR_P (current_function_decl)) && (complain & tf_warning)) - /* This is not an error, it is runtime undefined - behavior. */ - warning (0, (DECL_CONSTRUCTOR_P (current_function_decl) ? - "pure virtual %q#D called from constructor" - : "pure virtual %q#D called from destructor"), - fn); + { + /* This is not an error, it is runtime undefined + behavior. */ + if (!current_function_decl) + warning (0, "pure virtual %q#D called from " + "non-static data member initializer", fn); + else if (DECL_CONSTRUCTOR_P (current_function_decl) + || DECL_DESTRUCTOR_P (current_function_decl)) + warning (0, (DECL_CONSTRUCTOR_P (current_function_decl) + ? "pure virtual %q#D called from constructor" + : "pure virtual %q#D called from destructor"), + fn); + } if (TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE && is_dummy_object (instance)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c40bddb7da0..d0f56cdbca1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-03-19 Paolo Carlini + + PR c++/51474 + * g++.dg/cpp0x/nsdmi-virtual2.C: New. + 2014-03-19 H.J. Lu PR testsuite/60590 diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual2.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual2.C new file mode 100644 index 00000000000..157854c5aa0 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-virtual2.C @@ -0,0 +1,8 @@ +// PR c++/51474 +// { dg-do compile { target c++11 } } + +struct A +{ + virtual int foo() = 0; + int i = foo(); // { dg-warning "pure virtual" } +}; -- 2.11.4.GIT