diff options
| author | bors <bors@rust-lang.org> | 2023-01-11 05:19:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-11 05:19:55 +0000 |
| commit | ca855e6e42787ecd062d81d53336fe6788ef51a9 (patch) | |
| tree | 15df3ac5fd47f5122bdbea20f4ed7d31ed0bd920 /compiler/rustc_codegen_ssa/src | |
| parent | bf7ea0d11b07d84cfbd18feac0ed59e6d1da87ab (diff) | |
| parent | a80498091307d8ed43f168579f1ae6aa8692bc86 (diff) | |
| download | rust-ca855e6e42787ecd062d81d53336fe6788ef51a9.tar.gz rust-ca855e6e42787ecd062d81d53336fe6788ef51a9.zip | |
Auto merge of #106708 - JohnTitor:rollup-xcmg5yv, r=JohnTitor
Rollup of 14 pull requests Successful merges: - #105194 (Add comment to cleanup_kinds) - #106521 (remove E0280) - #106628 (Remove unneeded ItemId::Primitive variant) - #106635 (std sync tests: better type name, clarifying comment) - #106642 (Add test for #106062) - #106645 ([RFC 2397] Initial implementation) - #106653 (Fix help docs for -Zallow-features) - #106657 (Remove myself from rust-lang/rust reviewers) - #106662 (specialize impl of `ToString` on `bool`) - #106669 (create helper function for `rustc_lint_defs::Level` and remove it's duplicated code) - #106671 (Change flags with a fixed default value from Option<bool> to bool) - #106689 (Fix invalid files array re-creation in rustdoc-gui tester) - #106690 (Fix scrolling for item declaration block) - #106698 (Add compiler-errors to some trait system notification groups) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/analyze.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/analyze.rs b/compiler/rustc_codegen_ssa/src/mir/analyze.rs index c7617d2e464..dd1ac2c74ae 100644 --- a/compiler/rustc_codegen_ssa/src/mir/analyze.rs +++ b/compiler/rustc_codegen_ssa/src/mir/analyze.rs @@ -261,6 +261,9 @@ impl CleanupKind { } } +/// MSVC requires unwinding code to be split to a tree of *funclets*, where each funclet can only +/// branch to itself or to its parent. Luckily, the code we generates matches this pattern. +/// Recover that structure in an analyze pass. pub fn cleanup_kinds(mir: &mir::Body<'_>) -> IndexVec<mir::BasicBlock, CleanupKind> { fn discover_masters<'tcx>( result: &mut IndexVec<mir::BasicBlock, CleanupKind>, |