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

Fix two OOM issues related to `ConstProp` #66394

Merged
merged 4 commits into from Nov 17, 2019

Conversation

@wesleywiser
Copy link
Member

wesleywiser commented Nov 14, 2019

Fixes #66342
Fixes #66397

r? @oli-obk

@wesleywiser wesleywiser changed the title Fix spurious CI filures due to OOM Fix two OOM issues related to `ConstProp` Nov 14, 2019
@oli-obk

This comment has been minimized.

Copy link
Contributor

oli-obk commented Nov 14, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 14, 2019

📌 Commit 0c52c3e has been approved by oli-obk

@pnkfelix pnkfelix added the T-compiler label Nov 14, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Nov 14, 2019
Fix two OOM issues related to `ConstProp`

Fixes rust-lang#66342
Fixes rust-lang#66397

r? @oli-obk
bors added a commit that referenced this pull request Nov 14, 2019
Rollup of 8 pull requests

Successful merges:

 - #65557 (rename Error::iter_chain() and remove Error::iter_sources())
 - #66197 (Push `ast::{ItemKind, ImplItemKind}::OpaqueTy` hack down into lowering)
 - #66306 (Remove cannot mutate statics in initializer of another static error)
 - #66338 (Update mdbook.)
 - #66394 (Fix two OOM issues related to `ConstProp`)
 - #66396 (Make a test compatible across python versions.)
 - #66398 (Remove some stack frames from `.async` calls)
 - #66410 (miri: helper methods for max values of machine's usize/isize)

Failed merges:

r? @ghost
@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Nov 14, 2019

@bors r-

The two new test cases cause const evaluation error on 32-bit targets in #66417 (comment).

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Nov 15, 2019

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 15, 2019

📌 Commit 3bd5226 has been approved by oli-obk

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 15, 2019
Fix two OOM issues related to `ConstProp`

Fixes rust-lang#66342
Fixes rust-lang#66397

r? @oli-obk
bors added a commit that referenced this pull request Nov 15, 2019
Rollup of 12 pull requests

Successful merges:

 - #65557 (rename Error::iter_chain() and remove Error::iter_sources())
 - #66013 (Avoid hashing the key twice in `get_query()`.)
 - #66306 (Remove cannot mutate statics in initializer of another static error)
 - #66338 (Update mdbook.)
 - #66388 (Do not ICE on recovery from unmet associated type bound obligation)
 - #66390 (Fix ICE when trying to suggest `Type<>` instead of `Type()`)
 - #66391 (Do not ICE in `if` without `else` in `async fn`)
 - #66394 (Fix two OOM issues related to `ConstProp`)
 - #66398 (Remove some stack frames from `.async` calls)
 - #66410 (miri: helper methods for max values of machine's usize/isize)
 - #66418 (Link to tracking issue in HIR const-check error code description)
 - #66419 (Don't warn labels beginning with `_` on unused_labels lint)

Failed merges:

r? @ghost
@JohnTitor

This comment has been minimized.

Copy link
Member

JohnTitor commented Nov 15, 2019

Seems failed in #66436 (comment)
@bors r-

@wesleywiser wesleywiser force-pushed the wesleywiser:fix_oom branch from 3bd5226 to fd2595d Nov 15, 2019
@wesleywiser

This comment has been minimized.

Copy link
Member Author

wesleywiser commented Nov 15, 2019

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 15, 2019

📌 Commit fd2595d has been approved by oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 16, 2019

📌 Commit 6252e4b has been approved by oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 16, 2019

⌛️ Testing commit 6252e4b with merge 85dc18f...

bors added a commit that referenced this pull request Nov 16, 2019
Fix two OOM issues related to `ConstProp`

Fixes #66342
Fixes #66397

r? @oli-obk
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 16, 2019

💔 Test failed - checks-azure

@rust-highfive

This comment was marked as outdated.

Copy link
Collaborator

rust-highfive commented Nov 16, 2019

