From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2735BC433DB for ; Mon, 15 Feb 2021 12:03:39 +0000 (UTC) Received: from isis.lip6.fr (isis.lip6.fr [132.227.60.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A52664E23 for ; Mon, 15 Feb 2021 12:03:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A52664E23 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=inria.fr Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=cocci-bounces@systeme.lip6.fr Received: from systeme.lip6.fr (systeme.lip6.fr [132.227.104.7]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id 11FC3DXN022405; Mon, 15 Feb 2021 13:03:13 +0100 (CET) Received: from systeme.lip6.fr (systeme.lip6.fr [127.0.0.1]) by systeme.lip6.fr (Postfix) with ESMTP id 1A4DE77C0; Mon, 15 Feb 2021 13:03:13 +0100 (CET) Received: from isis.lip6.fr (isis.lip6.fr [132.227.60.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by systeme.lip6.fr (Postfix) with ESMTPS id 2E4E3376A for ; Mon, 15 Feb 2021 13:03:11 +0100 (CET) Received: from mail2-relais-roc.national.inria.fr (mail2-relais-roc.national.inria.fr [192.134.164.83]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id 11FC3A4l024365 for ; Mon, 15 Feb 2021 13:03:10 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.81,180,1610406000"; d="scan'208";a="493037795" Received: from 173.121.68.85.rev.sfr.net (HELO hadrien) ([85.68.121.173]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Feb 2021 13:03:10 +0100 Date: Mon, 15 Feb 2021 13:03:08 +0100 (CET) From: Julia Lawall X-X-Sender: jll@hadrien To: Denis Efremov In-Reply-To: Message-ID: References: User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, Sender e-mail whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Mon, 15 Feb 2021 13:03:13 +0100 (CET) X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Mon, 15 Feb 2021 13:03:10 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Cc: cocci@systeme.lip6.fr Subject: Re: [Cocci] Problem with partial patch generation X-BeenThere: cocci@systeme.lip6.fr X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: cocci-bounces@systeme.lip6.fr Errors-To: cocci-bounces@systeme.lip6.fr On Mon, 15 Feb 2021, Denis Efremov wrote: > > > On 2/15/21 2:47 PM, Julia Lawall wrote: > > > > > > On Mon, 15 Feb 2021, Denis Efremov wrote: > > > >> Hi, > >> > >> I wrote a simple rule (swap.cocci): > >> > >> virtual patch > >> > >> @depends on patch@ > >> identifier tmp; > >> expression a, b; > >> type T; > >> @@ > >> > >> ( > >> - T tmp; > >> | > >> - T tmp = 0; > >> | > >> - T *tmp = NULL; > >> ) > >> ... when != tmp > >> - tmp = a; > >> - a = b; > >> - b = tmp; > >> + swap(a, b); > >> ... when != tmp > >> > >> I would expect it to remove a local variable only if there is a match > >> with swap template. > >> > >> However, it generates "partial" patch on 5.11 linux code: > >> $ spatch --version > >> spatch version 1.0.8-00201-g267f9cf8cc82 compiled with OCaml version 4.11.1 > >> $ spatch -D patch --sp-file swap.cocci mm/filemap.c > >> --- mm/filemap.c > >> +++ /tmp/cocci-output-445786-88aa66-filemap.c > >> @@ -2348,7 +2348,7 @@ static int generic_file_buffered_read_ge > >> struct file_ra_state *ra = &filp->f_ra; > >> pgoff_t index = iocb->ki_pos >> PAGE_SHIFT; > >> pgoff_t last_index = (iocb->ki_pos + iter->count + PAGE_SIZE-1) >> PAGE_SHIFT; > >> - int i, j, nr_got, err = 0; > >> + int i, nr_got, err = 0; > >> > >> nr = min_t(unsigned long, last_index - index, nr); > >> find_page: > >> > >> How can I improve the rule? > > > > I don't get a match with the latest version of Coccinelle. > > > > If the latest version of Coccinelle were to become a release, would that > > be good enough for you? Or do you need 1.0.8 to work as well? > > I planned to submit the swap rule to scripts/coccinelle. However, I can > create more strict pattern for the patch mode. Maybe adding "when strict" > is suitable here? If there is a release, then the submitted rule can just have a constraint about the release. You can try when strict. Normally, that is to ensure that error paths aren't excused from having the pattern. I don't see why it would help here, but perhaps it's worth a try. julia _______________________________________________ Cocci mailing list Cocci@systeme.lip6.fr https://systeme.lip6.fr/mailman/listinfo/cocci