@@ -110,19 +110,6 @@ impl<R> RenamePass<R>
110110where
111111 R : Renamer ,
112112{
113- fn get_unresolved < N > ( & self , n : & N , has_eval : bool ) -> FxHashSet < Atom >
114- where
115- N : VisitWith < Collector < Id > > ,
116- {
117- let ( usages, decls, preserved) = collect ( n, has_eval. then_some ( self . config . top_level_mark ) ) ;
118- usages
119- . into_iter ( )
120- . filter ( |used_id| !decls. contains ( used_id) )
121- . map ( |v| v. 0 )
122- . chain ( preserved. into_iter ( ) . map ( |v| v. 0 ) )
123- . collect ( )
124- }
125-
126113 fn get_map < N > ( & mut self , node : & N , skip_one : bool , top_level : bool , has_eval : bool ) -> RenameMap
127114 where
128115 N : VisitWith < Collector < Id > > + VisitWith < Analyzer > ,
@@ -143,13 +130,21 @@ where
143130 } ;
144131 scope. prepare_renaming ( ) ;
145132
146- let mut map = RenameMap :: default ( ) ;
133+ let ( usages, decls, preserved) =
134+ collect ( node, has_eval. then_some ( self . config . top_level_mark ) ) ;
135+ let unresolved = usages
136+ . into_iter ( )
137+ . filter ( |used_id| !decls. contains ( used_id) )
138+ . map ( |v| v. 0 )
139+ . chain ( preserved. into_iter ( ) . map ( |v| v. 0 ) )
140+ . collect :: < FxHashSet < _ > > ( ) ;
147141
148142 let mut unresolved = if !top_level {
149- let mut unresolved = self . unresolved . clone ( ) ;
150- unresolved . extend ( self . get_unresolved ( node , has_eval ) ) ;
151- Cow :: Owned ( unresolved )
143+ let mut set = self . unresolved . clone ( ) ;
144+ set . extend ( unresolved ) ;
145+ Cow :: Owned ( set )
152146 } else {
147+ self . unresolved = unresolved;
153148 Cow :: Borrowed ( & self . unresolved )
154149 } ;
155150
@@ -167,6 +162,8 @@ where
167162 }
168163 }
169164
165+ let mut map = RenameMap :: default ( ) ;
166+
170167 if R :: MANGLE {
171168 let cost = scope. rename_cost ( ) ;
172169 scope. rename_in_mangle_mode (
@@ -335,8 +332,6 @@ where
335332
336333 let has_eval = !self . config . ignore_eval && contains_eval ( m, true ) ;
337334
338- self . unresolved = self . get_unresolved ( m, has_eval) ;
339-
340335 let map = self . get_map ( m, false , true , has_eval) ;
341336
342337 // If we have eval, we cannot rename a whole program at once.
@@ -378,8 +373,6 @@ where
378373
379374 let has_eval = !self . config . ignore_eval && contains_eval ( m, true ) ;
380375
381- self . unresolved = self . get_unresolved ( m, has_eval) ;
382-
383376 let map = self . get_map ( m, false , true , has_eval) ;
384377
385378 if has_eval {
0 commit comments