Several changes to the codegen backend organization #65340
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Some changes occurred in diagnostic error codes |
|
r? @cramertj (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @eddyb I'll look into this ASAP (please ping me elsewhere otherwise) |
eddyb
reviewed
Oct 12, 2019
eddyb
reviewed
Oct 12, 2019
src/librustc_codegen_llvm/common.rs
Outdated
| @@ -86,6 +86,8 @@ impl Funclet<'ll> { | |||
|
|
|||
| impl BackendTypes for CodegenCx<'ll, 'tcx> { | |||
| type Value = &'ll Value; | |||
| type FuncId = &'ll Value; | |||
There was a problem hiding this comment.
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
reviewed
Oct 12, 2019
| @@ -34,7 +34,7 @@ pub trait BuilderMethods<'a, 'tcx>: | |||
| + HasTargetSpec | |||
|
|
|||
| { | |||
| fn new_block<'b>(cx: &'a Self::CodegenCx, llfn: Self::Value, name: &'b str) -> Self; | |||
| fn new_block<'b>(cx: &'a Self::CodegenCx, llfn: Self::FuncId, name: &'b str) -> Self; | |||
There was a problem hiding this comment.
At some point we'll have to replace all of these ll prefixes in variable names.
eddyb
reviewed
Oct 12, 2019
eddyb
reviewed
Oct 12, 2019
eddyb
reviewed
Oct 12, 2019
|
☔ The latest upstream changes (presumably #65182) made this pull request unmergeable. Please resolve the merge conflicts. |
The associated long diagnostic didn't get registered before
bjorn3
force-pushed
the
cg_ssa_refactor4
branch
from
1711aba
to
f0e2fc7
Compare
eddyb
approved these changes
Oct 14, 2019
|
@bors r+ |
|
📌 Commit f0e2fc7 has been approved by |
bors
added
S-waiting-on-bors
tmandry
added a commit
to tmandry/rust
that referenced
this pull request
Oct 15, 2019
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.
bors
added a commit
that referenced
this pull request
Oct 15, 2019
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
BackendTypes.is_const_integralfunction fromConstMethods.diagnosticsmethod fromCodegenBackends, as it was unused.default_provide, so codegen backend don't have to do it themself.