diff options
| author | bors <bors@rust-lang.org> | 2020-03-19 11:41:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-19 11:41:41 +0000 |
| commit | cf35136850a7698c0da0a76785c1552ed88e1cfd (patch) | |
| tree | c694b90a17f58fd2680ff3f51859d80b86933728 /src/librustc_codegen_llvm/builder.rs | |
| parent | 6724d584b8e3b5fa5e06466d1e900cdd60953707 (diff) | |
| parent | 40dea87fbdf2ce943bfe245f0a13d7821831a88b (diff) | |
| download | rust-try.tar.gz | |
Auto merge of #68965 - eddyb:mir-inline-scope, r=<try>try
rustc_mir: track inlined callees in SourceScopeData.
We now record which MIR scopes are the roots of *other* (inlined) functions's scope trees, which allows us to generate the correct debuginfo in codegen, similar to what LLVM inlining generates.
This PR makes the `ui` test `backtrace-debuginfo` pass, if the MIR inliner is turned on by default.
Also, `#[track_caller]` is now correct in the face of MIR inlining (cc @anp).
r? @rust-lang/wg-mir-opt
Diffstat (limited to 'src/librustc_codegen_llvm/builder.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/builder.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs index b37d63fce65..b2fca31e0f7 100644 --- a/src/librustc_codegen_llvm/builder.rs +++ b/src/librustc_codegen_llvm/builder.rs @@ -57,6 +57,7 @@ impl BackendTypes for Builder<'_, 'll, 'tcx> { type Funclet = <CodegenCx<'ll, 'tcx> as BackendTypes>::Funclet; type DIScope = <CodegenCx<'ll, 'tcx> as BackendTypes>::DIScope; + type DILocation = <CodegenCx<'ll, 'tcx> as BackendTypes>::DILocation; type DIVariable = <CodegenCx<'ll, 'tcx> as BackendTypes>::DIVariable; } |