From fa07d25b40bce1e4959a40a2753f1911e2b06431 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 20 May 2011 16:40:06 -0400 Subject: [PATCH] * tree.c (stabilize_expr): Fix typo. From-SVN: r173982 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/tree.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4ec657812e1..5aff2967a5b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-05-20 Jason Merrill + PR c++/48873 + * tree.c (stabilize_expr): Fix typo. + DR 1073 PR c++/49082 * typeck.c (comp_except_specs): noexcept(false) is not compatible diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 6b3680e8099..c93110b9062 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3136,7 +3136,7 @@ stabilize_expr (tree exp, tree* initp) /* There are no expressions with REFERENCE_TYPE, but there can be call arguments with such a type; just treat it as a pointer. */ else if (TREE_CODE (TREE_TYPE (exp)) == REFERENCE_TYPE - || SCALAR_TYPE_P (exp) + || SCALAR_TYPE_P (TREE_TYPE (exp)) || !lvalue_or_rvalue_with_address_p (exp)) { init_expr = get_target_expr (exp); -- 2.30.2