remove an unnecessary use of loc_place.ptr.into_pointer_or_addr

RalfJung · RalfJung · commit 55f0977a6bae · 2022-04-18T12:47:38.000-04:00
diff --git a/compiler/rustc_const_eval/src/const_eval/mod.rs b/compiler/rustc_const_eval/src/const_eval/mod.rs
@@ -38,7 +38,7 @@ pub(crate) fn const_caller_location(
     if intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &loc_place).is_err() {
         bug!("intern_const_alloc_recursive should not error in this case")
     }
-    ConstValue::Scalar(Scalar::from_pointer(loc_place.ptr.into_pointer_or_addr().unwrap(), &tcx))
+    ConstValue::Scalar(Scalar::from_maybe_pointer(loc_place.ptr, &tcx))
 }
 
 /// Convert an evaluated constant to a type level constant

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ pub(crate) fn const_caller_location(`
`38`	`38`	`if intern_const_alloc_recursive(&mut ecx, InternKind::Constant, &loc_place).is_err() {`
`39`	`39`	`bug!("intern_const_alloc_recursive should not error in this case")`
`40`	`40`	`}`
`41`		`- ConstValue::Scalar(Scalar::from_pointer(loc_place.ptr.into_pointer_or_addr().unwrap(), &tcx))`
	`41`	`+ ConstValue::Scalar(Scalar::from_maybe_pointer(loc_place.ptr, &tcx))`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/// Convert an evaluated constant to a type level constant`