use ConstantKind::Val in StaticRef

b-naber · b-naber · commit 5e0fab6da5ef · 2022-02-15T21:10:42.000+01:00
diff --git a/compiler/rustc_mir_build/src/build/expr/as_constant.rs b/compiler/rustc_mir_build/src/build/expr/as_constant.rs
@@ -27,7 +27,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 Constant { span, user_ty, literal: literal.into() }
             }
             ExprKind::StaticRef { literal, .. } => {
-                Constant { span, user_ty: None, literal: literal.into() }
+                let const_val = literal.val.try_to_value().unwrap_or_else(|| {
+                    bug!("expected `ConstKind::Value`, but found {:?}", literal.val)
+                });
+                let literal = ConstantKind::Val(const_val, literal.ty);
+
+                Constant { span, user_ty: None, literal }
             }
             ExprKind::ConstBlock { value } => {
                 Constant { span: span, user_ty: None, literal: value.into() }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {`
`27`	`27`	`Constant { span, user_ty, literal: literal.into() }`
`28`	`28`	`}`
`29`	`29`	`ExprKind::StaticRef { literal, .. } => {`
`30`		`- Constant { span, user_ty: None, literal: literal.into() }`
	`30`	`+ let const_val = literal.val.try_to_value().unwrap_or_else(\|\| {`
	`31`	+ bug!("expected `ConstKind::Value`, but found {:?}", literal.val)
	`32`	`+ });`
	`33`	`+ let literal = ConstantKind::Val(const_val, literal.ty);`
	`34`	`+`
	`35`	`+ Constant { span, user_ty: None, literal }`
`31`	`36`	`}`
`32`	`37`	`ExprKind::ConstBlock { value } => {`
`33`	`38`	`Constant { span: span, user_ty: None, literal: value.into() }`