Skip to content

Commit 415c502

Browse files
authored
Rollup merge of rust-lang#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 rust-lang#132615 and rust-lang#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.
2 parents 62c6e49 + bed136f commit 415c502

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/debuginfo.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ impl<'a, 'gcc, 'tcx> DebugInfoBuilderMethods for Builder<'a, 'gcc, 'tcx> {
5252
fn clear_dbg_loc(&mut self) {
5353
self.location = None;
5454
}
55+
56+
fn get_dbg_loc(&self) -> Option<Self::DILocation> {
57+
self.location
58+
}
5559
}
5660

5761
/// Generate the `debug_context` in an MIR Body.

0 commit comments

Comments
 (0)