From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21665 invoked by alias); 11 Nov 2019 09:04:47 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 21650 invoked by uid 89); 11 Nov 2019 09:04:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=longtime, mapping, factor X-HELO: esa4.mentor.iphmx.com Received: from esa4.mentor.iphmx.com (HELO esa4.mentor.iphmx.com) (68.232.137.252) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 11 Nov 2019 09:04:45 +0000 IronPort-SDR: BkK6kOjeAVOcKg4bogSFd+A3j8xk2+5DXM1DvKXZhPiV27dUt/nK4zErkFjHizDk1zzIhozqkE /etXnG6F/dJzuCmyd6C+38bNy9hys6v1dFm2hq+JAs8v77NBi13cQIcJoznq186T13fa+xJo5W BhX46UxIxSkTH6ajOFAmyvTUbZzZkZVjNbrRcaABFp6HGt6ufYHcdPzrgk0ZfRvG//kVtuFf2u +6QMDH/E3vlb0Hi/US1hB0FLIpzPTJ6mvrbiSFtuT3TNJk/Bh+8EuGsQ15LRreViJWby0c6G5e WV4= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 11 Nov 2019 01:04:44 -0800 IronPort-SDR: kvd9lnejegdkCqODRVpv9DZ/+NpaDVsJKgItzV5Ntd/XKKkBB45K6ForEVgX8f5aFmlLgvBnAv zDCGDfW1LMgftW1YazcKlLlGu4g0hGxvqiTcMaxPI6ING6YDFLvht3TFQ76q6uo95lChMWUqFM /JRVb/GWabYFmgOHAJ/u1939aLKQpF05Q70LQ4vrH2bszyCi+FAGBQWFNys9UdWuQ6l4bFNAY/ ErMwTu2Z9sweTaRUswY4/cRyMfoo/MPhXG9bJ1hmdUzdPb2XWqfI66ohQDkk3wBSrIdoJnfg0f 5D8= From: Thomas Schwinge To: Jakub Jelinek , CC: Julian Brown Subject: Re: [gomp4.1] Start of structure element mapping support In-Reply-To: <20191016165255.GP2116@tucnak> References: <20150731161610.GF1780@tucnak.redhat.com> <87wod4x1sj.fsf@euler.schwinge.homeip.net> <20191016165255.GP2116@tucnak> User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Mon, 11 Nov 2019 09:13:00 -0000 Message-ID: <87zhh2okbw.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-Path: tschwing@mentor.com X-SW-Source: 2019-11/txt/msg00713.txt.bz2 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-length: 889 Hi! On 2019-10-16T18:52:55+0200, Jakub Jelinek wrote: > On Wed, Oct 16, 2019 at 03:22:52PM +0200, Thomas Schwinge wrote: >> Stumbled over this while reviewing Julian's "Factor out duplicate code in >> gimplify_scan_omp_clauses": > >> ..., which here gets writte to... >>=20 >> > + if (base !=3D decl) >> > + break; >> > + gcc_assert (offset =3D=3D NULL_TREE >> > + || TREE_CODE (offset) =3D=3D INTEGER_CST); >>=20 >> ..., but here we again check 'offset', not 'offset2'... > > Yes, it indeed [...] Thanks. See attached; committed "Assert 'offset2' instead of 'offset' in 'gcc/gimplify.c:gimplify_scan_omp_clauses'" to trunk in r278038, gcc-9-branch in r278039, gcc-8-branch in r278040, gcc-7-branch (slightly different patch) omitted as that one's frozen for the final release, and this fix isn't important enough. Gr=C3=BC=C3=9Fe Thomas --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Assert-offset2-instead-of-offset-in-gcc-gimpli.trunk.patch Content-Transfer-Encoding: quoted-printable Content-length: 1614 =46rom c88bb56e02340083d10a728c2ca05748df5c6218 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Mon, 11 Nov 2019 08:18:46 +0000 Subject: [PATCH] Assert 'offset2' instead of 'offset' in 'gcc/gimplify.c:gimplify_scan_omp_clauses' ... to fix a long-time typo/copy'n'past-o. gcc/ * gimplify.c (gimplify_scan_omp_clauses): Assert 'offset2' instead of 'offset'. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@278038 138bc75d-0d04-0410-9= 61f-82ee72b054a4 --- gcc/ChangeLog | 3 +++ gcc/gimplify.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a1e928bf804d..ca0cebc20180 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2019-11-11 Thomas Schwinge =20 + * gimplify.c (gimplify_scan_omp_clauses): Assert 'offset2' instead + of 'offset'. + * Makefile.in (LANG_CONFIGUREFRAGS): Define. (config.status): Use/depend on it. * configure.ac (all_lang_configurefrags): Track, 'AC_SUBST'. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 5fa0ba6dda60..2bc41cf98ae9 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -8890,8 +8890,8 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *= pre_p, break; if (scp) continue; - gcc_assert (offset =3D=3D NULL_TREE - || poly_int_tree_p (offset)); + gcc_assert (offset2 =3D=3D NULL_TREE + || poly_int_tree_p (offset2)); tree d1 =3D OMP_CLAUSE_DECL (*sc); tree d2 =3D OMP_CLAUSE_DECL (c); while (TREE_CODE (d1) =3D=3D ARRAY_REF) --=20 2.17.1 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Assert-offset2-instead-of-offset-in-gcc.gcc-9-branch.patch Content-Transfer-Encoding: quoted-printable Content-length: 1644 =46rom a3174355911ea11b2e1f2786a7bffe2c5489e128 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Mon, 11 Nov 2019 08:19:23 +0000 Subject: [PATCH] Assert 'offset2' instead of 'offset' in 'gcc/gimplify.c:gimplify_scan_omp_clauses' ... to fix a long-time typo/copy'n'past-o. gcc/ * gimplify.c (gimplify_scan_omp_clauses): Assert 'offset2' instead of 'offset'. Backport from trunk r278038. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@278039 138b= c75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/gimplify.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 52d867db50a1..fc19dae278d4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2019-11-11 Thomas Schwinge =20 + Backport from trunk: + * gimplify.c (gimplify_scan_omp_clauses): Assert 'offset2' instead + of 'offset'. + Backport from trunk: * Makefile.in (LANG_CONFIGUREFRAGS): Define. (config.status): Use/depend on it. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 28e13a710215..a0cb6c402bcf 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -8718,8 +8718,8 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *= pre_p, break; if (scp) continue; - gcc_assert (offset =3D=3D NULL_TREE - || poly_int_tree_p (offset)); + gcc_assert (offset2 =3D=3D NULL_TREE + || poly_int_tree_p (offset2)); tree d1 =3D OMP_CLAUSE_DECL (*sc); tree d2 =3D OMP_CLAUSE_DECL (c); while (TREE_CODE (d1) =3D=3D ARRAY_REF) --=20 2.17.1 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Assert-offset2-instead-of-offset-in-gcc.gcc-8-branch.patch Content-Transfer-Encoding: quoted-printable Content-length: 1644 =46rom 2c1fdb6ef7fc5fbde790143c9c58b0f10241f9d8 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Mon, 11 Nov 2019 08:19:41 +0000 Subject: [PATCH] Assert 'offset2' instead of 'offset' in 'gcc/gimplify.c:gimplify_scan_omp_clauses' ... to fix a long-time typo/copy'n'past-o. gcc/ * gimplify.c (gimplify_scan_omp_clauses): Assert 'offset2' instead of 'offset'. Backport from trunk r278038. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@278040 138b= c75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/gimplify.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 80bf2e121c63..29441ada5dd3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2019-11-11 Thomas Schwinge =20 + Backport from trunk: + * gimplify.c (gimplify_scan_omp_clauses): Assert 'offset2' instead + of 'offset'. + Backport from trunk: * Makefile.in (LANG_CONFIGUREFRAGS): Define. (config.status): Use/depend on it. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index fcb50c8e0476..3bfd0692103b 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -8181,8 +8181,8 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *= pre_p, break; if (scp) continue; - gcc_assert (offset =3D=3D NULL_TREE - || poly_int_tree_p (offset)); + gcc_assert (offset2 =3D=3D NULL_TREE + || poly_int_tree_p (offset2)); tree d1 =3D OMP_CLAUSE_DECL (*sc); tree d2 =3D OMP_CLAUSE_DECL (c); while (TREE_CODE (d1) =3D=3D ARRAY_REF) --=20 2.17.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" Content-length: 658 -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEU9WEfWKGQazCmycCAKI7+41Q4XkFAl3JJBMACgkQAKI7+41Q 4XlOFgv+MtFuKj3T5UaYnK3wueASHdDdorMSFD+cw49U3T+f3R2x0woZABGp6Hj7 tmIn9vB1JDA3bmwesxHF3kv2+0hZkQ8xihMujdmeSBFpljlMENOTQ10WN3oFNWkn 3/24Hepd9OB0lgPGy0sppa0wNbeax1gXLRbdYHz2PBinpjJvlStQupgBK1e87NmN 62imd8g07rFydyp+QJeYXs3Q1voO3xJy0SQ6KX30PUtY+3Jwo0f8OvnE3iwNf1aQ ytxZoLyHFjnU0FBxS578uojLEhinFNwL5qwYd4fQ36nqNUpWfac0w1uio08NhWlm Om86funOZmN9K+ao/iSHk9qbd8iPtk5EHYJdtYROQ5saXHolfeLAZq1+q3mr2BQC TWCJKPLsCWzxeaaIS3LOLj6uZctwwJ6yhnWuWzfJnBJ+zzpAX7HzDX+CFbRK5DyN lQ68MA7JUxu51dS4ASL34WXTee9vy6FMHUK90MhZL9f6MxlpFWqAx2rxaIxVBD6m 0EOVURjV =TFN/ -----END PGP SIGNATURE----- --==-=-=--