Skip to content

Commit 2f2c438

Browse files
committedMay 8, 2023
Auto merge of rust-lang#111358 - compiler-errors:rollup-yv27vrp, r=compiler-errors
Rollup of 6 pull requests Successful merges: - rust-lang#104070 (Prevent aborting guard from aborting the process in a forced unwind) - rust-lang#109410 (Introduce `AliasKind::Inherent` for inherent associated types) - rust-lang#111004 (Migrate `mir_transform` to translatable diagnostics) - rust-lang#111118 (Suggest struct when we get colon in fileds in enum) - rust-lang#111170 (Diagnostic args are still args if they're documented) - rust-lang#111354 (Fix miscompilation when calling default methods on `Future`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents dfe3188 + bbea63f commit 2f2c438

File tree

133 files changed

+2066
-485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+2066
-485
lines changed
 

‎Cargo.lock

+3
Original file line numberDiff line numberDiff line change
@@ -3353,6 +3353,7 @@ dependencies = [
33533353
"rustc_middle",
33543354
"rustc_mir_build",
33553355
"rustc_mir_dataflow",
3356+
"rustc_mir_transform",
33563357
"rustc_monomorphize",
33573358
"rustc_parse",
33583359
"rustc_passes",
@@ -3861,8 +3862,10 @@ dependencies = [
38613862
"rustc_const_eval",
38623863
"rustc_data_structures",
38633864
"rustc_errors",
3865+
"rustc_fluent_macro",
38643866
"rustc_hir",
38653867
"rustc_index",
3868+
"rustc_macros",
38663869
"rustc_middle",
38673870
"rustc_mir_dataflow",
38683871
"rustc_serialize",

‎compiler/rustc_codegen_gcc/src/builder.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1227,6 +1227,11 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
12271227
(value1, value2)
12281228
}
12291229

1230+
fn filter_landing_pad(&mut self, pers_fn: RValue<'gcc>) -> (RValue<'gcc>, RValue<'gcc>) {
1231+
// TODO(antoyo): generate the correct landing pad
1232+
self.cleanup_landing_pad(pers_fn)
1233+
}
1234+
12301235
#[cfg(feature="master")]
12311236
fn resume(&mut self, exn0: RValue<'gcc>, _exn1: RValue<'gcc>) {
12321237
let exn_type = exn0.get_type();

0 commit comments

Comments
 (0)