OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Differentiate between interpret::Scalar and layout::Scalar

Browse Source
This commit is contained in:
Oliver Schneider 2018-05-21 00:00:38 +02:00
parent ef2177cffc
commit 6436de89fe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustc_codegen_llvm/mir/constant.rs
View File

@ -16,7 +16,7 @@ use rustc::mir;
use rustc_data_structures::indexed_vec::Idx; use rustc_data_structures::indexed_vec::Idx;
use rustc::mir::interpret::{GlobalId, MemoryPointer, Scalar, Allocation, ConstValue, AllocType}; use rustc::mir::interpret::{GlobalId, MemoryPointer, Scalar, Allocation, ConstValue, AllocType};
use rustc::ty::{self, Ty}; use rustc::ty::{self, Ty};
use rustc::ty::layout::{self, HasDataLayout, LayoutOf, Scalar, Size}; use rustc::ty::layout::{self, HasDataLayout, LayoutOf, Size};
use builder::Builder; use builder::Builder;
use common::{CodegenCx}; use common::{CodegenCx};
use common::{C_bytes, C_struct, C_uint_big, C_undef, C_usize}; use common::{C_bytes, C_struct, C_uint_big, C_undef, C_usize};
@ -30,14 +30,14 @@ use super::FunctionCx;
pub fn primval_to_llvm(cx: &CodegenCx, pub fn primval_to_llvm(cx: &CodegenCx,
cv: Scalar, cv: Scalar,
scalar: &Scalar, layout: &layout::Scalar,
llty: Type) -> ValueRef { llty: Type) -> ValueRef {
let bits = if scalar.is_bool() { 1 } else { scalar.value.size(cx).bits() }; let bits = if layout.is_bool() { 1 } else { layout.value.size(cx).bits() };
match cv { match cv {
Scalar::Undef => C_undef(Type::ix(cx, bits)), Scalar::Undef => C_undef(Type::ix(cx, bits)),
Scalar::Bytes(b) => { Scalar::Bytes(b) => {
let llval = C_uint_big(Type::ix(cx, bits), b); let llval = C_uint_big(Type::ix(cx, bits), b);
if scalar.value == layout::Pointer { if layout.value == layout::Pointer {
unsafe { llvm::LLVMConstIntToPtr(llval, llty.to_ref()) } unsafe { llvm::LLVMConstIntToPtr(llval, llty.to_ref()) }
} else { } else {
consts::bitcast(llval, llty) consts::bitcast(llval, llty)
@ -68,7 +68,7 @@ pub fn primval_to_llvm(cx: &CodegenCx,
&C_usize(cx, ptr.offset.bytes()), &C_usize(cx, ptr.offset.bytes()),
1, 1,
) }; ) };
if scalar.value != layout::Pointer { if layout.value != layout::Pointer {
unsafe { llvm::LLVMConstPtrToInt(llval, llty.to_ref()) } unsafe { llvm::LLVMConstPtrToInt(llval, llty.to_ref()) }
} else { } else {
consts::bitcast(llval, llty) consts::bitcast(llval, llty)
@ -97,7 +97,7 @@ pub fn const_alloc_to_llvm(cx: &CodegenCx, alloc: &Allocation) -> ValueRef {
llvals.push(primval_to_llvm( llvals.push(primval_to_llvm(
cx, cx,
Scalar::Ptr(MemoryPointer { alloc_id, offset: Size::from_bytes(ptr_offset) }), Scalar::Ptr(MemoryPointer { alloc_id, offset: Size::from_bytes(ptr_offset) }),
&Scalar { &layout::Scalar {
value: layout::Primitive::Pointer, value: layout::Primitive::Pointer,
valid_range: 0..=!0 valid_range: 0..=!0
}, },