diff options
| author | bors <bors@rust-lang.org> | 2020-10-06 23:07:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-06 23:07:17 +0000 |
| commit | 59dafb876e125c49fca93820c5ef22da3fcb8644 (patch) | |
| tree | e7f778f98203997578788c8a851fc12e91fd99e8 /compiler/rustc_codegen_ssa/src | |
| parent | 98edd1fbf8a68977a2a7c1312eb1ebff80515a92 (diff) | |
| parent | f600154be6600d6749dd38b9b7f5caeb3e98ad1c (diff) | |
| download | rust-59dafb876e125c49fca93820c5ef22da3fcb8644.tar.gz rust-59dafb876e125c49fca93820c5ef22da3fcb8644.zip | |
Auto merge of #77630 - Dylan-DPC:rollup-kfwl55z, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #76784 (Add some docs to rustdoc::clean::inline and def_id functions) - #76911 (fix VecDeque::iter_mut aliasing issues) - #77400 (Fix suggestions for x.py setup) - #77515 (Update to chalk 0.31) - #77568 (inliner: use caller param_env) - #77571 (Use matches! for core::char methods) - #77582 (Move `EarlyOtherwiseBranch` to mir-opt-level 2) - #77590 (Update RLS and Rustfmt) - #77605 (Fix rustc_def_path to show the full path and not the trimmed one) - #77614 (Let backends access span information) - #77624 (Add c as a shorthand check alternative for new options #77603) Failed merges: r? `@ghost`
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/debuginfo.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/traits/builder.rs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs index d8a530d98fa..26a646b0293 100644 --- a/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs +++ b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs @@ -55,6 +55,7 @@ impl<D> DebugScope<D> { impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { pub fn set_debug_loc(&self, bx: &mut Bx, source_info: mir::SourceInfo) { let (scope, span) = self.debug_loc(source_info); + bx.set_span(span); if let Some(scope) = scope { bx.set_source_location(scope, span); } diff --git a/compiler/rustc_codegen_ssa/src/traits/builder.rs b/compiler/rustc_codegen_ssa/src/traits/builder.rs index b35b0f24208..0b8289a8dd9 100644 --- a/compiler/rustc_codegen_ssa/src/traits/builder.rs +++ b/compiler/rustc_codegen_ssa/src/traits/builder.rs @@ -15,6 +15,7 @@ use crate::MemFlags; use rustc_middle::ty::layout::{HasParamEnv, TyAndLayout}; use rustc_middle::ty::Ty; +use rustc_span::Span; use rustc_target::abi::{Abi, Align, Scalar, Size}; use rustc_target::spec::HasTargetSpec; @@ -44,6 +45,7 @@ pub trait BuilderMethods<'a, 'tcx>: fn build_sibling_block(&self, name: &str) -> Self; fn cx(&self) -> &Self::CodegenCx; fn llbb(&self) -> Self::BasicBlock; + fn set_span(&self, span: Span); fn position_at_end(&mut self, llbb: Self::BasicBlock); fn ret_void(&mut self); |
