From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jason@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2122)
 id 95A16385C40D; Fri,  1 Jul 2022 14:55:45 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 95A16385C40D
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-8534] c++: tweak resolve_args change
X-Act-Checkin: gcc
X-Git-Author: Jason Merrill <jason@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-12
X-Git-Oldrev: c17206709f94331e81443e2bdcf135a6ab7428ce
X-Git-Newrev: d9130880f77c7f9ffd5deaabda605bc151521be5
Message-Id: <20220701145545.95A16385C40D@sourceware.org>
Date: Fri,  1 Jul 2022 14:55:45 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Jul 2022 14:55:45 -0000

https://gcc.gnu.org/g:d9130880f77c7f9ffd5deaabda605bc151521be5

commit r12-8534-gd9130880f77c7f9ffd5deaabda605bc151521be5
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Jul 1 00:37:10 2022 -0400

    c++: tweak resolve_args change
    
    I don't know why I used tf_error instead of complain here.
    
            PR c++/105779
    
    gcc/cp/ChangeLog:
    
            * call.cc (resolve_args): Use complain.

Diff:
---
 gcc/cp/call.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc
index 45253b1babf..726770d4db8 100644
--- a/gcc/cp/call.cc
+++ b/gcc/cp/call.cc
@@ -4675,7 +4675,7 @@ resolve_args (vec<tree, va_gc> *args, tsubst_flags_t complain)
 
       /* Force auto deduction now.  Omit tf_warning to avoid redundant
 	 deprecated warning on deprecated-14.C.  */
-      if (!mark_single_function (arg, tf_error))
+      if (!mark_single_function (arg, complain & ~tf_warning))
 	return NULL;
     }
   return args;