Skip to content

Commit dc44ae7

Browse files
committed
Auto merge of #153116 - jhpratt:rollup-yjBVB1Y, r=jhpratt
Rollup of 13 pull requests Successful merges: - rust-lang/rust#148146 (CI: use alternative disks if available) - rust-lang/rust#151771 (Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup) - rust-lang/rust#153035 (rustc_target: callconv: powerpc64: Use llvm_abiname rather than target_abi for ABI determination) - rust-lang/rust#153075 (mGCA: Lower negated literals directly and reject non-integer negations) - rust-lang/rust#153078 (Remove `QuerySystemFns`) - rust-lang/rust#153089 (interpret: avoid dummy spans in the stacktrace) - rust-lang/rust#153111 (Refactor url_parts to return is_absolute instead of out param) - rust-lang/rust#149978 (deprecate `Eq::assert_receiver_is_total_eq` and emit FCW on manual impls) - rust-lang/rust#153029 (Rename `rustc::pass_by_value` lint as `rustc::disallowed_pass_by_ref`.) - rust-lang/rust#153063 (`is_ty_must_use`: do not require a `span` argument) - rust-lang/rust#153071 (Update books) - rust-lang/rust#153092 (Remove redundant self usages) - rust-lang/rust#153094 (Simplify `AppendOnlyVec` iterators) Failed merges: - rust-lang/rust#153091 (Migration of `LintDiagnostic` - part 4)
2 parents 8ca8d84 + b149eba commit dc44ae7

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/diagnostics.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ pub fn report_result<'tcx>(
257257
// The "active" thread might actually be terminated, so we ignore it.
258258
let mut any_pruned = false;
259259
for (thread, stack) in ecx.machine.threads.all_blocked_stacks() {
260-
let stacktrace = Frame::generate_stacktrace_from_stack(stack);
260+
let stacktrace = Frame::generate_stacktrace_from_stack(stack, *ecx.tcx);
261261
let (stacktrace, was_pruned) = prune_stacktrace(stacktrace, &ecx.machine);
262262
any_pruned |= was_pruned;
263263
report_msg(
@@ -633,7 +633,8 @@ impl<'tcx> MiriMachine<'tcx> {
633633
pub fn emit_diagnostic(&self, e: NonHaltingDiagnostic) {
634634
use NonHaltingDiagnostic::*;
635635

636-
let stacktrace = Frame::generate_stacktrace_from_stack(self.threads.active_thread_stack());
636+
let stacktrace =
637+
Frame::generate_stacktrace_from_stack(self.threads.active_thread_stack(), self.tcx);
637638
let (stacktrace, _was_pruned) = prune_stacktrace(stacktrace, self);
638639

639640
let (label, diag_level) = match &e {

0 commit comments

Comments
 (0)