Skip to content

Allow filtering analysis by reachability #46011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 23, 2017
Merged

Allow filtering analysis by reachability #46011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d08a164
upgrade rls-data
euclio Nov 14, 2017
409297f
allow filtering analysis by reachability
euclio Nov 14, 2017
b082f78
initialize `Access` with macro
euclio Nov 16, 2017
794ada0
add `reachable_only` to save-analysis config
euclio Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/bootstrap/bin/rustc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ fn main() {
if env::var("RUSTC_SAVE_ANALYSIS") == Ok("api".to_string()) {
cmd.arg("-Zsave-analysis");
cmd.env("RUST_SAVE_ANALYSIS_CONFIG",
"{\"output_file\": null,\"full_docs\": false,\"pub_only\": true,\
"{\"output_file\": null,\"full_docs\": false,\
\"pub_only\": true,\"reachable_only\": false,\
\"distro_crate\": true,\"signatures\": false,\"borrow_data\": false}");
}

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_save_analysis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
rustc_typeck = { path = "../librustc_typeck" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
rls-data = "0.12"
rls-data = "0.13"
rls-span = "0.4"
# FIXME(#40527) should move rustc serialize out of tree
rustc-serialize = "0.3"
106 changes: 70 additions & 36 deletions src/librustc_save_analysis/dump_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ use syntax::codemap::Spanned;
use syntax_pos::*;

use {escape, generated_code, lower_attributes, PathCollector, SaveContext};
use json_dumper::{DumpOutput, JsonDumper};
use json_dumper::{Access, DumpOutput, JsonDumper};
use span_utils::SpanUtils;
use sig;

Expand All @@ -59,6 +59,15 @@ macro_rules! down_cast_data {
};
}

macro_rules! access_from {
($save_ctxt:expr, $item:expr) => {
Access {
public: $item.vis == ast::Visibility::Public,
reachable: $save_ctxt.analysis.access_levels.is_reachable($item.id),
}
}
}

pub struct DumpVisitor<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> {
save_ctxt: SaveContext<'l, 'tcx>,
tcx: TyCtxt<'l, 'tcx, 'tcx>,
Expand Down Expand Up @@ -341,7 +350,10 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
let span = self.span_from_span(sub_span.expect("No span found for variable"));

self.dumper.dump_def(
false,
&Access {
public: false,
reachable: false,
},
Def {
kind: DefKind::Local,
id,
Expand Down Expand Up @@ -387,8 +399,12 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {

method_data.value = sig_str;
method_data.sig = sig::method_signature(id, name, generics, sig, &self.save_ctxt);
self.dumper
.dump_def(vis == ast::Visibility::Public, method_data);
self.dumper.dump_def(
&Access {
public: vis == ast::Visibility::Public,
reachable: self.save_ctxt.analysis.access_levels.is_reachable(id),
},
method_data);
}

// walk arg and return types
Expand All @@ -409,8 +425,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
fn process_struct_field_def(&mut self, field: &ast::StructField, parent_id: NodeId) {
let field_data = self.save_ctxt.get_field_data(field, parent_id);
if let Some(field_data) = field_data {
self.dumper
.dump_def(field.vis == ast::Visibility::Public, field_data);
self.dumper.dump_def(&access_from!(self.save_ctxt, field), field_data);
}
}

Expand All @@ -432,7 +447,10 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
let span = self.span_from_span(param_ss);

self.dumper.dump_def(
false,
&Access {
public: false,
reachable: false,
},
Def {
kind: DefKind::Type,
id,
Expand Down Expand Up @@ -467,8 +485,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
|v| v.process_formals(&decl.inputs, &fn_data.qualname),
);
self.process_generic_params(ty_params, item.span, &fn_data.qualname, item.id);
self.dumper
.dump_def(item.vis == ast::Visibility::Public, fn_data);
self.dumper.dump_def(&access_from!(self.save_ctxt, item), fn_data);
}

for arg in &decl.inputs {
Expand All @@ -491,8 +508,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
self.nest_tables(item.id, |v| {
if let Some(var_data) = v.save_ctxt.get_item_data(item) {
down_cast_data!(var_data, DefData, item.span);
v.dumper
.dump_def(item.vis == ast::Visibility::Public, var_data);
v.dumper.dump_def(&access_from!(v.save_ctxt, item), var_data);
}
v.visit_ty(&typ);
v.visit_expr(expr);
Expand All @@ -516,14 +532,16 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {

if !self.span.filter_generated(sub_span, span) {
let sig = sig::assoc_const_signature(id, name, typ, expr, &self.save_ctxt);
let id = ::id_from_node_id(id, &self.save_ctxt);
let span = self.span_from_span(sub_span.expect("No span found for variable"));

self.dumper.dump_def(
vis == ast::Visibility::Public,
&Access {
public: vis == ast::Visibility::Public,
reachable: self.save_ctxt.analysis.access_levels.is_reachable(id),
},
Def {
kind: DefKind::Const,
id,
id: ::id_from_node_id(id, &self.save_ctxt),
span,
name: name.to_string(),
qualname,
Expand Down Expand Up @@ -596,7 +614,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
if !self.span.filter_generated(sub_span, item.span) {
let span = self.span_from_span(sub_span.expect("No span found for struct"));
self.dumper.dump_def(
item.vis == ast::Visibility::Public,
&access_from!(self.save_ctxt, item),
Def {
kind,
id: ::id_from_node_id(item.id, &self.save_ctxt),
Expand Down Expand Up @@ -635,6 +653,8 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
};
down_cast_data!(enum_data, DefData, item.span);

let access = access_from!(self.save_ctxt, item);

for variant in &enum_definition.variants {
let name = variant.node.name.name.to_string();
let mut qualname = enum_data.qualname.clone();
Expand All @@ -660,7 +680,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
let parent = Some(::id_from_node_id(item.id, &self.save_ctxt));

self.dumper.dump_def(
item.vis == ast::Visibility::Public,
&access,
Def {
kind: DefKind::StructVariant,
id,
Expand Down Expand Up @@ -700,7 +720,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
let parent = Some(::id_from_node_id(item.id, &self.save_ctxt));

self.dumper.dump_def(
item.vis == ast::Visibility::Public,
&access,
Def {
kind: DefKind::TupleVariant,
id,
Expand Down Expand Up @@ -730,8 +750,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
}
}
self.process_generic_params(ty_params, item.span, &enum_data.qualname, item.id);
self.dumper
.dump_def(item.vis == ast::Visibility::Public, enum_data);
self.dumper.dump_def(&access, enum_data);
}

fn process_impl(
Expand Down Expand Up @@ -783,7 +802,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
.map(|i| ::id_from_node_id(i.id, &self.save_ctxt))
.collect();
self.dumper.dump_def(
item.vis == ast::Visibility::Public,
&access_from!(self.save_ctxt, item),
Def {
kind: DefKind::Trait,
id,
Expand Down Expand Up @@ -846,8 +865,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
fn process_mod(&mut self, item: &ast::Item) {
if let Some(mod_data) = self.save_ctxt.get_item_data(item) {
down_cast_data!(mod_data, DefData, item.span);
self.dumper
.dump_def(item.vis == ast::Visibility::Public, mod_data);
self.dumper.dump_def(&access_from!(self.save_ctxt, item), mod_data);
}
}

Expand Down Expand Up @@ -1038,7 +1056,10 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
let span = self.span_from_span(sub_span.expect("No span found for variable"));

self.dumper.dump_def(
false,
&Access {
public: false,
reachable: false,
},
Def {
kind: DefKind::Local,
id,
Expand Down Expand Up @@ -1138,7 +1159,10 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
let id = ::id_from_node_id(trait_item.id, &self.save_ctxt);

self.dumper.dump_def(
true,
&Access {
public: true,
reachable: true,
},
Def {
kind: DefKind::Type,
id,
Expand Down Expand Up @@ -1225,7 +1249,10 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
let span = self.span_from_span(span);

self.dumper.dump_def(
true,
&Access {
public: true,
reachable: true,
},
Def {
kind: DefKind::Mod,
id: data_id,
Expand All @@ -1249,6 +1276,8 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
self.process_macro_use(item.span);
match item.node {
Use(ref use_item) => {
let access = access_from!(self.save_ctxt, item);

match use_item.node {
ast::ViewPathSimple(ident, ref path) => {
let sub_span = self.span.span_for_last_ident(path.span);
Expand All @@ -1273,7 +1302,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
let span =
self.span_from_span(sub_span.expect("No span found for use"));
self.dumper.import(
item.vis == ast::Visibility::Public,
&access,
Import {
kind: ImportKind::Use,
ref_id: mod_id.map(|id| ::id_from_def_id(id)),
Expand Down Expand Up @@ -1302,7 +1331,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
let span =
self.span_from_span(sub_span.expect("No span found for use glob"));
self.dumper.import(
item.vis == ast::Visibility::Public,
&access,
Import {
kind: ImportKind::GlobUse,
ref_id: None,
Expand Down Expand Up @@ -1334,7 +1363,10 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
let span =
self.span_from_span(alias_span.expect("No span found for extern crate"));
self.dumper.import(
false,
&Access {
public: false,
reachable: false,
},
Import {
kind: ImportKind::ExternCrate,
ref_id: None,
Expand Down Expand Up @@ -1373,7 +1405,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
let id = ::id_from_node_id(item.id, &self.save_ctxt);

self.dumper.dump_def(
item.vis == ast::Visibility::Public,
&access_from!(self.save_ctxt, item),
Def {
kind: DefKind::Type,
id,
Expand Down Expand Up @@ -1596,7 +1628,10 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
let span = self.span_from_span(sp);

self.dumper.dump_def(
false,
&Access {
public: false,
reachable: false,
},
Def {
kind: DefKind::Local,
id,
Expand Down Expand Up @@ -1662,6 +1697,8 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
}

fn visit_foreign_item(&mut self, item: &'l ast::ForeignItem) {
let access = access_from!(self.save_ctxt, item);

match item.node {
ast::ForeignItemKind::Fn(ref decl, ref generics) => {
if let Some(fn_data) = self.save_ctxt.get_extern_item_data(item) {
Expand All @@ -1672,8 +1709,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
|v| v.process_formals(&decl.inputs, &fn_data.qualname),
);
self.process_generic_params(generics, item.span, &fn_data.qualname, item.id);
self.dumper
.dump_def(item.vis == ast::Visibility::Public, fn_data);
self.dumper.dump_def(&access, fn_data);
}

for arg in &decl.inputs {
Expand All @@ -1687,17 +1723,15 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
ast::ForeignItemKind::Static(ref ty, _) => {
if let Some(var_data) = self.save_ctxt.get_extern_item_data(item) {
down_cast_data!(var_data, DefData, item.span);
self.dumper
.dump_def(item.vis == ast::Visibility::Public, var_data);
self.dumper.dump_def(&access, var_data);
}

self.visit_ty(ty);
}
ast::ForeignItemKind::Ty => {
if let Some(var_data) = self.save_ctxt.get_extern_item_data(item) {
down_cast_data!(var_data, DefData, item.span);
self.dumper
.dump_def(item.vis == ast::Visibility::Public, var_data);
self.dumper.dump_def(&access, var_data);
}
}
}
Expand Down
Loading