Skip to content

Commit cb85f4b

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of rust-lang#73582 - RalfJung:miri-span-bug, r=oli-obk
Miri: replace many bug! by span_bug! r? @oli-obk
2 parents 35ecb26 + 726b6f4 commit cb85f4b

File tree

6 files changed

+61
-28
lines changed

6 files changed

+61
-28
lines changed

‎src/librustc_mir/interpret/cast.rs‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
5252
}
5353

5454
if self.tcx.has_attr(def_id, sym::rustc_args_required_const) {
55-
bug!("reifying a fn ptr that requires const arguments");
55+
span_bug!(
56+
self.cur_span(),
57+
"reifying a fn ptr that requires const arguments"
58+
);
5659
}
5760

5861
let instance = ty::Instance::resolve_for_fn_ptr(
@@ -66,7 +69,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
6669
let fn_ptr = self.memory.create_fn_alloc(FnVal::Instance(instance));
6770
self.write_scalar(fn_ptr, dest)?;
6871
}
69-
_ => bug!("reify fn pointer on {:?}", src.layout.ty),
72+
_ => span_bug!(self.cur_span(), "reify fn pointer on {:?}", src.layout.ty),
7073
}
7174
}
7275

@@ -77,7 +80,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
7780
// No change to value
7881
self.write_immediate(*src, dest)?;
7982
}
80-
_ => bug!("fn to unsafe fn cast on {:?}", cast_ty),
83+
_ => span_bug!(self.cur_span(), "fn to unsafe fn cast on {:?}", cast_ty),
8184
}
8285
}
8386

@@ -99,7 +102,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
99102
let fn_ptr = self.memory.create_fn_alloc(FnVal::Instance(instance));
100103
self.write_scalar(fn_ptr, dest)?;
101104
}
102-
_ => bug!("closure fn pointer on {:?}", src.layout.ty),
105+
_ => span_bug!(self.cur_span(), "closure fn pointer on {:?}", src.layout.ty),
103106
}
104107
}
105108
}
@@ -162,7 +165,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
162165
assert!(src.layout.ty.is_unsafe_ptr());
163166
return match *src {
164167
Immediate::ScalarPair(data, _) => Ok(data.into()),
165-
Immediate::Scalar(..) => bug!(
168+
Immediate::Scalar(..) => span_bug!(
169+
self.cur_span(),
166170
"{:?} input to a fat-to-thin cast ({:?} -> {:?})",
167171
*src,
168172
src.layout.ty,
@@ -216,7 +220,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
216220
}
217221

218222
// Casts to bool are not permitted by rustc, no need to handle them here.
219-
_ => bug!("invalid int to {:?} cast", cast_ty),
223+
_ => span_bug!(self.cur_span(), "invalid int to {:?} cast", cast_ty),
220224
}
221225
}
222226

@@ -248,7 +252,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
248252
// float -> f64
249253
Float(FloatTy::F64) => Scalar::from_f64(f.convert(&mut false).value),
250254
// That's it.
251-
_ => bug!("invalid float to {:?} cast", dest_ty),
255+
_ => span_bug!(self.cur_span(), "invalid float to {:?} cast", dest_ty),
252256
}
253257
}
254258

@@ -287,7 +291,9 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
287291
self.write_immediate(val, dest)
288292
}
289293

290-
_ => bug!("invalid unsizing {:?} -> {:?}", src.layout.ty, cast_ty),
294+
_ => {
295+
span_bug!(self.cur_span(), "invalid unsizing {:?} -> {:?}", src.layout.ty, cast_ty)
296+
}
291297
}
292298
}
293299

