Deduplicate inlined function debug info, but create a new lexical scope to child subsequent scopes and variables from colliding

2023-09-01 14:27:21 -07:00
parent 83995f320c
commit 06890774ab
7 changed files with 61 additions and 22 deletions
--- a/compiler/rustc_codegen_ssa/src/mir/mod.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/mod.rs
@@ -46,7 +46,7 @@ pub struct FunctionCx<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> {

    mir: &'tcx mir::Body<'tcx>,

-    debug_context: Option<FunctionDebugContext<Bx::DIScope, Bx::DILocation>>,
+    debug_context: Option<FunctionDebugContext<'tcx, Bx::DIScope, Bx::DILocation>>,

    llfn: Bx::Function,