975-g++-ICE-with-generic-lambda.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From 7a1606168f60622f73a7dd90778e2a148a2c520c Mon Sep 17 00:00:00 2001
  2. From: mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4>
  3. Date: Mon, 6 May 2019 17:08:08 +0000
  4. Subject: [PATCH] PR c++/90265 - ICE with generic lambda. * pt.c
  5. (tsubst_copy_and_build): Use a dedicated variable for the last
  6. element in the vector.
  7. * g++.dg/cpp1y/lambda-generic-90265.C: New test.
  8. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@270919 138bc75d-0d04-0410-961f-82ee72b054a4
  9. ---
  10. gcc/cp/ChangeLog | 6 ++++++
  11. gcc/cp/pt.c | 3 ++-
  12. gcc/testsuite/ChangeLog | 5 +++++
  13. gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C | 4 ++++
  14. 4 files changed, 17 insertions(+), 1 deletion(-)
  15. create mode 100644 gcc/testsuite/g++.dg/cpp1y/lambda-generic-90265.C
  16. --- a/gcc/cp/ChangeLog
  17. +++ b/gcc/cp/ChangeLog
  18. @@ -1,3 +1,9 @@
  19. +2019-05-06 Marek Polacek <[email protected]>
  20. +
  21. + PR c++/90265 - ICE with generic lambda.
  22. + * pt.c (tsubst_copy_and_build): Use a dedicated variable for the last
  23. + element in the vector.
  24. +
  25. 2019-05-03 Release Manager
  26. * GCC 9.1.0 released.
  27. --- a/gcc/cp/pt.c
  28. +++ b/gcc/cp/pt.c
  29. @@ -18881,7 +18881,8 @@ tsubst_copy_and_build (tree t,
  30. if (thisarg)
  31. {
  32. /* Shift the other args over to make room. */
  33. - vec_safe_push (call_args, (*call_args)[nargs-1]);
  34. + tree last = (*call_args)[nargs - 1];
  35. + vec_safe_push (call_args, last);
  36. for (int i = nargs-1; i > 0; --i)
  37. (*call_args)[i] = (*call_args)[i-1];
  38. (*call_args)[0] = thisarg;