diff options
| author | bors <bors@rust-lang.org> | 2023-05-08 21:00:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-08 21:00:50 +0000 |
| commit | 2f2c438dce75d8cc532c3baa849eeddc0901802c (patch) | |
| tree | fa7ed639cbffe04f276031f2a76221f91aae56f2 /compiler/rustc_codegen_gcc/src | |
| parent | dfe31889e10e36eed53327d1ca624fbf21b475a5 (diff) | |
| parent | bbea63f627433eb00ef9ac235bcced35e4cfbd4c (diff) | |
| download | rust-2f2c438dce75d8cc532c3baa849eeddc0901802c.tar.gz rust-2f2c438dce75d8cc532c3baa849eeddc0901802c.zip | |
Auto merge of #111358 - compiler-errors:rollup-yv27vrp, r=compiler-errors
Rollup of 6 pull requests Successful merges: - #104070 (Prevent aborting guard from aborting the process in a forced unwind) - #109410 (Introduce `AliasKind::Inherent` for inherent associated types) - #111004 (Migrate `mir_transform` to translatable diagnostics) - #111118 (Suggest struct when we get colon in fileds in enum) - #111170 (Diagnostic args are still args if they're documented) - #111354 (Fix miscompilation when calling default methods on `Future`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc/src')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/builder.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_gcc/src/builder.rs b/compiler/rustc_codegen_gcc/src/builder.rs index a66ddb6a09f..869344ce92d 100644 --- a/compiler/rustc_codegen_gcc/src/builder.rs +++ b/compiler/rustc_codegen_gcc/src/builder.rs @@ -1227,6 +1227,11 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> { (value1, value2) } + fn filter_landing_pad(&mut self, pers_fn: RValue<'gcc>) -> (RValue<'gcc>, RValue<'gcc>) { + // TODO(antoyo): generate the correct landing pad + self.cleanup_landing_pad(pers_fn) + } + #[cfg(feature="master")] fn resume(&mut self, exn0: RValue<'gcc>, _exn1: RValue<'gcc>) { let exn_type = exn0.get_type(); |
