Commit c609da5

committed

Auto merge of #109772 - petrochenkov:slimchild, r=cjgillot

rustc_metadata: Remove `Span` from `ModChild` It can be decoded on demand from regular `def_span` tables. Partially mitigates perf regressions from #109500.

2 parents 4e46301 + ec8f688 commit c609da5Copy full SHA for c609da5

File tree

5 files changed

+12

-16

lines changed

compiler
- rustc_metadata/src/rmeta
  - decoder.rs
  - encoder.rs
- rustc_middle/src
  - metadata.rs
- rustc_resolve/src
  - build_reduced_graph.rs
  - imports.rs

5 files changed

+12

-16

lines changed

`‎compiler/rustc_metadata/src/rmeta/decoder.rs‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -998,9 +998,8 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {`
`998`	`998`	`let ident = self.item_ident(id, sess);`
`999`	`999`	`let res = Res::Def(self.def_kind(id), self.local_def_id(id));`
`1000`	`1000`	`let vis = self.get_visibility(id);`
`1001`		`- let span = self.get_span(id, sess);`
`1002`	`1001`
`1003`		`- ModChild { ident, res, vis, span,reexport_chain: Default::default() }`
	`1002`	`+ ModChild { ident, res, vis, reexport_chain: Default::default() }`
`1004`	`1003`	`}`
`1005`	`1004`
`1006`	`1005`	`/// Iterates over all named children of the given module,`

`‎compiler/rustc_metadata/src/rmeta/encoder.rs‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -831,16 +831,16 @@ fn should_encode_span(def_kind: DefKind) -> bool {`
`831`	`831`	`\| DefKind::AssocFn`
`832`	`832`	`\| DefKind::AssocConst`
`833`	`833`	`\| DefKind::Macro(_)`
	`834`	`+ \| DefKind::ExternCrate`
	`835`	`+ \| DefKind::Use`
`834`	`836`	`\| DefKind::AnonConst`
`835`	`837`	`\| DefKind::InlineConst`
`836`	`838`	`\| DefKind::OpaqueTy`
`837`	`839`	`\| DefKind::Field`
`838`	`840`	`\| DefKind::Impl { .. }`
`839`	`841`	`\| DefKind::Closure`
`840`	`842`	`\| DefKind::Generator => true,`
`841`		`- DefKind::ExternCrate`
`842`		`- \| DefKind::Use`
`843`		`- \| DefKind::ForeignMod`
	`843`	`+ DefKind::ForeignMod`
`844`	`844`	`\| DefKind::ImplTraitPlaceholder`
`845`	`845`	`\| DefKind::LifetimeParam`
`846`	`846`	`\| DefKind::GlobalAsm => false,`

`‎compiler/rustc_middle/src/metadata.rs‎`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ use rustc_hir::def::Res;`
`4`	`4`	`use rustc_macros::HashStable;`
`5`	`5`	`use rustc_span::def_id::DefId;`
`6`	`6`	`use rustc_span::symbol::Ident;`
`7`		`-use rustc_span::Span;`
`8`	`7`	`use smallvec::SmallVec;`
`9`	`8`
`10`	`9`	/// A simplified version of `ImportKind` from resolve.
`@@ -41,8 +40,6 @@ pub struct ModChild {`
`41`	`40`	`pub res: Res<!>,`
`42`	`41`	`/// Visibility of the item.`
`43`	`42`	`pub vis: ty::Visibility<DefId>,`
`44`		`- /// Span of the item.`
`45`		`- pub span: Span,`
`46`	`43`	`/// Reexport chain linking this module child to its original reexported item.`
`47`	`44`	`/// Empty if the module child is a proper item.`
`48`	`45`	`pub reexport_chain: SmallVec<[Reexport; 2]>,`

`‎compiler/rustc_resolve/src/build_reduced_graph.rs‎`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,13 @@ impl<'a, 'b, 'tcx> BuildReducedGraphVisitor<'a, 'b, 'tcx> {`
`931`	`931`	`/// Builds the reduced graph for a single item in an external crate.`
`932`	`932`	`fn build_reduced_graph_for_external_crate_res(&mut self, child: ModChild) {`
`933`	`933`	`let parent = self.parent_scope.module;`
`934`		`- let ModChild { ident, res, vis, span, .. } = child;`
	`934`	`+ let ModChild { ident, res, vis, reexport_chain } = child;`
	`935`	`+ let span = self.r.def_span(`
	`936`	`+ reexport_chain`
	`937`	`+ .first()`
	`938`	`+ .and_then(\|reexport\| reexport.id())`
	`939`	`+ .unwrap_or_else(\|\| res.def_id()),`
	`940`	`+ );`
`935`	`941`	`let res = res.expect_non_local();`
`936`	`942`	`let expansion = self.parent_scope.expansion;`
`937`	`943`	`// Record primary definitions.`

`‎compiler/rustc_resolve/src/imports.rs‎`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1276,13 +1276,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {`
`1276`	`1276`	`next_binding = binding;`
`1277`	`1277`	`}`
`1278`	`1278`
`1279`		`- reexports.push(ModChild {`
`1280`		`- ident,`
`1281`		`- res,`
`1282`		`- vis: binding.vis,`
`1283`		`- span: binding.span,`
`1284`		`- reexport_chain,`
`1285`		`- });`
	`1279`	`+ reexports.push(ModChild { ident, res, vis: binding.vis, reexport_chain });`
`1286`	`1280`	`}`
`1287`	`1281`	`});`
`1288`	`1282`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit c609da5

File tree

5 files changed

5 files changed

`‎compiler/rustc_metadata/src/rmeta/decoder.rs‎`

`‎compiler/rustc_metadata/src/rmeta/encoder.rs‎`

`‎compiler/rustc_middle/src/metadata.rs‎`

`‎compiler/rustc_resolve/src/build_reduced_graph.rs‎`

`‎compiler/rustc_resolve/src/imports.rs‎`

0 commit comments