aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2019-02-28 00:07:06 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2019-02-28 00:07:06 +0000
commit294a3e20e5bf4290cf9001d1a532a155af3bca9c (patch)
tree849feb9ca1457ec69248badfd3806bd5945aeaf2
parentcba8a572c208078c1c6eb9845b54f960526c53c0 (diff)
downloadgcc-294a3e20e5bf4290cf9001d1a532a155af3bca9c.zip
gcc-294a3e20e5bf4290cf9001d1a532a155af3bca9c.tar.gz
gcc-294a3e20e5bf4290cf9001d1a532a155af3bca9c.tar.bz2
PR c++/88857 - ICE with value-initialization of argument in template.
* call.c (convert_like_real): Don't call build_value_init in template. * g++.dg/cpp0x/initlist-value4.C: New test. From-SVN: r269267
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/call.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/initlist-value4.C12
4 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e4d876b..8ad0f22 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-27 Marek Polacek <polacek@redhat.com>
+
+ PR c++/88857 - ICE with value-initialization of argument in template.
+ * call.c (convert_like_real): Don't call build_value_init in template.
+
2019-02-27 Jason Merrill <jason@redhat.com>
PR c++/86969 - ICE with constexpr if and recursive generic lambdas.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index c53eb58..fb67d905 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -7005,7 +7005,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
/* If we're initializing from {}, it's value-initialization. */
if (BRACE_ENCLOSED_INITIALIZER_P (expr)
&& CONSTRUCTOR_NELTS (expr) == 0
- && TYPE_HAS_DEFAULT_CONSTRUCTOR (totype))
+ && TYPE_HAS_DEFAULT_CONSTRUCTOR (totype)
+ && !processing_template_decl)
{
bool direct = CONSTRUCTOR_IS_DIRECT_INIT (expr);
if (abstract_virtuals_error_sfinae (NULL_TREE, totype, complain))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eff4a81..0b126ba 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2019-02-27 Marek Polacek <polacek@redhat.com>
+ PR c++/88857 - ICE with value-initialization of argument in template.
+ * g++.dg/cpp0x/initlist-value4.C: New test.
+
+2019-02-27 Marek Polacek <polacek@redhat.com>
+
PR c++/89511 - ICE with using-declaration and unscoped enumerator.
* g++.dg/cpp0x/using-enum-3.C: New test.
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-value4.C b/gcc/testsuite/g++.dg/cpp0x/initlist-value4.C
new file mode 100644
index 0000000..427147f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-value4.C
@@ -0,0 +1,12 @@
+// PR c++/88857
+// { dg-do compile { target c++11 } }
+
+class S { int a; };
+void foo (const S &, int);
+
+template <int N>
+void
+bar ()
+{
+ foo ({}); // { dg-error "too few arguments to function" }
+}