diff --git a/src/intrinsics.rs b/src/intrinsics.rs
index 4ad6ae91f92..840b4bf0db2 100644
--- a/src/intrinsics.rs
+++ b/src/intrinsics.rs
@@ -625,6 +625,7 @@ pub fn codegen_intrinsic_call<'tcx>(
                         }
                         _ => panic!("clif_type returned {}", clif_ty),
                     };
+                    fx.bcx.set_val_label(val, cranelift::codegen::ir::ValueLabel::from_u32(var.as_u32()));
                     fx.bcx.def_var(mir_var(var), val);
                 }
                 _ => {
@@ -656,6 +657,7 @@ pub fn codegen_intrinsic_call<'tcx>(
                         }
                         _ => panic!("clif_type returned {}", clif_ty),
                     };
+                    fx.bcx.set_val_label(val, cranelift::codegen::ir::ValueLabel::from_u32(var.as_u32()));
                     fx.bcx.def_var(mir_var(var), val);
                 }
                 CPlaceInner::Addr(_, _) | CPlaceInner::Stack(_) => {
diff --git a/src/value_and_place.rs b/src/value_and_place.rs
index 8016a802dab..64fd30def06 100644
--- a/src/value_and_place.rs
+++ b/src/value_and_place.rs
@@ -423,6 +423,7 @@ impl<'tcx> CPlace<'tcx> {
         let addr = match self.inner {
             CPlaceInner::Var(var) => {
                 let data = from.load_scalar(fx);
+                fx.bcx.set_val_label(data, cranelift::codegen::ir::ValueLabel::from_u32(var.as_u32()));
                 fx.bcx.def_var(mir_var(var), data);
                 return;
             }