@@ -40,8 +40,8 @@ pub(crate) fn check_constants(fx: &mut FunctionCx<'_, '_, '_>) -> bool {
40
40
let mut all_constants_ok = true ;
41
41
for constant in & fx. mir . required_consts {
42
42
let const_ = match fx. monomorphize ( constant. literal ) {
43
- ConstantSource :: Ty ( ct) => ct,
44
- ConstantSource :: Val ( ..) => continue ,
43
+ ConstantKind :: Ty ( ct) => ct,
44
+ ConstantKind :: Val ( ..) => continue ,
45
45
} ;
46
46
match const_. val {
47
47
ConstKind :: Value ( _) => { }
@@ -117,8 +117,8 @@ pub(crate) fn codegen_constant<'tcx>(
117
117
constant : & Constant < ' tcx > ,
118
118
) -> CValue < ' tcx > {
119
119
let const_ = match fx. monomorphize ( constant. literal ) {
120
- ConstantSource :: Ty ( ct) => ct,
121
- ConstantSource :: Val ( val, ty) => return codegen_const_value ( fx, val, ty) ,
120
+ ConstantKind :: Ty ( ct) => ct,
121
+ ConstantKind :: Val ( val, ty) => return codegen_const_value ( fx, val, ty) ,
122
122
} ;
123
123
let const_val = match const_. val {
124
124
ConstKind :: Value ( const_val) => const_val,
@@ -427,10 +427,10 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
427
427
match operand {
428
428
Operand :: Copy ( _) | Operand :: Move ( _) => None ,
429
429
Operand :: Constant ( const_) => match const_. literal {
430
- ConstantSource :: Ty ( const_) => {
430
+ ConstantKind :: Ty ( const_) => {
431
431
fx. monomorphize ( const_) . eval ( fx. tcx , ParamEnv :: reveal_all ( ) ) . val . try_to_value ( )
432
432
}
433
- ConstantSource :: Val ( val, _) => Some ( val) ,
433
+ ConstantKind :: Val ( val, _) => Some ( val) ,
434
434
} ,
435
435
}
436
436
}
0 commit comments