Skip to content

Add -Z combine_cgu flag#75094

Merged
bors merged 1 commit intorust-lang:masterfrom
0dvictor:cgu
Sep 10, 2020
Merged

Add -Z combine_cgu flag#75094
bors merged 1 commit intorust-lang:masterfrom
0dvictor:cgu

Conversation

@0dvictor
Copy link

@0dvictor 0dvictor commented Aug 3, 2020

Introduce a compiler option to let rustc combines all regular CGUs into a single one at the end of compilation.

Part of Issue #64191

@rust-highfive
Copy link
Contributor

rust-highfive commented Aug 3, 2020

r? @oli-obk

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 3, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Aug 3, 2020

@tmandry do you want to take this one?

mati865
mati865 reviewed Aug 3, 2020
View reviewed changes
bjorn3
bjorn3 reviewed Aug 3, 2020
View reviewed changes
@0dvictor 0dvictor mentioned this pull request Aug 3, 2020
Open
@crlf0710 crlf0710 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 21, 2020
@bors
Copy link
Collaborator

bors commented Aug 30, 2020

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

oli-obk
oli-obk reviewed Sep 7, 2020
View reviewed changes
oli-obk
oli-obk reviewed Sep 7, 2020
View reviewed changes
@oli-obk
Copy link
Contributor

oli-obk commented Sep 7, 2020

needs a rebase, too

@0dvictor
Copy link
Author

0dvictor commented Sep 9, 2020

Rebased.

Add -Z combine_cgu flag
c81b43d 
Introduce a compiler option to let rustc combines all regular CGUs into
a single one at the end of compilation.

Part of Issue #64191
@oli-obk
Copy link
Contributor

oli-obk commented Sep 9, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 9, 2020

📌 Commit c81b43d 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 Sep 9, 2020
@bors
Copy link
Collaborator

bors commented Sep 9, 2020

⌛ Testing commit c81b43d with merge c419cb607cfc568c4a2026dc5b9ce00c95384340...

@bors
Copy link
Collaborator

bors commented Sep 9, 2020

💔 Test failed - checks-actions

@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 Sep 9, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Sep 9, 2020

cc @rust-lang/rustdoc looks some randomness in test output:

diff of stdout:

1	
2	running 2 tests
-	test $DIR/failed-doctest-output.rs - OtherStruct (line 21) ... FAILED
4	test $DIR/failed-doctest-output.rs - SomeStruct (line 11) ... FAILED
+	test $DIR/failed-doctest-output.rs - OtherStruct (line 21) ... FAILED
5	
6	failures:
7	

-	---- $DIR/failed-doctest-output.rs - OtherStruct (line 21) stdout ----
-	error[E0425]: cannot find value `no` in this scope
-	  --> $DIR/failed-doctest-output.rs:22:1
-	   |
-	LL | no
-	   | ^^ not found in this scope
-	
-	error: aborting due to previous error
-	
-	For more information about this error, try `rustc --explain E0425`.
-	Couldn't compile the test.
19	---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ----
20	Test executable failed (exit code 101).
21	

30	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
31	
32	
+	---- $DIR/failed-doctest-output.rs - OtherStruct (line 21) stdout ----
+	error[E0425]: cannot find value `no` in this scope
+	  --> $DIR/failed-doctest-output.rs:22:1
+	   |
+	LL | no
+	   | ^^ not found in this scope
+	
+	error: aborting due to previous error
+	
+	For more information about this error, try `rustc --explain E0425`.
+	Couldn't compile the test.
33	
34	failures:
35	    $DIR/failed-doctest-output.rs - OtherStruct (line 21)

@oli-obk
Copy link
Contributor

oli-obk commented Sep 9, 2020

Since this PRs flag is disabled by default it can't be the cause of it

@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 Sep 9, 2020
@mati865
Copy link
Member

mati865 commented Sep 9, 2020

It was #76442

@tmandry tmandry mentioned this pull request Sep 9, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 9, 2020
@bors
Auto merge of rust-lang#76540 - tmandry:rollup-5ogt8x0, r=tmandry
97eb606 
Rollup of 14 pull requests

Successful merges:

 - rust-lang#75094 (Add `-Z combine_cgu` flag)
 - rust-lang#75984 (Improve unresolved use error message)
 - rust-lang#76141 (Address review comments about config.toml from rustc-dev-guide PR)
 - rust-lang#76313 (Improved the MIR spanview output)
 - rust-lang#76430 (Add align to rustc-attrs unstable book)
 - rust-lang#76465 (Add a script to automatically update Rust/Clang versions in documentation)
 - rust-lang#76473 (Add missed spaces to GCC-WARNING.txt)
 - rust-lang#76481 (Convert repetitive target_pointer_width checks to const solution.)
 - rust-lang#76493 (Remove a stray ignore-tidy-undocumented-unsafe)
 - rust-lang#76504 (Capitalize safety comments)
 - rust-lang#76515 (SessionDiagnostic: Fix non-determinism in generated format string.)
 - rust-lang#76516 (Enable GitHub Releases synchronization)
 - rust-lang#76522 (remove redundant clones)
 - rust-lang#76523 (Remove unused PlaceContext::NonUse(NonUseContext::Coverage))

Failed merges:

r? `@ghost`
@bors bors merged commit 07dbe49 into rust-lang:master Sep 10, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 10, 2020
@0dvictor 0dvictor deleted the cgu branch October 26, 2020 10:56
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

@mati865 mati865 mati865 left review comments

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@oli-obk oli-obk

Labels

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.48.0

Development

Successfully merging this pull request may close these issues.

8 participants

@0dvictor @rust-highfive @oli-obk @bors @mati865 @bjorn3 @crlf0710 @rustbot