bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rustup to rustc 1.31.0-nightly (424a749a0 2018-10-21)

Browse source
This commit is contained in:
bjorn3 2018-10-22 11:06:09 +02:00
parent 397c6843d0
commit 35d4d22e5c
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/constant.rs
View file

@ -4,7 +4,7 @@ use crate::rustc::mir::interpret::{
read_target_uint, AllocId, AllocType, Allocation, ConstValue, EvalResult, GlobalId, Scalar, read_target_uint, AllocId, AllocType, Allocation, ConstValue, EvalResult, GlobalId, Scalar,
}; };
use crate::rustc::ty::Const; use crate::rustc::ty::Const;
use crate::rustc_mir::interpret::{EvalContext, Machine, Memory, MemoryKind, OpTy, PlaceTy}; use crate::rustc_mir::interpret::{EvalContext, Machine, Memory, MemoryKind, OpTy, PlaceTy, Pointer};
use std::borrow::Cow; use std::borrow::Cow;
#[derive(Default)] #[derive(Default)]
@ -127,7 +127,6 @@ fn trans_const_place<'a, 'tcx: 'a>(
fx.tcx.at(DUMMY_SP), fx.tcx.at(DUMMY_SP),
ty::ParamEnv::reveal_all(), ty::ParamEnv::reveal_all(),
TransPlaceInterpreter, TransPlaceInterpreter,
(),
); );
let op = ecx.const_to_op(const_)?; let op = ecx.const_to_op(const_)?;
let ptr = ecx.allocate(op.layout, MemoryKind::Stack)?; let ptr = ecx.allocate(op.layout, MemoryKind::Stack)?;
@ -188,7 +187,7 @@ fn define_all_allocs<'a, 'tcx: 'a, B: Backend + 'a>(
module: &mut Module<B>, module: &mut Module<B>,
cx: &mut ConstantCx, cx: &mut ConstantCx,
) { ) {
let memory = Memory::<TransPlaceInterpreter>::new(tcx.at(DUMMY_SP), ()); let memory = Memory::<TransPlaceInterpreter>::new(tcx.at(DUMMY_SP));
while let Some(todo_item) = pop_set(&mut cx.todo) { while let Some(todo_item) = pop_set(&mut cx.todo) {
let (data_id, alloc) = match todo_item { let (data_id, alloc) = match todo_item {
@ -278,11 +277,12 @@ fn pop_set<T: Copy + Eq + ::std::hash::Hash>(set: &mut HashSet<T>) -> Option<T>
struct TransPlaceInterpreter; struct TransPlaceInterpreter;
impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for TransPlaceInterpreter { impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for TransPlaceInterpreter {
type MemoryData = (); type MemoryKinds = !;
type MemoryKinds = ();
type MemoryMap = FxHashMap<AllocId, (MemoryKind<()>, Allocation<()>)>;
type PointerTag = (); type PointerTag = ();
const STATIC_KIND: Option<()> = None; type AllocExtra = ();
type MemoryMap = FxHashMap<AllocId, (MemoryKind<!>, Allocation<()>)>;
const STATIC_KIND: Option<!> = None;
const ENABLE_PTR_TRACKING_HOOKS: bool = false;
fn enforce_validity(_: &EvalContext<'a, 'mir, 'tcx, Self>) -> bool { fn enforce_validity(_: &EvalContext<'a, 'mir, 'tcx, Self>) -> bool {
false false
@ -336,4 +336,12 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for TransPlaceInterpreter {
fn box_alloc(_: &mut EvalContext<'a, 'mir, 'tcx, Self>, _: PlaceTy<'tcx>) -> EvalResult<'tcx> { fn box_alloc(_: &mut EvalContext<'a, 'mir, 'tcx, Self>, _: PlaceTy<'tcx>) -> EvalResult<'tcx> {
panic!(); panic!();
} }
fn tag_reference(_: &mut EvalContext<'a, 'mir, 'tcx, Self>, _: Pointer<()>, _: Ty<'tcx>, _: Size, _: Option<BorrowKind>) -> EvalResult<'tcx> {
panic!();
}
fn tag_dereference(_: &EvalContext<'a, 'mir, 'tcx, Self>, _: Pointer<()>, _: Ty<'tcx>) -> EvalResult<'tcx> {
panic!();
}
} }

2
src/lib.rs
View file

@ -1,4 +1,4 @@
#![feature(rustc_private, macro_at_most_once_rep)] #![feature(rustc_private, macro_at_most_once_rep, never_type)]
#![allow(intra_doc_link_resolution_failure)] #![allow(intra_doc_link_resolution_failure)]
extern crate byteorder; extern crate byteorder;