From patchwork Fri Jul 1 14:55:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1651271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=biZD8Vdn; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LZJD51DTxz9s07 for ; Sat, 2 Jul 2022 00:55:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0A87F385B805 for ; Fri, 1 Jul 2022 14:55:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0A87F385B805 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1656687347; bh=jf3Pjfz143zKpB4pRP0/87dpf9S4g8nxvbrze0787ps=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=biZD8VdnohyAb2Nc0c8uHCYkfsWCk32+vzUrFGjSDfbVaDA4Zpf5ne+/xZ5So2n70 qdiqRWDqStOFYr1GyFqabSrafNNoh/4jMbVUwJOWVt1llUPFtTu2B3vhg9CYdLEHs7 8gMKl1zgI6lTM+ou2C2FMIFJH1AQvvUULT6ir38c= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id C0A0E385624D for ; Fri, 1 Jul 2022 14:55:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C0A0E385624D Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-413-82V_fJVdMEKWWs60bGA8zg-1; Fri, 01 Jul 2022 10:55:25 -0400 X-MC-Unique: 82V_fJVdMEKWWs60bGA8zg-1 Received: by mail-qt1-f197.google.com with SMTP id v6-20020ac85786000000b003052ec6b6baso514438qta.3 for ; Fri, 01 Jul 2022 07:55:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jf3Pjfz143zKpB4pRP0/87dpf9S4g8nxvbrze0787ps=; b=iGXyPJfm/cyrb+hTe5kuV5WNUP66vL0emqMQ/rxhsjh+/RDnU1xjXTFNw7sFGtbYF1 9OcOiCQZowVA0/5Z6jLvQb1w41qIEemstk0tQ0nqy0OPqQKow+gimGrRfsrOsA5gYhCd JsJSXpjj9FFXUV/44J4WbAZ6TuJebiW5Dp5O+s7J+MsUsBGV3+3VJ1YrxFfl9TlBVj7n dmIImkizB3xzGsffe7Ut0D1Gzl1Qgd7Yx5gGhSPlRprvCmEnmHOgQgMKRIeKYLv6UtmR ykQzXqdQ2pEWi1MQ+4Ib0WgyNjg2s68WTUAd8Jy1MucWtMfzIGctVSvRCggb/gRZ9Aau qoug== X-Gm-Message-State: AJIora/tXhSjV1aEU0FyBWF+zDZr1Pqwt2OaTQCf8FrBS0KXkFb9hniC B2r/+C0gOqBSWrupyjmdmmnLXQicQhdfHWk0e35E1D2k/1z8ERjCk9+6Cqvxut+PCuKLZ2dPfPB zPFQGGWX29OwG3SzhUoSnvqR7ltkeM0clgeqk1LfQ/gl4uEqDexfbmGEvE9d7Tjr8SQ== X-Received: by 2002:a05:6214:518e:b0:470:64d8:ed05 with SMTP id kl14-20020a056214518e00b0047064d8ed05mr16815911qvb.77.1656687324566; Fri, 01 Jul 2022 07:55:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vva6qJ4U/uF5gcfApbDHhlKBU+Km6xnu6WvBst7rIuGCfaMErPWtGizTXqF0GJj+VhNVrTGg== X-Received: by 2002:a05:6214:518e:b0:470:64d8:ed05 with SMTP id kl14-20020a056214518e00b0047064d8ed05mr16815884qvb.77.1656687324249; Fri, 01 Jul 2022 07:55:24 -0700 (PDT) Received: from barrymore.cygnus.csb (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id t16-20020a37aa10000000b006a760640118sm17910543qke.27.2022.07.01.07.55.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 07:55:23 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: tweak resolve_args change Date: Fri, 1 Jul 2022 10:55:22 -0400 Message-Id: <20220701145522.908108-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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. --- gcc/cp/call.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 288c6cce0277e03e08b324283b6a015a70066bb7 diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index f1dd8377628..fc98552fda2 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -4675,7 +4675,7 @@ resolve_args (vec *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;