From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1734) id A040A3836430; Wed, 18 May 2022 14:33:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A040A3836430 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marek Polacek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-621] c++: fix SIGFPE with -Wclass-memaccess [PR105634] X-Act-Checkin: gcc X-Git-Author: Marek Polacek X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 0d189b16f81fb9dced0b29495b5d100492b779d8 X-Git-Newrev: dfe38b8d5dbfe3dd5209aece4ce2f7a6b303a2f9 Message-Id: <20220518143341.A040A3836430@sourceware.org> Date: Wed, 18 May 2022 14:33:41 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2022 14:33:41 -0000 https://gcc.gnu.org/g:dfe38b8d5dbfe3dd5209aece4ce2f7a6b303a2f9 commit r13-621-gdfe38b8d5dbfe3dd5209aece4ce2f7a6b303a2f9 Author: Marek Polacek Date: Tue May 17 15:13:58 2022 -0400 c++: fix SIGFPE with -Wclass-memaccess [PR105634] 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. 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. Diff: --- gcc/cp/call.cc | 2 ++ gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-2.C | 0 gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-3.C | 0 gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-4.C | 0 gcc/testsuite/g++.dg/{ => warn}/Wclass-memaccess-5.C | 0 gcc/testsuite/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(+) 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