From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 793701F4B5 for ; Sat, 16 Nov 2019 17:57:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727614AbfKPR5m (ORCPT ); Sat, 16 Nov 2019 12:57:42 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:40403 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727437AbfKPR5m (ORCPT ); Sat, 16 Nov 2019 12:57:42 -0500 X-IronPort-AV: E=Sophos;i="5.68,313,1569276000"; d="scan'208";a="326964230" Received: from abo-228-123-68.mrs.modulonet.fr (HELO hadrien) ([85.68.123.228]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Nov 2019 18:57:39 +0100 Date: Sat, 16 Nov 2019 18:57:38 +0100 (CET) From: Julia Lawall X-X-Sender: jll@hadrien To: Markus Elfring cc: Coccinelle , =?ISO-8859-15?Q?Ren=E9_Scharfe?= , Junio C Hamano , git@vger.kernel.org Subject: Re: [Cocci] git-coccinelle: adjustments for array.cocci? In-Reply-To: <6fffd13a-738b-e750-9f5a-f0bfb252855b@web.de> Message-ID: References: <50c77cdc-2b2d-16c8-b413-5eb6a2bae749@web.de> <5189f847-1af1-f050-6c72-576a977f6f12@web.de> <53346d52-e096-c651-f70a-ce6ca4d82ff9@web.de> <6c4ef61f-5fef-ffc8-82d6-ee42006756b4@web.de> <6fffd13a-738b-e750-9f5a-f0bfb252855b@web.de> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323329-2018444975-1573927059=:3558" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-2018444975-1573927059=:3558 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT On Fri, 15 Nov 2019, Markus Elfring wrote: > > Anyway, someone who can reproduce the issue using the latest release > > of Coccinelle would be in a better position to file a bug report. > > Hello, > > I repeated the discussed source code transformation approach together > with the software combination “Coccinelle 1.0.8-00004-g842075f7” (OCaml 4.09). > https://github.com/coccinelle/coccinelle/commits/master > > 1. Yesterday I checked the source files out for the software “Git” > according to the commit “The first batch post 2.24 cycle”. > https://github.com/git/git/commit/d9f6f3b6195a0ca35642561e530798ad1469bd41 > > 2. I restored a previous development status by the following command. > > git show 921d49be86 | patch -p1 -R > > See also: > https://public-inbox.org/git/53346d52-e096-c651-f70a-ce6ca4d82ff9@web.de/ > > 3. I stored a generated patch based on the currently released SmPL script. > https://github.com/git/git/blob/177fbab747da4f58cb2a8ce010b3515c86dd67c9/contrib/coccinelle/array.cocci > > 4. I applied the following patch then. > > diff --git a/contrib/coccinelle/array.cocci b/contrib/coccinelle/array.cocci > index 46b8d2ee11..89df184bbd 100644 > --- a/contrib/coccinelle/array.cocci > +++ b/contrib/coccinelle/array.cocci > @@ -12,27 +12,21 @@ T *ptr; > T[] arr; > expression E, n; > @@ > -( > - memcpy(ptr, E, > -- n * sizeof(*(ptr)) > -+ n * sizeof(T) > - ) > -| > - memcpy(arr, E, > -- n * sizeof(*(arr)) > -+ n * sizeof(T) > - ) > -| > - memcpy(E, ptr, > -- n * sizeof(*(ptr)) > -+ n * sizeof(T) > - ) > -| > - memcpy(E, arr, > -- n * sizeof(*(arr)) > -+ n * sizeof(T) > - ) > + memcpy( > +( ptr, E, n * > +- sizeof(*(ptr)) > ++ sizeof(T) > +| arr, E, n * > +- sizeof(*(arr)) > ++ sizeof(T) > +| E, ptr, n * > +- sizeof(*(ptr)) > ++ sizeof(T) > +| E, arr, n * > +- sizeof(*(arr)) > ++ sizeof(T) > ) > + ) This seems quite unreadable, in contrast to the original code. > > @@ > type T; > > I suggested in this way to move a bit of SmPL code. > > 5. I stored another generated patch based on the adjusted SmPL script. No idea what it means to store a patch. > 6. I performed a corresponding file comparison. > > --- array-released.diff 2019-11-14 21:29:11.020576916 +0100 > +++ array-reduced1.diff 2019-11-14 21:45:58.931956527 +0100 > @@ -6,24 +6,10 @@ > r->entry_count = t->entry_count; > r->delta_depth = t->delta_depth; > - memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0])); > -+ COPY_ARRAY(r->entries, t->entries, t->entry_count); > ++ memcpy(r->entries,t->entries,t->entry_count*sizeof(*(t->entries))); > release_tree_content(t); > return r; > } I have no idea what is being compared here. The COPY_ARRAY thing looks nice, but doesn't seem to have anything to do with your semantic patch. julia > -diff -u -p a/pretty.c b/pretty.c > ---- a/pretty.c > -+++ b/pretty.c > -@@ -106,8 +106,8 @@ static void setup_commit_formats(void) > - commit_formats_len = ARRAY_SIZE(builtin_formats); > - builtin_formats_len = commit_formats_len; > - ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc); > -- memcpy(commit_formats, builtin_formats, > -- sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats)); > -+ COPY_ARRAY(commit_formats, builtin_formats, > -+ ARRAY_SIZE(builtin_formats)); > - > - git_config(git_pretty_formats_config, NULL); > - } > diff -u -p a/packfile.c b/packfile.c > --- a/packfile.c > +++ b/packfile.c > @@ -36,17 +22,6 @@ > } else { > ALLOC_GROW(poi_stack, poi_stack_nr+1, poi_stack_alloc); > } > -@@ -1698,8 +1698,8 @@ void *unpack_entry(struct repository *r, > - && delta_stack == small_delta_stack) { > - delta_stack_alloc = alloc_nr(delta_stack_nr); > - ALLOC_ARRAY(delta_stack, delta_stack_alloc); > -- memcpy(delta_stack, small_delta_stack, > -- sizeof(*delta_stack)*delta_stack_nr); > -+ COPY_ARRAY(delta_stack, small_delta_stack, > -+ delta_stack_nr); > - } else { > - ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc); > - } > diff -u -p a/compat/regex/regexec.c b/compat/regex/regexec.c > --- a/compat/regex/regexec.c > +++ b/compat/regex/regexec.c > > > How do you think about the differences from this test result? > > Regards, > Markus > _______________________________________________ > Cocci mailing list > Cocci@systeme.lip6.fr > https://systeme.lip6.fr/mailman/listinfo/cocci > --8323329-2018444975-1573927059=:3558--