Skip to content

Commit f280138

Browse files
sanxiynsanxiyn
committed
Use par_body_owners for liveness
1 parent 8818b00 commit f280138

File tree

8 files changed

+106
-115
lines changed

8 files changed

+106
-115
lines changed

‎compiler/rustc_interface/src/passes.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -911,13 +911,13 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
911911
});
912912
},
913913
{
914-
sess.time("liveness_and_intrinsic_checking", || {
915-
tcx.hir().par_for_each_module(|module| {
914+
sess.time("liveness_checking", || {
915+
tcx.hir().par_body_owners(|def_id| {
916916
// this must run before MIR dump, because
917917
// "not all control paths return a value" is reported here.
918918
//
919919
// maybe move the check to a MIR pass?
920-
tcx.ensure().check_mod_liveness(module);
920+
tcx.ensure().check_liveness(def_id.to_def_id());
921921
});
922922
});
923923
}

‎compiler/rustc_middle/src/query/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -818,8 +818,8 @@ rustc_queries! {
818818
desc { |tcx| "checking privacy in {}", describe_as_module(key, tcx) }
819819
}
820820

821-
query check_mod_liveness(key: LocalDefId) -> () {
822-
desc { |tcx| "checking liveness of variables in {}", describe_as_module(key, tcx) }
821+
query check_liveness(key: DefId) {
822+
desc { |tcx| "checking liveness of variables in {}", tcx.def_path_str(key) }
823823
}
824824

825825
/// Return the live symbols in the crate for dead code check.

‎compiler/rustc_passes/src/liveness.rs

+46-55
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,10 @@ use rustc_data_structures::fx::FxIndexMap;
8989
use rustc_errors::Applicability;
9090
use rustc_hir as hir;
9191
use rustc_hir::def::*;
92-
use rustc_hir::def_id::LocalDefId;
92+
use rustc_hir::def_id::{DefId, LocalDefId};
9393
use rustc_hir::intravisit::{self, Visitor};
9494
use rustc_hir::{Expr, HirId, HirIdMap, HirIdSet};
9595
use rustc_index::vec::IndexVec;
96-
use rustc_middle::hir::nested_filter;
9796
use rustc_middle::ty::query::Providers;
9897
use rustc_middle::ty::{self, DefIdTree, RootVariableMinCaptureList, Ty, TyCtxt};
9998
use rustc_session::lint;
@@ -139,12 +138,54 @@ fn live_node_kind_to_string(lnk: LiveNodeKind, tcx: TyCtxt<'_>) -> String {
139138
}
140139
}
141140

142-
fn check_mod_liveness(tcx: TyCtxt<'_>, module_def_id: LocalDefId) {
143-
tcx.hir().visit_item_likes_in_module(module_def_id, &mut IrMaps::new(tcx));
141+
fn check_liveness(tcx: TyCtxt<'_>, def_id: DefId) {
142+
let local_def_id = match def_id.as_local() {
143+
None => return,
144+
Some(def_id) => def_id,
145+
};
146+
147+
// Don't run unused pass for #[derive()]
148+
let parent = tcx.local_parent(local_def_id);
149+
if let DefKind::Impl = tcx.def_kind(parent)
150+
&& tcx.has_attr(parent.to_def_id(), sym::automatically_derived)
151+
{
152+
return;
153+
}
154+
155+
// Don't run unused pass for #[naked]
156+
if tcx.has_attr(def_id, sym::naked) {
157+
return;
158+
}
159+
160+
let mut maps = IrMaps::new(tcx);
161+
let body_id = tcx.hir().body_owned_by(local_def_id);
162+
let hir_id = tcx.hir().body_owner(body_id);
163+
let body = tcx.hir().body(body_id);
164+
165+
if let Some(upvars) = tcx.upvars_mentioned(def_id) {
166+
for &var_hir_id in upvars.keys() {
167+
let var_name = tcx.hir().name(var_hir_id);
168+
maps.add_variable(Upvar(var_hir_id, var_name));
169+
}
170+
}
171+
172+
// gather up the various local variables, significant expressions,
173+
// and so forth:
174+
maps.visit_body(body);
175+
176+
// compute liveness
177+
let mut lsets = Liveness::new(&mut maps, local_def_id);
178+
let entry_ln = lsets.compute(&body, hir_id);
179+
lsets.log_liveness(entry_ln, body_id.hir_id);
180+
181+
// check for various error conditions
182+
lsets.visit_body(body);
183+
lsets.warn_about_unused_upvars(entry_ln);
184+
lsets.warn_about_unused_args(body, entry_ln);
144185
}
145186

146187
pub fn provide(providers: &mut Providers) {
147-
*providers = Providers { check_mod_liveness, ..*providers };
188+
*providers = Providers { check_liveness, ..*providers };
148189
}
149190

150191
// ______________________________________________________________________
@@ -316,56 +357,6 @@ impl<'tcx> IrMaps<'tcx> {
316357
}
317358

318359
impl<'tcx> Visitor<'tcx> for IrMaps<'tcx> {
319-
type NestedFilter = nested_filter::OnlyBodies;
320-
321-
fn nested_visit_map(&mut self) -> Self::Map {
322-
self.tcx.hir()
323-
}
324-
325-
fn visit_body(&mut self, body: &'tcx hir::Body<'tcx>) {
326-
debug!("visit_body {:?}", body.id());
327-
328-
// swap in a new set of IR maps for this body
329-
let mut maps = IrMaps::new(self.tcx);
330-
let hir_id = maps.tcx.hir().body_owner(body.id());
331-
let local_def_id = maps.tcx.hir().local_def_id(hir_id);
332-
let def_id = local_def_id.to_def_id();
333-
334-
// Don't run unused pass for #[derive()]
335-
let parent = self.tcx.local_parent(local_def_id);
336-
if let DefKind::Impl = self.tcx.def_kind(parent)
337-
&& self.tcx.has_attr(parent.to_def_id(), sym::automatically_derived)
338-
{
339-
return;
340-
}
341-
342-
// Don't run unused pass for #[naked]
343-
if self.tcx.has_attr(def_id, sym::naked) {
344-
return;
345-
}
346-
347-
if let Some(upvars) = maps.tcx.upvars_mentioned(def_id) {
348-
for &var_hir_id in upvars.keys() {
349-
let var_name = maps.tcx.hir().name(var_hir_id);
350-
maps.add_variable(Upvar(var_hir_id, var_name));
351-
}
352-
}
353-
354-
// gather up the various local variables, significant expressions,
355-
// and so forth:
356-
intravisit::walk_body(&mut maps, body);
357-
358-
// compute liveness
359-
let mut lsets = Liveness::new(&mut maps, local_def_id);
360-
let entry_ln = lsets.compute(&body, hir_id);
361-
lsets.log_liveness(entry_ln, body.id().hir_id);
362-
363-
// check for various error conditions
364-
lsets.visit_body(body);
365-
lsets.warn_about_unused_upvars(entry_ln);
366-
lsets.warn_about_unused_args(body, entry_ln);
367-
}
368-
369360
fn visit_local(&mut self, local: &'tcx hir::Local<'tcx>) {
370361
self.add_from_pat(&local.pat);
371362
if local.els.is_some() {

‎src/test/ui/closures/2229_closure_analysis/run_pass/destructure-pattern-closure-within-closure.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
warning: unused variable: `t2`
2-
--> $DIR/destructure-pattern-closure-within-closure.rs:13:21
1+
warning: unused variable: `g2`
2+
--> $DIR/destructure-pattern-closure-within-closure.rs:10:17
33
|
4-
LL | let (_, t2) = t;
5-
| ^^ help: if this is intentional, prefix it with an underscore: `_t2`
4+
LL | let (_, g2) = g;
5+
| ^^ help: if this is intentional, prefix it with an underscore: `_g2`
66
|
77
note: the lint level is defined here
88
--> $DIR/destructure-pattern-closure-within-closure.rs:3:9
@@ -11,11 +11,11 @@ LL | #![warn(unused)]
1111
| ^^^^^^
1212
= note: `#[warn(unused_variables)]` implied by `#[warn(unused)]`
1313

14-
warning: unused variable: `g2`
15-
--> $DIR/destructure-pattern-closure-within-closure.rs:10:17
14+
warning: unused variable: `t2`
15+
--> $DIR/destructure-pattern-closure-within-closure.rs:13:21
1616
|
17-
LL | let (_, g2) = g;
18-
| ^^ help: if this is intentional, prefix it with an underscore: `_g2`
17+
LL | let (_, t2) = t;
18+
| ^^ help: if this is intentional, prefix it with an underscore: `_t2`
1919

2020
warning: 2 warnings emitted
2121

‎src/test/ui/lint/unused/issue-54180-unused-ref-field.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ LL | #![deny(unused)]
1111
| ^^^^^^
1212
= note: `#[deny(unused_variables)]` implied by `#[deny(unused)]`
1313

14-
error: unused variable: `x`
15-
--> $DIR/issue-54180-unused-ref-field.rs:29:45
16-
|
17-
LL | let _: i32 = points.iter().map(|Point { x, y }| y).sum();
18-
| ^ help: try ignoring the field: `x: _`
19-
2014
error: unused variable: `f1`
2115
--> $DIR/issue-54180-unused-ref-field.rs:26:13
2216
|
@@ -29,5 +23,11 @@ error: unused variable: `x`
2923
LL | Point { y, ref mut x } => y,
3024
| ^^^^^^^^^ help: try ignoring the field: `x: _`
3125

26+
error: unused variable: `x`
27+
--> $DIR/issue-54180-unused-ref-field.rs:29:45
28+
|
29+
LL | let _: i32 = points.iter().map(|Point { x, y }| y).sum();
30+
| ^ help: try ignoring the field: `x: _`
31+
3232
error: aborting due to 4 previous errors
3333

‎src/test/ui/lint/unused/lint-unused-variables.stderr

+14-14
Original file line numberDiff line numberDiff line change
@@ -17,55 +17,55 @@ LL | b: i32,
1717
| ^ help: if this is intentional, prefix it with an underscore: `_b`
1818

1919
error: unused variable: `a`
20-
--> $DIR/lint-unused-variables.rs:68:9
20+
--> $DIR/lint-unused-variables.rs:22:9
2121
|
2222
LL | a: i32,
2323
| ^ help: if this is intentional, prefix it with an underscore: `_a`
2424

2525
error: unused variable: `b`
26-
--> $DIR/lint-unused-variables.rs:74:9
26+
--> $DIR/lint-unused-variables.rs:29:9
2727
|
2828
LL | b: i32,
2929
| ^ help: if this is intentional, prefix it with an underscore: `_b`
3030

3131
error: unused variable: `b`
32-
--> $DIR/lint-unused-variables.rs:42:9
32+
--> $DIR/lint-unused-variables.rs:34:9
3333
|
3434
LL | b: i32,
3535
| ^ help: if this is intentional, prefix it with an underscore: `_b`
3636

3737
error: unused variable: `b`
38-
--> $DIR/lint-unused-variables.rs:47:9
38+
--> $DIR/lint-unused-variables.rs:42:9
3939
|
4040
LL | b: i32,
4141
| ^ help: if this is intentional, prefix it with an underscore: `_b`
4242

43-
error: unused variable: `a`
44-
--> $DIR/lint-unused-variables.rs:22:9
45-
|
46-
LL | a: i32,
47-
| ^ help: if this is intentional, prefix it with an underscore: `_a`
48-
4943
error: unused variable: `b`
50-
--> $DIR/lint-unused-variables.rs:29:9
44+
--> $DIR/lint-unused-variables.rs:47:9
5145
|
5246
LL | b: i32,
5347
| ^ help: if this is intentional, prefix it with an underscore: `_b`
5448

5549
error: unused variable: `b`
56-
--> $DIR/lint-unused-variables.rs:34:9
50+
--> $DIR/lint-unused-variables.rs:55:9
5751
|
5852
LL | b: i32,
5953
| ^ help: if this is intentional, prefix it with an underscore: `_b`
6054

6155
error: unused variable: `b`
62-
--> $DIR/lint-unused-variables.rs:55:9
56+
--> $DIR/lint-unused-variables.rs:60:9
6357
|
6458
LL | b: i32,
6559
| ^ help: if this is intentional, prefix it with an underscore: `_b`
6660

61+
error: unused variable: `a`
62+
--> $DIR/lint-unused-variables.rs:68:9
63+
|
64+
LL | a: i32,
65+
| ^ help: if this is intentional, prefix it with an underscore: `_a`
66+
6767
error: unused variable: `b`
68-
--> $DIR/lint-unused-variables.rs:60:9
68+
--> $DIR/lint-unused-variables.rs:74:9
6969
|
7070
LL | b: i32,
7171
| ^ help: if this is intentional, prefix it with an underscore: `_b`

‎src/test/ui/liveness/liveness-consts.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ warning: unused variable: `z`
3939
LL | pub fn f(x: [u8; { let s = 17; 100 }]) -> [u8; { let z = 18; 100 }] {
4040
| ^ help: if this is intentional, prefix it with an underscore: `_z`
4141

42-
warning: unused variable: `z`
43-
--> $DIR/liveness-consts.rs:60:13
44-
|
45-
LL | let z = 42;
46-
| ^ help: if this is intentional, prefix it with an underscore: `_z`
47-
4842
warning: value assigned to `t` is never read
4943
--> $DIR/liveness-consts.rs:42:9
5044
|
@@ -59,5 +53,11 @@ warning: unused variable: `w`
5953
LL | let w = 10;
6054
| ^ help: if this is intentional, prefix it with an underscore: `_w`
6155

56+
warning: unused variable: `z`
57+
--> $DIR/liveness-consts.rs:60:13
58+
|
59+
LL | let z = 42;
60+
| ^ help: if this is intentional, prefix it with an underscore: `_z`
61+
6262
warning: 8 warnings emitted
6363

0 commit comments

Comments
 (0)