Skip to content

Commit

Permalink
Rollup merge of rust-lang#69068 - Goirad:make-sgx-arg-cleanup-nop, r=…
Browse files Browse the repository at this point in the history
…jethrogb,nagisa

Make the SGX arg cleanup implementation a NOP

fixes rust-lang#64304

cc @jethrogb
  • Loading branch information
Dylan-DPC authored Feb 13, 2020
2 parents a50a896 + 1f6fb33 commit 2501a10
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/libstd/sys/sgx/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8) {
}
}

pub unsafe fn cleanup() {
let args = ARGS.swap(0, Ordering::Relaxed);
if args != 0 {
drop(Box::<ArgsStore>::from_raw(args as _))
}
}
pub unsafe fn cleanup() {}

pub fn args() -> Args {
let args = unsafe { (ARGS.load(Ordering::Relaxed) as *const ArgsStore).as_ref() };
Expand Down

0 comments on commit 2501a10

Please sign in to comment.