Remove ScalarPair from ConstValue

oli-obk · oli-obk · commit 4b367ba31536 · 2018-11-28T15:13:55.000+01:00
diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
@@ -313,7 +313,6 @@ impl_stable_hash_for!(
     impl<'tcx> for enum mir::interpret::ConstValue<'tcx> [ mir::interpret::ConstValue ] {
         Unevaluated(def_id, substs),
         Scalar(val),
-        ScalarPair(a, b),
         ByRef(id, alloc, offset),
     }
 );
diff --git a/src/librustc/mir/interpret/allocation.rs b/src/librustc/mir/interpret/allocation.rs
@@ -15,7 +15,7 @@ use super::{
     truncate,
 };
 
-use ty::layout::{Size, Align};
+use ty::layout::{Size, Align, self};
 use syntax::ast::Mutability;
 use std::iter;
 use mir;
@@ -325,6 +325,33 @@ impl<'tcx, Tag: Copy, Extra> Allocation<Tag, Extra> {
         Ok(())
     }
 
+    pub fn write_scalar_pair<MemoryExtra>(
+        &mut self,
+        cx: &impl HasDataLayout,
+        ptr: Pointer<Tag>,
+        a_val: ScalarMaybeUndef<Tag>,
+        b_val: ScalarMaybeUndef<Tag>,
+        layout: layout::TyLayout<'tcx>,
+    ) -> EvalResult<'tcx>
+        // FIXME: Working around https://github.com/rust-lang/rust/issues/56209
+        where Extra: AllocationExtra<Tag, MemoryExtra>
+    {
+        let (a, b) = match layout.abi {
+            layout::Abi::ScalarPair(ref a, ref b) => (&a.value, &b.value),
+            _ => bug!("write_scalar_pair: invalid ScalarPair layout: {:#?}", layout),
+        };
+        let (a_size, b_size) = (a.size(cx), b.size(cx));
+        let b_offset = a_size.align_to(b.align(cx).abi);
+        let b_ptr = ptr.offset(b_offset, cx)?;
+
+        // It is tempting to verify `b_offset` against `layout.fields.offset(1)`,
+        // but that does not work: We could be a newtype around a pair, then the
+        // fields do not match the `ScalarPair` components.
+
+        self.write_scalar(cx, ptr, a_val, a_size)?;
+        self.write_scalar(cx, b_ptr, b_val, b_size)
+    }
+
     /// Sets `count` bytes starting at `ptr.offset` with `val`. Basically `memset`.
     pub fn write_repeat<MemoryExtra>(
         &mut self,
@@ -400,6 +427,28 @@ impl<'tcx, Tag: Copy, Extra> Allocation<Tag, Extra> {
         self.read_scalar(cx, ptr, cx.data_layout().pointer_size)
     }
 
+    pub fn read_usize<MemoryExtra>(
+        &self,
+        cx: &impl HasDataLayout,
+        ptr: Pointer<Tag>,
+    ) -> EvalResult<'tcx, u64>
+        // FIXME: Working around https://github.com/rust-lang/rust/issues/56209
+        where Extra: AllocationExtra<Tag, MemoryExtra>
+    {
+        self.read_ptr_sized(cx, ptr)?.not_undef()?.to_usize(cx)
+    }
+
+    pub fn read_ptr<MemoryExtra>(
+        &self,
+        cx: &impl HasDataLayout,
+        ptr: Pointer<Tag>,
+    ) -> EvalResult<'tcx, Pointer<Tag>>
+        // FIXME: Working around https://github.com/rust-lang/rust/issues/56209
+        where Extra: AllocationExtra<Tag, MemoryExtra>
+    {
+        self.read_ptr_sized(cx, ptr)?.not_undef()?.to_ptr()
+    }
+
     /// Write a *non-ZST* scalar
     ///
     /// zsts can't be read out of two reasons:
diff --git a/src/librustc/mir/interpret/value.rs b/src/librustc/mir/interpret/value.rs
@@ -10,7 +10,7 @@
 
 use std::fmt;
 
