aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2019-05-06 16:56:39 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2019-05-06 16:56:39 +0000
commitcd0a831ce6d6fe9ff14959b0602ad7deed6d2785 (patch)
tree24c8ddcec75adcb5aac5942d4b9c2e57bb1bae04 /gcc
parentfd661a34e53dd2b20ae5309b78960c171ff9a720 (diff)
downloadgcc-cd0a831ce6d6fe9ff14959b0602ad7deed6d2785.zip
gcc-cd0a831ce6d6fe9ff14959b0602ad7deed6d2785.tar.gz
gcc-cd0a831ce6d6fe9ff14959b0602ad7deed6d2785.tar.bz2
PR c++/90265 - ICE with generic lambda.
* pt.c (tsubst_copy_and_build): Use a dedicated variable for the last element in the vector. * g++.dg/cpp1y/lambda-generic-90265.C: New test. From-SVN: r270917
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/pt.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C4
4 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d9b7d2b..e974951 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-06 Marek Polacek <polacek@redhat.com>
+
+ PR c++/90265 - ICE with generic lambda.
+ * pt.c (tsubst_copy_and_build): Use a dedicated variable for the last
+ element in the vector.
+
2019-05-03 Martin Liska <mliska@suse.cz>
* call.c (build_aggr_conv): Use is_empty instead of
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 3e8c70b..2f2066e 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -18881,7 +18881,8 @@ tsubst_copy_and_build (tree t,
if (thisarg)
{
/* Shift the other args over to make room. */
- vec_safe_push (call_args, (*call_args)[nargs-1]);
+ tree last = (*call_args)[nargs - 1];
+ vec_safe_push (call_args, last);
for (int i = nargs-1; i > 0; --i)
(*call_args)[i] = (*call_args)[i-1];
(*call_args)[0] = thisarg;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 679ac80..1ffdb10 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-06 Marek Polacek <polacek@redhat.com>
+
+ PR c++/90265 - ICE with generic lambda.
+ * g++.dg/cpp1y/lambda-generic-90265.C: New test.
+
2019-05-06 Richard Biener <rguenther@suse.de>
PR tree-optimization/90358
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C
new file mode 100644
index 0000000..d9ab9b7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C
@@ -0,0 +1,4 @@
+// PR c++/90265
+// { dg-do compile { target c++14 } }
+
+void (*a)(int, int, int, void *) = [](auto, auto, auto, auto) {};