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_ssa/src | |
| parent | cb5b40269f6f087e4bdb8cc1c2776fd47eda1a3e (diff) | |
| parent | 3a423c3feb9b4827ff8b3dd1e18307df700320f2 (diff) | |
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_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/block.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs index 1f5f5b69d4d..d516ac4ebb7 100644 --- a/compiler/rustc_codegen_ssa/src/mir/block.rs +++ b/compiler/rustc_codegen_ssa/src/mir/block.rs @@ -1450,11 +1450,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { ) -> OperandRef<'tcx, Bx::Value> { let tcx = bx.tcx(); - let mut span_to_caller_location = |mut span: Span| { - // Remove `Inlined` marks as they pollute `expansion_cause`. - while span.is_inlined() { - span.remove_mark(); - } + let mut span_to_caller_location = |span: Span| { let topmost = span.ctxt().outer_expn().expansion_cause().unwrap_or(span); let caller = tcx.sess.source_map().lookup_char_pos(topmost.lo()); let const_loc = tcx.const_caller_location(( |