Rustup to rustc 1.35.0-nightly (fbd34efb3 2019-03-26)

Author: bjorn3

src/base.rs

@@ -1135,8 +1135,14 @@ pub fn trans_place<'a, 'tcx: 'a>(
     match place {
         Place::Base(base) => match base {
             PlaceBase::Local(local) => fx.get_local_place(*local),
-            PlaceBase::Promoted(data) => crate::constant::trans_promoted(fx, data.0, data.1),
-            PlaceBase::Static(static_) => crate::constant::codegen_static_ref(fx, static_),
+            PlaceBase::Static(static_) => match static_.kind {
+                StaticKind::Static(def_id) => {
+                    crate::constant::codegen_static_ref(fx, def_id, static_.ty)
+                }
+                StaticKind::Promoted(promoted) => {
+                    crate::constant::trans_promoted(fx, promoted, static_.ty)
+                }
+            }
         }
         Place::Projection(projection) => {
             let base = trans_place(fx, &projection.base);

src/constant.rs

@@ -44,11 +44,12 @@ pub fn codegen_static<'a, 'tcx: 'a>(ccx: &mut ConstantCx, def_id: DefId) {
 
 pub fn codegen_static_ref<'a, 'tcx: 'a>(
     fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
-    static_: &Static<'tcx>,
+    def_id: DefId,
+    ty: Ty<'tcx>,
 ) -> CPlace<'tcx> {
-    let linkage = crate::linkage::get_static_ref_linkage(fx.tcx, static_.def_id);
-    let data_id = data_id_for_static(fx.tcx, fx.module, static_.def_id, linkage);
-    cplace_for_dataid(fx, static_.ty, data_id)
+    let linkage = crate::linkage::get_static_ref_linkage(fx.tcx, def_id);
+    let data_id = data_id_for_static(fx.tcx, fx.module, def_id, linkage);
+    cplace_for_dataid(fx, ty, data_id)
 }
 
 pub fn trans_promoted<'a, 'tcx: 'a>(