about summary refs log tree commit diff
path: root/compiler/rustc_codegen_gcc
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-11-12 23:26:41 +0100
committerGitHub <noreply@github.com>2024-11-12 23:26:41 +0100
commitbd79fe7a94b8191ef580db7789fc55291eb825f1 (patch)
treead8fd165e93db6d67b120e58c898ee8fbb21a063 /compiler/rustc_codegen_gcc
parentf7273e0044ad8f35ad27282e4ab776af50b61a54 (diff)
parentc2102259a04dd9ede1e7faf01daa0dfcb948c214 (diff)
downloadrust-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_gcc')
-rw-r--r--compiler/rustc_codegen_gcc/src/debuginfo.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_gcc/src/debuginfo.rs b/compiler/rustc_codegen_gcc/src/debuginfo.rs
index 9d62ccc95d5..5d8c5c199b1 100644
--- a/compiler/rustc_codegen_gcc/src/debuginfo.rs
+++ b/compiler/rustc_codegen_gcc/src/debuginfo.rs
@@ -52,6 +52,10 @@ impl<'a, 'gcc, 'tcx> DebugInfoBuilderMethods for Builder<'a, 'gcc, 'tcx> {
     fn clear_dbg_loc(&mut self) {
         self.location = None;
     }
+
+    fn get_dbg_loc(&self) -> Option<Self::DILocation> {
+        self.location
+    }
 }
 
 /// Generate the `debug_context` in an MIR Body.