From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 11 Oct 2011 13:07:52 +0000 (+0000)
Subject: 2011-10-11  Paolo Carlini  <paolo.carlini@oracle.com>
X-Git-Tag: upstream/4.9.2~17181
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2947c3a29b35c0df88fc7c7f21829815604abe8;p=platform%2Fupstream%2Flinaro-gcc.git

2011-10-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50611
	* pt.c (tsubst_copy_and_build): If (complain & tf_error) is false
	do not call unqualified_name_lookup_error.


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d36ffaa..3be7f7d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50611
+	* pt.c (tsubst_copy_and_build): If (complain & tf_error) is false
+	do not call unqualified_name_lookup_error.
+
 2011-10-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/50660
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index c95f1cb..2cb478d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13026,7 +13026,11 @@ tsubst_copy_and_build (tree t,
 	if (error_msg)
 	  error (error_msg);
 	if (!function_p && TREE_CODE (decl) == IDENTIFIER_NODE)
-	  decl = unqualified_name_lookup_error (decl);
+	  {
+	    if (complain & tf_error)
+	      unqualified_name_lookup_error (decl);
+	    decl = error_mark_node;
+	  }
 	return decl;
       }