Represent function pointers in mir-constants as a Value instead of Item #40602
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
eddyb
requested changes
Mar 17, 2017
src/librustc_trans/mir/constant.rs
Outdated
| // Shortcut for zero-sized types, including function item | ||
| // types, which would not work with MirConstContext. | ||
| // Shortcut for zero-sized types | ||
| // which would not work with MirConstContext. |
There was a problem hiding this comment.
I think this means it's a function-specific hack that can be removed.
src/librustc_trans/mir/constant.rs
Outdated
| @@ -927,8 +930,8 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> { | |||
| let ty = self.monomorphize(&constant.ty); | |||
| let result = match constant.literal.clone() { | |||
| mir::Literal::Item { def_id, substs } => { | |||
| // Shortcut for zero-sized types, including function item | |||
| // types, which would not work with MirConstContext. | |||
| // Shortcut for zero-sized types | |||
|
Gotta run, so I can't test the changes locally. let's see what travis says. |
eddyb
approved these changes
Mar 17, 2017
|
@bors r+ |
|
📌 Commit 187a922 has been approved by |
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 19, 2017
Represent function pointers in mir-constants as a Value instead of Item r? @eddyb
|
☔ The latest upstream changes (presumably #39628) made this pull request unmergeable. Please resolve the merge conflicts. |
|
You have a merge commit, please rebase properly. |
|
since the MIR-shim changes I can't figure out how to make this work. |
|
I applied the fixes as discussed in IRC. It works now. |
|
@bors r+ |
|
📌 Commit 9c91846 has been approved by |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Mar 24, 2017
Represent function pointers in mir-constants as a Value instead of Item r? @eddyb
bors
added a commit
that referenced
this pull request
Mar 24, 2017
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.
r? @eddyb