bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge ConstVal and ConstValue

Browse source
This commit is contained in:
Oliver Schneider 2018-06-25 20:53:02 +02:00
parent 221a499bf1
commit 4bb9648b27
35 changed files with 204 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_codegen_llvm/base.rs
View file

@ -1381,7 +1381,6 @@ mod temp_stable_hash_impls {
fn fetch_wasm_section(tcx: TyCtxt, id: DefId) -> (String, Vec<u8>) {
use rustc::mir::interpret::GlobalId;
use rustc::mir::interpret::ConstVal;
info!("loading wasm section {:?}", id);
@ -1399,12 +1398,6 @@ fn fetch_wasm_section(tcx: TyCtxt, id: DefId) -> (String, Vec<u8>) {
};
let param_env = ty::ParamEnv::reveal_all();
let val = tcx.const_eval(param_env.and(cid)).unwrap();
let const_val = match val.val {
ConstVal::Value(val) => val,
ConstVal::Unevaluated(..) => bug!("should be evaluated"),
};
let alloc = tcx.const_value_to_allocation((const_val, val.ty));
let alloc = tcx.const_value_to_allocation(val);
(section.to_string(), alloc.bytes.clone())
}