Fix various ICEs relating to trans'ing fields with associated types #20706
Conversation
This file contains hidden or 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
always were but it's dang annoying to weed out all the places that fail to meet the assertion, and it doesn't really hurt things if we don't always get it right.
|
Does this close #20368 as well? |
|
@sfackler yes, I just tried it. Test seems too similar to merit being added as a regression test though. |
nikomatsakis
force-pushed
the
assoc-types-projections-in-structs-issue-20470
branch
from
d6204e1 to
e16449e
Compare
|
Just pushed one additional commit. This also fixes #20535 now. |
| @@ -114,23 +114,24 @@ pub fn normalize_ty<'tcx>(cx: &ty::ctxt<'tcx>, ty: Ty<'tcx>) -> Ty<'tcx> { | |||
| } | |||
|
|
|||
| // Is the type's representation size known at compile time? | |||
| pub fn type_is_sized<'tcx>(cx: &ty::ctxt<'tcx>, ty: Ty<'tcx>) -> bool { | |||
| ty::type_contents(cx, ty).is_sized(cx) | |||
| pub fn type_is_sized<'a,'tcx>(ccx: &CrateContext<'a,'tcx>, ty: Ty<'tcx>) -> bool { | |||
There was a problem hiding this comment.
Changing this fn and lltype_is_sized to take a CrateCtxt rather than a ty::ctxt seems unnecessary and makes things more complicated.
|
r = me with the tcx -> ccx changes reverted |
result of using `ty::type_is_sized`
nikomatsakis
force-pushed
the
assoc-types-projections-in-structs-issue-20470
branch
from
e16449e to
cb98c3d
Compare
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Jan 8, 2015
…-in-structs-issue-20470 Conflicts: src/librustc_trans/trans/expr.rs
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.
There were various parts of trans that were failing to normalize associated types of fields. In addition, the use of
TypeContentsto compute whether something is sized was not able to handle projection types.Fixes #20470.
Fixes #20368.
Fixes #20535.
r? @nick29581