Auto merge of #1273 - RalfJung:environ-cleanup, r=RalfJung

bors · bors · commit c89076b43c1a · 2020-03-28T13:33:57.000Z
we don't deallocate the environ global, so leave it in the machine Follow-up to #1271. I forgot to adjust this when my plans changed a bit.
diff --git a/src/shims/env.rs b/src/shims/env.rs
@@ -55,7 +55,7 @@ impl<'tcx> EnvVars<'tcx> {
             ecx.memory.deallocate(ptr, None, MiriMemoryKind::Env.into())?;
         }
         // Deallocate environ var list.
-        let environ = ecx.machine.env_vars.environ.take().unwrap();
+        let environ = ecx.machine.env_vars.environ.unwrap();
         let old_vars_ptr = ecx.read_scalar(environ.into())?.not_undef()?;
         ecx.memory.deallocate(ecx.force_ptr(old_vars_ptr)?, None, MiriMemoryKind::Env.into())?;
         Ok(())

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ impl<'tcx> EnvVars<'tcx> {`
`55`	`55`	`ecx.memory.deallocate(ptr, None, MiriMemoryKind::Env.into())?;`
`56`	`56`	`}`
`57`	`57`	`// Deallocate environ var list.`
`58`		`- let environ = ecx.machine.env_vars.environ.take().unwrap();`
	`58`	`+ let environ = ecx.machine.env_vars.environ.unwrap();`
`59`	`59`	`let old_vars_ptr = ecx.read_scalar(environ.into())?.not_undef()?;`
`60`	`60`	`ecx.memory.deallocate(ecx.force_ptr(old_vars_ptr)?, None, MiriMemoryKind::Env.into())?;`
`61`	`61`	`Ok(())`