From 8b2cfd45fa8dd4f01d9535ad43bc37ce4953e78d Mon Sep 17 00:00:00 2001
From: "Alex Lam S.L" <alexlamsl@gmail.com>
Date: Mon, 15 Jun 2020 01:29:01 +0800
Subject: fix corner case in `rename` (#4000)

fixes #3999
---
 lib/scope.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib/scope.js')

diff --git a/lib/scope.js b/lib/scope.js
index 2f49df76..66314766 100644
--- a/lib/scope.js
+++ b/lib/scope.js
@@ -543,11 +543,8 @@ AST_Toplevel.DEFMETHOD("expand_names", function(options) {
         var redef = def.redefined();
         var name = redef ? redef.rename || redef.name : next_name();
         def.rename = name;
-        def.orig.forEach(function(sym) {
-            sym.name = name;
-        });
-        def.references.forEach(function(sym) {
-            sym.name = name;
+        def.orig.concat(def.references).forEach(function(sym) {
+            if (sym.definition() === def) sym.name = name;
         });
     }
 });
-- 
cgit v1.2.3

type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a'>refs</a><a class='active' href='/guix/log/gnu/packages/avahi.scm'>log</a><a href='/guix/tree/gnu/packages/avahi.scm?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a'>tree</a><a href='/guix/commit/gnu/packages/avahi.scm?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a'>commit</a><a href='/guix/diff/gnu/packages/avahi.scm?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/avahi.scm'>
<input type='hidden' name='id' value='a30f250d7426df48f5532cd339b8f53dd6e4dd3a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a'>root</a>/<a href='/guix/log/gnu?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a'>gnu</a>/<a href='/guix/log/gnu/packages?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a'>packages</a>/<a href='/guix/log/gnu/packages/avahi.scm?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a'>avahi.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/avahi.scm?id=a30f250d7426df48f5532cd339b8f53dd6e4dd3a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-13 23:48:15 +0200'>2020-10-13</span></td><td><a href='/guix/commit/gnu/packages/avahi.scm?id=9e1f5a263e4f6df4d075901c9b58a56f80c8b452'>gnu: libcap: Make 'libcap/next' the default libcap.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-03-18 19:23:46 +0100'>2020-03-18</span></td><td><a href='/guix/commit/gnu/packages/avahi.scm?id=850093ac24f92ae805a2ee90681d1e4cb01ff8eb'>gnu: avahi: Update to 0.8.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-03-18 19:23:46 +0100'>2020-03-18</span></td><td><a href='/guix/commit/gnu/packages/avahi.scm?id=32b089f4f4e86a32bb34c2c7983be5dbe9603784'>gnu: avahi: Do not build the static libraries.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-01-21 22:39:42 +0100'>2020-01-21</span></td><td><a href='/guix/commit/gnu/packages/avahi.scm?id=8ed9be3faccb865204de46d2a8ed3e96e59281b6'>Merge branch 'staging' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-01-19 06:09:01 +0100'>2020-01-19</span></td><td><a href='/guix/commit/gnu/packages/avahi.scm?id=f460f8da68f915dee5aa3ce97e05ba38c92f3106'>gnu: Use HTTPS for avahi.org everywhere.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-12-05 17:58:58 +0100'>2019-12-05</span></td><td><a href='/guix/commit/gnu/packages/avahi.scm?id=edb8aa3a28d410ef6fcb9355b57f9be26f87caed'>gnu: avahi: Incorporate grafted changes.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-10-23 20:39:46 +0200'>2019-10-23</span></td><td><a href='/guix/commit/gnu/packages/avahi.scm?id=4163b6d855a4e655852029625762fccb077a196d'>gnu: avahi: Don't use package/inherit.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-10-23 19:58:48 +0200'>2019-10-23</span></td><td><a href='/guix/commit/gnu/packages/avahi.scm?id=3f4ea9a62b5fa68d57724b2f83c35a191e33b7c8'>gnu: avahi: Fix CVE-2018-1000845 and duplicate CVE-2017-6519.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>