Commit 624ed6d

committed

Change layout of SwitchTargets

1 parent 60a5372 commit 624ed6dCopy full SHA for 624ed6d

File tree

14 files changed

+217

-139

lines changed

compiler
- rustc_borrowck/src/type_check
  - mod.rs
- rustc_codegen_ssa/src/mir
  - block.rs
- rustc_middle/src
  - lib.rs
  - mir
- rustc_mir_dataflow/src
  - framework
    - direction.rs
  - impls
    - initialized.rs
- rustc_mir_transform/src

14 files changed

+217

-139

lines changed

`‎compiler/rustc_borrowck/src/type_check/mod.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2016,7 +2016,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {`
`2016`	`2016`	`}`
`2017`	`2017`	`TerminatorKind::SwitchInt { ref targets, .. } => {`
`2018`	`2018`	`for target in targets.all_targets() {`
`2019`		`- self.assert_iscleanup(block_data, *target, is_cleanup);`
	`2019`	`+ self.assert_iscleanup(block_data, target, is_cleanup);`
`2020`	`2020`	`}`
`2021`	`2021`	`}`
`2022`	`2022`	`TerminatorKind::UnwindResume => {`

`‎compiler/rustc_codegen_ssa/src/mir/block.rs‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`use std::cmp;`
`2`	`2`
	`3`	`+use itertools::Itertools as _;`
`3`	`4`	`use rustc_abi::{Align, BackendRepr, ExternAbi, HasDataLayout, Reg, Size, WrappingRange};`
`4`	`5`	`use rustc_ast as ast;`
`5`	`6`	`use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,15 @@`
`48`	`48`	`#![feature(gen_blocks)]`
`49`	`49`	`#![feature(if_let_guard)]`
`50`	`50`	`#![feature(intra_doc_pointers)]`
	`51`	`+#![feature(iter_advance_by)]`
`51`	`52`	`#![feature(min_specialization)]`
`52`	`53`	`#![feature(negative_impls)]`
`53`	`54`	`#![feature(never_type)]`
`54`	`55`	`#![feature(ptr_alignment_type)]`
`55`	`56`	`#![feature(rustc_attrs)]`
`56`	`57`	`#![feature(rustdoc_internals)]`
`57`	`58`	`#![feature(sized_hierarchy)]`
	`59`	`+#![feature(trusted_len)]`
`58`	`60`	`#![feature(try_blocks)]`
`59`	`61`	`#![feature(try_trait_v2)]`
`60`	`62`	`#![feature(try_trait_v2_residual)]`

`‎compiler/rustc_middle/src/mir/pretty.rs‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1004,9 +1004,8 @@ impl<'tcx> TerminatorKind<'tcx> {`
`1004`	`1004`	`\| CoroutineDrop => vec![],`
`1005`	`1005`	`Goto { .. } => vec!["".into()],`
`1006`	`1006`	`SwitchInt { ref targets, .. } => targets`
`1007`		`- .values`
`1008`		`- .iter()`
`1009`		`- .map(\|&u\| Cow::Owned(u.to_string()))`
	`1007`	`+ .all_values()`
	`1008`	`+ .map(\|u\| Cow::Owned(u.to_string()))`
`1010`	`1009`	`.chain(iter::once("otherwise".into()))`
`1011`	`1010`	`.collect(),`
`1012`	`1011`	`Call { target: Some(_), unwind: UnwindAction::Cleanup(_), .. } => {`

`‎compiler/rustc_middle/src/mir/syntax.rs‎`

Lines changed: 2 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -1004,31 +1004,8 @@ pub enum BackwardIncompatibleDropReason {`
`1004`	`1004`
`1005`	`1005`	`#[derive(Debug, Clone, TyEncodable, TyDecodable, Hash, HashStable, PartialEq)]`
`1006`	`1006`	`pub struct SwitchTargets {`
`1007`		`- /// Possible values. For each value, the location to branch to is found in`
`1008`		- /// the corresponding element in the `targets` vector.
`1009`		`- pub(super) values: SmallVec<[Pu128; 1]>,`
`1010`		`-`
`1011`		`- /// Possible branch targets. The last element of this vector is used for`
`1012`		- /// the "otherwise" branch, so `targets.len() == values.len() + 1` always
`1013`		`- /// holds.`
`1014`		`- //`
`1015`		`- // Note: This invariant is non-obvious and easy to violate. This would be a`
`1016`		`- // more rigorous representation:`
`1017`		`- //`
`1018`		`- // normal: SmallVec<[(Pu128, BasicBlock); 1]>,`
`1019`		`- // otherwise: BasicBlock,`
`1020`		`- //`
`1021`		`- // But it's important to have the targets in a sliceable type, because`
`1022`		- // target slices show up elsewhere. E.g. `TerminatorKind::InlineAsm` has a
`1023`		- // boxed slice, and `TerminatorKind::FalseEdge` has a single target that
`1024`		- // can be converted to a slice with `slice::from_ref`.
`1025`		`- //`
`1026`		- // Why does this matter? In functions like `TerminatorKind::successors` we
`1027`		- // return `impl Iterator` and a non-slice-of-targets representation here
`1028`		`- // causes problems because multiple different concrete iterator types would`
`1029`		`- // be involved and we would need a boxed trait object, which requires an`
`1030`		`- // allocation, which is expensive if done frequently.`
`1031`		`- pub(super) targets: SmallVec<[BasicBlock; 2]>,`
	`1007`	`+ pub(super) normal: SmallVec<[(Pu128, BasicBlock); 1]>,`
	`1008`	`+ pub(super) otherwise: BasicBlock,`
`1032`	`1009`	`}`
`1033`	`1010`
`1034`	`1011`	`/// Action to be taken when a stack unwind happens.`

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 624ed6d

File tree

14 files changed

14 files changed

`‎compiler/rustc_borrowck/src/type_check/mod.rs‎`

`‎compiler/rustc_codegen_ssa/src/mir/block.rs‎`

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

`‎compiler/rustc_middle/src/mir/pretty.rs‎`

`‎compiler/rustc_middle/src/mir/syntax.rs‎`

0 commit comments