From patchwork Wed Jun 9 00:42:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1489672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=wy6Rfz7D; dkim-atps=neutral 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 (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G07d218J2z9sSn for ; Wed, 9 Jun 2021 10:43:16 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 81C193986435 for ; Wed, 9 Jun 2021 00:43:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 81C193986435 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1623199393; bh=S8IbhoHwN3I/kfbjdSU+hPjNdTJShvsAAD7nqqrsOAo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wy6Rfz7DQ0cgc+v9hc2UxBI2rkrC7VlxWBvedIY6SZeZj0A1R8hNTQCIwgoBnYAvd 67QKEAO7Or2GcAmbw3vYDPCnfi7uxCf/5fjVjHCyW9EOWhy1LXdlVSPcWgQmNH/7W3 NY4fT9HZVLV6KcRg6/vHj2bpTJ8TlBgyMm01Ca3Y= 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.133.124]) by sourceware.org (Postfix) with ESMTP id 40559385E447 for ; Wed, 9 Jun 2021 00:42:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 40559385E447 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-490-NwjdUYZVOsaV1IOgEILTVg-1; Tue, 08 Jun 2021 20:42:26 -0400 X-MC-Unique: NwjdUYZVOsaV1IOgEILTVg-1 Received: by mail-qt1-f200.google.com with SMTP id z4-20020ac87f840000b02902488809b6d6so3423439qtj.9 for ; Tue, 08 Jun 2021 17:42:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=S8IbhoHwN3I/kfbjdSU+hPjNdTJShvsAAD7nqqrsOAo=; b=l+6FC0dysPm9LgNQeRetIPHDaVRrTbBexap8dBs15MYVYrouCJVO7XSNqxroDs+bRv KRxyvsLof1ul0yL9r8XTnVmMH/FFBb2aOhRaTcNGh53qIhhjldH+jMvCPyMFOm66wU4K iNMY8P7RI+1w8ftxp+BKfglyFec0d9yRzwUYyu+cQZ028LC20j4R1TIvC8mKJRVH7J1q 4BJcWHHcl8Le5y+mSIjSypmOOPVOcRDDUA8D5kDJENiYsrsvI5KEsN7Pq4JlV/ybb3go gK8jIIYTM/d8IXuOyK3f2ZRubtwFBndpY894YVbU6rAc7dpbm0ZQYEerJ+iRnv2YToR1 QZlg== X-Gm-Message-State: AOAM532jSrEjHp4Dqe4iq9zvfGRJO4Y0k29cVRiu0KYRGJ24Pu6tzuj9 lx32EqScm3L5R8O4ZgBJenONCT5LfNljTeJCx0BhvKfGYkC49nb0TcjeJKf48vxZt9NJStKiFbR PYfSKwzOnIeuy5RZ3T+LqGUM+a/PtZXvC1FrIap3KyTEKwvcXhLlMozw9C+xiSc0c2Q== X-Received: by 2002:a05:620a:232:: with SMTP id u18mr14104175qkm.413.1623199345997; Tue, 08 Jun 2021 17:42:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4DKeLpva7FHnT9ExiuB1Z0t/ABVL/BG4arkCCyULbir4BORNAH2AqWlwgd7ocLKNEaXRVHw== X-Received: by 2002:a05:620a:232:: with SMTP id u18mr14104143qkm.413.1623199345564; Tue, 08 Jun 2021 17:42:25 -0700 (PDT) Received: from barrymore.redhat.com ([130.44.159.43]) by smtp.gmail.com with ESMTPSA id l127sm4280064qkc.64.2021.06.08.17.42.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 17:42:24 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: remove redundant warning [PR100879] Date: Tue, 8 Jun 2021 20:42:23 -0400 Message-Id: <20210609004223.1026742-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.2 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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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" Before my r277864, build_new_op promoted enums to int before passing them on to cp_build_binary_op; after that commit, it doesn't, so warn_for_sign_compare sees the enum operands and gives a redundant warning. This warning dates back to 1995, and seems to have been dead code for a long time--likely since build_new_op was added in 1997--so let's just remove it. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/100879 gcc/c-family/ChangeLog: * c-warn.c (warn_for_sign_compare): Remove C++ enum mismatch warning. gcc/testsuite/ChangeLog: * g++.dg/diagnostic/enum3.C: New test. --- gcc/c-family/c-warn.c | 12 ------------ gcc/testsuite/g++.dg/diagnostic/enum3.C | 9 +++++++++ 2 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 gcc/testsuite/g++.dg/diagnostic/enum3.C base-commit: 61fc01806f376a780978a6dea165ec3dadef085b diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c index a587b993fde..cd3c99ef4df 100644 --- a/gcc/c-family/c-warn.c +++ b/gcc/c-family/c-warn.c @@ -2240,18 +2240,6 @@ warn_for_sign_compare (location_t location, int op1_signed = !TYPE_UNSIGNED (TREE_TYPE (orig_op1)); int unsignedp0, unsignedp1; - /* In C++, check for comparison of different enum types. */ - if (c_dialect_cxx() - && TREE_CODE (TREE_TYPE (orig_op0)) == ENUMERAL_TYPE - && TREE_CODE (TREE_TYPE (orig_op1)) == ENUMERAL_TYPE - && TYPE_MAIN_VARIANT (TREE_TYPE (orig_op0)) - != TYPE_MAIN_VARIANT (TREE_TYPE (orig_op1))) - { - warning_at (location, - OPT_Wsign_compare, "comparison between types %qT and %qT", - TREE_TYPE (orig_op0), TREE_TYPE (orig_op1)); - } - /* Do not warn if the comparison is being done in a signed type, since the signed type will only be chosen if it can represent all the values of the unsigned type. */ diff --git a/gcc/testsuite/g++.dg/diagnostic/enum3.C b/gcc/testsuite/g++.dg/diagnostic/enum3.C new file mode 100644 index 00000000000..d51aa8a0f70 --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/enum3.C @@ -0,0 +1,9 @@ +// PR c++/100879 +// { dg-additional-options -Werror=sign-compare } + +enum e1 { e1val }; +enum e2 { e3val }; + +int main( int, char * [] ) { + if ( e1val == e3val ) return 1; // { dg-warning -Wenum-compare } +}