From patchwork Sun Sep 29 16:45:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1990624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JFHNaqJE; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XGqnr3h12z1xt8 for ; Mon, 30 Sep 2024 02:45:36 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5A922385E83F for ; Sun, 29 Sep 2024 16:45:34 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 1BEFC385EC1D for ; Sun, 29 Sep 2024 16:45:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1BEFC385EC1D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1BEFC385EC1D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727628316; cv=none; b=dI/DSc73JV8Q7pmasIMN+vVqx+Ssrpf2KqY5ngFR3QwgyyxJENLK2BdMqA35EU2dmU5WRjqmexGM8i74HNKyCCzfTD4QfpABdrnYLMX1JRZcMU1Q+LsJoRSSysiSNqafxbrRIaQmsNBDYE5QydroiVOg/vUf8QK8E3PwZP23MtA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727628316; c=relaxed/simple; bh=kX2oe6adTCY2c6iwMr6qZ+fmC8AZkPyspibHg29u23Q=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=p6DXlcoEGpJlk7JcxHuvaILf1tOfZtWuGnaCM4QhH45ZEd8J+4eSkNvSrIHoAJz4wcYp9gQCZhn1PZhWk9UtNQUm6MGnqxIHqTcwXHgX6aVBeFlgege6ALITb8iqsaXXuH6l+oEyIj04XtmoKO4/d4dLlmSV+nI2olO4yPR9Xas= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727628313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BPrg+m2U4LYXqHUmZG77idG7IF1ECTfgjZpo9npkZ3Y=; b=JFHNaqJEbCG9XQBi/JVogV6TP+N21Lg5BEaQpgX+1DcDOJEev8tHk3JK771z0R914mYKO0 CiC7VYxD2IoOm0VxBFjp/IhrOki+uIdKa/Vy0bj6WncAPJuJHpq83sjpTqnIptNSFr/hs0 rrcU+mqvAjmf7jxW4VCPcoyq7jSFfH4= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-150-9SVMp5p3PcSJW-Rvt7ckgQ-1; Sun, 29 Sep 2024 12:45:12 -0400 X-MC-Unique: 9SVMp5p3PcSJW-Rvt7ckgQ-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D876C190ECE8 for ; Sun, 29 Sep 2024 16:45:11 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.45.224.151]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 123053003E4D for ; Sun, 29 Sep 2024 16:45:10 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v3 27/29] malloc: Use volatile as compiler barrier in tst-memalign, tst-valloc In-Reply-To: Message-ID: References: X-From-Line: a53c320699b268fd618aaa96bc416dd51724ca22 Mon Sep 17 00:00:00 2001 Date: Sun, 29 Sep 2024 18:45:07 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org This is a simpler way to avoid compiler warnings. Apply this to the pagesize variable as well, to enable future optimizations. --- malloc/tst-memalign.c | 17 ++++++----------- malloc/tst-valloc.c | 17 ++++++----------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/malloc/tst-memalign.c b/malloc/tst-memalign.c index 563f6413d2..1cfe9312dd 100644 --- a/malloc/tst-memalign.c +++ b/malloc/tst-memalign.c @@ -35,25 +35,20 @@ merror (const char *msg) static int do_test (void) { + /* Use volatile for compiler barriers, to avoid + Walloc-size-larger-than warnings. */ + volatile unsigned long int pagesize = getpagesize (); + volatile int minus1 = -1; void *p; - unsigned long pagesize = getpagesize (); - unsigned long ptrval; + unsigned long int ptrval; int save; errno = 0; DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (7, 0) - /* GCC 7 warns about too-large allocations; here we want to test - that they fail. */ - DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); -#endif /* An attempt to allocate a huge value should return NULL and set errno to ENOMEM. */ - p = memalign (sizeof (void *), -1); -#if __GNUC_PREREQ (7, 0) - DIAG_POP_NEEDS_COMMENT; -#endif + p = memalign (sizeof (void *), minus1); save = errno; diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c index 9bab8c6470..b27a6c0fc0 100644 --- a/malloc/tst-valloc.c +++ b/malloc/tst-valloc.c @@ -35,25 +35,20 @@ merror (const char *msg) static int do_test (void) { + /* Use volatile for compiler barriers, to avoid + Walloc-size-larger-than warnings. */ + volatile unsigned long int pagesize = getpagesize (); + volatile int minus1 = -1; void *p; - unsigned long pagesize = getpagesize (); - unsigned long ptrval; + unsigned long int ptrval; int save; errno = 0; DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (7, 0) - /* GCC 7 warns about too-large allocations; here we want to test - that they fail. */ - DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); -#endif /* An attempt to allocate a huge value should return NULL and set errno to ENOMEM. */ - p = valloc (-1); -#if __GNUC_PREREQ (7, 0) - DIAG_POP_NEEDS_COMMENT; -#endif + p = valloc (minus1); save = errno;