diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-11-12 23:26:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-12 23:26:41 +0100 |
| commit | bd79fe7a94b8191ef580db7789fc55291eb825f1 (patch) | |
| tree | ad8fd165e93db6d67b120e58c898ee8fbb21a063 /compiler/rustc_codegen_llvm/src/debuginfo | |
| parent | f7273e0044ad8f35ad27282e4ab776af50b61a54 (diff) | |
| parent | c2102259a04dd9ede1e7faf01daa0dfcb948c214 (diff) | |
| download | rust-bd79fe7a94b8191ef580db7789fc55291eb825f1.tar.gz rust-bd79fe7a94b8191ef580db7789fc55291eb825f1.zip | |
Rollup merge of #132702 - 1c3t3a:issue-132615, r=rcvalle
CFI: Append debug location to CFI blocks Currently we're not appending debug locations to the inserted CFI blocks. This shows up in #132615 and #100783. This change fixes that by passing down the debug location to the CFI type-test generation and appending it to the blocks. Credits also belong to `@jakos-sec` who worked with me on this.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/debuginfo')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/mod.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs index 9e1e5127e80..89492e4b9fe 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs @@ -206,6 +206,10 @@ impl<'ll> DebugInfoBuilderMethods for Builder<'_, 'll, '_> { } } + fn get_dbg_loc(&self) -> Option<&'ll DILocation> { + unsafe { llvm::LLVMGetCurrentDebugLocation2(self.llbuilder) } + } + fn insert_reference_to_gdb_debug_scripts_section_global(&mut self) { gdb::insert_reference_to_gdb_debug_scripts_section_global(self) } |