@@ -458,11 +458,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
458
458
scalar,
459
459
) ) = * value
460
460
{
461
- * operand = self . operand_from_scalar (
462
- scalar,
463
- value. layout . ty ,
464
- DUMMY_SP ,
465
- ) ;
461
+ * operand = self . operand_from_scalar ( scalar, value. layout . ty ) ;
466
462
}
467
463
}
468
464
}
@@ -587,9 +583,9 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
587
583
}
588
584
589
585
/// Creates a new `Operand::Constant` from a `Scalar` value
590
- fn operand_from_scalar ( & self , scalar : Scalar , ty : Ty < ' tcx > , span : Span ) -> Operand < ' tcx > {
586
+ fn operand_from_scalar ( & self , scalar : Scalar , ty : Ty < ' tcx > ) -> Operand < ' tcx > {
591
587
Operand :: Constant ( Box :: new ( Constant {
592
- span,
588
+ span : DUMMY_SP ,
593
589
user_ty : None ,
594
590
literal : ConstantKind :: from_scalar ( self . tcx , scalar, ty) ,
595
591
} ) )
@@ -634,8 +630,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
634
630
if let Some ( Right ( imm) ) = imm {
635
631
match * imm {
636
632
interpret:: Immediate :: Scalar ( scalar) => {
637
- * rval =
638
- Rvalue :: Use ( self . operand_from_scalar ( scalar, value. layout . ty , DUMMY_SP ) ) ;
633
+ * rval = Rvalue :: Use ( self . operand_from_scalar ( scalar, value. layout . ty ) ) ;
639
634
}
640
635
Immediate :: ScalarPair ( ..) => {
641
636
// Found a value represented as a pair. For now only do const-prop if the type
@@ -933,11 +928,7 @@ impl<'tcx> MutVisitor<'tcx> for ConstPropagator<'_, 'tcx> {
933
928
&& self . should_const_prop ( value)
934
929
{
935
930
trace ! ( "assertion on {:?} should be {:?}" , value, expected) ;
936
- * cond = self . operand_from_scalar (
937
- value_const,
938
- self . tcx . types . bool ,
939
- DUMMY_SP ,
940
- ) ;
931
+ * cond = self . operand_from_scalar ( value_const, self . tcx . types . bool ) ;
941
932
}
942
933
}
943
934
TerminatorKind :: SwitchInt { ref mut discr, .. } => {
0 commit comments