From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30262 invoked by alias); 13 Apr 2019 09:01:08 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 30251 invoked by uid 89); 13 Apr 2019 09:01:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Spam-Relays-External:sk:mail.gi, H*RU:sk:mail.gi, H*r:192.168.43, HX-Spam-Relays-External:sk:!192.16 X-HELO: mail.gigawatt.nl Received: from mail.gigawatt.nl (HELO mail.gigawatt.nl) (51.68.198.76) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 13 Apr 2019 09:01:05 +0000 Received: from [192.168.43.159] (92.40.249.197.threembb.co.uk [92.40.249.197]) by mail.gigawatt.nl (Postfix) with ESMTPSA id 7F45A748 for ; Sat, 13 Apr 2019 11:01:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.gigawatt.nl 7F45A748 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gigawatt.nl; s=default; t=1555146061; bh=dDA1RDoijEgs1kO1pzod7clxO0gvs12c9T2C8K4Eg54=; h=From:Subject:To:Date:From; b=D7ZXLEzKQlFppzdlnbQ2pVMv1NHEVygISurSSBHaUYDioIVzW568PhVEelxSQWRke CwHzjD3kmWZev1F6cyQswNZNBx4g2naeckIYAyN7/7k+RffV22CYn5u5UItdZ2Pnou jyOnlQHIo4jOfpW+K2F1gB0+t4b+Ol7gy/O7LgZs= From: Harald van Dijk Subject: [C++ PATCH] PR60531 - Wrong error about unresolved overloaded function To: gcc-patches@gcc.gnu.org Message-ID: Date: Sat, 13 Apr 2019 11:54:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:66.0) Gecko/20100101 Thunderbird/66.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2019-04/txt/msg00540.txt.bz2 Hi, For PR60531, GCC wrongly rejects function templates with explicitly specified template arguments as overloaded. They are resolved by resolve_nondeduced_context, which is normally called by cp_default_conversion through decay_conversion, but the latter have extra effects making them unusable here. Calling the former directly does work. Bootstrapped on x86_64-pc-linux-gnu on top of r270264 with --enable-languages=all; make check shows no regressions. Does this look okay? This is my first code contribution to GCC, please let me know if anything is missing. I have not signed any copyright disclaimer or copyright assignment; says that is not necessary for small changes, which I trust this is. If it is needed after all, please let me know what specifically will be required. Cheers, Harald van Dijk PR c++/60531 * typeck.c (cp_build_binary_op): See if overload can be resolved. (cp_build_unary_op): Ditto. * g++.dg/template/operator15.C: New test. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 03b14024738..e1ffe88ce2c 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4384,10 +4384,6 @@ cp_build_binary_op (const op_location_t &location, /* True if both operands have arithmetic type. */ bool arithmetic_types_p; - /* Apply default conversions. */ - op0 = orig_op0; - op1 = orig_op1; - /* Remember whether we're doing / or %. */ bool doing_div_or_mod = false; @@ -4397,6 +4393,10 @@ cp_build_binary_op (const op_location_t &location, /* Tree holding instrumentation expression. */ tree instrument_expr = NULL_TREE; + /* Apply default conversions. */ + op0 = resolve_nondeduced_context (orig_op0, complain); + op1 = resolve_nondeduced_context (orig_op1, complain); + if (code == TRUTH_AND_EXPR || code == TRUTH_ANDIF_EXPR || code == TRUTH_OR_EXPR || code == TRUTH_ORIF_EXPR || code == TRUTH_XOR_EXPR) @@ -6204,11 +6204,13 @@ cp_build_unary_op (enum tree_code code, tree xarg, bool noconvert, if (!arg || error_operand_p (arg)) return error_mark_node; + arg = resolve_nondeduced_context (arg, complain); + if ((invalid_op_diag = targetm.invalid_unary_op ((code == UNARY_PLUS_EXPR ? CONVERT_EXPR : code), - TREE_TYPE (xarg)))) + TREE_TYPE (arg)))) { if (complain & tf_error) error (invalid_op_diag); diff --git a/gcc/testsuite/g++.dg/template/operator15.C b/gcc/testsuite/g++.dg/template/operator15.C new file mode 100644 index 00000000000..755442266bb --- /dev/null +++ b/gcc/testsuite/g++.dg/template/operator15.C @@ -0,0 +1,6 @@ +// PR c++/60531 + +template < class T > T foo (); + +bool b1 = foo == foo; +int (*fp1)() = +foo;