Skip to content

Miri: give machine the chance to tag all allocations#61278

Merged
bors merged 7 commits intorust-lang:masterfrom
RalfJung:miri-tag-allocations
Jun 2, 2019
Merged

Miri: give machine the chance to tag all allocations#61278
bors merged 7 commits intorust-lang:masterfrom
RalfJung:miri-tag-allocations

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented May 28, 2019 •
edited
Loading

r? @oli-obk

The Miri side of this is at #61278.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 28, 2019
@RalfJung RalfJung mentioned this pull request May 28, 2019
Merged
@bors
Copy link
Collaborator

bors commented May 28, 2019

☔ The latest upstream changes (presumably #61274) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung RalfJung force-pushed the miri-tag-allocations branch from 1cc0095 to c604350 Compare May 29, 2019 09:06
oli-obk
oli-obk reviewed May 29, 2019
View reviewed changes
oli-obk
oli-obk reviewed May 29, 2019
View reviewed changes
oli-obk
oli-obk reviewed May 29, 2019
View reviewed changes
@RalfJung
Copy link
Member Author

RalfJung commented May 29, 2019

I addressed all comments.

oli-obk
oli-obk reviewed May 29, 2019
View reviewed changes
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, sorry, github tricked me again. I didn't send these comments

@oli-obk
Copy link
Contributor

oli-obk commented May 29, 2019

r=me with them resolved

oli-obk
oli-obk reviewed May 29, 2019
View reviewed changes
RalfJung
RalfJung commented May 29, 2019
View reviewed changes
@RalfJung RalfJung mentioned this pull request May 30, 2019
Closed
@oli-obk
Copy link
Contributor

oli-obk commented May 30, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented May 30, 2019

📌 Commit 5a8f6db 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 May 30, 2019
This was referenced May 30, 2019
Closed
Closed
Centril added a commit to Centril/rust that referenced this pull request May 30, 2019
@Centril
Rollup merge of rust-lang#61278 - RalfJung:miri-tag-allocations, r=ol…
8996ebb 
…i-obk

Miri: give machine the chance to tag all allocations

r? @oli-obk

The Miri side of this is at rust-lang#61278.
@Centril Centril mentioned this pull request May 30, 2019
Closed
bors added a commit that referenced this pull request May 31, 2019
@bors
Auto merge of #61379 - Centril:rollup-hx912ts, r=Centril
b3475de 
Rollup of 10 pull requests

Successful merges:

 - #60897 (error: remove StringError from Debug output)
 - #61278 (Miri: give machine the chance to tag all allocations)
 - #61304 (Speed up Azure CI installing Windows dependencies)
 - #61342 (Set ellipsis_inclusive_range_patterns lint to warn)
 - #61344 (Add regression test for const generics ICE)
 - #61359 (Fix links in Deref documentation)
 - #61363 (Stabilize iter_nth_back feature)
 - #61369 (Fixed lifetime misspelling)
 - #61372 (Migrate some books to mdbook version 0.2)
 - #61374 (Explicitly suggest 'type_ascription' feature)

Failed merges:

r? @ghost
@RalfJung RalfJung mentioned this pull request May 31, 2019
Merged
@bors
Copy link
Collaborator

bors commented May 31, 2019

☔ The latest upstream changes (presumably #60166) made this pull request unmergeable. Please resolve the merge conflicts.

@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 May 31, 2019
@RalfJung RalfJung mentioned this pull request May 31, 2019
Closed
@RalfJung RalfJung force-pushed the miri-tag-allocations branch from 5a8f6db to 14265a3 Compare May 31, 2019 15:56
@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 Jun 2, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Jun 2, 2019

Uh, wrong command.

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Jun 2, 2019

📌 Commit 823ffaa has been approved by oli-obk

@RalfJung
Copy link
Member Author

RalfJung commented Jun 2, 2019

On the critical path to get Miri working again, and has been bitrotting a lot.

@bors p=1

@bors
Copy link
Collaborator

bors commented Jun 2, 2019

⌛ Testing commit 823ffaa with merge 3f0d4a52fc4b4bdd69986aa8853537f6b54936f1...

@bors
Copy link
Collaborator

bors commented Jun 2, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Contributor

rust-highfive commented Jun 2, 2019

The job dist-x86_64-apple 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. 
wry
xmoto
zxing-cpp
==> Downloading https://homebrew.bintray.com/bottles/xz-5.2.4.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/e7/e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880?__gda__=exp=1559467337~hmac=f3c161d1a005811a23c48513a56c87ef2d45c1f20c1e7930ce3fb1f655413f53&response-content-disposition=attachment%3Bfilename%3D%22xz-5.2.4.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1_b8vZpCio9wbIQUzhj2WoevBaPAISHD1as6yh_zb7LmearqnE0PElU1xVDI7x8sxSECthIjkoBE08TuHmw23vSHv4Z9_OCLkpsINjjAukMH2t4zc8xPb_2kfxxSgItR4q3VQGAMXhs-w&response-X-Checksum-Sha1=32dc0b28e61f32b40c20e2993418aa8cb6e746d5&response-X-Checksum-Sha2=e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880
🍺  /usr/local/Cellar/xz/5.2.4: 92 files, 1MB
==> `brew cleanup` has not been run in 30 days, running now...
Removing: /Users/travis/Library/Caches/Homebrew/boost-1.66.0.high_sierra.bottle.tar.gz... (84.6MB)
Removing: /Users/travis/Library/Caches/Homebrew/carthage-0.28.0.high_sierra.bottle.tar.gz... (8.3MB)
---
Pruned 0 symbolic links and 5 directories from /usr/local
==> Installing dependencies for swig: pcre
==> Installing swig dependency: pcre
==> Downloading https://homebrew.bintray.com/bottles/pcre-8.43.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/03/0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861?__gda__=exp=1559467348~hmac=453639954a78ef2321e73151d4221dbb6f9858cf1266f30f80642bf1609a135a&response-content-disposition=attachment%3Bfilename%3D%22pcre-8.43.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX19Do3ooXfaVZfZKHNJ_RYQnzbCem7LJZYzXvKQg-4eSIjpjgnuAfU0WG21l5h6ajc2vgnrMg2HcKS2FLkGKZRq7AYGnTnEMGBdkTn3k0vIXOyKZ3_GvZlmoT489LwJqH5V2QwU-uc2O5w&response-X-Checksum-Sha1=c67d4b99bb245f0ea56b34118dd6325b06a7250c&response-X-Checksum-Sha2=0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861
🍺  /usr/local/Cellar/pcre/8.43: 204 files, 5.5MB
==> Installing swig
==> Downloading https://homebrew.bintray.com/bottles/swig-4.0.0.high_sierra.bottle.tar.gz
==> Downloading https://homebrew.bintray.com/bottles/swig-4.0.0.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/ae/aed79cb436b3a0ac5812c4085e3121ffd62866397b8c7eaa06815ed8ec1e22b7?__gda__=exp=1559467350~hmac=f8c493dc31662746e8fc8af2fc90e5b8574b7e357f3b75a49c23f0ad71e56b1f&response-content-disposition=attachment%3Bfilename%3D%22swig-4.0.0.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1-x7KXnBonY3RiJeeel09LIYZBsTo5Y8DEJsYEERDtilVJVz5FP8Q95HMYfm2crS0bmBBtVOIn0zobtnzFmXs-q0vDb8BIYjshPiD0noJIVfDl-EBWXdHVbAJZvo9YzK7CiMG70tHOuMw&response-X-Checksum-Sha1=a9c428aee4337d91061a69c02d7ae508b627d03f&response-X-Checksum-Sha2=aed79cb436b3a0ac5812c4085e3121ffd62866397b8c7eaa06815ed8ec1e22b7
🍺  /usr/local/Cellar/swig/4.0.0: 722 files, 5.4MB
travis_time:end:16db50e0:start=1559466284821620000,finish=1559466667835190000,duration=383013570000
travis_fold:end:install
travis_fold:start:before_script.1
---
[00:01:41]    Compiling serde_derive v1.0.81
[00:02:07]    Compiling serde_json v1.0.33
[00:02:07]    Compiling toml v0.4.10
[00:02:12]    Compiling bootstrap v0.0.0 (/Users/travis/build/rust-lang/rust/src/bootstrap)
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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 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 Jun 2, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Jun 2, 2019 via email

@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 Jun 2, 2019
@bors
Copy link
Collaborator

bors commented Jun 2, 2019

⌛ Testing commit 823ffaa with merge 4d3bf01370046437c378db1fff556c879402841f...

@rust-highfive
Copy link
Contributor

rust-highfive commented Jun 2, 2019

The job dist-x86_64-apple 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. 
wry
xmoto
zxing-cpp
==> Downloading https://homebrew.bintray.com/bottles/xz-5.2.4.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/e7/e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880?__gda__=exp=1559474681~hmac=edbce145bc54b93048c710e087b189e4eaba8ea77fe53a71cfd2f37156fc3ea4&response-content-disposition=attachment%3Bfilename%3D%22xz-5.2.4.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX18-LfkfzyCwsiBJZtE7LrKipPebflPRHYuHsWq7cl5qUerJYkYfVFiufzV2DsFrvsP2P5rYzzK-kFbCErX-JHz81mYj3BtoGvfvQHdjOO1c8DGXIuJHJdmEHQ4lHmpttuldqnoGKkSvjQ&response-X-Checksum-Sha1=32dc0b28e61f32b40c20e2993418aa8cb6e746d5&response-X-Checksum-Sha2=e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880
🍺  /usr/local/Cellar/xz/5.2.4: 92 files, 1MB
==> `brew cleanup` has not been run in 30 days, running now...
Removing: /Users/travis/Library/Caches/Homebrew/boost-1.66.0.high_sierra.bottle.tar.gz... (84.6MB)
Removing: /Users/travis/Library/Caches/Homebrew/carthage-0.28.0.high_sierra.bottle.tar.gz... (8.3MB)
---
Pruned 0 symbolic links and 5 directories from /usr/local
==> Installing dependencies for swig: pcre
==> Installing swig dependency: pcre
==> Downloading https://homebrew.bintray.com/bottles/pcre-8.43.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/03/0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861?__gda__=exp=1559474692~hmac=97a8f809c41a0b7b4e90af0913cbc938872b9d51ab25717aaa06fe9613e9fe1b&response-content-disposition=attachment%3Bfilename%3D%22pcre-8.43.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1-GF9bLPAuxHprLG3_ODwtfXLNlWVE_tQ43dCHzyvRe4J0RmAuBrvSo-gkmMDYx3PmsuhjHJ00EWf1BRLxohejkmHkmA3rr8BYg38ApmcVQtoLySmJx_rcdqF-xovm79Y28oSz_SqWlpg&response-X-Checksum-Sha1=c67d4b99bb245f0ea56b34118dd6325b06a7250c&response-X-Checksum-Sha2=0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861
🍺  /usr/local/Cellar/pcre/8.43: 204 files, 5.5MB
==> Installing swig
==> Downloading https://homebrew.bintray.com/bottles/swig-4.0.0.high_sierra.bottle.tar.gz
==> Downloading https://homebrew.bintray.com/bottles/swig-4.0.0.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/ae/aed79cb436b3a0ac5812c4085e3121ffd62866397b8c7eaa06815ed8ec1e22b7?__gda__=exp=1559474695~hmac=562ccb5780910a18b5af23a71117636122b9a715cbf4b0fd72c1327061f34614&response-content-disposition=attachment%3Bfilename%3D%22swig-4.0.0.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1_L-Uk06D5_3kQtBV_1Pa6XRhSpo0_D96jCY9qDMCMdzlOKDhZzuQGHYh7lxxwX_6PGpb81B67n5a51EaeDQqqdNhQbFY-jIZKPPYcUzcWAx47JGU-wvAof4KFB0tCO05J8agd8PALaGg&response-X-Checksum-Sha1=a9c428aee4337d91061a69c02d7ae508b627d03f&response-X-Checksum-Sha2=aed79cb436b3a0ac5812c4085e3121ffd62866397b8c7eaa06815ed8ec1e22b7
🍺  /usr/local/Cellar/swig/4.0.0: 722 files, 5.4MB
travis_time:end:03c57396:start=1559473600847753000,finish=1559474014364965000,duration=413517212000
travis_fold:end:install
travis_fold:start:before_script.1
---
[00:01:45]    Compiling serde_derive v1.0.81
[00:02:12]    Compiling toml v0.4.10
[00:02:12]    Compiling serde_json v1.0.33
[00:02:17]    Compiling bootstrap v0.0.0 (/Users/travis/build/rust-lang/rust/src/bootstrap)
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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
Collaborator

bors commented Jun 2, 2019

💔 Test failed - checks-travis

@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 Jun 2, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Jun 2, 2019

Another macOS timeout? Cc @rust-lang/infra

@bors retry

@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 Jun 2, 2019
@bors
Copy link
Collaborator

bors commented Jun 2, 2019

⌛ Testing commit 823ffaa with merge 627486a...

bors added a commit that referenced this pull request Jun 2, 2019
@bors
Auto merge of #61278 - RalfJung:miri-tag-allocations, r=oli-obk
627486a 
Miri: give machine the chance to tag all allocations

r? @oli-obk

The Miri side of this is at #61278.
@bors
Copy link
Collaborator

bors commented Jun 2, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 627486a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 2, 2019
@bors bors merged commit 823ffaa into rust-lang:master Jun 2, 2019
@bors bors mentioned this pull request Jun 2, 2019
Merged
@RalfJung RalfJung deleted the miri-tag-allocations branch June 10, 2019 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@RalfJung @bors @oli-obk @rust-highfive