Add getpid shim

[rust.git] / src / shims / backtrace.rs

diff --git a/src/shims/backtrace.rs b/src/shims/backtrace.rs
index 541cec8e8474325b9247c8b8c46d2b12f840e1f4..339aa4d57e2201b4c909659bc570ceefc6e9184b 100644 (file)
--- a/src/shims/backtrace.rs
+++ b/src/shims/backtrace.rs
@@ -1,10 +1,9 @@
 use crate::*;
 use rustc_ast::ast::Mutability;
 use rustc_middle::ty::layout::LayoutOf as _;
-use rustc_middle::ty::{self, Instance, TypeAndMut};
+use rustc_middle::ty::{self, Instance};
 use rustc_span::{BytePos, Loc, Symbol};
 use rustc_target::{abi::Size, spec::abi::Abi};
-use std::convert::TryInto as _;
 
 impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
 pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
@@ -16,7 +15,7 @@ fn handle_miri_backtrace_size(
         dest: &PlaceTy<'tcx, Tag>,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
-        let &[ref flags] = this.check_shim(abi, Abi::Rust, link_name, args)?;
+        let [flags] = this.check_shim(abi, Abi::Rust, link_name, args)?;
 
         let flags = this.read_scalar(flags)?.to_u64()?;
         if flags != 0 {
@@ -64,22 +63,21 @@ fn handle_miri_get_backtrace(
                 // to reconstruct the needed frame information in `handle_miri_resolve_frame`.
                 // Note that we never actually read or write anything from/to this pointer -
                 // all of the data is represented by the pointer value itself.
-                let fn_ptr = this.memory.create_fn_alloc(FnVal::Instance(instance));
+                let fn_ptr = this.create_fn_alloc_ptr(FnVal::Instance(instance));
                 fn_ptr.wrapping_offset(Size::from_bytes(pos.0), this)
             })
             .collect();
 
         let len: u64 = ptrs.len().try_into().unwrap();
 
-        let ptr_ty = tcx.mk_ptr(TypeAndMut { ty: tcx.types.unit, mutbl: Mutability::Mut });
-
+        let ptr_ty = this.machine.layouts.mut_raw_ptr.ty;
         let array_layout = this.layout_of(tcx.mk_array(ptr_ty, len)).unwrap();
 
         match flags {
             // storage for pointers is allocated by miri
             // deallocating the slice is undefined behavior with a custom global allocator
             0 => {
-                let &[_flags] = this.check_shim(abi, Abi::Rust, link_name, args)?;
+                let [_flags] = this.check_shim(abi, Abi::Rust, link_name, args)?;
 
                 let alloc = this.allocate(array_layout, MiriMemoryKind::Rust.into())?;
 
@@ -97,7 +95,7 @@ fn handle_miri_get_backtrace(
             }
             // storage for pointers is allocated by the caller
             1 => {
-                let &[_flags, ref buf] = this.check_shim(abi, Abi::Rust, link_name, args)?;
+                let [_flags, buf] = this.check_shim(abi, Abi::Rust, link_name, args)?;
 
                 let buf_place = this.deref_operand(buf)?;
 
@@ -126,7 +124,7 @@ fn resolve_frame_pointer(
 
         let ptr = this.read_pointer(ptr)?;
         // Take apart the pointer, we need its pieces.
-        let (alloc_id, offset, ptr) = this.memory.ptr_get_alloc(ptr)?;
+        let (alloc_id, offset, _tag) = this.ptr_get_alloc_id(ptr)?;
 
         let fn_instance =
             if let Some(GlobalAlloc::Function(instance)) = this.tcx.get_global_alloc(alloc_id) {
@@ -152,7 +150,7 @@ fn handle_miri_resolve_frame(
         dest: &PlaceTy<'tcx, Tag>,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
-        let &[ref ptr, ref flags] = this.check_shim(abi, Abi::Rust, link_name, args)?;
+        let [ptr, flags] = this.check_shim(abi, Abi::Rust, link_name, args)?;
 
         let flags = this.read_scalar(flags)?.to_u64()?;
 
@@ -160,7 +158,7 @@ fn handle_miri_resolve_frame(
 
         // Reconstruct the original function pointer,
         // which we pass to user code.
-        let fn_ptr = this.memory.create_fn_alloc(FnVal::Instance(fn_instance));
+        let fn_ptr = this.create_fn_alloc_ptr(FnVal::Instance(fn_instance));
 
         let num_fields = dest.layout.fields.count();
 
@@ -235,7 +233,7 @@ fn handle_miri_resolve_frame_names(
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
 
-        let &[ref ptr, ref flags, ref name_ptr, ref filename_ptr] =
+        let [ptr, flags, name_ptr, filename_ptr] =
             this.check_shim(abi, Abi::Rust, link_name, args)?;
 
         let flags = this.read_scalar(flags)?.to_u64()?;
@@ -245,8 +243,8 @@ fn handle_miri_resolve_frame_names(
 
         let (_, _, name, filename) = this.resolve_frame_pointer(ptr)?;
 
-        this.memory.write_bytes(this.read_pointer(name_ptr)?, name.bytes())?;
-        this.memory.write_bytes(this.read_pointer(filename_ptr)?, filename.bytes())?;
+        this.write_bytes_ptr(this.read_pointer(name_ptr)?, name.bytes())?;
+        this.write_bytes_ptr(this.read_pointer(filename_ptr)?, filename.bytes())?;
 
         Ok(())
     }