Rollup merge of #132702 - 1c3t3a:issue-132615, r=rcvalle

matthiaskrgr · web-flow · commit 415c502d8386 · 2024-11-12T23:26:41.000+01:00
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.
diff --git a/src/debuginfo.rs b/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.

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ impl<'a, 'gcc, 'tcx> DebugInfoBuilderMethods for Builder<'a, 'gcc, 'tcx> {`
`52`	`52`	`fn clear_dbg_loc(&mut self) {`
`53`	`53`	`self.location = None;`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ fn get_dbg_loc(&self) -> Option<Self::DILocation> {`
	`57`	`+ self.location`
	`58`	`+ }`
`55`	`59`	`}`
`56`	`60`
`57`	`61`	/// Generate the `debug_context` in an MIR Body.