From: Jason Merrill <jason@redhat.com>
Date: Thu, 21 Apr 2011 04:28:06 +0000 (-0400)
Subject: re PR c++/48594 (Rejects valid with pointer-to-member in template)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8adaafcf039d470993d1969069231b20fe67b460;p=gcc.git

re PR c++/48594 (Rejects valid with pointer-to-member in template)

	PR c++/48594
	* decl2.c (build_offset_ref_call_from_tree): Move
	non-dependency of object outside condition.

From-SVN: r172807
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ed9871973bc..eae80e3ae11 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-20  Jason Merrill  <jason@redhat.com>
 
+	PR c++/48594
+	* decl2.c (build_offset_ref_call_from_tree): Move
+	non-dependency of object outside condition.
+
 	PR c++/48657
 	* decl.c (cp_finish_decl): Simplify template handling.
 
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 882bbf9f88e..a9c24556167 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -4081,9 +4081,9 @@ build_offset_ref_call_from_tree (tree fn, VEC(tree,gc) **args)
 	 parameter.  That must be done before the FN is transformed
 	 because we depend on the form of FN.  */
       make_args_non_dependent (*args);
+      object = build_non_dependent_expr (object);
       if (TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE)
 	{
-	  object = build_non_dependent_expr (object);
 	  if (TREE_CODE (fn) == DOTSTAR_EXPR)
 	    object = cp_build_addr_expr (object, tf_warning_or_error);
 	  VEC_safe_insert (tree, gc, *args, 0, object);