From: Julia Lawall <julia.lawall@lip6.fr>
To: Markus Elfring <Markus.Elfring@web.de>
Cc: Coccinelle <cocci@systeme.lip6.fr>, "René Scharfe" <l.s.r@web.de>,
"Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [Cocci] git-coccinelle: adjustments for array.cocci?
Date: Sat, 16 Nov 2019 18:57:38 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.21.1911161855400.3558@hadrien> (raw)
In-Reply-To: <6fffd13a-738b-e750-9f5a-f0bfb252855b@web.de>
[-- Attachment #1: Type: text/plain, Size: 4506 bytes --]
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
>
next prev parent reply other threads:[~2019-11-16 17:57 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 15:08 coccinelle: adjustments for array.cocci? Markus Elfring
2019-11-12 18:37 ` René Scharfe
2019-11-13 2:11 ` Junio C Hamano
2019-11-13 8:49 ` Markus Elfring
2019-11-14 2:03 ` Junio C Hamano
2019-11-14 13:15 ` Markus Elfring
2019-11-14 16:41 ` René Scharfe
2019-11-14 17:14 ` Markus Elfring
2019-11-14 17:46 ` René Scharfe
2019-11-15 11:11 ` git-coccinelle: " Markus Elfring
2019-11-15 14:20 ` Markus Elfring
2019-11-15 18:50 ` Markus Elfring
2019-11-16 1:00 ` [Cocci] " Julia Lawall
2019-11-16 6:57 ` Markus Elfring
2019-11-16 8:29 ` Markus Elfring
2019-11-16 17:57 ` Julia Lawall [this message]
2019-11-16 18:29 ` Markus Elfring
2019-11-15 20:37 ` coccinelle: " Markus Elfring
2019-11-16 21:13 ` René Scharfe
2019-11-17 7:56 ` Markus Elfring
2019-11-17 13:40 ` René Scharfe
2019-11-17 18:19 ` Markus Elfring
2019-11-19 19:14 ` René Scharfe
2019-11-19 20:21 ` Markus Elfring
2019-11-21 19:01 ` René Scharfe
2019-11-16 16:33 ` Markus Elfring
2019-11-16 21:38 ` René Scharfe
2019-11-17 8:19 ` Markus Elfring
2019-11-17 13:40 ` René Scharfe
2019-11-17 18:36 ` Markus Elfring
2019-11-19 19:15 ` René Scharfe
2019-11-18 16:10 ` [PATCH] coccinelle: improve array.cocci Markus Elfring
2019-11-19 19:15 ` René Scharfe
2019-11-20 9:01 ` Markus Elfring
2019-11-21 19:02 ` René Scharfe
2019-11-21 19:44 ` Markus Elfring
2019-11-22 15:29 ` SZEDER Gábor
2019-11-22 16:17 ` Markus Elfring
2019-11-22 5:54 ` [PATCH] " Junio C Hamano
2019-11-22 7:34 ` Markus Elfring
2020-01-25 8:23 ` Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.21.1911161855400.3558@hadrien \
--to=julia.lawall@lip6.fr \
--cc=Markus.Elfring@web.de \
--cc=cocci@systeme.lip6.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).