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=-5.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no 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 C8813C4707F for ; Thu, 27 May 2021 11:44:57 +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 D789E61355 for ; Thu, 27 May 2021 11:44:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D789E61355 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 14RBiqau008788; Thu, 27 May 2021 13:44:52 +0200 (CEST) Received: from systeme.lip6.fr (systeme.lip6.fr [127.0.0.1]) by systeme.lip6.fr (Postfix) with ESMTP id 89CF27737; Thu, 27 May 2021 13:44:52 +0200 (CEST) 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 150477648 for ; Thu, 27 May 2021 13:44:51 +0200 (CEST) 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 ESMTPS id 14RBinDf013675 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 May 2021 13:44:49 +0200 (CEST) IronPort-HdrOrdr: =?us-ascii?q?A9a23=3A7ADvn6hIj3VFqfZFK6lYDhIoMHBQXq8ji2hC?= =?us-ascii?q?6mlwRA09TyX2rayTdZgguCMc9gx+ZJhIo7npU5VoKkmyyXca2+MsAYs=3D?= X-IronPort-AV: E=Sophos;i="5.82,334,1613430000"; d="scan'208";a="510255134" 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; 27 May 2021 13:44:49 +0200 Date: Thu, 27 May 2021 13:44:49 +0200 (CEST) From: Julia Lawall X-X-Sender: jll@hadrien To: Fuad Tabba 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]); Thu, 27 May 2021 13:44:53 +0200 (CEST) X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Thu, 27 May 2021 13:44:49 +0200 (CEST) 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] Adding a line to a function after all variable declarations 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 > @@ > expression a, b; > identifier vcpu; > fresh identifier vcpu_ctxt = vcpu ## "_ctxt"; > iterator name kvm_for_each_vcpu; > identifier fc; > @@ > kvm_for_each_vcpu(a, vcpu, b) > { > /* hop over any declarations */ > + vcpu_ctxt = &vcpu->arch.ctxt; > <+... > fc(..., vcpu, ...) > ...+> > } > > So I'm trying to add the line "vcpu_ctxt = &vcpu->arch.ctxt" after any > declarations, only if there's a function in that block that's using > vcpu. This works, but the vcpu_ctxt assignment is of course always > added first, before any declarations. > > Doing the following partially works, but it of course misses the case > where the function call with vcpu comes immediately after the > vcpu_ctxt assignment. Removing S2 altogether gives me a parse error. > > @@ > expression a, b; > identifier vcpu; > fresh identifier vcpu_ctxt = vcpu ## "_ctxt"; > iterator name kvm_for_each_vcpu; > identifier fc; > statement S1, S2; > @@ > kvm_for_each_vcpu(a, vcpu, b) > { > ... when != S1 > + vcpu_ctxt = &vcpu->arch.ctxt; > S2; > <+... > fc(..., vcpu, ...) > ...+> > } @@ identifier f; statement S1,S2; @@ f(...) { ... when != S1 ( + new_code S2 ... when any & <+... fc(..., vcpu, ...) ...+> ) } julia _______________________________________________ Cocci mailing list Cocci@systeme.lip6.fr https://systeme.lip6.fr/mailman/listinfo/cocci