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

update miri #52338

Merged
merged 3 commits into from
Jul 17, 2018
Merged

update miri #52338

merged 3 commits into from
Jul 17, 2018

Conversation

RalfJung
Copy link
Member

No description provided.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 13, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:0aedaf82:start=1531476244385073539,finish=1531476244392210173,duration=7136634
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0b85eb38
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0118ce60
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@RalfJung
Copy link
Member Author

RalfJung commented Jul 13, 2018

$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory

and

[01:25:45] 1 command(s) did not execute successfully:
[01:25:45] 
[01:25:45]   - "/checkout/obj/build/bootstrap/debug/rustdoc" "--test" "/checkout/src/doc/nomicon/src/vec-final.md" "--test-args" ""

That's not introduced by this PR, is it?

@oli-obk
Copy link
Contributor

oli-obk commented Jul 13, 2018

cc @kennytm maybe related to all submodules successfully passing CI? 😆

@oli-obk
Copy link
Contributor

oli-obk commented Jul 13, 2018

@bors r+ p=1

let's see if bors likes this better

@bors
Copy link
Contributor

bors commented Jul 13, 2018

📌 Commit 817c5783b03a6ad17bfa608f3c5c7a800bbd2ddd has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2018
@bors
Copy link
Contributor

bors commented Jul 13, 2018

⌛ Testing commit 817c5783b03a6ad17bfa608f3c5c7a800bbd2ddd with merge 51d30eef406bc0c6cfd4a175ae23b280927a2c25...

@bors
Copy link
Contributor

bors commented Jul 13, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 13, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Jul 13, 2018

A bunch of tests are failing on windows:

error[E0080]: constant evaluation error
  --> C:\projects\rust\src\libstd\sys\windows\stack_overflow.rs:45:8
   |
45 |     if c::AddVectoredExceptionHandler(0, vectored_handler).is_null() {
   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no mir for `std::sys::windows::c::::AddVectoredExceptionHandler`
   |
note: inside call to `std::sys::windows::stack_overflow::init`
  --> C:\projects\rust\src\libstd\rt.rs:44:9
   |
44 |         sys::stack_overflow::init();
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: inside call to `std::rt::lang_start_internal`
  --> C:\projects\rust\src\libstd\rt.rs:74:5
   |
74 |     lang_start_internal(&move || main().report(), argc, argv)
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:0209b6f8:start=1531489291273393734,finish=1531489291280369674,duration=6975940
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:00146ae4
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:07c93662
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2018
@RalfJung
Copy link
Member Author

Needs a fix on Windows, which is being developed at rust-lang/miri#401

@kennytm kennytm added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 13, 2018
@RalfJung
Copy link
Member Author

Blocked by #52400

@kennytm
Copy link
Member

kennytm commented Jul 16, 2018

#52400 has been merged.

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jul 16, 2018
@RalfJung
Copy link
Member Author

Yep, now this is blocked on rust-lang/miri#401 :)

@kennytm kennytm added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 16, 2018
@kennytm
Copy link
Member

kennytm commented Jul 16, 2018

@bors r-

#52433 (comment) — miri is broken by #52264.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 16, 2018
@RalfJung
Copy link
Member Author

All right, miri should be fixed (again). Let's hope nobody else breaks it this time. ;)

@oli-obk
Copy link
Contributor

oli-obk commented Jul 17, 2018

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jul 17, 2018

📌 Commit 358b88ca1e8fd72b82aef528032db2e7e06fee99 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 17, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Jul 17, 2018

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout miri (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self miri --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 17, 2018
@RalfJung
Copy link
Member Author

Rebased.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jul 17, 2018

@RalfJung: 🔑 Insufficient privileges: Not in reviewers

@oli-obk
Copy link
Contributor

oli-obk commented Jul 17, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Jul 17, 2018

📌 Commit 9e10b12 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 17, 2018
@rust-highfive

This comment has been minimized.

kennytm added a commit to kennytm/rust that referenced this pull request Jul 17, 2018
@nikomatsakis
Copy link
Contributor

cc @alexcrichton -- any idea why @RalfJung doesn't have review privileges, given rust-lang/rust-central-station#72?

bors added a commit that referenced this pull request Jul 17, 2018
Rollup of 9 pull requests

Successful merges:

 - #52286 (Deny bare trait objects in src/librustc_errors)
 - #52306 (Reduce the number of clone()s needed in obligation_forest)
 - #52338 (update miri)
 - #52385 (Pass edition flags to compiler from rustdoc as expected)
 - #52392 (AsRef doc wording tweaks)
 - #52430 (update nomicon)
 - #52434 (Enable incremental independent of stage)
 - #52435 (Calculate the exact capacity for 2 HashMaps)
 - #52446 (Block beta if clippy breaks.)

r? @ghost
@bors bors merged commit 9e10b12 into rust-lang:master Jul 17, 2018
@bors
Copy link
Contributor

bors commented Jul 17, 2018

⌛ Testing commit 9e10b12 with merge 4bff385...

@RalfJung RalfJung deleted the miri branch July 23, 2018 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants