Skip to content

Several changes to the codegen backend organization - #65340

Merged
bors merged 10 commits into
rust-lang:masterfrom
bjorn3:cg_ssa_refactor4
Oct 15, 2019
Merged

Several changes to the codegen backend organization#65340
bors merged 10 commits into
rust-lang:masterfrom
bjorn3:cg_ssa_refactor4

Conversation

@bjorn3

@bjorn3bjorn3 commented Oct 12, 2019

Copy link
Copy Markdown
Member
  • Split functions from values in cg_ssa BackendTypes.
  • Remove is_const_integral function from ConstMethods.
  • Actually register the invalid monomorphization of intrinsic long diagnostic and remove the diagnostics method from CodegenBackends, as it was unused.
  • Add cg_ssa and cg_utils provided methods to default_provide, so codegen backend don't have to do it themself.

@rust-highfive

rust-highfive commented Oct 12, 2019

Copy link
Copy Markdown
Contributor

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive

rust-highfive commented Oct 12, 2019

Copy link
Copy Markdown
Contributor

r? @cramertj

(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 Oct 12, 2019
@Centril

Centril commented Oct 12, 2019

Copy link
Copy Markdown
Contributor

cc @rkruppe@eddyb

@eddyb

eddyb commented Oct 12, 2019

Copy link
Copy Markdown
Contributor

r? @eddyb I'll look into this ASAP (please ping me elsewhere otherwise)

@rust-highfiverust-highfive assigned eddyb and unassigned cramertjOct 12, 2019
eddyb
eddyb reviewed Oct 12, 2019
View reviewed changes
Comment threadsrc/librustc_codegen_ssa/traits/backend.rs Outdated
eddyb
eddyb reviewed Oct 12, 2019
View reviewed changes
Comment threadsrc/librustc_codegen_llvm/common.rs Outdated

@eddybeddybOct 12, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should have a newtype of Value to force this to be correctly typed (LLVM has a class for functions which IIRC is a subclass of GlobalValue). But this is a low-priority cleanup.

eddyb
eddyb reviewed Oct 12, 2019
View reviewed changes
Comment threadsrc/librustc_codegen_ssa/traits/builder.rs Outdated

@eddybeddybOct 12, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At some point we'll have to replace all of these ll prefixes in variable names.

eddyb
eddyb reviewed Oct 12, 2019
View reviewed changes
Comment threadsrc/librustc_codegen_ssa/traits/misc.rs Outdated
eddyb
eddyb reviewed Oct 12, 2019
View reviewed changes
Comment threadsrc/librustc_codegen_llvm/common.rs Outdated
eddyb
eddyb reviewed Oct 12, 2019
View reviewed changes
Comment threadsrc/librustc_interface/passes.rs Outdated
@bjorn3bjorn3 mentioned this pull request Oct 12, 2019
Closed
@bors

bors commented Oct 13, 2019

Copy link
Copy Markdown
Collaborator

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

@eddyb

eddyb commented Oct 14, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit f0e2fc7 has been approved by eddyb

@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 Oct 14, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 15, 2019
@tmandry
Rollup merge ofrust-lang#65340- bjorn3:cg_ssa_refactor4, r=eddyb
6241a4a
Several changes to the codegen backend organization
* Split functions from values in cg_ssa `BackendTypes`.
* Remove `is_const_integral` function from `ConstMethods`.
* Actually register the invalid monomorphization of intrinsic long diagnostic and remove the `diagnostics` method from `CodegenBackends`, as it was unused.
* Add cg_ssa and cg_utils provided methods to `default_provide`, so codegen backend don't have to do it themself.
@tmandrytmandry mentioned this pull request Oct 15, 2019
Merged
bors added a commit that referenced this pull request Oct 15, 2019
@bors
Auto merge of#65422- tmandry:rollup-r5u3mlc, r=tmandry
e369d87
Rollup of 10 pull requests
Successful merges:
- #65170 (rustc_metadata: Privatize private code and remove dead code)
- #65260 (Optimize `LexicalResolve::expansion`.)
- #65261 (Remove `Option` from `TokenStream`)
- #65332 (std::fmt: reorder docs)
- #65340 (Several changes to the codegen backend organization)
- #65365 (Include const generic arguments in metadata)
- #65398 (Bring attention to suggestions when the only difference is capitalization)
- #65410 (syntax: add parser recovery for intersection- / and-patterns `p1 @ p2`)
- #65415 (Remove an outdated test output file)
- #65416 (Minor sync changes)
Failed merges:
r? @ghost
@bors
bors merged commit f0e2fc7 into rust-lang:masterOct 15, 2019
@bjorn3
bjorn3 deleted the cg_ssa_refactor4 branch October 15, 2019 07:05
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@bjorn3@rust-highfive@Centril@eddyb@bors@cramertj