Skip to content

Normalize main return type during mono item collection & codegen - #94308

Merged
bors merged 1 commit into
rust-lang:masterfrom
tmiasko:normalize-main-ret-ty
Feb 25, 2022
Merged

Normalize main return type during mono item collection & codegen#94308
bors merged 1 commit into
rust-lang:masterfrom
tmiasko:normalize-main-ret-ty

Conversation

@tmiasko

Copy link
Copy Markdown
Contributor

The issue can be observed with -Zprint-mono-items=lazy in:

#![feature(termination_trait_lib)]fnmain() -> impl std::process::Termination{}
BEFORE: MONO_ITEM fn std::rt::lang_start::<impl std::process::Termination> @@ t.93933fa2-cgu.2[External]
AFTER: MONO_ITEM fn std::rt::lang_start::<()> @@ t.df56e625-cgu.1[External]

@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 23, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @davidtwco

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 23, 2022
@oli-obk

Copy link
Copy Markdown
Contributor

r? @oli-obk

@bors r+ rollup

@bors

bors commented Feb 24, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit f047af2 has been approved by oli-obk

@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 Feb 24, 2022
Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 24, 2022
…i-obk
Normalize main return type during mono item collection & codegen
The issue can be observed with `-Zprint-mono-items=lazy` in:
```rust
#![feature(termination_trait_lib)]
fn main() -> impl std::process::Termination { }
```
```
BEFORE: MONO_ITEM fn std::rt::lang_start::<impl std::process::Termination> `@@` t.93933fa2-cgu.2[External]
AFTER: MONO_ITEM fn std::rt::lang_start::<()> `@@` t.df56e625-cgu.1[External]
```
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 24, 2022
…i-obk
Normalize main return type during mono item collection & codegen
The issue can be observed with `-Zprint-mono-items=lazy` in:
```rust
#![feature(termination_trait_lib)]
fn main() -> impl std::process::Termination { }
```
```
BEFORE: MONO_ITEM fn std::rt::lang_start::<impl std::process::Termination> ``@@`` t.93933fa2-cgu.2[External]
AFTER: MONO_ITEM fn std::rt::lang_start::<()> ``@@`` t.df56e625-cgu.1[External]
```
@Dylan-DPCDylan-DPC mentioned this pull request Feb 24, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 24, 2022
…i-obk
Normalize main return type during mono item collection & codegen
The issue can be observed with `-Zprint-mono-items=lazy` in:
```rust
#![feature(termination_trait_lib)]
fn main() -> impl std::process::Termination { }
```
```
BEFORE: MONO_ITEM fn std::rt::lang_start::<impl std::process::Termination> ```@@``` t.93933fa2-cgu.2[External]
AFTER: MONO_ITEM fn std::rt::lang_start::<()> ```@@``` t.df56e625-cgu.1[External]
```
This was referenced Feb 24, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 24, 2022
Rollup of 9 pull requests
Successful merges:
- rust-lang#91795 (resolve/metadata: Stop encoding macros as reexports)
- rust-lang#93714 (better ObligationCause for normalization errors in `can_type_implement_copy`)
- rust-lang#94175 (Improve `--check-cfg` implementation)
- rust-lang#94212 (Stop manually SIMDing in `swap_nonoverlapping`)
- rust-lang#94242 (properly handle fat pointers to uninhabitable types)
- rust-lang#94308 (Normalize main return type during mono item collection & codegen)
- rust-lang#94315 (update auto trait lint for `PhantomData`)
- rust-lang#94316 (Improve string literal unescaping)
- rust-lang#94327 (Avoid emitting full macro body into JSON errors)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 787c6f3 into rust-lang:masterFeb 25, 2022
@rustbotrustbot added this to the 1.61.0 milestone Feb 25, 2022
@tmiasko
tmiasko deleted the normalize-main-ret-ty branch February 25, 2022 07:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@tmiasko@rust-highfive@oli-obk@bors@davidtwco@rustbot