@@ -307,7 +313,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
307313
assert_eq!(def_a, def_b);
308314
if def_a.is_box() || def_b.is_box() {
309315
if !def_a.is_box() || !def_b.is_box() {
310-
bug!("invalid unsizing between {:?} -> {:?}", src.layout.ty, cast_ty.ty);
316+
span_bug!(
317+
self.cur_span(),
318+
"invalid unsizing between {:?} -> {:?}",
319+
src.layout.ty,
320+
cast_ty.ty
321+
);
311322
}
312323
return self.unsize_into_ptr(
313324
src,
@@ -335,7 +346,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
335346
}
336347
Ok(())
337348
}
338-
_ => bug!("unsize_into: invalid conversion: {:?} -> {:?}", src.layout, dest.layout),
349+
_ => span_bug!(
350+
self.cur_span(),
351+
"unsize_into: invalid conversion: {:?} -> {:?}",
352+
src.layout,
353+
dest.layout
354+
),
339355
}
340356
}
341357
}

‎src/librustc_mir/interpret/eval_context.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
536536
if sized_size == Size::ZERO {
537537
return Ok(None);
538538
} else {
539-
bug!("Fields cannot be extern types, unless they are at offset 0")
539+
span_bug!(
540+
self.cur_span(),
541+
"Fields cannot be extern types, unless they are at offset 0"
542+
)
540543
}
541544
}
542545
};
@@ -584,7 +587,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
584587

585588
ty::Foreign(_) => Ok(None),
586589

587-
_ => bug!("size_and_align_of::<{:?}> not supported", layout.ty),
590+
_ => span_bug!(self.cur_span(), "size_and_align_of::<{:?}> not supported", layout.ty),
588591
}
589592
}
590593
#[inline]

‎src/librustc_mir/interpret/intrinsics.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
135135
let bits = self.force_bits(val, layout_of.size)?;
136136
let kind = match layout_of.abi {
137137
Abi::Scalar(ref scalar) => scalar.value,
138-
_ => bug!("{} called on invalid type {:?}", intrinsic_name, ty),
138+
_ => span_bug!(
139+
self.cur_span(),
140+
"{} called on invalid type {:?}",
141+
intrinsic_name,
142+
ty
143+
),
139144
};
140145
let (nonzero, intrinsic_name) = match intrinsic_name {
141146
sym::cttz_nonzero => (true, sym::cttz),

‎src/librustc_mir/interpret/operand.rs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
311311
if let Ok(imm) = self.try_read_immediate(op)? {
312312
Ok(imm)
313313
} else {
314-
bug!("primitive read failed for type: {:?}", op.layout.ty);
314+
span_bug!(self.cur_span(), "primitive read failed for type: {:?}", op.layout.ty);
315315
}
316316
}
317317

@@ -360,9 +360,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
360360
let val = if offset.bytes() == 0 { a } else { b };
361361
Immediate::from(val)
362362
}
363-
Immediate::Scalar(val) => {
364-
bug!("field access on non aggregate {:#?}, {:#?}", val, op.layout)
365-
}
363+
Immediate::Scalar(val) => span_bug!(
364+
self.cur_span(),
365+
"field access on non aggregate {:#?}, {:#?}",
366+
val,
367+
op.layout
368+
),
366369
};
367370
Ok(OpTy { op: Operand::Immediate(immediate), layout: field_layout })
368371
}
@@ -545,7 +548,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
545548
ty::ConstKind::Infer(..)
546549
| ty::ConstKind::Bound(..)
547550
| ty::ConstKind::Placeholder(..) => {
548-
bug!("eval_const_to_op: Unexpected ConstKind {:?}", val)
551+
span_bug!(self.cur_span(), "eval_const_to_op: Unexpected ConstKind {:?}", val)
549552
}
550553
ty::ConstKind::Value(val_val) => val_val,
551554
};
@@ -656,7 +659,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
656659
.discriminants(def_id, *self.tcx)
657660
.find(|(_, var)| var.val == discr_bits)
658661
}
659-
_ => bug!("tagged layout for non-adt non-generator"),
662+
_ => span_bug!(self.cur_span(), "tagged layout for non-adt non-generator"),
660663
}
661664
.ok_or_else(|| err_ub!(InvalidTag(tag_val.erase_tag())))?;
662665
// Return the cast value, and the index.

