* pt.c (build_non_dependent_expr): Remove special handling of

	REFERENCE_REF_P.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174545 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bf79bb6..b53331d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-01  Jason Merrill  <jason@redhat.com>
 
+       * pt.c (build_non_dependent_expr): Remove special handling of
+       REFERENCE_REF_P.
+
        PR c++/44175
        * pt.c (template_args_equal): Handle one arg being NULL_TREE.
        (deduction_tsubst_fntype): Handle excessive non-infinite recursion.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index c1bee3e..c955777 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -19189,12 +19189,6 @@ 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 (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);