re PR c++/18803 (rejects access to operator() in template)

cp:
	PR c++/18803
	* cp-tree.h (REFERENCE_REF_P): New.
	(CPTI_TYPE_INFO_TYPE): Rename to ...
	(CPTI_CONST_TYPE_INFO_TYPE): ... here.
	(CPTI_TYPE_INFO_REF_TYPE): Remove.
	(type_info_type_node): Rename to ...
	(const_type_info_type_node): ... here.
	(type_info_ref_type): Remove.
	* call.c (build_user_type_conversion): Reformat.
	(resolve_args): Do not convert_from_reference.
	(build_object_call): Call convert_from_reference.
	(prep_operand): Do not convert_from_reference.
	(build_new_method_call): Likewise.
	* class.c (build_vfield_ref): Likewise.
	* cvt.c (convert_to_reference): Likewise.
	(convert_from_reference): Build INDIRECT_REF here, not with
	build_indirect_ref.
	(convert_force): Do not convert_from_reference.
	(build_expr_type_conversion): Likewise.
	* decl.c (grok_reference_init): Likewise.
	* decl2.c (delete_sanity): Likewise.
	* except.c (initialize_handler_parm): Use POINTER_TYPE_P.
	* init.c (build_dtor_call): Do not convert_from_reference.
	* parser.c (cp_parser_template_argument): Unwrap indirected
	reference. Allow TEMPLATE_PARM_INDEX as an object parm.
	* pt.c (tsubst_copy_and_build) <case INDIRECT_REF>: Use
	convert_from_reference, if indicated.
	<case CALL_EXPR>: Do not convert_from_reference.
	<case PARM_DECL, VAR_DECL>: Convert_from_reference if needed.
	(tsubst_initializer_list): Do not convert_from_reference.
	* rtti.c (init_rtti_processing): Adjust node creation.
	(throw_bad_typeid): Use const_type_info_type_node.
	Do not convert_from_reference.
	(typeid_ok_p): Use const_type_info_type_node.
	(build_typeid, get_typeid): Always return type_info typed node.
	(build_dynamic_cast_1): Dont convert_from_reference. Refactor.
	* semantics.c (finish_stmt_expr_expr): Do not
	convert_from_reference.
	(finish_id_expression): Convert_from_reference as appropriate.
	* typeck.c (decay_conversion): Do not convert_from_reference.
	(finish_class_member_access_expr): Likewise.
	(build_indirect_ref): Use POINTER_TYPE_P.
	(convert_arguments): Do not convert_from_reference.
	(build_modify_expr): Likewise.
	(convert_for_initialization): Likewise.
	* typeck2.c (build_x_arrow): Likewise.
testsuite:
	PR c++/18803
	* g++.dg/template/operator5.C: New.

From-SVN: r91863

1 files changed, 15 insertions, 6 deletions

diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index f1968fd..7039bfe 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -451,8 +451,6 @@ convert_to_reference (tree reftype, tree expr, int convtype,
     expr = instantiate_type (type, expr, 
 			     (flags & LOOKUP_COMPLAIN)
 			     ? tf_error | tf_warning : tf_none);
-  else
-    expr = convert_from_reference (expr);
 
   if (expr == error_mark_node)
     return error_mark_node;
@@ -553,7 +551,21 @@ tree
 convert_from_reference (tree val)
 {
   if (TREE_CODE (TREE_TYPE (val)) == REFERENCE_TYPE)
-    return build_indirect_ref (val, NULL);
+    {
+      tree t = canonical_type_variant (TREE_TYPE (TREE_TYPE (val)));
+      tree ref = build1 (INDIRECT_REF, t, val);
+      
+       /* We *must* set TREE_READONLY when dereferencing a pointer to const,
+	  so that we get the proper error message if the result is used
+	  to assign to.  Also, &* is supposed to be a no-op.  */
+      TREE_READONLY (ref) = CP_TYPE_CONST_P (t);
+      TREE_THIS_VOLATILE (ref) = CP_TYPE_VOLATILE_P (t);
+      TREE_SIDE_EFFECTS (ref)
+	= (TREE_THIS_VOLATILE (ref) || TREE_SIDE_EFFECTS (val));
+      REFERENCE_REF_P (ref) = 1;
+      val = ref;
+    }
+  
   return val;
 }
 
@@ -956,8 +968,6 @@ convert_force (tree type, tree expr, int convtype)
     return (fold_if_not_in_template 
 	    (convert_to_reference (type, e, CONV_C_CAST, LOOKUP_COMPLAIN,
 				   NULL_TREE)));
-  else if (TREE_CODE (TREE_TYPE (e)) == REFERENCE_TYPE)
-    e = convert_from_reference (e);
 
   if (code == POINTER_TYPE)
     return fold_if_not_in_template (convert_to_pointer_force (type, e));
@@ -1012,7 +1022,6 @@ build_expr_type_conversion (int desires, tree expr, bool complain)
       && !(desires & WANT_NULL))
     warning ("converting NULL to non-pointer type");
     
-  expr = convert_from_reference (expr);
   basetype = TREE_TYPE (expr);
 
   if (basetype == error_mark_node)