mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #2293 - RalfJung:env, r=RalfJung

Browse Source 
make -Zmiri-env-forward take precedence over -Zmiri-env-exclude

Lets people experiment with the `TERM` env var.
This commit is contained in:
bors 2022-06-30 15:15:20 +00:00
commit 38effb37da
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -285,8 +285,9 @@ environment variable. We first document the most relevant and most commonly used
harness](https://github.com/rust-lang/miri/issues/1702). This has no effect unless
`-Zmiri-disable-isolation` is also set.
* `-Zmiri-env-forward=<var>` forwards the `var` environment variable to the interpreted program. Can
be used multiple times to forward several variables. This has no effect if
`-Zmiri-disable-isolation` is set.
be used multiple times to forward several variables. This takes precedence over
`-Zmiri-env-exclude`: if a variable is both forwarded and exluced, it *will* get forwarded. This
means in particular `-Zmiri-env-forward=TERM` overwrites the default exclusion of `TERM`.
* `-Zmiri-ignore-leaks` disables the memory leak checker, and also allows some
remaining threads to exist when the main thread exits.
* `-Zmiri-permissive-provenance` disables the warning for integer-to-pointer casts and

8
src/shims/env.rs
View File

@ -50,10 +50,10 @@ pub(crate) fn init<'mir>(
// Skip the loop entirely if we don't want to forward anything.
if ecx.machine.communicate() || !config.forwarded_env_vars.is_empty() {
for (name, value) in env::vars_os() {
let forward = match ecx.machine.communicate() {
true => !excluded_env_vars.iter().any(|v| **v == name),
false => config.forwarded_env_vars.iter().any(|v| **v == name),
};
// Always forward what is in `forwarded_env_vars`; that list can take precedence over excluded_env_vars.
let forward = config.forwarded_env_vars.iter().any(|v| **v == name)
|| (ecx.machine.communicate()
&& !excluded_env_vars.iter().any(|v| **v == name));
if forward {
let var_ptr = match target_os {
target if target_os_is_unix(target) =>