diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-02-13 02:52:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 02:52:56 +0100 |
| commit | 2501a10670c331ad5fb51c64c6d991a9a66f8f31 (patch) | |
| tree | 17018a05b6d38cde117a91fc860042f5b8433ccc /src/libstd | |
| parent | a50a8967552d886a91b20fcd33310ad0f28857fd (diff) | |
| parent | 1f6fb338a5f775745595d32b61c1862887c948f9 (diff) | |
| download | rust-2501a10670c331ad5fb51c64c6d991a9a66f8f31.tar.gz rust-2501a10670c331ad5fb51c64c6d991a9a66f8f31.zip | |
Rollup merge of #69068 - Goirad:make-sgx-arg-cleanup-nop, r=jethrogb,nagisa
Make the SGX arg cleanup implementation a NOP fixes #64304 cc @jethrogb
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/sgx/args.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libstd/sys/sgx/args.rs b/src/libstd/sys/sgx/args.rs index b47a48e752c..5a53695a846 100644 --- a/src/libstd/sys/sgx/args.rs +++ b/src/libstd/sys/sgx/args.rs @@ -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() }; |
