Skip to content

Commit b25a719

Browse files
borsbors
committed
Auto merge of #3558 - RalfJung:unsupported, r=RalfJung
update 'unsupported' message Instead of "the interpreter", just say Miri. Also be a more more clear about what is expected to be supported and what not (Cc #2325).
2 parents a8f3116 + 23be20b commit b25a719

22 files changed

+45
-22
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ interpreter will explicitly tell you when it finds something unsupported:
141141
error: unsupported operation: can't call foreign function: bind
142142
...
143143
= help: this is likely not a bug in the program; it indicates that the program \
144-
performed an operation that the interpreter does not support
144+
performed an operation that Miri does not support
145145
```
146146

147147
### Cross-interpretation: running for different targets

‎src/diagnostics.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,10 @@ pub fn report_error<'tcx, 'mir>(
320320
#[rustfmt::skip]
321321
let helps = match e.kind() {
322322
Unsupported(_) =>
323-
vec![(None, format!("this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support"))],
323+
vec![
324+
(None, format!("this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support")),
325+
(None, format!("if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there")),
326+
],
324327
UndefinedBehavior(AlignmentCheckFailed { .. })
325328
if ecx.machine.check_alignment == AlignmentCheck::Symbolic
326329
=>

‎tests/extern-so/fail/function_not_in_so.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: can't call foreign function `foo` on $OS
44
LL | foo();
55
| ^^^^^ can't call foreign function `foo` on $OS
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/function_not_in_so.rs:LL:CC
1011

‎tests/fail-dep/shims/fs/close_stdout.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: cannot close stdout
44
LL | libc::close(1);
55
| ^^^^^^^^^^^^^^ cannot close stdout
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/close_stdout.rs:LL:CC
1011

‎tests/fail-dep/shims/fs/read_from_stdout.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: cannot read from stdout
44
LL | libc::read(1, bytes.as_mut_ptr() as *mut libc::c_void, 512);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot read from stdout
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/read_from_stdout.rs:LL:CC
1011

‎tests/fail-dep/shims/fs/write_to_stdin.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: cannot write to stdin
44
LL | libc::write(0, bytes.as_ptr() as *const libc::c_void, 5);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot write to stdin
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/write_to_stdin.rs:LL:CC
1011

‎tests/fail-dep/tokio/sleep.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ LL | | timeout,
99
LL | | ))
1010
| |__________^ returning ready events from epoll_wait is not yet implemented
1111
|
12-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
12+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
13+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
1314

1415
error: aborting due to 1 previous error
1516

‎tests/fail-dep/unsupported_incomplete_function.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: can't call foreign function `signal` on $OS
44
LL | libc::signal(libc::SIGPIPE, libc::SIG_IGN);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't call foreign function `signal` on $OS
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/unsupported_incomplete_function.rs:LL:CC
1011

‎tests/fail/alloc/no_global_allocator.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: can't call foreign function `__rust_alloc` on $OS
44
LL | __rust_alloc(1, 1);
55
| ^^^^^^^^^^^^^^^^^^ can't call foreign function `__rust_alloc` on $OS
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `start` at $DIR/no_global_allocator.rs:LL:CC
1011

‎tests/fail/extern-type-field-offset.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: `extern type` does not have a known offset
44
LL | let _field = &x.a;
55
| ^^^^ `extern type` does not have a known offset
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/extern-type-field-offset.rs:LL:CC
1011

‎tests/fail/extern_static.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: extern static `FOO` is not supported by Miri
44
LL | let _val = unsafe { std::ptr::addr_of!(FOO) };
55
| ^^^ extern static `FOO` is not supported by Miri
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/extern_static.rs:LL:CC
1011

‎tests/fail/extern_static_in_const.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: extern static `E` is not supported by Miri
44
LL | let _val = X;
55
| ^ extern static `E` is not supported by Miri
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/extern_static_in_const.rs:LL:CC
1011

‎tests/fail/extern_static_wrong_size.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: extern static `environ` has been declared as `exte
44
LL | let _val = unsafe { environ };
55
| ^^^^^^^ extern static `environ` has been declared as `extern_static_wrong_size::environ` with a size of 1 bytes and alignment of 1 bytes, but Miri emulates it via an extern static shim with a size of N bytes and alignment of N bytes
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/extern_static_wrong_size.rs:LL:CC
1011

‎tests/fail/issue-miri-3288-ice-symbolic-alignment-extern-static.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: extern static `_dispatch_queue_attr_concurrent` is
44
LL | let _val = *DISPATCH_QUEUE_CONCURRENT;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^ extern static `_dispatch_queue_attr_concurrent` is not supported by Miri
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/issue-miri-3288-ice-symbolic-alignment-extern-static.rs:LL:CC
1011

‎tests/fail/shims/backtrace/bad-backtrace-flags.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: unknown `miri_get_backtrace` flags 2
44
LL | miri_get_backtrace(2, std::ptr::null_mut());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unknown `miri_get_backtrace` flags 2
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/bad-backtrace-flags.rs:LL:CC
1011

‎tests/fail/shims/backtrace/bad-backtrace-resolve-flags.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: unknown `miri_resolve_frame` flags 2
44
LL | miri_resolve_frame(buf[0], 2);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unknown `miri_resolve_frame` flags 2
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/bad-backtrace-resolve-flags.rs:LL:CC
1011

‎tests/fail/shims/backtrace/bad-backtrace-resolve-names-flags.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: unknown `miri_resolve_frame_names` flags 2
44
LL | ... miri_resolve_frame_names(buf[0], 2, std::ptr::null_mut(), std::ptr::null_mut());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unknown `miri_resolve_frame_names` flags 2
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/bad-backtrace-resolve-names-flags.rs:LL:CC
1011

‎tests/fail/shims/backtrace/bad-backtrace-size-flags.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: unknown `miri_backtrace_size` flags 2
44
LL | miri_backtrace_size(2);
55
| ^^^^^^^^^^^^^^^^^^^^^^ unknown `miri_backtrace_size` flags 2
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/bad-backtrace-size-flags.rs:LL:CC
1011

‎tests/fail/unaligned_pointers/promise_alignment.call_unaligned_ptr.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: `miri_promise_symbolic_alignment`: pointer is not
44
LL | unsafe { utils::miri_promise_symbolic_alignment(align8.add(1).cast(), 8) };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `miri_promise_symbolic_alignment`: pointer is not actually aligned
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/promise_alignment.rs:LL:CC
1011

‎tests/fail/unaligned_pointers/promise_alignment_zero.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: `miri_promise_symbolic_alignment`: alignment must
44
LL | unsafe { utils::miri_promise_symbolic_alignment(buffer.as_ptr().cast(), 0) };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `miri_promise_symbolic_alignment`: alignment must be a power of 2, got 0
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/promise_alignment_zero.rs:LL:CC
1011

‎tests/fail/unsized-local.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: unsized locals are not supported
44
LL | let x = *(Box::new(A) as Box<dyn Foo>);
55
| ^ unsized locals are not supported
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/unsized-local.rs:LL:CC
1011

‎tests/fail/unsupported_foreign_function.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ error: unsupported operation: can't call foreign function `foo` on $OS
44
LL | foo();
55
| ^^^^^ can't call foreign function `foo` on $OS
66
|
7-
= help: this is likely not a bug in the program; it indicates that the program performed an operation that the interpreter does not support
7+
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
8+
= help: if this is a basic API commonly used on this target, please report an issue; but note that Miri does not aim to support every FFI function out there
89
= note: BACKTRACE:
910
= note: inside `main` at $DIR/unsupported_foreign_function.rs:LL:CC
1011

0 commit comments

Comments
 (0)