Oops: use the correct DefId

Author: Nadrieril

frontend/exporter/src/constant_utils.rs

@@ -384,7 +384,7 @@ pub trait ConstantExt<'tcx>: Sized + std::fmt::Debug {
                     trait_refs: vec![],
                 }
             };
-            let ty = s.base().tcx.type_of(s.owner_id());
+            let ty = s.base().tcx.type_of(ucv.def);
             let cv = kind.decorate(ty.sinto(s), span.sinto(s));
             TranslateUnevalRes::GlobalName(cv)
         }
@@ -414,10 +414,9 @@ impl<'tcx, S: UnderOwnerState<'tcx>> SInto<S, ConstantExpr> for ty::Const<'tcx>
         let span = self.default_span(s.base().tcx);
         match self.kind() {
             ty::ConstKind::Param(p) => {
-                let kind = ConstantExprKind::ConstRef { id: p.sinto(s) };
-                let tcx = s.base().tcx;
-                let param_env = tcx.param_env(s.owner_id());
+                let param_env = s.base().tcx.param_env(s.owner_id());
                 let ty = p.find_ty_from_env(param_env);
+                let kind = ConstantExprKind::ConstRef { id: p.sinto(s) };
                 kind.decorate(ty.sinto(s), span.sinto(s))
             }
             ty::ConstKind::Infer(..) => fatal!(s[span], "ty::ConstKind::Infer node? {:#?}", self),