From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 1C1DA394882E for ; Tue, 10 May 2022 15:33:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1C1DA394882E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1055E1F461; Tue, 10 May 2022 15:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1652196798; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OwCCLp59F19+DSJ3yZEOkbgeDBW2a3sf2c427i1MSeU=; b=b00J1SVcJh957uGVoEWhU/7HoCrEDm5doikf0mEMeR5J0PgXN3B1kKtzJQiHEWxFN+hhu7 BNlwkNz3VLsQ+2/Z3kjcIVIJIq9UMj99Yq8Nn1UHYqrNQEsLOslA6qtQoWR0VqOv35Umpw dlbVv1yav2JdHyP1U+6B23q7ZqeECk4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1652196798; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OwCCLp59F19+DSJ3yZEOkbgeDBW2a3sf2c427i1MSeU=; b=JX2DR1g70KJlTUXzaDc47TNMQeEJQtkdeg0BsO+FY43UM5cn+FPOs8Ekh9ILdVO2LKES9B 5KuWPpyZmweNxABw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F252F13AC1; Tue, 10 May 2022 15:33:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ME7zOb2FemLFaAAAMHmgww (envelope-from ); Tue, 10 May 2022 15:33:17 +0000 Content-Type: multipart/mixed; boundary="------------7rsYfLS5GxnMJgGswIL1o1GM" Message-ID: <7d24cbe2-ed68-f798-fbed-5ec7f6b56152@suse.cz> Date: Tue, 10 May 2022 17:33:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH] libiberty: stop using PTR macro. Content-Language: en-US To: Alan Modra Cc: gcc-patches@gcc.gnu.org References: <3bb2674f-c568-5eb2-4758-26c12e1680d1@suse.cz> From: =?UTF-8?Q?Martin_Li=c5=a1ka?= In-Reply-To: X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2022 15:33:20 -0000 This is a multi-part message in MIME format. --------------7rsYfLS5GxnMJgGswIL1o1GM Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 5/10/22 16:20, Alan Modra wrote: > On Tue, May 10, 2022 at 10:56:22AM +0200, Martin Liška wrote: > >> diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c > >> @@ -457,15 +457,15 @@ htab_empty (htab_t htab) >> else if (htab->free_with_arg_f != NULL) >> (*htab->free_with_arg_f) (htab->alloc_arg, htab->entries); >> if (htab->alloc_with_arg_f != NULL) >> - htab->entries = (PTR *) (*htab->alloc_with_arg_f) (htab->alloc_arg, nsize, >> - sizeof (PTR *)); >> + htab->entries = (void **) (*htab->alloc_with_arg_f) (htab->alloc_arg, nsize, >> + sizeof (void **)); > > Here, and below, the code should really be using "sizeof (void *)". > You may as well fix that nit while you're at it. Also, indentation > looks wrong. > >> else >> - htab->entries = (PTR *) (*htab->alloc_f) (nsize, sizeof (PTR *)); >> + htab->entries = (void **) (*htab->alloc_f) (nsize, sizeof (void **)); >> htab->size = nsize; >> htab->size_prime_index = nindex; >> } >> else >> - memset (entries, 0, size * sizeof (PTR)); >> + memset (entries, 0, size * sizeof (void *)); >> htab->n_deleted = 0; >> htab->n_elements = 0; >> } > >> @@ -543,10 +543,10 @@ htab_expand (htab_t htab) >> } >> >> if (htab->alloc_with_arg_f != NULL) >> - nentries = (PTR *) (*htab->alloc_with_arg_f) (htab->alloc_arg, nsize, >> - sizeof (PTR *)); >> + nentries = (void **) (*htab->alloc_with_arg_f) (htab->alloc_arg, nsize, >> + sizeof (void **)); >> else >> - nentries = (PTR *) (*htab->alloc_f) (nsize, sizeof (PTR *)); >> + nentries = (void **) (*htab->alloc_f) (nsize, sizeof (void **)); >> if (nentries == NULL) >> return 0; >> htab->entries = nentries; > > Here too. > Thanks for the comments, I'm going to push the following patch. Martin --------------7rsYfLS5GxnMJgGswIL1o1GM Content-Type: text/x-patch; charset=UTF-8; name="0001-libiberty-fix-type-in-allocation.patch" Content-Disposition: attachment; filename="0001-libiberty-fix-type-in-allocation.patch" Content-Transfer-Encoding: base64 RnJvbSA1ZGFjNDNiNDNjMzk5OWY5NGI0NTFjZDc5MjVlMjRkOGU3YzM4YTdhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gTGlza2EgPG1saXNrYUBzdXNlLmN6PgpE YXRlOiBUdWUsIDEwIE1heSAyMDIyIDE3OjMxOjI0ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g bGliaWJlcnR5OiBmaXggdHlwZSBpbiBhbGxvY2F0aW9uCgpUaGUgYWxsb2NhdGlvbiBmdW5j dGlvbiBhbGxvY19mIGlzIGNhbGxlZCBmb3IgbnNpemUKaXRlbXMgd2hlcmUgZWFjaCBpcyBv ZiB0eXBlIHZvaWQgKi4KCmxpYmliZXJ0eS9DaGFuZ2VMb2c6CgoJKiBoYXNodGFiLmMgKGh0 YWJfZW1wdHkpOiBVc2Ugdm9pZCAqIHR5cGUgaW5zdGVhZCBvZiB2b2lkICoqLgoJKGh0YWJf ZXhwYW5kKTogTGlrZXdpc2UuCgpDby1BdXRob3JlZC1CeTogQWxhbiBNb2RyYSA8YW1vZHJh QGdtYWlsLmNvbT4KLS0tCiBsaWJpYmVydHkvaGFzaHRhYi5jIHwgOCArKysrLS0tLQogMSBm aWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9saWJpYmVydHkvaGFzaHRhYi5jIGIvbGliaWJlcnR5L2hhc2h0YWIuYwppbmRleCBm NzYyMWNkNDdlNS4uNDcwZDNlNjZjMzIgMTAwNjQ0Ci0tLSBhL2xpYmliZXJ0eS9oYXNodGFi LmMKKysrIGIvbGliaWJlcnR5L2hhc2h0YWIuYwpAQCAtNDU4LDkgKzQ1OCw5IEBAIGh0YWJf ZW1wdHkgKGh0YWJfdCBodGFiKQogCSgqaHRhYi0+ZnJlZV93aXRoX2FyZ19mKSAoaHRhYi0+ YWxsb2NfYXJnLCBodGFiLT5lbnRyaWVzKTsKICAgICAgIGlmIChodGFiLT5hbGxvY193aXRo X2FyZ19mICE9IE5VTEwpCiAJaHRhYi0+ZW50cmllcyA9ICh2b2lkICoqKSAoKmh0YWItPmFs bG9jX3dpdGhfYXJnX2YpIChodGFiLT5hbGxvY19hcmcsIG5zaXplLAotCQkJCQkJICAgICAg ICAgICBzaXplb2YgKHZvaWQgKiopKTsKKwkJCQkJCQkgICAgIHNpemVvZiAodm9pZCAqKSk7 CiAgICAgICBlbHNlCi0JaHRhYi0+ZW50cmllcyA9ICh2b2lkICoqKSAoKmh0YWItPmFsbG9j X2YpIChuc2l6ZSwgc2l6ZW9mICh2b2lkICoqKSk7CisJaHRhYi0+ZW50cmllcyA9ICh2b2lk ICoqKSAoKmh0YWItPmFsbG9jX2YpIChuc2l6ZSwgc2l6ZW9mICh2b2lkICopKTsKICAgICAg aHRhYi0+c2l6ZSA9IG5zaXplOwogICAgICBodGFiLT5zaXplX3ByaW1lX2luZGV4ID0gbmlu ZGV4OwogICAgIH0KQEAgLTU0NCw5ICs1NDQsOSBAQCBodGFiX2V4cGFuZCAoaHRhYl90IGh0 YWIpCiAKICAgaWYgKGh0YWItPmFsbG9jX3dpdGhfYXJnX2YgIT0gTlVMTCkKICAgICBuZW50 cmllcyA9ICh2b2lkICoqKSAoKmh0YWItPmFsbG9jX3dpdGhfYXJnX2YpIChodGFiLT5hbGxv Y19hcmcsIG5zaXplLAotCQkJCQkJICBzaXplb2YgKHZvaWQgKiopKTsKKwkJCQkJCSAgICBz aXplb2YgKHZvaWQgKikpOwogICBlbHNlCi0gICAgbmVudHJpZXMgPSAodm9pZCAqKikgKCpo dGFiLT5hbGxvY19mKSAobnNpemUsIHNpemVvZiAodm9pZCAqKikpOworICAgIG5lbnRyaWVz ID0gKHZvaWQgKiopICgqaHRhYi0+YWxsb2NfZikgKG5zaXplLCBzaXplb2YgKHZvaWQgKikp OwogICBpZiAobmVudHJpZXMgPT0gTlVMTCkKICAgICByZXR1cm4gMDsKICAgaHRhYi0+ZW50 cmllcyA9IG5lbnRyaWVzOwotLSAKMi4zNi4wCgo= --------------7rsYfLS5GxnMJgGswIL1o1GM--