From 417877702b6424047854f85e1b155bf4b74647a0 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 17 Dec 2015 11:52:25 -0500 Subject: [PATCH] re PR c++/67576 (expression of typeid( expression ) is evaluated twice) PR c++/67576 PR c++/25466 * rtti.c (build_typeid): Use save_expr, not stabilize_reference. From-SVN: r231781 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/rtti.c | 2 +- gcc/testsuite/g++.dg/rtti/typeid11.C | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/rtti/typeid11.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1e030b033819..34e1ea241a66 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2015-12-17 Jason Merrill + PR c++/67576 + PR c++/25466 + * rtti.c (build_typeid): Use save_expr, not stabilize_reference. + PR c++/67557 * call.c (is_base_field_ref): New. (unsafe_copy_elision_p): New. diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index a8e6d25c8444..ac5a6fb82b35 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -335,7 +335,7 @@ build_typeid (tree exp, tsubst_flags_t complain) /* So we need to look into the vtable of the type of exp. Make sure it isn't a null lvalue. */ exp = cp_build_addr_expr (exp, complain); - exp = stabilize_reference (exp); + exp = save_expr (exp); cond = cp_convert (boolean_type_node, exp, complain); exp = cp_build_indirect_ref (exp, RO_NULL, complain); } diff --git a/gcc/testsuite/g++.dg/rtti/typeid11.C b/gcc/testsuite/g++.dg/rtti/typeid11.C new file mode 100644 index 000000000000..384b0f417054 --- /dev/null +++ b/gcc/testsuite/g++.dg/rtti/typeid11.C @@ -0,0 +1,16 @@ +// { dg-do run } + +#include + +struct Base { virtual void foo() {} }; // polymorphic + +int main() +{ + Base b; + Base *ary[] = { &b, &b, &b}; + + int iter = 0; + typeid(*ary[iter++]); + if (iter != 1) // should be 1 + __builtin_abort(); // but 2 +} -- 2.47.2