Check other rvalues #19
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
Closed
spastorino
force-pushed
the
check_other_rvalues
branch
5 times, most recently
from
2943e65
to
5b8a13d
Compare
nikomatsakis
requested changes
Nov 28, 2017
| @@ -59,7 +59,7 @@ pub fn type_check<'a, 'gcx, 'tcx>( | |||
| } | |||
|
|
|||
| fn mirbug(tcx: TyCtxt, span: Span, msg: &str) { | |||
| tcx.sess.diagnostic().span_bug(span, msg); | |||
| tcx.sess.diagnostic().delay_span_bug(span, msg); | |||
There was a problem hiding this comment.
maybe worth a comment here -- something like:
// We sometimes see MIR failures (notably predicate failures) due to
// the fact that we check rvalue sized predicates here. So use `delay_span_bug`
// to avoid reporting bugs in those cases.
|
|
||
| AggregateKind::Closure(def_id, substs) | | ||
| AggregateKind::Generator(def_id, substs, _) => { | ||
| tcx.predicates_of(*def_id).instantiate(tcx, substs.substs) |
There was a problem hiding this comment.
I realized that this code should probably move into this match arm
spastorino
force-pushed
the
check_other_rvalues
branch
from
5b8a13d
to
0aeff1a
Compare
|
@nikomatsakis addressed both things |
spastorino
force-pushed
the
check_other_rvalues
branch
from
0aeff1a
to
152b96c
Compare
| self.prove_aggregate_predicates(aggregate_kind, location); | ||
|
|
||
| match aggregate_kind { | ||
| if *aggregate_kind == AggregateKind::Tuple { |
There was a problem hiding this comment.
Nit: if we are going to "return early" for tuples, we should have bug! cases for the prove_aggregate_predicates function etc. Otherwise if people tried to add code there there might be confusion.
There was a problem hiding this comment.
The other thing we could do is to leave prove_aggregate_predicates before the early return as it was ... so if you want to handle Tuples there you can.
spastorino
force-pushed
the
check_other_rvalues
branch
from
152b96c
to
bdcabf8
Compare
spastorino
force-pushed
the
check_other_rvalues
branch
from
75b045a
to
9e93966
Compare
17 tasks
Otherwise, `run-pass/typeck-fn-to-unsafe-fn-ptr.rs` fails the MIR type checker.
These tests had FIXMEs for errors that were not previously being reported.
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.
#15 but done on top of
nll-masterThis should close rust-lang#45827 and rust-lang#45959.