cleanup dtors test

Author: joboet

tests/pass/tls/macos_tlv_atexit.rs

@@ -10,11 +10,14 @@ fn register<F>(f: F)
 where
     F: FnOnce() + 'static,
 {
-    unsafe extern "C" fn run<F>(data: *mut u8)
+    // This will receive the pointer passed into `_tlv_atexit`, which is the
+    // original `f` but boxed up.
+    unsafe extern "C" fn run<F>(ptr: *mut u8)
     where
         F: FnOnce() + 'static,
     {
-        unsafe { (*Box::from_raw(data as *mut F))() }
+        let f = unsafe { Box::from_raw(ptr as *mut F) };
+        f()
     }
 
     unsafe {
@@ -34,7 +37,7 @@ fn main() {
     println!("exiting main");
     register(|| println!("dtor 5"));
     register(|| {
-        println!("registering dtor in dtor 4");
-        register(|| println!("dtor 3"));
+        println!("registering dtor in dtor 3");
+        register(|| println!("dtor 4"));
     });
 }

tests/pass/tls/macos_tlv_atexit.stdout

@@ -2,6 +2,6 @@ exiting thread
 dtor 1
 dtor 2
 exiting main
-registering dtor in dtor 4
-dtor 3
+registering dtor in dtor 3
+dtor 4
 dtor 5