diff options
| author | Michael Goulet <michael@errs.io> | 2023-05-25 13:58:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 13:58:02 -0700 |
| commit | c2e3521bfbef47939d858a0c9d11e08b71bc80c0 (patch) | |
| tree | 255ebd85d7c30ba43616a673bf014d19be47c1f2 /compiler/rustc_codegen_cranelift/src | |
| parent | cb5b40269f6f087e4bdb8cc1c2776fd47eda1a3e (diff) | |
| parent | 3a423c3feb9b4827ff8b3dd1e18307df700320f2 (diff) | |
| download | rust-c2e3521bfbef47939d858a0c9d11e08b71bc80c0.tar.gz rust-c2e3521bfbef47939d858a0c9d11e08b71bc80c0.zip | |
Rollup merge of #111950 - cjgillot:expn-noinline, r=oli-obk
Remove ExpnKind::Inlined. Suggested in https://github.com/rust-lang/rust/pull/111815#issuecomment-1561903339 r? ``@oli-obk``
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/common.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/common.rs b/compiler/rustc_codegen_cranelift/src/common.rs index ccb3a0c4f27..5eaa988dd09 100644 --- a/compiler/rustc_codegen_cranelift/src/common.rs +++ b/compiler/rustc_codegen_cranelift/src/common.rs @@ -413,11 +413,7 @@ impl<'tcx> FunctionCx<'_, '_, 'tcx> { // Note: must be kept in sync with get_caller_location from cg_ssa pub(crate) fn get_caller_location(&mut self, mut source_info: mir::SourceInfo) -> CValue<'tcx> { - let span_to_caller_location = |fx: &mut FunctionCx<'_, '_, 'tcx>, mut span: Span| { - // Remove `Inlined` marks as they pollute `expansion_cause`. - while span.is_inlined() { - span.remove_mark(); - } + let span_to_caller_location = |fx: &mut FunctionCx<'_, '_, 'tcx>, span: Span| { let topmost = span.ctxt().outer_expn().expansion_cause().unwrap_or(span); let caller = fx.tcx.sess.source_map().lookup_char_pos(topmost.lo()); let const_loc = fx.tcx.const_caller_location(( |