From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 DE0B13858D20 for ; Fri, 27 Jan 2023 22:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DE0B13858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674857706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GaE90l9+O5TDAY+rCBMZAJLepbOn2LKWDH7QOQb+MYQ=; b=PR5XBsJA7yQsocRhN7wdrUx8/3AMWUoG+eUybuIsMaXYuZVWsNH6UVx0vGayHPgPhHb+CS Mn3Is/Ogaf8vObFfvgskNxFMBz2W+cUic+A3zrqH/DnZn3dUlI/7gBb3xOyHtl2EgcSkL2 Zyni9EXsM5tN6Zy6HoQKfKDRy6S8WSE= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-611-sJRCte_qMF64sxrp-hwzvA-1; Fri, 27 Jan 2023 17:15:03 -0500 X-MC-Unique: sJRCte_qMF64sxrp-hwzvA-1 Received: by mail-qk1-f197.google.com with SMTP id de37-20020a05620a372500b00707391077b4so3801252qkb.17 for ; Fri, 27 Jan 2023 14:15:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GaE90l9+O5TDAY+rCBMZAJLepbOn2LKWDH7QOQb+MYQ=; b=cqcRE06hLPs2ZcirGJXK1dCuzQlM9OIsO797bbhRywE6is1xM7hnx97Tvs03O0025s 5rcfNTV6aPXQW6QzRAu5Agz9NilWSAXJFHJQY56I9fWZ15m23XCXyiyQAztGrjDEbN0M zsylfFdxdSKGc/E3gLL5c+jk3NlQihyVD7nOifKvC415B5Qu67E6FFbQH6vlAQ5VAKMB Sq43UhbMyE5oYTONrUWHhH3BxQ91xkQXZ21uSQWC6eqxNed9ZrMk5b7AwxSh7+GyZKpN lUhlkRj6fA7NOXTsXnjaD+DVQC9U3lRsTGIXj2awsSjXiMjkbE4VivhuzytJcLIkCZeG nmXw== X-Gm-Message-State: AFqh2kohvCmyrXiwS/s9Ex8N1yDn5CVkmI3OPdb/Son/SoOJ5HKBuYug xg8ZR2X+4GLZGqV7CXJR/UR2ASPJiG+txzn1W/09Jb/kr0wHCG+6TPyFulzyizlQ80xp8x9lWP5 b1UMAiJPh9cJDcwCHgg== X-Received: by 2002:ac8:734d:0:b0:3a8:ef7:f29c with SMTP id q13-20020ac8734d000000b003a80ef7f29cmr55379686qtp.46.1674857702363; Fri, 27 Jan 2023 14:15:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXtkyunkaT5HtdP4+dab4EFmoTZQu8ktbQvEkDb2vfphtCUxeKV3kIYqFP6JzECTdqqUEAglRw== X-Received: by 2002:ac8:734d:0:b0:3a8:ef7:f29c with SMTP id q13-20020ac8734d000000b003a80ef7f29cmr55379667qtp.46.1674857702092; Fri, 27 Jan 2023 14:15:02 -0800 (PST) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id d12-20020a05622a15cc00b003b82055de0asm2093929qty.37.2023.01.27.14.15.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 14:15:01 -0800 (PST) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Fri, 27 Jan 2023 17:15:00 -0500 (EST) To: Marek Polacek cc: Jason Merrill , GCC Patches Subject: Re: [PATCH] c++: fix ICE with -Wduplicated-cond [PR107593] In-Reply-To: <20230126221732.617749-1-polacek@redhat.com> Message-ID: <6cd96b09-828b-8820-e1f7-7f11a90e0f54@idea> References: <20230126221732.617749-1-polacek@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.9 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_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, 26 Jan 2023, Marek Polacek via Gcc-patches wrote: > Here we crash because a CAST_EXPR, representing T(), doesn't have > its operand, and operand_equal_p's STRIP_ANY_LOCATION_WRAPPER doesn't > expect that. (o_e_p is called from warn_duplicated_cond_add_or_warn.) > > In the past we've adjusted o_e_p to better cope with template codes, > but in this case I think we just want to avoid attempting to warn > about inst-dependent expressions; I don't think I've ever envisioned > -Wduplicated-cond to warn about them. > > The ICE started with r12-6022, two-stage name lookup for overloaded > operators, which gave dependent operators a TREE_TYPE (in particular, > DEPENDENT_OPERATOR_TYPE), so we no longer bail out here in o_e_p: > > /* Similar, if either does not have a type (like a template id), > they aren't equal. */ > if (!TREE_TYPE (arg0) || !TREE_TYPE (arg1)) > return false; > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? > > PR c++/107593 > > gcc/cp/ChangeLog: > > * parser.cc (cp_parser_selection_statement): Don't do > -Wduplicated-cond when the condition is dependent. > > gcc/testsuite/ChangeLog: > > * g++.dg/warn/Wduplicated-cond3.C: New test. > --- > gcc/cp/parser.cc | 3 +- > gcc/testsuite/g++.dg/warn/Wduplicated-cond3.C | 38 +++++++++++++++++++ > 2 files changed, 40 insertions(+), 1 deletion(-) > create mode 100644 gcc/testsuite/g++.dg/warn/Wduplicated-cond3.C > > diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc > index 4cdc1cd472f..3df85d49e16 100644 > --- a/gcc/cp/parser.cc > +++ b/gcc/cp/parser.cc > @@ -13209,7 +13209,8 @@ cp_parser_selection_statement (cp_parser* parser, bool *if_p, > /* Add the condition. */ > condition = finish_if_stmt_cond (condition, statement); > > - if (warn_duplicated_cond) > + if (warn_duplicated_cond > + && !instantiation_dependent_expression_p (condition)) > warn_duplicated_cond_add_or_warn (token->location, condition, > &chain); I noticed warn_duplicated_cond_add_or_warn already has logic to handle TREE_SIDE_EFFECTS conditions by invaliding the entire chain. I wonder if we'd want to do the same for instantiation-dep conditions? > > diff --git a/gcc/testsuite/g++.dg/warn/Wduplicated-cond3.C b/gcc/testsuite/g++.dg/warn/Wduplicated-cond3.C > new file mode 100644 > index 00000000000..3da054e5485 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/warn/Wduplicated-cond3.C > @@ -0,0 +1,38 @@ > +// PR c++/107593 > +// { dg-do compile } > +// { dg-options "-Wduplicated-cond" } > + > +template > +void > +foo () > +{ > + if (T() && T() && int()) > + ; > + else if (T() && T() && int()) > + ; > +} > + > +template > +void bar(T a) > +{ > + if (a) > + ; > + else if (a) > + ; > +} > + > +template > +void baz(int a) > +{ > + if (a) > + ; > + else if (a) // { dg-warning "duplicated" } > + ; > +} > +void > +f () > +{ > + foo(); > + bar(1); > + baz(1); > +} > > base-commit: 94673a121cfc7f9d51c9d05e31795477f4dc8dc7 > -- > 2.39.1 > >