‎src/librustc_mir/interpret/operator.rs‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
6161
Le => l <= r,
6262
Gt => l > r,
6363
Ge => l >= r,
64-
_ => bug!("Invalid operation on char: {:?}", bin_op),
64+
_ => span_bug!(self.cur_span(), "Invalid operation on char: {:?}", bin_op),
6565
};
6666
(Scalar::from_bool(res), false, self.tcx.types.bool)
6767
}
@@ -84,7 +84,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
8484
BitAnd => l & r,
8585
BitOr => l | r,
8686
BitXor => l ^ r,
87-
_ => bug!("Invalid operation on bool: {:?}", bin_op),
87+
_ => span_bug!(self.cur_span(), "Invalid operation on bool: {:?}", bin_op),
8888
};
8989
(Scalar::from_bool(res), false, self.tcx.types.bool)
9090
}
@@ -110,7 +110,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
110110
Mul => ((l * r).value.into(), ty),
111111
Div => ((l / r).value.into(), ty),
112112
Rem => ((l % r).value.into(), ty),
113-
_ => bug!("invalid float op: `{:?}`", bin_op),
113+
_ => span_bug!(self.cur_span(), "invalid float op: `{:?}`", bin_op),
114114
};
115115
(val, false, ty)
116116
}
@@ -154,7 +154,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
154154

155155
// For the remaining ops, the types must be the same on both sides
156156
if left_layout.ty != right_layout.ty {
157-
bug!(
157+
span_bug!(
158+
self.cur_span(),
158159
"invalid asymmetric binary op {:?}: {:?} ({:?}), {:?} ({:?})",
159160
bin_op,
160161
l,
@@ -251,7 +252,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
251252
));
252253
}
253254

254-
_ => bug!(
255+
_ => span_bug!(
256+
self.cur_span(),
255257
"invalid binary op {:?}: {:?}, {:?} (both {:?})",
256258
bin_op,
257259
l,
@@ -333,7 +335,11 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
333335

334336
M::binary_ptr_op(self, bin_op, left, right)
335337
}
336-
_ => bug!("Invalid MIR: bad LHS type for binop: {:?}", left.layout.ty),
338+
_ => span_bug!(
339+
self.cur_span(),
340+
"Invalid MIR: bad LHS type for binop: {:?}",
341+
left.layout.ty
342+
),
337343
}
338344
}
339345

@@ -367,15 +373,15 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
367373
let val = val.to_bool()?;
368374
let res = match un_op {
369375
Not => !val,
370-
_ => bug!("Invalid bool op {:?}", un_op),
376+
_ => span_bug!(self.cur_span(), "Invalid bool op {:?}", un_op),
371377
};
372378
Ok((Scalar::from_bool(res), false, self.tcx.types.bool))
373379
}
374380
ty::Float(fty) => {
375381
let res = match (un_op, fty) {
376382
(Neg, FloatTy::F32) => Scalar::from_f32(-val.to_f32()?),
377383
(Neg, FloatTy::F64) => Scalar::from_f64(-val.to_f64()?),
378-
_ => bug!("Invalid float op {:?}", un_op),
384+
_ => span_bug!(self.cur_span(), "Invalid float op {:?}", un_op),
379385
};
380386
Ok((res, false, layout.ty))
381387
}

‎src/librustc_mir/interpret/terminator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
232232
ty::FnDef(..) => instance_ty.fn_sig(*self.tcx).abi(),
233233
ty::Closure(..) => Abi::RustCall,
234234
ty::Generator(..) => Abi::Rust,
235-
_ => bug!("unexpected callee ty: {:?}", instance_ty),
235+
_ => span_bug!(self.cur_span(), "unexpected callee ty: {:?}", instance_ty),
236236
}
237237
};
238238
let normalize_abi = |abi| match abi {

0 commit comments

Comments
 (0)