diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-25 12:16:53 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-25 12:16:53 -0400 |
| commit | 7eda336814b5c8d3ed37b4f9055889c6651eb1bb (patch) | |
| tree | 9338a715246efa562c1019665f1a0bd4f761396f /gcc/cp | |
| parent | c7dc8804a86017317cd7d3e5f65f715d5c4d5da2 (diff) | |
| download | gcc-7eda336814b5c8d3ed37b4f9055889c6651eb1bb.zip gcc-7eda336814b5c8d3ed37b4f9055889c6651eb1bb.tar.gz gcc-7eda336814b5c8d3ed37b4f9055889c6651eb1bb.tar.bz2 | |
re PR c++/48289 (-pedantic breaks std::move)
PR c++/48289
* pt.c (build_non_dependent_expr): Keep dereferences outside the
NON_DEPENDENT_EXPR.
From-SVN: r171461
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 23 |
2 files changed, 14 insertions, 15 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8bf29c7..b9fb0cd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-25 Jason Merrill <jason@redhat.com> + + PR c++/48289 + * pt.c (build_non_dependent_expr): Keep dereferences outside the + NON_DEPENDENT_EXPR. + 2011-03-25 Kai Tietz <ktietz@redhat.com> * decl.c (decls_match): Replace target hook diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c8c1010..9032dd9 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -18846,24 +18846,17 @@ build_non_dependent_expr (tree expr) TREE_OPERAND (expr, 0), build_non_dependent_expr (TREE_OPERAND (expr, 1))); + /* Keep dereferences outside the NON_DEPENDENT_EXPR so lvalue_kind + doesn't need to look inside. */ + if (TREE_CODE (expr) == INDIRECT_REF && REFERENCE_REF_P (expr)) + return convert_from_reference (build_non_dependent_expr + (TREE_OPERAND (expr, 0))); + /* If the type is unknown, it can't really be non-dependent */ gcc_assert (TREE_TYPE (expr) != unknown_type_node); - /* Otherwise, build a NON_DEPENDENT_EXPR. - - REFERENCE_TYPEs are not stripped for expressions in templates - because doing so would play havoc with mangling. Consider, for - example: - - template <typename T> void f<T& g>() { g(); } - - In the body of "f", the expression for "g" will have - REFERENCE_TYPE, even though the standard says that it should - not. The reason is that we must preserve the syntactic form of - the expression so that mangling (say) "f<g>" inside the body of - "f" works out correctly. Therefore, the REFERENCE_TYPE is - stripped here. */ - return build1 (NON_DEPENDENT_EXPR, non_reference (TREE_TYPE (expr)), expr); + /* Otherwise, build a NON_DEPENDENT_EXPR. */ + return build1 (NON_DEPENDENT_EXPR, TREE_TYPE (expr), expr); } /* ARGS is a vector of expressions as arguments to a function call. |