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 B2628385740F for ; Tue, 17 May 2022 23:57:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B2628385740F Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-176-U9muOCrMOpa5Mz04NZIRUA-1; Tue, 17 May 2022 19:57:19 -0400 X-MC-Unique: U9muOCrMOpa5Mz04NZIRUA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D4920299E775 for ; Tue, 17 May 2022 23:57:18 +0000 (UTC) Received: from pdp-11.redhat.com (unknown [10.22.16.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id B580C1410DD5; Tue, 17 May 2022 23:57:18 +0000 (UTC) From: Marek Polacek To: Jason Merrill , GCC Patches Subject: [PATCH] c++: fix SIGFPE with -Wclass-memaccess [PR105634] Date: Tue, 17 May 2022 19:57:13 -0400 Message-Id: <20220517235713.473148-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.0 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-List-Received-Date: Tue, 17 May 2022 23:57:22 -0000 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? 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 -- 2.36.1