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 machine the chance to tag all allocations #61278

Merged
merged 7 commits into from Jun 2, 2019

Conversation

Projects
None yet
4 participants
@RalfJung
Copy link
Member

commented May 28, 2019

r? @oli-obk

The Miri side of this is at #61278.

@bors

This comment has been minimized.

Copy link
Contributor

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 RalfJung:miri-tag-allocations branch from 1cc0095 to c604350 May 29, 2019

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented May 29, 2019

I addressed all comments.

@oli-obk
Copy link
Contributor

left a comment

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

Show resolved Hide resolved src/librustc_mir/interpret/operand.rs
Show resolved Hide resolved src/librustc_mir/interpret/operand.rs Outdated
@oli-obk

This comment has been minimized.

Copy link
Contributor

commented May 29, 2019

r=me with them resolved

@oli-obk

This comment has been minimized.

Copy link
Contributor

commented May 30, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented May 30, 2019

📌 Commit 5a8f6db has been approved by oli-obk

This was referenced May 30, 2019

Centril added a commit to Centril/rust that referenced this pull request May 30, 2019

Rollup merge of rust-lang#61278 - RalfJung:miri-tag-allocations, r=ol…
…i-obk

Miri: give machine the chance to tag all allocations

r? @oli-obk

The Miri side of this is at rust-lang#61278.

bors added a commit that referenced this pull request May 31, 2019

Auto merge of #61379 - Centril:rollup-hx912ts, r=Centril
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

bors added a commit that referenced this pull request May 31, 2019

Auto merge of #61379 - Centril:rollup-hx912ts, r=Centril
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 referenced this pull request May 31, 2019

Merged

update miri #61295

@bors

This comment has been minimized.

Copy link
Contributor

commented May 31, 2019

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

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Jun 2, 2019

Uh, wrong command.

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 2, 2019

📌 Commit 823ffaa has been approved by oli-obk

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Jun 2, 2019

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

@bors p=1

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 2, 2019

⌛️ Testing commit 823ffaa with merge 3f0d4a5...

bors added a commit that referenced this pull request Jun 2, 2019

Auto merge of #61278 - RalfJung:miri-tag-allocations, r=oli-obk
Miri: give machine the chance to tag all allocations

r? @oli-obk

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

This comment has been minimized.

Copy link
Contributor

commented Jun 2, 2019

💔 Test failed - checks-travis

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

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)

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Jun 2, 2019

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 2, 2019

⌛️ Testing commit 823ffaa with merge 4d3bf01...

bors added a commit that referenced this pull request Jun 2, 2019

Auto merge of #61278 - RalfJung:miri-tag-allocations, r=oli-obk
Miri: give machine the chance to tag all allocations

r? @oli-obk

The Miri side of this is at #61278.
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

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

This comment has been minimized.

Copy link
Contributor

commented Jun 2, 2019

💔 Test failed - checks-travis

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Jun 2, 2019

Another macOS timeout? Cc @rust-lang/infra

@bors retry

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 2, 2019

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

bors added a commit that referenced this pull request Jun 2, 2019

Auto merge of #61278 - RalfJung:miri-tag-allocations, r=oli-obk
Miri: give machine the chance to tag all allocations

r? @oli-obk

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

This comment has been minimized.

Copy link
Contributor

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 label Jun 2, 2019

@bors bors merged commit 823ffaa into rust-lang:master Jun 2, 2019

2 checks passed

Travis CI - Pull Request Build Passed
Details
homu Test successful
Details

@RalfJung RalfJung deleted the RalfJung:miri-tag-allocations branch Jun 10, 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.