diff options
author | Jason Merrill <jason@redhat.com> | 2011-05-31 14:06:39 -0400 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-31 14:06:39 -0400 |
commit | e87b4dde327ca929b323cf63c013ec90a1dc8108 (patch) | |
tree | e2ab9d1734e09c9e6a22e38a3ca145f2f51d55ec /gcc/cp | |
parent | 5cc93ee0999f3dcea86b3b58623a85ec8f96c48a (diff) | |
download | gcc-e87b4dde327ca929b323cf63c013ec90a1dc8108.zip gcc-e87b4dde327ca929b323cf63c013ec90a1dc8108.tar.gz gcc-e87b4dde327ca929b323cf63c013ec90a1dc8108.tar.bz2 |
re PR c++/44870 ([C++0x] error when calling function with rvalue argument inside template)
PR c++/44870
* tree.c (lvalue_kind): Recurse on NON_DEPENDENT_EXPR. Handle
ARROW_EXPR, TYPEID_EXPR, and arbitrary class-valued expressions.
(build_min_non_dep): Preserve reference refs.
(build_min_non_dep_call_vec): Likewise
From-SVN: r174499
Diffstat (limited to 'gcc/cp')
-rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/cp/tree.c | 29 |
2 files changed, 28 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 24aab15..10a1d77 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2011-05-31 Jason Merrill <jason@redhat.com> + + PR c++/44870 + * tree.c (lvalue_kind): Recurse on NON_DEPENDENT_EXPR. Handle + ARROW_EXPR, TYPEID_EXPR, and arbitrary class-valued expressions. + (build_min_non_dep): Preserve reference refs. + (build_min_non_dep_call_vec): Likewise + 2011-05-30 Jakub Jelinek <jakub@redhat.com> PR c++/49223 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index c93110b..11e195e 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -139,6 +139,7 @@ lvalue_kind (const_tree ref) && DECL_IN_AGGR_P (ref)) return clk_none; case INDIRECT_REF: + case ARROW_EXPR: case ARRAY_REF: case PARM_DECL: case RESULT_DECL: @@ -170,6 +171,7 @@ lvalue_kind (const_tree ref) break; case MODIFY_EXPR: + case TYPEID_EXPR: return clk_ordinary; case COMPOUND_EXPR: @@ -182,7 +184,9 @@ lvalue_kind (const_tree ref) return (CLASS_TYPE_P (TREE_TYPE (ref)) ? clk_class : clk_none); case CALL_EXPR: - /* Any class-valued call would be wrapped in a TARGET_EXPR. */ + /* We can see calls outside of TARGET_EXPR in templates. */ + if (CLASS_TYPE_P (TREE_TYPE (ref))) + return clk_class; return clk_none; case FUNCTION_DECL: @@ -199,14 +203,16 @@ lvalue_kind (const_tree ref) return lvalue_kind (BASELINK_FUNCTIONS (CONST_CAST_TREE (ref))); case NON_DEPENDENT_EXPR: - /* We must consider NON_DEPENDENT_EXPRs to be lvalues so that - things like "&E" where "E" is an expression with a - non-dependent type work. It is safe to be lenient because an - error will be issued when the template is instantiated if "E" - is not an lvalue. */ - return clk_ordinary; + /* We used to just return clk_ordinary for NON_DEPENDENT_EXPR because + it was safe enough for C++98, but in C++0x lvalues don't bind to + rvalue references, so we get bogus errors (c++/44870). */ + return lvalue_kind (TREE_OPERAND (ref, 0)); default: + if (!TREE_TYPE (ref)) + return clk_none; + if (CLASS_TYPE_P (TREE_TYPE (ref))) + return clk_class; break; } @@ -1985,6 +1991,9 @@ build_min_non_dep (enum tree_code code, tree non_dep, ...) va_start (p, non_dep); + if (REFERENCE_REF_P (non_dep)) + non_dep = TREE_OPERAND (non_dep, 0); + t = make_node (code); length = TREE_CODE_LENGTH (code); TREE_TYPE (t) = TREE_TYPE (non_dep); @@ -2002,7 +2011,7 @@ build_min_non_dep (enum tree_code code, tree non_dep, ...) COMPOUND_EXPR_OVERLOADED (t) = 1; va_end (p); - return t; + return convert_from_reference (t); } /* Similar to `build_nt_call_vec', but for template definitions of @@ -2013,9 +2022,11 @@ tree build_min_non_dep_call_vec (tree non_dep, tree fn, VEC(tree,gc) *argvec) { tree t = build_nt_call_vec (fn, argvec); + if (REFERENCE_REF_P (non_dep)) + non_dep = TREE_OPERAND (non_dep, 0); TREE_TYPE (t) = TREE_TYPE (non_dep); TREE_SIDE_EFFECTS (t) = TREE_SIDE_EFFECTS (non_dep); - return t; + return convert_from_reference (t); } tree |