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 4BBC0383569C for ; Thu, 12 Jan 2023 20:59:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4BBC0383569C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673557192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQovNiJ2rywMJP0ufBq8ICl4uu1jgHsB1N5YbXvWoCc=; b=X2SuF8g2D9Fdga5RITTm9l8q87UF6NvQvgFniX0LpdkX2/CgG9PLZp3xm1J/ktNdPNqbSb lRjvb+NXBZxxwfbzaVcyvNP0ZZYdev5P9H6Y3LcvF4iR11LBGckq6wWSxUF6ki6Z2QL24g PG0FHfPTc+Rnu1iAO8pUoVZyFYQpztM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-286-Gf8l3VEfNw-ANPD4sycEqg-1; Thu, 12 Jan 2023 15:59:50 -0500 X-MC-Unique: Gf8l3VEfNw-ANPD4sycEqg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A9DC85D061; Thu, 12 Jan 2023 20:59:50 +0000 (UTC) Received: from localhost (unknown [10.33.36.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14A04492B00; Thu, 12 Jan 2023 20:59:49 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Extend max_align_t special case to 64-bit HP-UX [PR77691] Date: Thu, 12 Jan 2023 20:59:49 +0000 Message-Id: <20230112205949.932013-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.3 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_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP 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: Tested x86_64-linux. Pushed to trunk. -- >8 -- GCC's std::max_align_t doesn't agree with the system malloc on HP-UX, so generalize the current hack for Solaris to apply to that target too. libstdc++-v3/ChangeLog: PR libstdc++/77691 * include/experimental/memory_resource (_GLIBCXX_MAX_ALIGN_MATCHES_MALLOC): Define. (do_allocate, do_deallocate): Check it. * testsuite/experimental/memory_resource/new_delete_resource.cc: Relax expected behaviour for 64-bit hppa-hp-hpux11.11. --- libstdc++-v3/include/experimental/memory_resource | 15 ++++++++++++--- .../memory_resource/new_delete_resource.cc | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/experimental/memory_resource b/libstdc++-v3/include/experimental/memory_resource index aa86c042d84..786392e8904 100644 --- a/libstdc++-v3/include/experimental/memory_resource +++ b/libstdc++-v3/include/experimental/memory_resource @@ -412,11 +412,20 @@ namespace pmr { allocator_type get_allocator() const noexcept { return _M_alloc; } protected: +#if (defined __sun__ || defined __VXWORKS__) && defined __i386__ +// Cannot use max_align_t on 32-bit Solaris x86, see PR libstdc++/77691 +# define _GLIBCXX_MAX_ALIGN_MATCHES_MALLOC 0 +#elif defined __hpux__ && defined __hppa__ && defined __LP64__ +// Ignore inconsistent long double and malloc alignment (libstdc++/77691) +# define _GLIBCXX_MAX_ALIGN_MATCHES_MALLOC 0 +#else +# define _GLIBCXX_MAX_ALIGN_MATCHES_MALLOC 1 +#endif + virtual void* do_allocate(size_t __bytes, size_t __alignment) override { - // Cannot use max_align_t on 32-bit Solaris x86, see PR libstdc++/77691 -#if ! ((defined __sun__ || defined __VXWORKS__) && defined __i386__) +#if _GLIBCXX_MAX_ALIGN_MATCHES_MALLOC if (__alignment == alignof(max_align_t)) return _M_allocate(__bytes); #endif @@ -442,7 +451,7 @@ namespace pmr { do_deallocate(void* __ptr, size_t __bytes, size_t __alignment) noexcept override { -#if ! ((defined __sun__ || defined __VXWORKS__) && defined __i386__) +#if _GLIBCXX_MAX_ALIGN_MATCHES_MALLOC if (__alignment == alignof(max_align_t)) return (void) _M_deallocate(__ptr, __bytes); #endif diff --git a/libstdc++-v3/testsuite/experimental/memory_resource/new_delete_resource.cc b/libstdc++-v3/testsuite/experimental/memory_resource/new_delete_resource.cc index d121d5f2c41..a7ecb54b905 100644 --- a/libstdc++-v3/testsuite/experimental/memory_resource/new_delete_resource.cc +++ b/libstdc++-v3/testsuite/experimental/memory_resource/new_delete_resource.cc @@ -27,6 +27,10 @@ // See PR libstdc++/77691 # define BAD_MAX_ALIGN_T 1 #endif +#if defined __hpux__ && defined __hppa__ && defined __LP64__ +// Ignore inconsistent long double and malloc alignment (libstdc++/77691) +# define BAD_MAX_ALIGN_T 1 +#endif bool new_called = false; bool delete_called = false; -- 2.39.0