The job test-various of your PR failed (pretty log, 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.
2019-11-16T07:25:51.9815436Z failures:
2019-11-16T07:25:51.9838742Z 
2019-11-16T07:25:51.9839155Z ---- [ui] ui/consts/issue-66397.rs stdout ----
2019-11-16T07:25:51.9839220Z 
2019-11-16T07:25:51.9839434Z error: test compilation failed although it shouldn't!
2019-11-16T07:25:51.9839516Z status: signal: 6
2019-11-16T07:25:51.9841082Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/issue-66397.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-musl" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/issue-66397" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-musl/native/rust-test-helpers" "-Clinker=x86_64-linux-musl-gcc" "--emit" "mir" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/issue-66397/auxiliary" "-A" "unused"
2019-11-16T07:25:51.9841716Z ------------------------------------------
2019-11-16T07:25:51.9841771Z 
2019-11-16T07:25:51.9842044Z ------------------------------------------
2019-11-16T07:25:51.9842120Z stderr:
2019-11-16T07:25:51.9842120Z stderr:
2019-11-16T07:25:51.9842369Z ------------------------------------------
2019-11-16T07:25:51.9843064Z rustc: /checkout/src/llvm-project/llvm/lib/IR/Type.cpp:610: static llvm::VectorType* llvm::VectorType::get(llvm::Type*, llvm::ElementCount): Assertion `EC.Min > 0 && "#Elements of a VectorType must be greater than 0"' failed.
2019-11-16T07:25:51.9843393Z ------------------------------------------
2019-11-16T07:25:51.9843434Z 
2019-11-16T07:25:51.9843463Z 
2019-11-16T07:25:51.9843491Z 
---
2019-11-16T07:25:51.9869907Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-11-16T07:25:51.9870198Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-11-16T07:25:51.9882032Z 
2019-11-16T07:25:51.9882129Z 
2019-11-16T07:25:51.9883942Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-musl/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-musl" "--mode" "ui" "--target" "x86_64-unknown-linux-musl" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--nodejs" "/node-v9.2.0-linux-x64/bin/node" "--linker" "x86_64-linux-musl-gcc" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-musl/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "9.0.0-rust-1.41.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-11-16T07:25:51.9884736Z 
2019-11-16T07:25:51.9884786Z 
2019-11-16T07:25:51.9890787Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target x86_64-unknown-linux-musl
2019-11-16T07:25:51.9890909Z Build completed unsuccessfully in 0:16:18
2019-11-16T07:25:51.9890909Z Build completed unsuccessfully in 0:16:18
2019-11-16T07:25:51.9946130Z == clock drift check ==
2019-11-16T07:25:51.9965431Z   local time: Sat Nov 16 07:25:51 UTC 2019
2019-11-16T07:25:52.2184244Z   network time: Sat, 16 Nov 2019 07:25:52 GMT
2019-11-16T07:25:52.2184809Z == end clock drift check ==
2019-11-16T07:25:53.6780528Z 
2019-11-16T07:25:53.6871415Z ##[error]Bash exited with code '1'.
2019-11-16T07:25:53.6931455Z ##[section]Starting: Checkout
2019-11-16T07:25:53.6933478Z ==============================================================================
2019-11-16T07:25:53.6933558Z Task         : Get sources
2019-11-16T07:25:53.6933648Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

@wesleywiser wesleywiser force-pushed the wesleywiser:fix_oom branch from 6252e4b to 2dea8af Nov 16, 2019
@wesleywiser

This comment was marked as resolved.

Copy link
Member Author

wesleywiser commented Nov 16, 2019

Gonna give the tests one last shot before I remove them just so we can land the fix.

@bors=oli-obk

@JohnTitor

This comment has been minimized.

Copy link
Member

JohnTitor commented Nov 16, 2019

@wesleywiser I noticed it's the wrong command.

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 16, 2019

📌 Commit 2dea8af has been approved by oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 16, 2019

⌛️ Testing commit 2dea8af with merge 2cdc289...

bors added a commit that referenced this pull request Nov 16, 2019
Fix two OOM issues related to `ConstProp`

Fixes #66342
Fixes #66397

r? @oli-obk
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Nov 17, 2019

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 2cdc289 to master...

@bors bors added the merged-by-bors label Nov 17, 2019
@bors bors merged commit 2dea8af into rust-lang:master Nov 17, 2019
5 checks passed
5 checks passed
homu Test successful
Details
pr Build #20191116.33 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
@pnkfelix

This comment has been minimized.

Copy link
Member

pnkfelix commented Nov 21, 2019

beta-accepted (last week, sorry for delay!)

bors added a commit that referenced this pull request Dec 6, 2019
[beta] backports

This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.

 * Handle non_exhaustive in borrow checking #66722
 * Do not ICE on trait aliases with missing obligations #66392
 * Do not ICE in `if` without `else` in `async fn` #66391
 * Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
 * Do not ICE on recovery from unmet associated type bound obligation #66388
 * find_deprecation: deprecation attr may be ill-formed meta. #66381
 * parser: don't use `unreachable!()` in `fn unexpected`. #66361
 * Undo an assert causing an ICE until we fix the underlying problem #66250
 * Do not ICE with a precision flag in formatting str and no format arguments #66093
 * Fix two OOM issues related to `ConstProp` #66394
bors added a commit that referenced this pull request Dec 6, 2019
[beta] backports

This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.

 * Handle non_exhaustive in borrow checking #66722
 * Do not ICE on trait aliases with missing obligations #66392
 * Do not ICE in `if` without `else` in `async fn` #66391
 * Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
 * Do not ICE on recovery from unmet associated type bound obligation #66388
 * find_deprecation: deprecation attr may be ill-formed meta. #66381
 * parser: don't use `unreachable!()` in `fn unexpected`. #66361
 * Undo an assert causing an ICE until we fix the underlying problem #66250
 * Do not ICE with a precision flag in formatting str and no format arguments #66093
 * Fix two OOM issues related to `ConstProp` #66394
bors added a commit that referenced this pull request Dec 6, 2019
[beta] backports

This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.

 * Handle non_exhaustive in borrow checking #66722
 * Do not ICE on trait aliases with missing obligations #66392
 * Do not ICE in `if` without `else` in `async fn` #66391
 * Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
 * Do not ICE on recovery from unmet associated type bound obligation #66388
 * find_deprecation: deprecation attr may be ill-formed meta. #66381
 * parser: don't use `unreachable!()` in `fn unexpected`. #66361
 * Undo an assert causing an ICE until we fix the underlying problem #66250
 * Do not ICE with a precision flag in formatting str and no format arguments #66093
 * Fix two OOM issues related to `ConstProp` #66394
bors added a commit that referenced this pull request Dec 6, 2019
[beta] backports

This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.

 * Handle non_exhaustive in borrow checking #66722
 * Do not ICE on trait aliases with missing obligations #66392
 * Do not ICE in `if` without `else` in `async fn` #66391
 * Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
 * Do not ICE on recovery from unmet associated type bound obligation #66388
 * find_deprecation: deprecation attr may be ill-formed meta. #66381
 * parser: don't use `unreachable!()` in `fn unexpected`. #66361
 * Undo an assert causing an ICE until we fix the underlying problem #66250
 * Do not ICE with a precision flag in formatting str and no format arguments #66093
 * Fix two OOM issues related to `ConstProp` #66394
bors added a commit that referenced this pull request Dec 7, 2019
[beta] backports

This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.

 * Handle non_exhaustive in borrow checking #66722
 * Do not ICE on trait aliases with missing obligations #66392
 * Do not ICE in `if` without `else` in `async fn` #66391
 * Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
 * Do not ICE on recovery from unmet associated type bound obligation #66388
 * find_deprecation: deprecation attr may be ill-formed meta. #66381
 * parser: don't use `unreachable!()` in `fn unexpected`. #66361
 * Undo an assert causing an ICE until we fix the underlying problem #66250
 * Do not ICE with a precision flag in formatting str and no format arguments #66093
 * Fix two OOM issues related to `ConstProp` #66394
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.