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.

Sign up for GitHub

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

Jump to bottom

[beta] next #74219

Merged
merged 7 commits into from
Jul 13, 2020
Merged

[beta] next #74219

merged 7 commits into from
Jul 13, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jul 10, 2020 •
edited
Loading

Backports of:

ollie27 and others added 6 commits July 10, 2020 10:49
@ollie27 @Mark-Simulacrum
rustdoc: Fix doc aliases with crate filtering
cbde61c 
Fix a crash when searching for an alias contained in the currently selected filter crate.

Also remove alias search results for crates that should be filtered out.

The test suite needed to be fixed to actually take into account the crate filtering and check that there are no results when none are expected.
@ollie27 @Mark-Simulacrum
rustdoc: Rename invalid_codeblock_attribute lint to be plural
13da8ab
@petrochenkov @Mark-Simulacrum
rustc_lexer: Simplify shebang parsing once more
5ceb946
@estebank @Mark-Simulacrum
Perform obligation deduplication to avoid buggy ExistentialMismatch
04c208b 
Fix rust-lang#59326.
@mati865 @Mark-Simulacrum
Reoder order in which MinGW libs are linked
ffebd8a
@alexcrichton @Mark-Simulacrum
Change how compiler-builtins gets many CGUs
25ac6de 
This commit intends to fix an accidental regression from rust-lang#70846. The
goal of rust-lang#70846 was to build compiler-builtins with a maximal number of
CGUs to ensure that each module in the source corresponds to an object
file. This high degree of control for compiler-builtins is desirable to
ensure that there's at most one exported symbol per CGU, ideally
enabling compiler-builtins to not conflict with the system libgcc as
often.

In rust-lang#70846, however, only part of the compiler understands that
compiler-builtins is built with many CGUs. The rest of the compiler
thinks it's building with `sess.codegen_units()`. Notably the
calculation of `sess.lto()` consults `sess.codegen_units()`, which when
there's only one CGU it disables ThinLTO. This means that
compiler-builtins is built without ThinLTO, which is quite harmful to
performance! This is the root of the cause from rust-lang#73135 where intrinsics
were found to not be inlining trivial functions.

The fix applied in this commit is to remove the special-casing of
compiler-builtins in the compiler. Instead the build system is now
responsible for special-casing compiler-builtins. It doesn't know
exactly how many CGUs will be needed but it passes a large number that
is assumed to be much greater than the number of source-level modules
needed. After reading the various locations in the compiler source, this
seemed like the best solution rather than adding more and more special
casing in the compiler for compiler-builtins.

Closes rust-lang#73135
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 10, 2020
Closed
@Mark-Simulacrum
Copy link
Member Author

@bors rollup=never p=20 r+

Should be the last round of beta backports.

@bors
Copy link
Contributor

bors commented Jul 10, 2020

📌 Commit 25ac6de has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 10, 2020
@bors
Copy link
Contributor

bors commented Jul 10, 2020

⌛ Testing commit 25ac6de with merge a9389ffb2d27cb2627cd3e63eae537ded2947b52...

@Manishearth
Copy link
Member

@bors rollup=never

@Manishearth
Copy link
Member 

2020-07-10T17:33:01.0331851Z Set({"src/libpanic_abort"}) not skipped for "bootstrap::test::Crate" -- not in ["src/libcore", "src/liballoc", "src/libproc_macro", "src/libstd", "src/libterm", "src/libtest"]
2020-07-10T17:33:01.0346894Z thread 'main' panicked at 'nodejs not configured', src/bootstrap/test.rs:1762:17
2020-07-10T17:33:01.0347403Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-07-10T17:33:01.0362643Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target wasm32-unknown-emscripten --exclude src/libcore --exclude src/liballoc --exclude src/libproc_macro --exclude src/libstd --exclude src/libterm --exclude src/libtest

@bors yield

this failed housr ago

@Manishearth
Copy link
Member

@bors r-

@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 10, 2020
@Manishearth
Copy link
Member

@bors r- retry yield

@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 10, 2020
@pietroalbini @Mark-Simulacrum
ci: fix wasm32 broken due to a NodeJS version bump
9ce2d97 
Emscripten's SDK recently bumped the version of NodeJS they shipped, but
our Dockerfile for the wasm32 builder hardcoded the version number. This
will cause consistent CI failures once the currently cached image is
rebuilt (either due to a change or due to the cache expiring).

This commit fixes the problem by finding the latest version of NodeJS in
the Emscripten SDK and symlinking it to a "latest" directory, which is
then added to the PATH.
@Mark-Simulacrum
Copy link
Member Author

@bors rollup=never p=20 r+

Included "Fix wasm32 being broken due to a NodeJS version bump #73885".

@bors
Copy link
Contributor

bors commented Jul 10, 2020

📌 Commit 9ce2d97 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jul 10, 2020

⌛ Testing commit 9ce2d97 with merge 639a08d7fede58ed6f8b8c602992cb335c651ea1...

@bors
Copy link
Contributor

bors commented Jul 10, 2020

💔 Test failed - checks-azure

@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 10, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors retry network?

2020-07-10T23:03:52.6150499Z error: failed to get `cc` as a dependency of package `bootstrap v0.0.0 (D:\a\1\s\src\bootstrap)`
2020-07-10T23:03:52.8597051Z 
2020-07-10T23:03:52.8605158Z Caused by:
2020-07-10T23:03:52.8606450Z   failed to fetch `https://github.com/rust-lang/crates.io-index`
2020-07-10T23:03:52.8607548Z 
2020-07-10T23:03:52.8609580Z Caused by:
2020-07-10T23:03:52.8610738Z   error inflating zlib stream; class=Zlib (5)

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 10, 2020
@bors
Copy link
Contributor

bors commented Jul 13, 2020

💥 Test timed out

@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, 2020
@Manishearth
Copy link
Member

@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 Jul 13, 2020
@bors
Copy link
Contributor

bors commented Jul 13, 2020

⌛ Testing commit 9ce2d97 with merge 10604669030dd07625a4b505f45f1543530a3212...

@bors
Copy link
Contributor

bors commented Jul 13, 2020

💥 Test timed out

@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, 2020
@eddyb
Copy link
Member

eddyb commented Jul 13, 2020

@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 Jul 13, 2020
@bors
Copy link
Contributor

bors commented Jul 13, 2020

⌛ Testing commit 9ce2d97 with merge 60c3e1f4400a92aeca75600b672f946fca4b3f7f...

@mati865
Copy link
Contributor

mati865 commented Jul 13, 2020

We stopped hearing from agent Azure Pipelines 2. Verify the agent machine is running and has a healthy network connection. Anything that terminates an agent process, starves it for CPU, or blocks its network access can cause this error. For more information, see: https://go.microsoft.com/fwlink/?linkid=846610

😕

@bors
Copy link
Contributor

bors commented Jul 13, 2020

💔 Test failed - checks-azure

@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, 2020
@eddyb
Copy link
Member

eddyb commented Jul 13, 2020

@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 Jul 13, 2020
@bors
Copy link
Contributor

bors commented Jul 13, 2020

⌛ Testing commit 9ce2d97 with merge e99e642...

@bors
Copy link
Contributor

bors commented Jul 13, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing e99e642 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 13, 2020
@bors bors merged commit e99e642 into rust-lang:beta Jul 13, 2020
@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch July 13, 2020 15:56
@ehuss ehuss mentioned this pull request Jul 23, 2020
Closed
@cuviper cuviper added this to the 1.45 milestone May 2, 2024
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
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
1.45
Development

Successfully merging this pull request may close these issues.