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.133.124]) by sourceware.org (Postfix) with ESMTPS id 8C16A38485A0 for ; Wed, 18 May 2022 14:25:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8C16A38485A0 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-3AtiHC09NVuJpkOl7paAZg-1; Wed, 18 May 2022 10:25:00 -0400 X-MC-Unique: 3AtiHC09NVuJpkOl7paAZg-1 Received: by mail-qv1-f69.google.com with SMTP id q36-20020a0c9127000000b00461e3828064so1709511qvq.12 for ; Wed, 18 May 2022 07:25:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=AzZcWak9O7hvR0naDUUwtU4bwU6i+oN8h8QOF/B+GbU=; b=avKXU381BZMJtgvbiCYDMpzP7j0yEWf3ZRIvMxjIBvqMwFlKpv5ApNwNOhjcg3Wv7u xAcriCMsdktrk9piCxQbPsWWqoDpC6EVZX0FEtAK6lB2BTtdBkfw1P0PvsQH9gJ4XTFF pqAUMeHsTTgASQv88MfL2iJs7sGk+1ThsT3uC86Hdz6AJwPrYCTUCo87ZFr9A5LUFtHd USu8KsEnsq/D4O23UNWyMulUP2ovH8HpKtJxL1ohScCIPduSD4dYoPtWxeaQfVIHqoei ZGWLmihKOQbew8+9ZQRnnGKTUe2vjAWJDGhZiAOocjVLjR0P+Rj4tRDgBkhoPwCN0jYS NhFA== X-Gm-Message-State: AOAM5311pKw5MQlp5rgE/PyJ+65hJcoK/wUOf3TY83S8gxdm002fCqyf 6pA4fiNiplQ8iUY/nBW8GpxHw3Sre4yCV+RyHTGgO28obz4PW53XJmmftaiNhRQFU6B9Vep9xqA R00D6ofM2cYdYEAYpLg== X-Received: by 2002:a05:620a:1182:b0:69f:fc99:490c with SMTP id b2-20020a05620a118200b0069ffc99490cmr20874067qkk.316.1652883899415; Wed, 18 May 2022 07:24:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzPs0GOuJqXi4uFHvhL36X4SLj1wK0eTAdj9M196R+PYB7sFEX3qMdIYKpz652zNJZH2YhNA== X-Received: by 2002:a05:620a:1182:b0:69f:fc99:490c with SMTP id b2-20020a05620a118200b0069ffc99490cmr20874046qkk.316.1652883899138; Wed, 18 May 2022 07:24:59 -0700 (PDT) Received: from [192.168.1.100] (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 z197-20020a3765ce000000b0069fc13ce212sm1574324qkb.67.2022.05.18.07.24.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 May 2022 07:24:56 -0700 (PDT) Message-ID: <432005ad-1396-f7a4-5fa7-178ef0e6f5cb@redhat.com> Date: Wed, 18 May 2022 10:24:55 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH] c++: fix SIGFPE with -Wclass-memaccess [PR105634] To: Marek Polacek , GCC Patches References: <20220517235713.473148-1-polacek@redhat.com> From: Jason Merrill In-Reply-To: <20220517235713.473148-1-polacek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, 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-List-Received-Date: Wed, 18 May 2022 14:25:03 -0000 On 5/17/22 19:57, Marek Polacek wrote: > Here we crash because we attempt to % by 0. Thus fixed. > While at it, I've moved the -Wclass-memaccess tests into warn/. > I've checked that the # of expected passes is the same before/after > the move. > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? OK. > PR c++/105634 > > gcc/cp/ChangeLog: > > * call.cc (maybe_warn_class_memaccess): Avoid % by zero. > > gcc/testsuite/ChangeLog: > > * g++.dg/Wclass-memaccess-2.C: Moved to... > * g++.dg/warn/Wclass-memaccess-2.C: ...here. > * g++.dg/Wclass-memaccess-3.C: Moved to... > * g++.dg/warn/Wclass-memaccess-3.C: ...here. > * g++.dg/Wclass-memaccess-4.C: Moved to... > * g++.dg/warn/Wclass-memaccess-4.C: ...here. > * g++.dg/Wclass-memaccess-5.C: Moved to... > * g++.dg/warn/Wclass-memaccess-5.C: ...here. > * g++.dg/Wclass-memaccess-6.C: Moved to... > * g++.dg/warn/Wclass-memaccess-6.C: ...here. > * g++.dg/Wclass-memaccess.C: Moved to... > * g++.dg/warn/Wclass-memaccess.C: ...here. > * g++.dg/warn/Wclass-memaccess-7.C: New test. > --- > gcc/cp/call.cc | 2 ++ > .../g++.dg/{ => warn}/Wclass-memaccess-2.C | 0 > .../g++.dg/{ => warn}/Wclass-memaccess-3.C | 0 > .../g++.dg/{ => warn}/Wclass-memaccess-4.C | 0 > .../g++.dg/{ => warn}/Wclass-memaccess-5.C | 0 > .../g++.dg/{ => warn}/Wclass-memaccess-6.C | 0 > gcc/testsuite/g++.dg/warn/Wclass-memaccess-7.C | 13 +++++++++++++ > gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess.C | 0 > 8 files changed, 15 insertions(+) > rename gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-2.C (100%) > rename gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-3.C (100%) > rename gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-4.C (100%) > rename gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-5.C (100%) > rename gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-6.C (100%) > create mode 100644 gcc/testsuite/g++.dg/warn/Wclass-memaccess-7.C > rename gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess.C (100%) > > diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc > index 0240e364324..14c6037729f 100644 > --- a/gcc/cp/call.cc > +++ b/gcc/cp/call.cc > @@ -10329,6 +10329,8 @@ maybe_warn_class_memaccess (location_t loc, tree fndecl, > /* Finally, warn on partial copies. */ > unsigned HOST_WIDE_INT typesize > = tree_to_uhwi (TYPE_SIZE_UNIT (desttype)); > + if (typesize == 0) > + break; > if (unsigned HOST_WIDE_INT partial = tree_to_uhwi (sz) % typesize) > warned = warning_at (loc, OPT_Wclass_memaccess, > (typesize - partial > 1 > diff --git a/gcc/testsuite/g++.dg/Wclass-memaccess-2.C b/gcc/testsuite/g++.dg/warn/Wclass-memaccess-2.C > similarity index 100% > rename from gcc/testsuite/g++.dg/Wclass-memaccess-2.C > rename to gcc/testsuite/g++.dg/warn/Wclass-memaccess-2.C > diff --git a/gcc/testsuite/g++.dg/Wclass-memaccess-3.C b/gcc/testsuite/g++.dg/warn/Wclass-memaccess-3.C > similarity index 100% > rename from gcc/testsuite/g++.dg/Wclass-memaccess-3.C > rename to gcc/testsuite/g++.dg/warn/Wclass-memaccess-3.C > diff --git a/gcc/testsuite/g++.dg/Wclass-memaccess-4.C b/gcc/testsuite/g++.dg/warn/Wclass-memaccess-4.C > similarity index 100% > rename from gcc/testsuite/g++.dg/Wclass-memaccess-4.C > rename to gcc/testsuite/g++.dg/warn/Wclass-memaccess-4.C > diff --git a/gcc/testsuite/g++.dg/Wclass-memaccess-5.C b/gcc/testsuite/g++.dg/warn/Wclass-memaccess-5.C > similarity index 100% > rename from gcc/testsuite/g++.dg/Wclass-memaccess-5.C > rename to gcc/testsuite/g++.dg/warn/Wclass-memaccess-5.C > diff --git a/gcc/testsuite/g++.dg/Wclass-memaccess-6.C b/gcc/testsuite/g++.dg/warn/Wclass-memaccess-6.C > similarity index 100% > rename from gcc/testsuite/g++.dg/Wclass-memaccess-6.C > rename to gcc/testsuite/g++.dg/warn/Wclass-memaccess-6.C > diff --git a/gcc/testsuite/g++.dg/warn/Wclass-memaccess-7.C b/gcc/testsuite/g++.dg/warn/Wclass-memaccess-7.C > new file mode 100644 > index 00000000000..7e86b248629 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/warn/Wclass-memaccess-7.C > @@ -0,0 +1,13 @@ > +// PR c++/105634 > +// { dg-do compile { target { c++11 } } } > +// { dg-options "-Wall" } > + > +struct s > +{ > + struct {} a[] = 1.0; // { dg-error "" } > + void f (char *c) > + { > + s s; > + __builtin_memcpy (&s, c, sizeof(s)); > + } > +}; > diff --git a/gcc/testsuite/g++.dg/Wclass-memaccess.C b/gcc/testsuite/g++.dg/warn/Wclass-memaccess.C > similarity index 100% > rename from gcc/testsuite/g++.dg/Wclass-memaccess.C > rename to gcc/testsuite/g++.dg/warn/Wclass-memaccess.C > > base-commit: c9852156dd2fedec130f6d8eb669579ef6237946