Rollup merge of #69068 - Goirad:make-sgx-arg-cleanup-nop, r=jethrogb,nagisa

Dylan-DPC · web-flow · commit 2501a10670c3 · 2020-02-13T02:52:56.000+01:00
Make the SGX arg cleanup implementation a NOP fixes #64304 cc @jethrogb
diff --git 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() };

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,7 @@ pub unsafe fn init(argc: isize, argv: const const u8) {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-pub unsafe fn cleanup() {`
`26`		`- let args = ARGS.swap(0, Ordering::Relaxed);`
`27`		`- if args != 0 {`
`28`		`- drop(Box::<ArgsStore>::from_raw(args as _))`
`29`		`- }`
`30`		`-}`
	`25`	`+pub unsafe fn cleanup() {}`
`31`	`26`
`32`	`27`	`pub fn args() -> Args {`
`33`	`28`	`let args = unsafe { (ARGS.load(Ordering::Relaxed) as *const ArgsStore).as_ref() };`