From d8a3a1f09c7d32ad4122932bf95ab5b4249eecda Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 26 Oct 2019 09:33:24 +0200 Subject: [PATCH] rustup for projection interning --- rust-version | 2 +- src/helpers.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rust-version b/rust-version index 61a6353bb4d..f7618eadd9f 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -8e0007f829661e57d008d2e908c95f6e84b04b25 +084edc426f2e7e4bbedb5c6afa7fc422a52ee379 diff --git a/src/helpers.rs b/src/helpers.rs index dd0530cf48b..ae117d5fb35 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -5,6 +5,7 @@ use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX}; use rustc::mir; use rustc::ty::{ self, + List, layout::{self, LayoutOf, Size, TyLayout}, }; @@ -75,7 +76,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx /// Get the `Place` for a local fn local_place(&mut self, local: mir::Local) -> InterpResult<'tcx, PlaceTy<'tcx, Tag>> { let this = self.eval_context_mut(); - let place = mir::Place { base: mir::PlaceBase::Local(local), projection: Box::new([]) }; + let place = mir::Place { base: mir::PlaceBase::Local(local), projection: List::empty() }; this.eval_place(&place) }