Skip to content

bump Rust - #862

Merged
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:rustup
Jul 29, 2019
Merged

bump Rust#862
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:rustup

Conversation

@RalfJung

@RalfJung RalfJung commented Jul 28, 2019

Copy link
Copy Markdown
Member

My hypothesis is that this will replicate https://travis-ci.com/rust-lang/miri/jobs/220221687 (so we know which commit range caused it).

@JohnTitor JohnTitor mentioned this pull request Jul 28, 2019
Closed
@RalfJung RalfJung mentioned this pull request Jul 28, 2019
Merged
@RalfJung

RalfJung commented Jul 28, 2019

Copy link
Copy Markdown
Member Author

The regression landed with rust-lang/rust#63043; the likely cause is rust-lang/rust#62982.

@RalfJung

RalfJung commented Jul 28, 2019

Copy link
Copy Markdown
Member Author

Dang, the log is too long for Travis... but then how can we debug this? :/

@RalfJung

RalfJung commented Jul 28, 2019

Copy link
Copy Markdown
Member Author

My best guess so far is that it has something to do with the find_foreign_static machine hook. That one emulates the existence of __cxa_thread_atexit_impl and maybe using the type there is not the right call?

@RalfJung

RalfJung commented Jul 28, 2019

Copy link
Copy Markdown
Member Author

Relevant part of the log:

 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::eval_context: CONTINUING(17) getrandom::macos::fetch_getentropy
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: // bb1
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: StorageDead(_6)
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: _4 = move _5 as *const i8 (Misc)
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: _3 = _4
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: StorageDead(_5)
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: _2 = const libc::unix::dlsym(const libc::unix::bsd::RTLD_DEFAULT, move _3) -> bb2
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::eval_context: ENTERING(0) libc::unix::bsd::RTLD_DEFAULT
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: _0 = const -2isize as *mut std::ffi::c_void (Misc)
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: return
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::eval_context: LEAVING(0) libc::unix::bsd::RTLD_DEFAULT
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: // bb2
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: StorageDead(_3)
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: StorageDead(_4)
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: StorageLive(_7)
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: _7 = _2
 INFO 2019-07-28T10:50:36Z: rustc_mir::interpret::step: _0 = const std::mem::transmute::<*mut std::ffi::c_void, std::option::Option<unsafe extern "C" fn(*mut u8, usize) -> i32>>(move _7) -> bb3

@RalfJung RalfJung mentioned this pull request Jul 28, 2019
Merged
@RalfJung

RalfJung commented Jul 28, 2019

Copy link
Copy Markdown
Member Author

Fix submitted at rust-lang/rust#63076

Centril added a commit to Centril/rust that referenced this pull request Jul 29, 2019
@Centril
Rollup merge of rust-lang#63076 - RalfJung:miri-fn-ptr-alloc-size, r=…
5922a19 
…oli-obk

Miri: fix determining size of an "extra function" allocation

Fixes [a bug](rust-lang/miri#862) introduced by rust-lang#62982. Best reviewed commit-by-commit.

r? @oli-obk
@RalfJung

RalfJung commented Jul 29, 2019 •
edited
Loading

Copy link
Copy Markdown
Member Author

Why... did GitHub do that?!?

@RalfJung RalfJung reopened this Jul 29, 2019
@RalfJung

RalfJung commented Jul 29, 2019

Copy link
Copy Markdown
Member Author

With the fix landed in rustc, this should work now.

@bors r+

@bors

bors commented Jul 29, 2019

Copy link
Copy Markdown
Contributor

📌 Commit 784ad69 has been approved by RalfJung

bors added a commit that referenced this pull request Jul 29, 2019
@bors
Auto merge of #862 - RalfJung:rustup, r=RalfJung
a254eaa 
bump Rust

My hypothesis is that this will replicate https://travis-ci.com/rust-lang/miri/jobs/220221687 (so we know which commit range caused it).
@bors

bors commented Jul 29, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit 784ad69 with merge a254eaa...

@RalfJung

RalfJung commented Jul 29, 2019

Copy link
Copy Markdown
Member Author

@bors r+ retry

@bors

bors commented Jul 29, 2019

Copy link
Copy Markdown
Contributor

📌 Commit 87f20fe has been approved by RalfJung

@bors

bors commented Jul 29, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit 87f20fe with merge 6560663...

bors added a commit that referenced this pull request Jul 29, 2019
@bors
Auto merge of #862 - RalfJung:rustup, r=RalfJung
6560663 
bump Rust

My hypothesis is that this will replicate https://travis-ci.com/rust-lang/miri/jobs/220221687 (so we know which commit range caused it).
@bors

bors commented Jul 29, 2019

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-travis

@bjorn3

bjorn3 commented Jul 29, 2019

Copy link
Copy Markdown
Member

Why... did GitHub do that?!?

Because of the Fixes a bug in the other PR's description. The a bug is a link to this PR, so fixes closes it. If you hover over the Fixes, it will say This pull request closes pull request #862.

@RalfJung

RalfJung commented Jul 29, 2019 via email

Copy link
Copy Markdown
Member Author

@bors

bors commented Jul 29, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit 87f20fe with merge 5aa7308...

bors added a commit that referenced this pull request Jul 29, 2019
@bors
Auto merge of #862 - RalfJung:rustup, r=RalfJung
5aa7308 
bump Rust

My hypothesis is that this will replicate https://travis-ci.com/rust-lang/miri/jobs/220221687 (so we know which commit range caused it).
@bors

bors commented Jul 29, 2019

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 5aa7308 to master...

@bors
bors merged commit 87f20fe into rust-lang:master Jul 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@RalfJung @bors @bjorn3