From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by sourceware.org (Postfix) with ESMTPS id 8E5303858D37; Fri, 30 Jun 2023 03:48:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E5303858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=axis.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=axis.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1688096929; x=1719632929; h=from:to:cc:in-reply-to:subject:mime-version: content-transfer-encoding:references:message-id:date; bh=xeMOMNmxOE0f6JannPjHVweXSMYfqXcy9KLO3tLsZzQ=; b=St/MKwqVIKUS8dQKk8fKd2aM+1ncnYlCcRm66ft3QOpsVPGVHfV7WYF7 l4YR/uxTclhTrOmSyVlytF0DG+tjUdFY6ry7gJ/SYONUWQT914SUUpI7I 3RHWG6ILdQ+1OB3X+XmB4YPdBD6oZ0Yg3RiXbzaGHkZ/TdunichoMyOB1 sFVrJGbpAyWgwOTHhMz+JH2mVnRgkyvI5Pu48068FrG7oPg+UC7PiCIhU X6O9U6DQtF+f/1flyWmYUYLQrxaayNE2NBv65ZTJyrnZYG6rIL8gGeodo z4vx2hZNQDiEZg2fJtBqms80TYEDEkmW5Kyud//TH7jZGot+5qqNH3tId g==; From: Hans-Peter Nilsson To: Thomas Rodgers CC: , , In-Reply-To: (message from Thomas Rodgers via Gcc-patches on Mon, 26 Jun 2023 11:57:49 -0700) Subject: PR108672 re-fixed after [PATCH] libstdc++: Synchronize PSTL with upstream MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT References: Message-ID: <20230630034847.0D200203F8@pchp3.se.axis.com> Date: Fri, 30 Jun 2023 05:48:47 +0200 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_PASS,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 List-Id: > Date: Mon, 26 Jun 2023 11:57:49 -0700 > From: Thomas Rodgers via Gcc-patches > On Wed, May 17, 2023 at 12:32 PM Jonathan Wakely wrote: > > All the actual code changes look good. Unfortunately, this overwrote the fix for PR108672. I take it there's a step missing from the synchronization process; a check that no local commits are overwritten? Sounds like something that can be fully scripted (not volunteering) or already available (like, "list all commits affecting contents touched by/between two named commits"). I did *not* check whether any other local commits were also overwritten. Also, not sure about whether better try to get this upstreamed: __INT32_TYPE__ seems gcc-specific. Anyway, r13-5702-g72058eea9d407e was "re-committed" per below as obvious after regtesting cris-elf. brgds, H-P -- >8 -- Subject: libstdc++: Re-apply PR108672 fix (avoid use of naked int32_t in unseq_backend_simd.h) The fix was overwritten by r14-2109-g3162ca09dbdc2e "libstdc++: Synchronize PSTL with upstream". libstdc++-v3: PR libstdc++/108672 * include/pstl/unseq_backend_simd.h (__simd_or): Re-apply using __INT32_TYPE__ instead of int32_t. --- libstdc++-v3/include/pstl/unseq_backend_simd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/pstl/unseq_backend_simd.h b/libstdc++-v3/include/pstl/unseq_backend_simd.h index 69784bcdbe66..f3c38fbbbc2a 100644 --- a/libstdc++-v3/include/pstl/unseq_backend_simd.h +++ b/libstdc++-v3/include/pstl/unseq_backend_simd.h @@ -74,7 +74,7 @@ __simd_or(_Index __first, _DifferenceType __n, _Pred __pred) noexcept const _Index __last = __first + __n; while (__last != __first) { - int32_t __flag = 1; + __INT32_TYPE__ __flag = 1; _PSTL_PRAGMA_SIMD_REDUCTION(& : __flag) for (_DifferenceType __i = 0; __i < __block_size; ++__i) if (__pred(*(__first + __i))) -- 2.30.2