Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash checking spread element in loop #31098

Merged
merged 2 commits into from May 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
Expand Up @@ -20708,7 +20708,7 @@ namespace ts {
// of the argument is a tuple type, spread the tuple elements into the argument list. We can
// call checkExpressionCached because spread expressions never have a contextual type.
const spreadArgument = <SpreadElement>args[length - 1];
const type = checkExpressionCached(spreadArgument.expression);
const type = flowLoopCount ? checkExpression(spreadArgument.expression) : checkExpressionCached(spreadArgument.expression);
if (isTupleType(type)) {
const typeArguments = (<TypeReference>type).typeArguments || emptyArray;
const restIndex = type.target.hasRestElement ? typeArguments.length - 1 : -1;
Expand Down
18 changes: 18 additions & 0 deletions tests/baselines/reference/noImplicitAnyLoopCrash.errors.txt
@@ -0,0 +1,18 @@
tests/cases/compiler/noImplicitAnyLoopCrash.ts(4,16): error TS2556: Expected 0 arguments, but got 1 or more.
tests/cases/compiler/noImplicitAnyLoopCrash.ts(4,19): error TS2461: Type 'number' is not an array type.
tests/cases/compiler/noImplicitAnyLoopCrash.ts(4,19): error TS2461: Type 'undefined' is not an array type.


==== tests/cases/compiler/noImplicitAnyLoopCrash.ts (3 errors) ====
let foo = () => {};
let bar;
while (1) {
bar = ~foo(...bar);
~~~~~~
!!! error TS2556: Expected 0 arguments, but got 1 or more.
~~~
!!! error TS2461: Type 'number' is not an array type.
~~~
!!! error TS2461: Type 'undefined' is not an array type.
}

14 changes: 14 additions & 0 deletions tests/baselines/reference/noImplicitAnyLoopCrash.js
@@ -0,0 +1,14 @@
//// [noImplicitAnyLoopCrash.ts]
let foo = () => {};
let bar;
while (1) {
bar = ~foo(...bar);
}


//// [noImplicitAnyLoopCrash.js]
var foo = function () { };
var bar;
while (1) {
bar = ~foo.apply(void 0, bar);
}
14 changes: 14 additions & 0 deletions tests/baselines/reference/noImplicitAnyLoopCrash.symbols
@@ -0,0 +1,14 @@
=== tests/cases/compiler/noImplicitAnyLoopCrash.ts ===
let foo = () => {};
>foo : Symbol(foo, Decl(noImplicitAnyLoopCrash.ts, 0, 3))

let bar;
>bar : Symbol(bar, Decl(noImplicitAnyLoopCrash.ts, 1, 3))

while (1) {
bar = ~foo(...bar);
>bar : Symbol(bar, Decl(noImplicitAnyLoopCrash.ts, 1, 3))
>foo : Symbol(foo, Decl(noImplicitAnyLoopCrash.ts, 0, 3))
>bar : Symbol(bar, Decl(noImplicitAnyLoopCrash.ts, 1, 3))
}

21 changes: 21 additions & 0 deletions tests/baselines/reference/noImplicitAnyLoopCrash.types
@@ -0,0 +1,21 @@
=== tests/cases/compiler/noImplicitAnyLoopCrash.ts ===
let foo = () => {};
>foo : () => void
>() => {} : () => void

let bar;
>bar : any

while (1) {
>1 : 1

bar = ~foo(...bar);
>bar = ~foo(...bar) : number
>bar : any
>~foo(...bar) : number
>foo(...bar) : void
>foo : () => void
>...bar : any
>bar : number
}

6 changes: 6 additions & 0 deletions tests/cases/compiler/noImplicitAnyLoopCrash.ts
@@ -0,0 +1,6 @@
// @noImplicitAny: true
let foo = () => {};
let bar;
while (1) {
bar = ~foo(...bar);
}