Skip to content

fix build --stage 2 compiler/rustc panic#108288

Merged
bors merged 1 commit intorust-lang:masterfrom
onur-ozkan:hotfix-90244
Apr 3, 2023
Merged

fix build --stage 2 compiler/rustc panic#108288
bors merged 1 commit intorust-lang:masterfrom
onur-ozkan:hotfix-90244

Conversation

@onur-ozkan
Copy link
Contributor

@onur-ozkan onur-ozkan commented Feb 20, 2023 •
edited
Loading

Skip assembling(which causes panic due to not found .librustc.stamp file) process
for stage3(since it has problems with sysroot) if full-bootstrap isn't used.

Resolves #90244

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 20, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan

This comment was marked as outdated.

Sign in to view
@onur-ozkan
Copy link
Contributor Author

onur-ozkan commented Feb 25, 2023

r? @Mark-Simulacrum

@rustbot rustbot assigned Mark-Simulacrum and unassigned jyn514 Feb 25, 2023
Mark-Simulacrum
Mark-Simulacrum reviewed Mar 4, 2023
View reviewed changes
@Mark-Simulacrum

This comment was marked as outdated.

Sign in to view
@Mark-Simulacrum Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 4, 2023
@onur-ozkan

This comment was marked as outdated.

Sign in to view
@jyn514 jyn514 mentioned this pull request Mar 18, 2023
Closed
@onur-ozkan onur-ozkan force-pushed the hotfix-90244 branch 2 times, most recently from 4c08b68 to 60291d4 Compare March 21, 2023 22:57
@onur-ozkan onur-ozkan changed the title avoid incrementing bootstrap stage for compiler assembling step fix build --stage 2 compiler/rustc panic Mar 21, 2023
@onur-ozkan
Copy link
Contributor Author

onur-ozkan commented Mar 21, 2023

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 21, 2023
@onur-ozkan
Copy link
Contributor Author

onur-ozkan commented Mar 26, 2023

This PR is a blocker for one of our(I am responsible for working on that) task(including tools to sysroot after build). cc @rust-lang/bootstrap

Just wanted to ping our team for reminding the PR so it's not forgotten and not to be left behind.

Mark-Simulacrum
Mark-Simulacrum reviewed Apr 2, 2023
View reviewed changes
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Apr 2, 2023

@bors r+

I'll accept with the FIXME, but maybe worth poking some more.

@bors
Copy link
Collaborator

bors commented Apr 2, 2023

📌 Commit 5d1ee66 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Apr 2, 2023
@bors
Copy link
Collaborator

bors commented Apr 3, 2023

⌛ Testing commit 5d1ee66 with merge d0eed58...

@bors
Copy link
Collaborator

bors commented Apr 3, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing d0eed58 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 3, 2023
@bors bors merged commit d0eed58 into rust-lang:master Apr 3, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 3, 2023
@onur-ozkan onur-ozkan deleted the hotfix-90244 branch April 3, 2023 09:22
@rust-timer
Copy link
Collaborator

rust-timer commented Apr 3, 2023

Finished benchmarking commit (d0eed58): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.3% [0.3%, 0.5%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.5% [-3.5%, -3.5%] 1
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.5% [-3.2%, -2.0%] 3
All ❌✅ (primary) - - 0

@bjorn3 bjorn3 mentioned this pull request Dec 31, 2023
Closed
onur-ozkan added a commit to onur-ozkan/rust that referenced this pull request Jan 17, 2024
@onur-ozkan
revert temporary patch rust-lang#108288
341f0a1 
Signed-off-by: onur-ozkan <[email protected]>
@onur-ozkan onur-ozkan mentioned this pull request Jan 18, 2024
Merged
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Jan 21, 2024
@TaKO8Ki
Rollup merge of rust-lang#120058 - onur-ozkan:compiler-assemble, r=Ma…
26accc6 
…rk-Simulacrum

bootstrap: improvements for compiler builds

Reverted rust-lang#108288 and applied a proper fix with the following commit.

r? `@Mark-Simulacrum`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2024
@matthiaskrgr
Rollup merge of rust-lang#120058 - onur-ozkan:compiler-assemble, r=Ma…
18a07f7 
…rk-Simulacrum

bootstrap: improvements for compiler builds

Reverted rust-lang#108288 and applied a proper fix with the following commit.

r? `@Mark-Simulacrum`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2024
@matthiaskrgr
Rollup merge of rust-lang#120058 - onur-ozkan:compiler-assemble, r=Ma…
7b6311b 
…rk-Simulacrum

bootstrap: improvements for compiler builds

Reverted rust-lang#108288 and applied a proper fix with the following commit.

r? ``@Mark-Simulacrum``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2024
@matthiaskrgr
Rollup merge of rust-lang#120058 - onur-ozkan:compiler-assemble, r=Ma…
5f8988b 
…rk-Simulacrum

bootstrap: improvements for compiler builds

Reverted rust-lang#108288 and applied a proper fix with the following commit.

r? ```@Mark-Simulacrum```
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 22, 2024
@rust-timer
Unrolled build for rust-lang#120058
5b362b4 
Rollup merge of rust-lang#120058 - onur-ozkan:compiler-assemble, r=Mark-Simulacrum

bootstrap: improvements for compiler builds

Reverted rust-lang#108288 and applied a proper fix with the following commit.

r? ```@Mark-Simulacrum```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.70.0

Development

Successfully merging this pull request may close these issues.

x.py panics when trying to build "stage3" compiler

7 participants

@onur-ozkan @rust-log-analyzer @Mark-Simulacrum @bors @rust-timer @jyn514 @rustbot