Merge branch 'master' into closures

Author: RalfJung

.travis.yml

@@ -10,6 +10,7 @@ before_script:
 - cargo install xargo
 - export RUST_SYSROOT=$HOME/rust
 script:
+- set -e
 - |
   # get ourselves a MIR-ful libstd
   xargo/build.sh

src/librustc_mir/interpret/eval_context.rs

@@ -2275,6 +2275,12 @@ fn resolve_associated_item<'a, 'tcx>(
                 substs: rcvr_substs,
             }
         }
+        ::rustc::traits::VtableBuiltin(..) if Some(trait_id) == tcx.lang_items.clone_trait() => {
+            ty::Instance {
+                def: ty::InstanceDef::CloneShim(def_id, trait_ref.self_ty()),
+                substs: rcvr_substs
+            }
+        }
         _ => bug!("static call to invalid vtable: {:?}", vtbl),
     }
 }

src/librustc_mir/interpret/terminator/mod.rs

@@ -256,6 +256,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
                 self.dump_local(ret);
                 Ok(())
             }
+            // FIXME: figure out why we can't just go through the shim
             ty::InstanceDef::ClosureOnceShim { .. } => {
                 let mut args = Vec::new();
                 for arg in arg_operands {
@@ -297,6 +298,9 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
                 }
                 Ok(())
             }
+            ty::InstanceDef::FnPtrShim(..) |
+            ty::InstanceDef::DropGlue(..) |
+            ty::InstanceDef::CloneShim(..) |
             ty::InstanceDef::Item(_) => {
                 let mut args = Vec::new();
                 for arg in arg_operands {
@@ -394,47 +398,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
                 }
                 Ok(())
             }
-            ty::InstanceDef::DropGlue(..) => {
-                assert_eq!(arg_operands.len(), 1);
-                assert_eq!(sig.abi, Abi::Rust);
-                let val = self.eval_operand(&arg_operands[0])?;
-                let ty = self.operand_ty(&arg_operands[0]);
-                let (_, target) = destination.expect("diverging drop glue");
-                self.goto_block(target);
-                // FIXME: deduplicate these matches
-                let pointee_type = match ty.sty {
-                    ty::TyRawPtr(ref tam) |
-                    ty::TyRef(_, ref tam) => tam.ty,
-                    ty::TyAdt(def, _) if def.is_box() => ty.boxed_ty(),
-                    _ => bug!("can only deref pointer types"),
-                };
-                self.drop(val, instance, pointee_type, span)
-            }
-            ty::InstanceDef::FnPtrShim(..) => {
-                trace!("ABI: {}", sig.abi);
-                let mut args = Vec::new();
-                for arg in arg_operands {
-                    let arg_val = self.eval_operand(arg)?;
-                    let arg_ty = self.operand_ty(arg);
-                    args.push((arg_val, arg_ty));
-                }
-                if M::eval_fn_call(self, instance, destination, arg_operands, span, sig)? {
-                    return Ok(());
-                }
-                let arg_locals = self.frame().mir.args_iter();
-                match sig.abi {
-                    Abi::Rust => {
-                        args.remove(0);
-                    }
-                    Abi::RustCall => {}
-                    _ => unimplemented!(),
-                };
-                for (arg_local, (arg_val, arg_ty)) in arg_locals.zip(args) {
-                    let dest = self.eval_lvalue(&mir::Lvalue::Local(arg_local))?;
-                    self.write_value(arg_val, dest, arg_ty)?;
-                }
-                Ok(())
-            }
+            // cannot use the shim here, because that will only result in infinite recursion
             ty::InstanceDef::Virtual(_, idx) => {
                 let ptr_size = self.memory.pointer_size();
                 let (_, vtable) = self.eval_operand(&arg_operands[0])?.into_ptr_vtable_pair(

tests/compile-fail/validation_buggy_as_mut_slice.rs

@@ -0,0 +1,20 @@
+#![allow(unused_variables)]
+
+// For some reason, the error location is different when using fullmir
+// error-pattern: in conflict with lock WriteLock
+
+mod safe {
+    use std::slice::from_raw_parts_mut;
+
+    pub fn as_mut_slice<T>(self_: &Vec<T>) -> &mut [T] {
+        unsafe {
+            from_raw_parts_mut(self_.as_ptr() as *mut T, self_.len())
+        }
+    }
+}
+
+fn main() {
+    let v = vec![0,1,2];
+    let v1_ = safe::as_mut_slice(&v);
+    let v2_ = safe::as_mut_slice(&v);
+}

tests/run-pass/validation_lifetime_resolution.rs

@@ -0,0 +1,30 @@
+trait Id {
+    type Out;
+
+    fn id(self) -> Self::Out;
+}
+
+impl<'a> Id for &'a mut i32 {
+    type Out = &'a mut i32;
+
+    fn id(self) -> Self { self }
+}
+
+impl<'a> Id for &'a mut u32 {
+    type Out = &'a mut u32;
+
+    fn id(self) -> Self { self }
+}
+
+fn foo<T>(mut x: T) where for<'a> &'a mut T: Id
+{
+    let x = &mut x;
+    let _y = x.id();
+    // Inspecting the trace should show that _y has a type involving a local lifetime, when it gets validated.
+    // Unfortunately, there doesn't seem to be a way to actually have a test fail if it does not have the right
+    // type.  Currently, this is NOT working correctly; see <https://github.com/solson/miri/issues/298>.
+}
+
+fn main() {
+    foo(3)
+}

xargo/build.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
 cd "$(dirname "$0")"
+sed 's/gcc = "0\.3\.50"/gcc = "=0\.3\.50"/' -i ~/.rustup/toolchains/*/lib/rustlib/src/rust/src/libstd/Cargo.toml
 RUSTFLAGS='-Zalways-encode-mir -Zmir-emit-validate=1' xargo build