Skip to content

Commit

Permalink
Rollup merge of rust-lang#83535 - MidasLamb:mir-type-count-mismatch, …
Browse files Browse the repository at this point in the history
…r=nikomatsakis

Break when there is a mismatch in the type count

When other errors are generated, there can be a mismatch between the
amount of input types in MIR, and the amount in the function itself.
Break from the comparative loop if this is the case to prevent
out-of-bounds.
Fixes rust-lang#83499
  • Loading branch information
JohnTitor authored Apr 2, 2021
2 parents 9badf69 + 2d813b2 commit bf384b6
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {

// Equate expected input tys with those in the MIR.
for (argument_index, &normalized_input_ty) in normalized_input_tys.iter().enumerate() {
if argument_index + 1 >= body.local_decls.len() {
self.tcx()
.sess
.delay_span_bug(body.span, "found more normalized_input_ty than local_decls");
break;
}
// In MIR, argument N is stored in local N+1.
let local = Local::new(argument_index + 1);

Expand Down
10 changes: 10 additions & 0 deletions src/test/ui/mir/issue-83499-input-output-iteration-ice.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Test that when in MIR the amount of local_decls and amount of normalized_input_tys don't match
// that an out-of-bounds access does not occur.
#![feature(c_variadic)]

fn main() {}

fn foo(_: Bar, ...) -> impl {}
//~^ ERROR only foreign or `unsafe extern "C" functions may be C-variadic
//~| ERROR cannot find type `Bar` in this scope
//~| ERROR at least one trait must be specified
21 changes: 21 additions & 0 deletions src/test/ui/mir/issue-83499-input-output-iteration-ice.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
error: only foreign or `unsafe extern "C" functions may be C-variadic
--> $DIR/issue-83499-input-output-iteration-ice.rs:7:16
|
LL | fn foo(_: Bar, ...) -> impl {}
| ^^^

error: at least one trait must be specified
--> $DIR/issue-83499-input-output-iteration-ice.rs:7:24
|
LL | fn foo(_: Bar, ...) -> impl {}
| ^^^^

error[E0412]: cannot find type `Bar` in this scope
--> $DIR/issue-83499-input-output-iteration-ice.rs:7:11
|
LL | fn foo(_: Bar, ...) -> impl {}
| ^^^ not found in this scope

error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0412`.

0 comments on commit bf384b6

Please sign in to comment.