diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-04-11 10:42:48 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-04-11 10:42:48 +0000 |
| commit | 2ab4334a9601ecb2e47fe5a90ec985fe745a2a23 (patch) | |
| tree | ffc281d6f9db5f75d6b4e1496b8dbfaaa7462440 /compiler/rustc_codegen_cranelift/src/debuginfo | |
| parent | 05ccc49a4412a23a7afa1226804bb44558fb15b0 (diff) | |
| parent | 89f54caacf90e99fc8ba0d60a28bdadea3cfdf1e (diff) | |
| download | rust-2ab4334a9601ecb2e47fe5a90ec985fe745a2a23.tar.gz rust-2ab4334a9601ecb2e47fe5a90ec985fe745a2a23.zip | |
Merge commit '89f54caacf90e99fc8ba0d60a28bdadea3cfdf1e' into sync_cg_clif-2024-04-11
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src/debuginfo')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs b/compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs index 96ab7a29205..eebd181341d 100644 --- a/compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs +++ b/compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs @@ -38,6 +38,14 @@ impl UnwindContext { } pub(crate) fn add_function(&mut self, func_id: FuncId, context: &Context, isa: &dyn TargetIsa) { + if let target_lexicon::OperatingSystem::MacOSX { .. } = isa.triple().operating_system { + // The object crate doesn't currently support DW_GNU_EH_PE_absptr, which macOS + // requires for unwinding tables. In addition on arm64 it currently doesn't + // support 32bit relocations as we currently use for the unwinding table. + // See gimli-rs/object#415 and rust-lang/rustc_codegen_cranelift#1371 + return; + } + let unwind_info = if let Some(unwind_info) = context.compiled_code().unwrap().create_unwind_info(isa).unwrap() { |