Add a flat address space to librustc_codegen_llvm
#62565
Closed
+874
−130
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
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cramertj (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
rust-highfive
added
the
S-waiting-on-review
|
r? @eddyb |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
Changes to |
|
There's a merge commit that shouldn't exist - you might need to rebase. |
|
This seems to contain #51576, which was never shrunk enough for inclusion. |
YakoYakoYokuYoku
force-pushed
the
addrspaces
branch
from
67b23c3
to
c7b5154
Compare
|
Last night I was panicking that everything wasn't working because I've crashed miserably with the While reviewing the code locally I've seen a lot of the code problems pointed out by @eddyb, like a few lines we could change. I've left them untouched 'cause I wanted to see if the PR itself could work with Edit: I'll add the tests in the |
|
Ping from triage, any updates? @eddyb |
eddyb
added
S-waiting-on-author
|
@Alexendoo Sorry, this was incorrectly tagged. |
|
☔ The latest upstream changes (presumably #62961) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@eddyb they have pushed a new commit. You can review it now. |
|
☔ The latest upstream changes (presumably #63074) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@eddyb the conflicts are now solved, you can review this freely 👓 ✏️ |
Dylan-DPC-zz
added
S-waiting-on-review
|
Hey! This is a ping from triage, we would like to know if you @eddyb could give us a few more minutes to update us from last changes made by @YakoYakoYokuYoku . Thanks. |
eddyb
reviewed
Aug 9, 2019
| assert!(!layout.is_unsized(), "tried to statically allocate unsized place"); | ||
| let tmp = bx.alloca(bx.cx().backend_type(layout), name, layout.align.abi); | ||
| Self::new_sized(tmp, layout, layout.align.abi) | ||
| } |
There was a problem hiding this comment.
This is identical to alloca above though?
eddyb
reviewed
Aug 9, 2019
| @@ -292,7 +293,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { | |||
| bx.load(addr, self.fn_ty.ret.layout.align.abi) | |||
| } | |||
| }; | |||
| bx.ret(llval); | |||
| let llvalc = bx.flat_addr_cast(llval); | |||
There was a problem hiding this comment.
IMO the only way this PR will be accepted without an RFC is if everything is cast to the flat address space as soon as possible (as opposed to when needed).
eddyb
reviewed
Aug 9, 2019
| } | ||
| fn type_ptr_to_mut(&self, ty: Self::Type) -> Self::Type { | ||
| self.type_as_ptr_to(ty, self.mutable_addr_space()) | ||
| } |
There was a problem hiding this comment.
These methods shouldn't be added if they're unused.
eddyb
reviewed
Aug 9, 2019
| } | ||
|
|
||
| pub fn val_addr_space(v: &'ll Value) -> AddrSpaceIdx { | ||
| val_addr_space_opt(v).unwrap_or_default() |
There was a problem hiding this comment.
Reflecting LLVM values should be avoided as much as possible. New uses of val_ty shouldn't be added.
|
Ping from triage. @YakoYakoYokuYoku any updates on this? Thanks @rustbot modify labels to +S-waiting-on-author, -S-waiting-on-review |
rustbot
added
S-waiting-on-author
|
Think It's better to prepare a proper RFC, closing this. |
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.
To achieve compatibility with LLVM target machines which place allocas in another address space we need to the presence of a flat address space (an address space that is shared with other address spaces).
Also this PR updates #51576.