Skip to content

Commit b4af874

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #73155 - marmeladema:save-analysis-various-fixes, r=Xanewok
save_analysis: better handle paths and functions signature This should improve slightly some possible regressions due to hir rework. r? @Xanewok
2 parents 12e5a69 + 5bfa7f0 commit b4af874

File tree

4 files changed

+142
-77
lines changed

4 files changed

+142
-77
lines changed

‎src/librustc_hir_pretty/lib.rs

+22
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,28 @@ pub fn path_to_string(segment: &hir::Path<'_>) -> String {
227227
to_string(NO_ANN, |s| s.print_path(segment, false))
228228
}
229229

230+
pub fn fn_to_string(
231+
decl: &hir::FnDecl<'_>,
232+
header: hir::FnHeader,
233+
name: Option<Symbol>,
234+
generics: &hir::Generics<'_>,
235+
vis: &hir::Visibility<'_>,
236+
arg_names: &[Ident],
237+
body_id: Option<hir::BodyId>,
238+
) -> String {
239+
to_string(NO_ANN, |s| s.print_fn(decl, header, name, generics, vis, arg_names, body_id))
240+
}
241+
242+
pub fn enum_def_to_string(
243+
enum_definition: &hir::EnumDef<'_>,
244+
generics: &hir::Generics<'_>,
245+
name: Symbol,
246+
span: rustc_span::Span,
247+
visibility: &hir::Visibility<'_>,
248+
) -> String {
249+
to_string(NO_ANN, |s| s.print_enum_def(enum_definition, generics, name, span, visibility))
250+
}
251+
230252
impl<'a> State<'a> {
231253
pub fn cbox(&mut self, u: usize) {
232254
self.s.cbox(u);

‎src/librustc_save_analysis/dump_visitor.rs

+54-25
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use rustc_hir as hir;
2020
use rustc_hir::def::{DefKind as HirDefKind, Res};
2121
use rustc_hir::def_id::{DefId, LocalDefId};
2222
use rustc_hir::intravisit::{self, Visitor};
23-
use rustc_hir_pretty::{bounds_to_string, generic_params_to_string, ty_to_string};
23+
use rustc_hir_pretty::{bounds_to_string, fn_to_string, generic_params_to_string, ty_to_string};
2424
use rustc_middle::hir::map::Map;
2525
use rustc_middle::span_bug;
2626
use rustc_middle::ty::{self, DefIdTree, TyCtxt};
@@ -199,23 +199,23 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
199199
self.dumper.compilation_opts(data);
200200
}
201201

202-
fn write_sub_paths(&mut self, path: &'tcx hir::Path<'tcx>) {
203-
for seg in path.segments {
202+
fn write_segments(&mut self, segments: impl IntoIterator<Item = &'tcx hir::PathSegment<'tcx>>) {
203+
for seg in segments {
204204
if let Some(data) = self.save_ctxt.get_path_segment_data(seg) {
205205
self.dumper.dump_ref(data);
206206
}
207207
}
208208
}
209209

210+
fn write_sub_paths(&mut self, path: &'tcx hir::Path<'tcx>) {
211+
self.write_segments(path.segments)
212+
}
213+
210214
// As write_sub_paths, but does not process the last ident in the path (assuming it
211215
// will be processed elsewhere). See note on write_sub_paths about global.
212216
fn write_sub_paths_truncated(&mut self, path: &'tcx hir::Path<'tcx>) {
213217
if let [segments @ .., _] = path.segments {
214-
for seg in segments {
215-
if let Some(data) = self.save_ctxt.get_path_segment_data(seg) {
216-
self.dumper.dump_ref(data);
217-
}
218-
}
218+
self.write_segments(segments)
219219
}
220220
}
221221

@@ -276,7 +276,8 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
276276
}
277277
v.process_generic_params(&generics, &method_data.qualname, hir_id);
278278

279-
method_data.value = crate::make_signature(&sig.decl, &generics);
279+
method_data.value =
280+
fn_to_string(sig.decl, sig.header, Some(ident.name), generics, vis, &[], None);
280281
method_data.sig = sig::method_signature(hir_id, ident, generics, sig, &v.save_ctxt);
281282

282283
v.dumper.dump_def(&access_from_vis!(v.save_ctxt, vis, hir_id), method_data);
@@ -643,7 +644,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
643644
self.nest_tables(map.local_def_id(item.hir_id), |v| {
644645
v.visit_ty(&typ);
645646
if let &Some(ref trait_ref) = trait_ref {
646-
v.process_path(trait_ref.hir_ref_id, &trait_ref.path);
647+
v.process_path(trait_ref.hir_ref_id, &hir::QPath::Resolved(None, &trait_ref.path));
647648
}
648649
v.process_generic_params(generics, "", item.hir_id);
649650
for impl_item in impl_items {
@@ -746,7 +747,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
746747
}
747748
}
748749

749-
fn dump_path_ref(&mut self, id: hir::HirId, path: &hir::Path<'tcx>) {
750+
fn dump_path_ref(&mut self, id: hir::HirId, path: &hir::QPath<'tcx>) {
750751
let path_data = self.save_ctxt.get_path_data(id, path);
751752
if let Some(path_data) = path_data {
752753
self.dumper.dump_ref(path_data);
@@ -760,14 +761,30 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
760761
}
761762
}
762763

763-
fn process_path(&mut self, id: hir::HirId, path: &'tcx hir::Path<'tcx>) {
764-
if self.span.filter_generated(path.span) {
764+
fn process_path(&mut self, id: hir::HirId, path: &hir::QPath<'tcx>) {
765+
let span = match path {
766+
hir::QPath::Resolved(_, path) => path.span,
767+
hir::QPath::TypeRelative(_, segment) => segment.ident.span,
768+
};
769+
if self.span.filter_generated(span) {
765770
return;
766771
}
767772
self.dump_path_ref(id, path);
768773

769774
// Type arguments
770-
for seg in path.segments {
775+
let segments = match path {
776+
hir::QPath::Resolved(ty, path) => {
777+
if let Some(ty) = ty {
778+
self.visit_ty(ty);
779+
}
780+
path.segments
781+
}
782+
hir::QPath::TypeRelative(ty, segment) => {
783+
self.visit_ty(ty);
784+
std::slice::from_ref(*segment)
785+
}
786+
};
787+
for seg in segments {
771788
if let Some(ref generic_args) = seg.args {
772789
for arg in generic_args.args {
773790
if let hir::GenericArg::Type(ref ty) = arg {
@@ -777,7 +794,9 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
777794
}
778795
}
779796

780-
self.write_sub_paths_truncated(path);
797+
if let hir::QPath::Resolved(_, path) = path {
798+
self.write_sub_paths_truncated(path);
799+
}
781800
}
782801

783802
fn process_struct_lit(
@@ -931,9 +950,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
931950
}
932951

933952
for (id, ref path) in collector.collected_paths {
934-
if let hir::QPath::Resolved(_, path) = path {
935-
self.process_path(id, path);
936-
}
953+
self.process_path(id, path);
937954
}
938955
}
939956

@@ -1135,7 +1152,10 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
11351152
fn process_bounds(&mut self, bounds: hir::GenericBounds<'tcx>) {
11361153
for bound in bounds {
11371154
if let hir::GenericBound::Trait(ref trait_ref, _) = *bound {
1138-
self.process_path(trait_ref.trait_ref.hir_ref_id, &trait_ref.trait_ref.path)
1155+
self.process_path(
1156+
trait_ref.trait_ref.hir_ref_id,
1157+
&hir::QPath::Resolved(None, &trait_ref.trait_ref.path),
1158+
)
11391159
}
11401160
}
11411161
}
@@ -1330,13 +1350,16 @@ impl<'l, 'tcx> Visitor<'tcx> for DumpVisitor<'l, 'tcx> {
13301350
fn visit_ty(&mut self, t: &'tcx hir::Ty<'tcx>) {
13311351
self.process_macro_use(t.span);
13321352
match t.kind {
1333-
hir::TyKind::Path(hir::QPath::Resolved(_, path)) => {
1353+
hir::TyKind::Path(ref path) => {
13341354
if generated_code(t.span) {
13351355
return;
13361356
}
13371357

13381358
if let Some(id) = self.lookup_def_id(t.hir_id) {
1339-
let sub_span = path.segments.last().unwrap().ident.span;
1359+
let sub_span = match path {
1360+
hir::QPath::Resolved(_, path) => path.segments.last().unwrap().ident.span,
1361+
hir::QPath::TypeRelative(_, segment) => segment.ident.span,
1362+
};
13401363
let span = self.span_from_span(sub_span);
13411364
self.dumper.dump_ref(Ref {
13421365
kind: RefKind::Type,
@@ -1345,8 +1368,10 @@ impl<'l, 'tcx> Visitor<'tcx> for DumpVisitor<'l, 'tcx> {
13451368
});
13461369
}
13471370

1348-
self.write_sub_paths_truncated(path);
1349-
intravisit::walk_path(self, path);
1371+
if let hir::QPath::Resolved(_, path) = path {
1372+
self.write_sub_paths_truncated(path);
1373+
}
1374+
intravisit::walk_qpath(self, path, t.hir_id, t.span);
13501375
}
13511376
hir::TyKind::Array(ref ty, ref anon_const) => {
13521377
self.visit_ty(ty);
@@ -1355,6 +1380,10 @@ impl<'l, 'tcx> Visitor<'tcx> for DumpVisitor<'l, 'tcx> {
13551380
v.visit_expr(&map.body(anon_const.body).value)
13561381
});
13571382
}
1383+
hir::TyKind::Def(item_id, _) => {
1384+
let item = self.tcx.hir().item(item_id.id);
1385+
self.nest_tables(self.tcx.hir().local_def_id(item_id.id), |v| v.visit_item(item));
1386+
}
13581387
_ => intravisit::walk_ty(self, t),
13591388
}
13601389
}
@@ -1432,8 +1461,8 @@ impl<'l, 'tcx> Visitor<'tcx> for DumpVisitor<'l, 'tcx> {
14321461
self.visit_expr(&arm.body);
14331462
}
14341463

1435-
fn visit_path(&mut self, p: &'tcx hir::Path<'tcx>, id: hir::HirId) {
1436-
self.process_path(id, p);
1464+
fn visit_qpath(&mut self, path: &'tcx hir::QPath<'tcx>, id: hir::HirId, _: Span) {
1465+
self.process_path(id, path);
14371466
}
14381467

14391468
fn visit_stmt(&mut self, s: &'tcx hir::Stmt<'tcx>) {

‎src/librustc_save_analysis/lib.rs

+45-47
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ use rustc_ast::ast::{self};
1313
use rustc_ast::util::comments::strip_doc_comment_decoration;
1414
use rustc_ast_pretty::pprust::attribute_to_string;
1515
use rustc_hir as hir;
16-
use rustc_hir::def::{CtorOf, DefKind as HirDefKind, Res};
16+
use rustc_hir::def::{DefKind as HirDefKind, Res};
1717
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
1818
use rustc_hir::intravisit::{self, Visitor};
1919
use rustc_hir::Node;
20-
use rustc_hir_pretty::ty_to_string;
20+
use rustc_hir_pretty::{enum_def_to_string, fn_to_string, ty_to_string};
2121
use rustc_middle::hir::map::Map;
2222
use rustc_middle::middle::cstore::ExternCrate;
2323
use rustc_middle::middle::privacy::AccessLevels;
@@ -135,7 +135,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
135135
let def_id = self.tcx.hir().local_def_id(item.hir_id).to_def_id();
136136
let qualname = format!("::{}", self.tcx.def_path_str(def_id));
137137
match item.kind {
138-
hir::ForeignItemKind::Fn(ref decl, _, ref generics) => {
138+
hir::ForeignItemKind::Fn(ref decl, arg_names, ref generics) => {
139139
filter!(self.span_utils, item.ident.span);
140140

141141
Some(Data::DefData(Def {
@@ -144,7 +144,23 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
144144
span: self.span_from_span(item.ident.span),
145145
name: item.ident.to_string(),
146146
qualname,
147-
value: make_signature(decl, generics),
147+
value: fn_to_string(
148+
decl,
149+
hir::FnHeader {
150+
// functions in extern block are implicitly unsafe
151+
unsafety: hir::Unsafety::Unsafe,
152+
// functions in extern block cannot be const
153+
constness: hir::Constness::NotConst,
154+
abi: self.tcx.hir().get_foreign_abi(item.hir_id),
155+
// functions in extern block cannot be async
156+
asyncness: hir::IsAsync::NotAsync,
157+
},
158+
Some(item.ident.name),
159+
generics,
160+
&item.vis,
161+
arg_names,
162+
None,
163+
),
148164
parent: None,
149165
children: vec![],
150166
decl_id: None,
@@ -191,7 +207,15 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
191207
span: self.span_from_span(item.ident.span),
192208
name: item.ident.to_string(),
193209
qualname,
194-
value: make_signature(&sig.decl, generics),
210+
value: fn_to_string(
211+
sig.decl,
212+
sig.header,
213+
Some(item.ident.name),
214+
generics,
215+
&item.vis,
216+
&[],
217+
None,
218+
),
195219
parent: None,
196220
children: vec![],
197221
decl_id: None,
@@ -268,13 +292,12 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
268292
attributes: lower_attributes(item.attrs.to_vec(), self),
269293
}))
270294
}
271-
hir::ItemKind::Enum(ref def, _) => {
295+
hir::ItemKind::Enum(ref def, ref generics) => {
272296
let name = item.ident.to_string();
273297
let qualname = format!("::{}", self.tcx.def_path_str(def_id));
274298
filter!(self.span_utils, item.ident.span);
275-
let variants_str =
276-
def.variants.iter().map(|v| v.ident.to_string()).collect::<Vec<_>>().join(", ");
277-
let value = format!("{}::{{{}}}", name, variants_str);
299+
let value =
300+
enum_def_to_string(def, generics, item.ident.name, item.span, &item.vis);
278301
Some(Data::DefData(Def {
279302
kind: DefKind::Enum,
280303
id: id_from_def_id(def_id),
@@ -579,7 +602,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
579602
ref_id: def_id.or(decl_id).map(id_from_def_id).unwrap_or_else(null_id),
580603
}))
581604
}
582-
hir::ExprKind::Path(hir::QPath::Resolved(_, path)) => {
605+
hir::ExprKind::Path(ref path) => {
583606
self.get_path_data(expr.hir_id, path).map(Data::RefData)
584607
}
585608
_ => {
@@ -631,8 +654,12 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
631654
}
632655
}
633656

634-
pub fn get_path_data(&self, id: hir::HirId, path: &hir::Path<'_>) -> Option<Ref> {
635-
path.segments.last().and_then(|seg| {
657+
pub fn get_path_data(&self, id: hir::HirId, path: &hir::QPath<'_>) -> Option<Ref> {
658+
let segment = match path {
659+
hir::QPath::Resolved(_, path) => path.segments.last(),
660+
hir::QPath::TypeRelative(_, segment) => Some(*segment),
661+
};
662+
segment.and_then(|seg| {
636663
self.get_path_segment_data(seg).or_else(|| self.get_path_segment_data_with_id(seg, id))
637664
})
638665
}
@@ -681,20 +708,16 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
681708
Res::Def(HirDefKind::ConstParam, def_id) => {
682709
Some(Ref { kind: RefKind::Variable, span, ref_id: id_from_def_id(def_id) })
683710
}
684-
Res::Def(HirDefKind::Ctor(CtorOf::Struct, ..), def_id) => {
685-
// This is a reference to a tuple struct where the def_id points
711+
Res::Def(HirDefKind::Ctor(_, ..), def_id) => {
712+
// This is a reference to a tuple struct or an enum variant where the def_id points
686713
// to an invisible constructor function. That is not a very useful
687-
// def, so adjust to point to the tuple struct itself.
714+
// def, so adjust to point to the tuple struct or enum variant itself.
688715
let parent_def_id = self.tcx.parent(def_id).unwrap();
689716
Some(Ref { kind: RefKind::Type, span, ref_id: id_from_def_id(parent_def_id) })
690717
}
691-
Res::Def(
692-
HirDefKind::Static
693-
| HirDefKind::Const
694-
| HirDefKind::AssocConst
695-
| HirDefKind::Ctor(..),
696-
_,
697-
) => Some(Ref { kind: RefKind::Variable, span, ref_id: id_from_def_id(res.def_id()) }),
718+
Res::Def(HirDefKind::Static | HirDefKind::Const | HirDefKind::AssocConst, _) => {
719+
Some(Ref { kind: RefKind::Variable, span, ref_id: id_from_def_id(res.def_id()) })
720+
}
698721
Res::Def(HirDefKind::AssocFn, decl_id) => {
699722
let def_id = if decl_id.is_local() {
700723
let ti = self.tcx.associated_item(decl_id);
@@ -844,31 +867,6 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
844867
}
845868
}
846869

847-
fn make_signature(decl: &hir::FnDecl<'_>, generics: &hir::Generics<'_>) -> String {
848-
let mut sig = "fn ".to_owned();
849-
if !generics.params.is_empty() {
850-
sig.push('<');
851-
sig.push_str(
852-
&generics
853-
.params
854-
.iter()
855-
.map(|param| param.name.ident().to_string())
856-
.collect::<Vec<_>>()
857-
.join(", "),
858-
);
859-
sig.push_str("> ");
860-
}
861-
sig.push('(');
862-
sig.push_str(&decl.inputs.iter().map(ty_to_string).collect::<Vec<_>>().join(", "));
863-
sig.push(')');
864-
match decl.output {
865-
hir::FnRetTy::DefaultReturn(_) => sig.push_str(" -> ()"),
866-
hir::FnRetTy::Return(ref t) => sig.push_str(&format!(" -> {}", ty_to_string(t))),
867-
}
868-
869-
sig
870-
}
871-
872870
// An AST visitor for collecting paths (e.g., the names of structs) and formal
873871
// variables (idents) from patterns.
874872
struct PathCollector<'l> {

0 commit comments

Comments
 (0)