Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

miri: give non-generic functions a stable address #58324

Merged
merged 1 commit into from Feb 11, 2019

Conversation

Projects
None yet
4 participants
@RalfJung
Copy link
Member

RalfJung commented Feb 9, 2019

This makes Miri correctly handle format string parameters despite #58320.

Matching Miri PR: rust-lang/miri#626

r? @oli-obk

@oli-obk

This comment has been minimized.

Copy link
Contributor

oli-obk commented Feb 10, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 10, 2019

📌 Commit 66adf52 has been approved by oli-obk

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Feb 10, 2019

Rollup merge of rust-lang#58324 - RalfJung:fn-ptr-eq, r=oli-obk
miri: give non-generic functions a stable address

This makes Miri correctly handle format string parameters despite rust-lang#58320.

Matching Miri PR: rust-lang/miri#626

r? @oli-obk

bors added a commit that referenced this pull request Feb 10, 2019

Auto merge of #58348 - pietroalbini:rollup, r=pietroalbini
Rollup of 19 pull requests

Successful merges:

 - #57259 (Update reference of rlibc crate to compiler-builtins crate)
 - #57740 (Use `to_ne_bytes` for converting IPv4Addr to octets)
 - #57926 (Tiny expansion to docs for `core::convert`.)
 - #58129 (MaybeUninit: some docs, rename into_inner -> into_initialized, return &mut from set)
 - #58151 (Partially HirId-ify rustc)
 - #58152 (Partially HirIdify mir)
 - #58153 (Partially Hiridify typeck)
 - #58157 (Add Cargo.lock automatically adding message)
 - #58203 (rustdoc: display sugared return types for async functions)
 - #58262 (Add #[must_use] message to Fn* traits)
 - #58295 (std::sys::unix::stdio: explain why we do into_raw)
 - #58297 (Cleanup JS a bit)
 - #58300 (librustc_typeck => 2018)
 - #58313 (Use `?` in librustc macros)
 - #58322 (librustc_codegen_ssa => 2018)
 - #58324 (miri: give non-generic functions a stable address)
 - #58332 (operand-to-place copies should never be overlapping)
 - #58345 (When there are multiple filenames, print what got interpreted as filenames)
 - #58346 (rpath computation: explain why we pop())

Failed merges:

r? @ghost

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Feb 10, 2019

Rollup merge of rust-lang#58324 - RalfJung:fn-ptr-eq, r=oli-obk
miri: give non-generic functions a stable address

This makes Miri correctly handle format string parameters despite rust-lang#58320.

Matching Miri PR: rust-lang/miri#626

r? @oli-obk

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 10, 2019

Rollup merge of rust-lang#58324 - RalfJung:fn-ptr-eq, r=oli-obk
miri: give non-generic functions a stable address

This makes Miri correctly handle format string parameters despite rust-lang#58320.

Matching Miri PR: rust-lang/miri#626

r? @oli-obk

bors added a commit that referenced this pull request Feb 10, 2019

Auto merge of #58361 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 16 pull requests

Successful merges:

 - #57259 (Update reference of rlibc crate to compiler-builtins crate)
 - #57740 (Use `to_ne_bytes` for converting IPv4Addr to octets)
 - #57926 (Tiny expansion to docs for `core::convert`.)
 - #58157 (Add Cargo.lock automatically adding message)
 - #58203 (rustdoc: display sugared return types for async functions)
 - #58243 (Add trait alias support in rustdoc)
 - #58262 (Add #[must_use] message to Fn* traits)
 - #58295 (std::sys::unix::stdio: explain why we do into_raw)
 - #58297 (Cleanup JS a bit)
 - #58317 (Some writing improvement, conciseness of intro)
 - #58324 (miri: give non-generic functions a stable address)
 - #58332 (operand-to-place copies should never be overlapping)
 - #58345 (When there are multiple filenames, print what got interpreted as filenames)
 - #58346 (rpath computation: explain why we pop())
 - #58350 (Fix failing tidy (line endings on Windows))
 - #58352 (miri value visitor: use `?` in macro)

Failed merges:

r? @ghost

@bors bors merged commit 66adf52 into rust-lang:master Feb 11, 2019

@RalfJung RalfJung deleted the RalfJung:fn-ptr-eq branch Feb 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.