update test

Author: beepster4096

tests/run-pass/backtrace-api.rs

@@ -1,27 +1,24 @@
 // normalize-stderr-test ".*/(rust[^/]*|checkout)/library/" -> "RUSTLIB/"
 // normalize-stderr-test "RUSTLIB/(.*):\d+:\d+ "-> "RUSTLIB/$1:LL:COL "
 // normalize-stderr-test "::<.*>" -> ""
-#![feature(allocator_api)]
 
-use std::alloc::System;
-
-#[inline(never)] fn func_a() -> Box<[*mut ()], System> { func_b::<u8>() }
-#[inline(never)] fn func_b<T>() -> Box<[*mut ()], System> { func_c() }
+#[inline(never)] fn func_a() -> *mut [*mut ()] { func_b::<u8>() }
+#[inline(never)] fn func_b<T>() -> *mut [*mut ()] { func_c() }
 
 macro_rules! invoke_func_d {
     () => { func_d() }
 }
 
-#[inline(never)] fn func_c() -> Box<[*mut ()], System> { invoke_func_d!() }
-#[inline(never)] fn func_d() -> Box<[*mut ()], System> { unsafe { miri_get_backtrace(0) } }
+#[inline(never)] fn func_c() -> *mut [*mut ()] { invoke_func_d!() }
+#[inline(never)] fn func_d() -> *mut [*mut ()] { unsafe { miri_get_backtrace(0) } }
 
 fn main() {
     let mut seen_main = false;
     let frames = func_a();
-    for frame in frames.into_iter() {
+    for frame in unsafe{ &*frames }.into_iter() {
         let miri_frame = unsafe { miri_resolve_frame(*frame, 0) };
-        let name = std::str::from_utf8(&miri_frame.name).unwrap();
-        let filename = std::str::from_utf8(&miri_frame.filename).unwrap();
+        let name = unsafe { std::str::from_utf8(&*miri_frame.name).unwrap() };
+        let filename = unsafe { std::str::from_utf8(&*miri_frame.filename).unwrap() };
 
         if name == "func_a" {
             assert_eq!(func_a as *mut (), miri_frame.fn_ptr);
@@ -36,22 +33,32 @@ fn main() {
             println!("{}", out);
             seen_main = name == "main";
         }
+
+        unsafe {
+            miri_deallocate_backtrace(miri_frame.name as *mut ());
+            miri_deallocate_backtrace(miri_frame.filename as *mut ());
+        }
+    }
+
+    unsafe {
+        miri_deallocate_backtrace(frames as *mut ());
     }
 }
 
 // This goes at the bottom of the file so that we can change it
 // without disturbing line numbers of the functions in the backtrace.
 
 extern "Rust" {
-    fn miri_get_backtrace(flags: u64) -> Box<[*mut ()], System>;
+    fn miri_get_backtrace(flags: u64) -> *mut [*mut ()];
     fn miri_resolve_frame(ptr: *mut (), flags: u64) -> MiriFrame;
+    fn miri_deallocate_backtrace(ptr: *mut ());
 }
 
 #[derive(Debug)]
 #[repr(C)]
 struct MiriFrame {
-    name: Box<[u8], System>,
-    filename: Box<[u8], System>,
+    name: *mut [u8],
+    filename: *mut [u8],
     lineno: u32,
     colno: u32,
     fn_ptr: *mut (),

tests/run-pass/backtrace-api.stderr

@@ -1,8 +1,8 @@
-$DIR/backtrace-api.rs:16:67 (func_d)
-$DIR/backtrace-api.rs:15:58 (func_c)
-$DIR/backtrace-api.rs:9:61 (func_b)
-$DIR/backtrace-api.rs:8:58 (func_a)
-$DIR/backtrace-api.rs:20:18 (main)
+$DIR/backtrace-api.rs:13:59 (func_d)
+$DIR/backtrace-api.rs:12:50 (func_c)
+$DIR/backtrace-api.rs:6:53 (func_b)
+$DIR/backtrace-api.rs:5:50 (func_a)
+$DIR/backtrace-api.rs:17:18 (main)
 RUSTLIB/core/src/ops/function.rs:LL:COL (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn()))
 RUSTLIB/std/src/sys_common/backtrace.rs:LL:COL (std::sys_common::backtrace::__rust_begin_short_backtrace)
 RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start::{closure#0})

tests/run-pass/backtrace-api.stdout

@@ -1,5 +1,5 @@
-$DIR/backtrace-api.rs:16:67 (func_d)
-$DIR/backtrace-api.rs:15:58 (func_c)
-$DIR/backtrace-api.rs:9:61 (func_b::<u8>)
-$DIR/backtrace-api.rs:8:58 (func_a)
-$DIR/backtrace-api.rs:20:18 (main)
+$DIR/backtrace-api.rs:13:59 (func_d)
+$DIR/backtrace-api.rs:12:50 (func_c)
+$DIR/backtrace-api.rs:6:53 (func_b::<u8>)
+$DIR/backtrace-api.rs:5:50 (func_a)
+$DIR/backtrace-api.rs:17:18 (main)