diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/rtti.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/rtti/typeid11.C | 16 |
3 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a192f00..73906f3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-12-17 Jason Merrill <jason@redhat.com> + + PR c++/67576 + PR c++/25466 + * rtti.c (build_typeid): Use save_expr, not stabilize_reference. + 2015-12-16 Patrick Palka <ppalka@gcc.gnu.org> PR c++/16333 diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index b397b55..f42b1cb 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -332,7 +332,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 0000000..384b0f4 --- /dev/null +++ b/gcc/testsuite/g++.dg/rtti/typeid11.C @@ -0,0 +1,16 @@ +// { dg-do run } + +#include <typeinfo> + +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 +} |