summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2018-02-01 15:36:04 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2018-02-01 15:36:04 +0000
commit22db75d788c4db9e1f2c141d8567fa93a3e47368 (patch)
tree08eaaa23e6345a60a44473b0b17f23ac9ad82e5b
parent5efeed105b2148f0323ae201a25f17023caf48f7 (diff)
downloadgcc-22db75d788c4db9e1f2c141d8567fa93a3e47368.tar.gz
/cp
2018-02-01 Paolo Carlini <paolo.carlini@oracle.com> PR c++/83796 * call.c (convert_like_real): If w're initializing from {} explicitly call abstract_virtuals_error_sfinae. /testsuite 2018-02-01 Paolo Carlini <paolo.carlini@oracle.com> PR c++/83796 * g++.dg/cpp0x/abstract-default1.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@257298 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/call.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/abstract-default1.C26
4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6eb7f27883f..8fc9042ea01 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-01 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/83796
+ * call.c (convert_like_real): If w're initializing from {} explicitly
+ call abstract_virtuals_error_sfinae.
+
2018-01-31 Jason Merrill <jason@redhat.com>
Jakub Jelinek <jakub@redhat.com>
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 46d5ef5e7c0..15b723ad2b0 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6765,6 +6765,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
&& TYPE_HAS_DEFAULT_CONSTRUCTOR (totype))
{
bool direct = CONSTRUCTOR_IS_DIRECT_INIT (expr);
+ if (abstract_virtuals_error_sfinae (NULL_TREE, totype, complain))
+ return error_mark_node;
expr = build_value_init (totype, complain);
expr = get_target_expr_sfinae (expr, complain);
if (expr != error_mark_node)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3f2f4473611..465ae15296a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-01 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/83796
+ * g++.dg/cpp0x/abstract-default1.C: New.
+
2018-02-01 Richard Sandiford <richard.sandiford@linaro.org>
PR tree-optimization/81635
diff --git a/gcc/testsuite/g++.dg/cpp0x/abstract-default1.C b/gcc/testsuite/g++.dg/cpp0x/abstract-default1.C
new file mode 100644
index 00000000000..e98af766170
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/abstract-default1.C
@@ -0,0 +1,26 @@
+// PR c++/83796
+// { dg-do compile { target c++11 } }
+
+struct MyAbstractClass
+{
+ virtual int foo() const = 0;
+};
+
+struct TestClass
+{
+ TestClass(const MyAbstractClass& m = {}) // { dg-error "abstract type" }
+ : value_(m.foo()) {}
+
+ int value_;
+};
+
+int TestFunction(const MyAbstractClass& m = {}) // { dg-error "abstract type" }
+{
+ return m.foo();
+}
+
+int main()
+{
+ TestClass testInstance; // { dg-error "abstract type" }
+ TestFunction(); // { dg-error "abstract type" }
+}