From 2426ee774baaea8d4a447229830ac0f31c69ab25 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Mon, 26 Nov 2018 23:26:40 +0000 Subject: [PATCH] PR c++/88120 - ICE when calling save_expr in a template. * typeck.c (cp_build_binary_op): Call cp_save_expr instead of save_expr. * g++.dg/cpp0x/pr88120.C: New test. From-SVN: r266492 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/typeck.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/pr88120.C | 23 +++++++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr88120.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e870205541b..8e157f6c25c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-11-26 Marek Polacek + + PR c++/88120 - ICE when calling save_expr in a template. + * typeck.c (cp_build_binary_op): Call cp_save_expr instead of + save_expr. + 2018-11-22 Jakub Jelinek PR c++/87386 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 81cb4057a5b..f45c06e3fe4 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4919,7 +4919,7 @@ cp_build_binary_op (location_t location, tree pfn0, delta0, e1, e2; if (TREE_SIDE_EFFECTS (op0)) - op0 = save_expr (op0); + op0 = cp_save_expr (op0); pfn0 = pfn_from_ptrmemfunc (op0); delta0 = delta_from_ptrmemfunc (op0); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 234885aa44f..989b548276e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-11-26 Marek Polacek + + PR c++/88120 - ICE when calling save_expr in a template. + * g++.dg/cpp0x/pr88120.C: New test. + 2018-11-26 Jozef Lawrynowicz * c-c++-common/Warray-bounds-3.c (test_strcpy_bounds): Use long instead diff --git a/gcc/testsuite/g++.dg/cpp0x/pr88120.C b/gcc/testsuite/g++.dg/cpp0x/pr88120.C new file mode 100644 index 00000000000..7004e03f4da --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr88120.C @@ -0,0 +1,23 @@ +// PR c++/88120 +// { dg-do compile { target c++11 } } + +typedef int a; +enum b : a; +class c { + enum f { d }; + c(f); + friend c operator&(c, c); + typedef void (c::*e)(); + operator e(); +}; +class g { + template b h(); + struct k { + c i; + }; +}; +template b g::h() { + k j; + &j || j.i &c::d; + return b(); +} -- 2.30.2