From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 81580a70 for ; Sun, 22 Dec 2019 04:53:20 +0000 (UTC) Received: (qmail 26695 invoked by alias); 22 Dec 2019 04:53:15 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 45131 Received: (qmail 4890 invoked by uid 1010); 22 Dec 2019 04:53:15 -0000 X-Qmail-Scanner-Diagnostics: from wout3-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.1/25663. spamassassin: 3.4.2. Clear:RC:0(64.147.123.19):SA:0(-1.9/5.0):. Processed in 0.63703 secs); 22 Dec 2019 04:53:15 -0000 X-Envelope-From: danielsh@apache.org X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: softfail (ns1.primenet.com.au: transitioning SPF record at amazonses.com does not designate 64.147.123.19 as permitted sender) X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrvdduiedgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofestddtredtredttd enucfhrhhomhepffgrnhhivghlucfuhhgrhhgrfhcuoegurghnihgvlhhshhesrghprggt hhgvrdhorhhgqeenucfkphepjeelrddukedtrdehjedrudduleenucfrrghrrghmpehmrg hilhhfrhhomhepuggrnhhivghlshhhsegrphgrtghhvgdrohhrghenucevlhhushhtvghr ufhiiigvpedt X-ME-Proxy: From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH] Make a function that redefines itself preserve its tracedness. Date: Sun, 22 Dec 2019 04:52:38 +0000 Message-Id: <20191222045238.28097-1-danielsh@apache.org> X-Mailer: git-send-email 2.11.0 This makes it easy to apply local tracing ('functions -T') to autoloadable functions that redefines themselves when first loaded. --- Given how late we are in the release cycle, should I wait until after 5.8 to push this? Cheers, Daniel Src/exec.c | 6 ++++++ Test/E02xtrace.ztst | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/Src/exec.c b/Src/exec.c index fac095d64..356e2974b 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -5320,6 +5320,12 @@ execfuncdef(Estate state, Eprog redir_prog) */ removetrapnode(signum); } + /* Is this function traced and redefining itself? */ + if (funcstack && funcstack->tp == FS_FUNC && + !strcmp(s, funcstack->name)) { + Shfunc old = ((Shfunc)shfunctab->getnode(shfunctab, s)); + shf->node.flags |= old->node.flags & (PM_TAGGED|PM_TAGGED_LOCAL); + } shfunctab->addnode(shfunctab, ztrdup(s), shf); } } diff --git a/Test/E02xtrace.ztst b/Test/E02xtrace.ztst index da6191cd0..8d2c300cf 100644 --- a/Test/E02xtrace.ztst +++ b/Test/E02xtrace.ztst @@ -146,3 +146,12 @@ ?+(anon):0> '(anon)' ?+(anon):0> true ?+fn:0> gn + + f() { + f() { echo inner } + } + functions -T f + f + which f | grep '# traced' +0:a function that redefines itself preserves tracing +> # traced