Skip to content

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

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

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

Conversation

@onur-ozkan

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

Copy link
Copy Markdown
Contributor

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

@rustbotrustbot 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

onur-ozkan commented Feb 25, 2023

Copy link
Copy Markdown
ContributorAuthor

r? @Mark-Simulacrum

Mark-Simulacrum
Mark-Simulacrum reviewed Mar 4, 2023
View reviewed changes
Comment threadsrc/bootstrap/compile.rs Outdated
@Mark-Simulacrum

This comment was marked as outdated.

Sign in to view
@Mark-SimulacrumMark-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
@jyn514jyn514 mentioned this pull request Mar 18, 2023
Closed
@onur-ozkan
onur-ozkanforce-pushed the hotfix-90244 branch 2 times, most recently from 4c08b68 to 60291d4CompareMarch 21, 2023 22:57
@onur-ozkanonur-ozkan changed the title avoid incrementing bootstrap stage for compiler assembling stepfix build --stage 2 compiler/rustc panicMar 21, 2023
@onur-ozkan

onur-ozkan commented Mar 21, 2023

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot 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

onur-ozkan commented Mar 26, 2023

Copy link
Copy Markdown
ContributorAuthor

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
Comment threadsrc/bootstrap/compile.rs Outdated
@onur-ozkan
fix build --stage 2 compiler/rustc panic
5d1ee66
Signed-off-by: ozkanonur <work@onurozkan.dev>
@Mark-Simulacrum

Mark-Simulacrum commented Apr 2, 2023

Copy link
Copy Markdown
Member

@bors r+

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

@bors

bors commented Apr 2, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 5d1ee66 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@borsbors 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

bors commented Apr 3, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5d1ee66 with merge d0eed58...

@bors

bors commented Apr 3, 2023

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 3, 2023
@bors
bors merged commit d0eed58 into rust-lang:masterApr 3, 2023
@rustbotrustbot 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

rust-timer commented Apr 3, 2023

Copy link
Copy Markdown
Collaborator

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.

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

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

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

@bjorn3bjorn3 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 patchrust-lang#108288
341f0a1
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkanonur-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 ofrust-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 ofrust-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 ofrust-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 ofrust-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 forrust-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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-SimulacrumMark-SimulacrumMark-Simulacrum left review comments

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant 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