bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

CTFE: simplify Value type by not checking for alignment

Browse source
This commit is contained in:
Ralf Jung 2019-07-28 13:44:11 +02:00
parent cf048cc115
commit e590b849b8
14 changed files with 50 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_codegen_llvm/common.rs
View file

@ -11,7 +11,7 @@ use crate::value::Value;
use rustc_codegen_ssa::traits::*;
use crate::consts::const_alloc_to_llvm;
use rustc::ty::layout::{HasDataLayout, LayoutOf, self, TyLayout, Size, Align};
use rustc::ty::layout::{HasDataLayout, LayoutOf, self, TyLayout, Size};
use rustc::mir::interpret::{Scalar, GlobalAlloc, Allocation};
use rustc_codegen_ssa::mir::place::PlaceRef;
@ -329,10 +329,10 @@ impl ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> {
fn from_const_alloc(
&self,
layout: TyLayout<'tcx>,
align: Align,
alloc: &Allocation,
offset: Size,
) -> PlaceRef<'tcx, &'ll Value> {
let align = alloc.align; // follow what CTFE did, not what the layout says
let init = const_alloc_to_llvm(self, alloc);
let base_addr = self.static_addr_of(init, align, None);