-use crate::ty::{Ty, subst::Substs, layout::{HasDataLayout, Size}};
+use crate::ty::{Ty, subst::Substs, layout::{HasDataLayout, Size}, TyCtxt};
 use crate::hir::def_id::DefId;
 
 use super::{EvalResult, Pointer, PointerArithmetic, Allocation, AllocId, sign_extend, truncate};
@@ -39,11 +39,6 @@ pub enum ConstValue<'tcx> {
     /// Not using the enum `Value` to encode that this must not be `Undef`
     Scalar(Scalar),
 
-    /// Used only for *fat pointers* with layout::abi::ScalarPair
-    ///
-    /// Needed for pattern matching code related to slices and strings.
-    ScalarPair(Scalar, Scalar),
-
     /// An allocation + offset into the allocation.
     /// Invariant: The AllocId matches the allocation.
     ByRef(AllocId, &'tcx Allocation, Size),
@@ -54,8 +49,7 @@ impl<'tcx> ConstValue<'tcx> {
     pub fn try_to_scalar(&self) -> Option<Scalar> {
         match *self {
             ConstValue::Unevaluated(..) |
-            ConstValue::ByRef(..) |
-            ConstValue::ScalarPair(..) => None,
+            ConstValue::ByRef(..) => None,
             ConstValue::Scalar(val) => Some(val),
         }
     }
@@ -71,20 +65,46 @@ impl<'tcx> ConstValue<'tcx> {
     }
 
     #[inline]
-    pub fn new_slice(
-        val: Scalar,
-        len: u64,
-        cx: &impl HasDataLayout
-    ) -> Self {
-        ConstValue::ScalarPair(val, Scalar::Bits {
-            bits: len as u128,
-            size: cx.data_layout().pointer_size.bytes() as u8,
-        })
+    pub fn new_slice(val: Scalar, len: u64, tcx: TyCtxt<'_, '_, 'tcx>) -> Self {
+        Self::new_ptr_sized_seq(
+            &[
+                val,
+                Scalar::Bits {
+                    bits: len as u128,
+                    size: tcx.data_layout.pointer_size.bytes() as u8,
+                }
+            ],
+            tcx,
+        )
+    }
+
+    #[inline]
+    /// Used for fat pointers and vtables
+    fn new_ptr_sized_seq(scalars: &[Scalar], tcx: TyCtxt<'_, '_, 'tcx>) -> Self {
+        let mut allocation = Allocation::undef(
+            tcx.data_layout.pointer_size * scalars.len() as u64,
+            tcx.data_layout.pointer_align.abi,
+            Default::default(),
+        );
+        let alloc_id = tcx.alloc_map.lock().reserve();
+        let mut ptr = Pointer::from(alloc_id);
+        for &scalar in scalars {
+            allocation.write_scalar(
+                &tcx,
+                ptr,
+                scalar.into(),
+                tcx.data_layout.pointer_size,
+            ).unwrap();
+            ptr = ptr.offset(tcx.data_layout.pointer_size, &tcx).unwrap();
+        }
+        let allocation = tcx.intern_const_alloc(allocation);
+        tcx.alloc_map.lock().set_id_memory(alloc_id, allocation);
+        ConstValue::ByRef(alloc_id, allocation, Size::ZERO)
     }
 
     #[inline]
-    pub fn new_dyn_trait(val: Scalar, vtable: Pointer) -> Self {
-        ConstValue::ScalarPair(val, Scalar::Ptr(vtable))
+    pub fn new_dyn_trait(val: Scalar, vtable: Pointer, tcx: TyCtxt<'_, '_, 'tcx>) -> Self {
+        Self::new_ptr_sized_seq(&[val, Scalar::Ptr(vtable)], tcx)
     }
 }
 
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
@@ -15,7 +15,7 @@
 use hir::def::CtorKind;
 use hir::def_id::DefId;
 use hir::{self, HirId, InlineAsm};
-use mir::interpret::{ConstValue, EvalErrorKind, Scalar};
+use mir::interpret::{ConstValue, EvalErrorKind, Scalar, Pointer, EvalResult};
 use mir::visit::MirVisitable;
 use rustc_apfloat::ieee::{Double, Single};
 use rustc_apfloat::Float;
@@ -39,7 +39,7 @@ use syntax_pos::{Span, DUMMY_SP};
 use ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
 use ty::subst::{CanonicalUserSubsts, Subst, Substs};
 use ty::{self, AdtDef, CanonicalTy, ClosureSubsts, GeneratorSubsts, Region, Ty, TyCtxt};
-use ty::layout::VariantIdx;
+use ty::layout::{VariantIdx, Size};
 use util::ppaux;
 
 pub use mir::interpret::AssertMessage;
@@ -2623,24 +2623,29 @@ pub fn fmt_const_val(f: &mut impl Write, const_val: &ty::Const<'_>) -> fmt::Resu
         return write!(f, "{}", item_path_str(did));
     }
     // print string literals
-    if let ConstValue::ScalarPair(ptr, len) = value {
-        if let Scalar::Ptr(ptr) = ptr {
-            if let Scalar::Bits { bits: len, .. } = len {
-                if let Ref(_, &ty::TyS { sty: Str, .. }, _) = ty.sty {
-                    return ty::tls::with(|tcx| {
-                        let alloc = tcx.alloc_map.lock().get(ptr.alloc_id);
-                        if let Some(interpret::AllocType::Memory(alloc)) = alloc {
-                            assert_eq!(len as usize as u128, len);
-                            let slice =
-                                &alloc.bytes[(ptr.offset.bytes() as usize)..][..(len as usize)];
-                            let s = ::std::str::from_utf8(slice).expect("non utf8 str from miri");
-                            write!(f, "{:?}", s)
-                        } else {
-                            write!(f, "pointer to erroneous constant {:?}, {:?}", ptr, len)
-                        }
-                    });
+    if let ConstValue::ByRef(alloc_id, alloc, offset) = value {
+        if let Ref(_, &ty::TyS { sty: Str, .. }, _) = ty.sty {
+            return ty::tls::with(|tcx| {
+                let mut dummy = || -> EvalResult<'_, _> {
+                    let ptr = Pointer::new(alloc_id, offset);
+                    let slice_ptr = alloc.read_ptr(&tcx, ptr)?;
+                    let ptr = ptr.offset(tcx.data_layout.pointer_size, &tcx)?;
+                    let len = alloc.read_usize(&tcx, ptr)?;
+                    let alloc = tcx.alloc_map.lock().get(slice_ptr.alloc_id);
+                    if let Some(interpret::AllocType::Memory(alloc)) = alloc {
+                        let slice = alloc.get_bytes(&tcx, slice_ptr, Size::from_bytes(len))?;
+                        let s = ::std::str::from_utf8(slice)
+                            .map_err(|err| EvalErrorKind::ValidationFailure(err.to_string()))?;
+                        Ok(write!(f, "{:?}", s))
+                    } else {
+                        Ok(write!(f, "broken str slice: {:?}", alloc))
+                    }
+                };
+                match dummy() {
+                    Ok(res) => res,
+                    Err(err) => write!(f, "broken str constant: {:?}", err),
                 }
-            }
+            });
         }
     }
     // just raw dump everything else
diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs
@@ -1032,7 +1032,6 @@ impl<'tcx> TypeFoldable<'tcx> for ConstValue<'tcx> {
     fn super_fold_with<'gcx: 'tcx, F: TypeFolder<'gcx, 'tcx>>(&self, folder: &mut F) -> Self {
         match *self {
             ConstValue::Scalar(v) => ConstValue::Scalar(v),
-            ConstValue::ScalarPair(a, b) => ConstValue::ScalarPair(a, b),
             ConstValue::ByRef(id, alloc, offset) => ConstValue::ByRef(id, alloc, offset),
             ConstValue::Unevaluated(def_id, substs) => {
                 ConstValue::Unevaluated(def_id, substs.fold_with(folder))
@@ -1043,7 +1042,6 @@ impl<'tcx> TypeFoldable<'tcx> for ConstValue<'tcx> {
     fn super_visit_with<V: TypeVisitor<'tcx>>(&self, visitor: &mut V) -> bool {
         match *self {
             ConstValue::Scalar(_) |
-            ConstValue::ScalarPair(_, _) |
             ConstValue::ByRef(_, _, _) => false,
             ConstValue::Unevaluated(_, substs) => substs.visit_with(visitor),
         }
diff --git a/src/librustc_codegen_ssa/mir/operand.rs b/src/librustc_codegen_ssa/mir/operand.rs
@@ -99,23 +99,6 @@ impl<'a, 'tcx: 'a, V: CodegenObject> OperandRef<'tcx, V> {
                 );
                 OperandValue::Immediate(llval)
             },
-            ConstValue::ScalarPair(a, b) => {
-                let (a_scalar, b_scalar) = match layout.abi {
-                    layout::Abi::ScalarPair(ref a, ref b) => (a, b),
-                    _ => bug!("from_const: invalid ScalarPair layout: {:#?}", layout)
-                };
-                let a_llval = bx.cx().scalar_to_backend(
-                    a,
-                    a_scalar,
-                    bx.cx().scalar_pair_element_backend_type(layout, 0, true),
-                );
-                let b_llval = bx.cx().scalar_to_backend(
-                    b,
-                    b_scalar,
-                    bx.cx().scalar_pair_element_backend_type(layout, 1, true),
-                );
-                OperandValue::Pair(a_llval, b_llval)
-            },
             ConstValue::ByRef(_, alloc, offset) => {
                 return Ok(bx.load_operand(bx.cx().from_const_alloc(layout, alloc, offset)));
             },
diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs
@@ -21,7 +21,7 @@ use rustc::hir::def::Def;
 use rustc::mir::interpret::{ConstEvalErr, ErrorHandled};
 use rustc::mir;
 use rustc::ty::{self, TyCtxt, Instance, query::TyCtxtAt};
-use rustc::ty::layout::{self, LayoutOf, TyLayout, VariantIdx};
+use rustc::ty::layout::{self, LayoutOf, TyLayout, VariantIdx, Size};
 use rustc::ty::subst::Subst;
 use rustc::traits::Reveal;
 use rustc_data_structures::indexed_vec::IndexVec;
@@ -141,8 +141,18 @@ pub fn op_to_const<'tcx>(
         },
         Ok(Immediate::Scalar(x)) =>
             ConstValue::Scalar(x.not_undef()?),
-        Ok(Immediate::ScalarPair(a, b)) =>
-            ConstValue::ScalarPair(a.not_undef()?, b.not_undef()?),
+        Ok(Immediate::ScalarPair(a, b)) => {
+            // create an allocation just for the fat pointer
+            let mut allocation = Allocation::undef(op.layout.size, op.layout.align.abi, Default::default());
+            let alloc_id = ecx.tcx.alloc_map.lock().reserve();
+            let ptr = Pointer::from(alloc_id);
+            // write the fat pointer into the allocation
+            allocation.write_scalar_pair(&ecx.tcx.tcx, ptr, a, b, op.layout)?;
+            // intern everything
+            let allocation = ecx.tcx.intern_const_alloc(allocation);
+            ecx.tcx.alloc_map.lock().set_id_memory(alloc_id, allocation);
+            ConstValue::ByRef(alloc_id, allocation, Size::ZERO)
+        },
     };
     Ok(ty::Const::from_const_value(ecx.tcx.tcx, val, op.layout.ty))
 }
diff --git a/src/librustc_mir/hair/cx/mod.rs b/src/librustc_mir/hair/cx/mod.rs
@@ -166,7 +166,7 @@ impl<'a, 'gcx, 'tcx> Cx<'a, 'gcx, 'tcx> {
             LitKind::Str(ref s, _) => {
                 let s = s.as_str();
                 let id = self.tcx.allocate_bytes(s.as_bytes());
-                ConstValue::new_slice(Scalar::Ptr(id.into()), s.len() as u64, &self.tcx)
+                ConstValue::new_slice(Scalar::Ptr(id.into()), s.len() as u64, self.tcx)
             },
             LitKind::ByteStr(ref data) => {
                 let id = self.tcx.allocate_bytes(data);
diff --git a/src/librustc_mir/hair/pattern/_match.rs b/src/librustc_mir/hair/pattern/_match.rs
@@ -179,10 +179,10 @@ use super::{PatternFoldable, PatternFolder, compare_const_vals};
 use rustc::hir::def_id::DefId;
 use rustc::hir::RangeEnd;
 use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
-use rustc::ty::layout::{Integer, IntegerExt, VariantIdx};
+use rustc::ty::layout::{Integer, IntegerExt, VariantIdx, Size};
 
 use rustc::mir::Field;
-use rustc::mir::interpret::ConstValue;
+use rustc::mir::interpret::{ConstValue, Scalar, Pointer};
 use rustc::util::common::ErrorReported;
 
 use syntax::attr::{SignedInt, UnsignedInt};
@@ -1387,21 +1387,27 @@ fn slice_pat_covered_by_constructor<'tcx>(
 ) -> Result<bool, ErrorReported> {
     let data: &[u8] = match *ctor {
         ConstantValue(const_val) => {
-            let val = match const_val.val {
-                ConstValue::Unevaluated(..) |
-                ConstValue::ByRef(..) => bug!("unexpected ConstValue: {:?}", const_val),
-                ConstValue::Scalar(val) | ConstValue::ScalarPair(val, _) => val,
+            let (ptr, len) = match const_val.val {
+                ConstValue::ByRef(alloc_id, alloc, offset) => {
+                    let ptr = Pointer::new(alloc_id, offset);
+                    let slice_ptr = alloc.read_ptr(&tcx, ptr).unwrap();
+                    let len_ptr = ptr.offset(tcx.data_layout.pointer_size, &tcx).unwrap();
+                    let len = alloc.read_usize(&tcx, len_ptr).unwrap();
+                    (slice_ptr, len)
+                }
+                ConstValue::Scalar(Scalar::Ptr(ptr)) => {
+                    match const_val.ty.builtin_deref(true).unwrap().ty.sty {
+                        ty::TyKind::Array(e, n) => {
+                            assert!(e == tcx.types.u8);
+                            (ptr, n.unwrap_usize(tcx))
+                        },
+                        _ => bug!("bad ConstValue type: {:#?}", const_val),
+                    }
+                },
+                _ => bug!("unexpected ConstValue: {:#?}", const_val),
             };
-            if let Ok(ptr) = val.to_ptr() {
-                let is_array_ptr = const_val.ty
-                    .builtin_deref(true)
-                    .and_then(|t| t.ty.builtin_index())
-                    .map_or(false, |t| t == tcx.types.u8);
-                assert!(is_array_ptr);
-                tcx.alloc_map.lock().unwrap_memory(ptr.alloc_id).bytes.as_ref()
-            } else {
-                bug!("unexpected non-ptr ConstantValue")
-            }
+            let len = Size::from_bytes(len);
+            tcx.alloc_map.lock().unwrap_memory(ptr.alloc_id).get_bytes(&tcx, ptr, len).unwrap()
         }
         _ => bug!()
     };
diff --git a/src/librustc_mir/hair/pattern/mod.rs b/src/librustc_mir/hair/pattern/mod.rs
diff --git a/src/librustc_mir/interpret/operand.rs b/src/librustc_mir/interpret/operand.rs
diff --git a/src/librustc_mir/interpret/place.rs b/src/librustc_mir/interpret/place.rs
diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,6 @@ impl_stable_hash_for!(`
`313`	`313`	`impl<'tcx> for enum mir::interpret::ConstValue<'tcx> [ mir::interpret::ConstValue ] {`
`314`	`314`	`Unevaluated(def_id, substs),`
`315`	`315`	`Scalar(val),`
`316`		`- ScalarPair(a, b),`
`317`	`316`	`ByRef(id, alloc, offset),`
`318`	`317`	`}`
`319`	`318`	`);`