Skip to content

Fix crash when inferring from tuple with middle rest and trailing variadic elements #63288

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.

Sign up for GitHub

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

Closed
ongjin wants to merge 1 commit into from
+56 −3
Closed

Fix crash when inferring from tuple with middle rest and trailing variadic elements #63288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27422,7 +27422,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (constraint && isTupleType(constraint) && !(constraint.target.combinedFlags & ElementFlags.Variable)) {
const impliedArity = constraint.target.fixedLength;
inferFromTypes(sliceTupleType(source, startLength, sourceArity - (startLength + impliedArity)), elementTypes[startLength]);
inferFromTypes(getElementTypeOfSliceOfTupleType(source, startLength + impliedArity, endLength)!, elementTypes[startLength + 1]);
const restType = getElementTypeOfSliceOfTupleType(source, startLength + impliedArity, endLength);
if (restType) {
inferFromTypes(restType, elementTypes[startLength + 1]);
}
}
}
else if (elementFlags[startLength] & ElementFlags.Rest && elementFlags[startLength + 1] & ElementFlags.Variadic) {
Expand All @@ -27435,8 +27438,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const endIndex = sourceArity - getEndElementCount(target.target, ElementFlags.Fixed);
const startIndex = endIndex - impliedArity;
const trailingSlice = createTupleType(getTypeArguments(source).slice(startIndex, endIndex), source.target.elementFlags.slice(startIndex, endIndex), /*readonly*/ false, source.target.labeledElementDeclarations && source.target.labeledElementDeclarations.slice(startIndex, endIndex));

inferFromTypes(getElementTypeOfSliceOfTupleType(source, startLength, endLength + impliedArity)!, elementTypes[startLength]);
const restType = getElementTypeOfSliceOfTupleType(source, startLength, endLength + impliedArity);
if (restType) {
inferFromTypes(restType, elementTypes[startLength]);
}
inferFromTypes(trailingSlice, elementTypes[startLength + 1]);
}
}
Expand Down
23 changes: 23 additions & 0 deletions tests/baselines/reference/inferTypesWithFixedTupleExtendsAtVariadicPosition.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,26 @@ type SubTup2TrailingVariadicWithTrailingFixedElementsTest2 = SubTup2TrailingVari
>SubTup2TrailingVariadicWithTrailingFixedElementsTest2 : Symbol(SubTup2TrailingVariadicWithTrailingFixedElementsTest2, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 68, 140))
>SubTup2TrailingVariadicWithTrailingFixedElements : Symbol(SubTup2TrailingVariadicWithTrailingFixedElements, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 58, 129))

// repro #63005 - should not crash when implied arity consumes entire source tuple
type SubTup2RestAndTrailingVariadic3<T extends unknown[]> = T extends [
>SubTup2RestAndTrailingVariadic3 : Symbol(SubTup2RestAndTrailingVariadic3, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 69, 147))
>T : Symbol(T, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 72, 37))
>T : Symbol(T, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 72, 37))

...(infer C)[],
>C : Symbol(C, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 73, 13))

...infer B extends [any, any, any]
>B : Symbol(B, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 74, 12))

]
? [C, ...B]
>C : Symbol(C, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 73, 13))
>B : Symbol(B, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 74, 12))

: never;

type SubTup2RestAndTrailingVariadic3Test = SubTup2RestAndTrailingVariadic3<[...a: 0[], b: 1, c: 2]>;
>SubTup2RestAndTrailingVariadic3Test : Symbol(SubTup2RestAndTrailingVariadic3Test, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 77, 12))
>SubTup2RestAndTrailingVariadic3 : Symbol(SubTup2RestAndTrailingVariadic3, Decl(inferTypesWithFixedTupleExtendsAtVariadicPosition.ts, 69, 147))

15 changes: 15 additions & 0 deletions tests/baselines/reference/inferTypesWithFixedTupleExtendsAtVariadicPosition.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,18 @@ type SubTup2TrailingVariadicWithTrailingFixedElementsTest2 = SubTup2TrailingVari
>SubTup2TrailingVariadicWithTrailingFixedElementsTest2 : [c: 2, d: 3]
> : ^^^^^^^^^^^^

// repro #63005 - should not crash when implied arity consumes entire source tuple
type SubTup2RestAndTrailingVariadic3<T extends unknown[]> = T extends [
>SubTup2RestAndTrailingVariadic3 : SubTup2RestAndTrailingVariadic3<T>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

...(infer C)[],
...infer B extends [any, any, any]
]
? [C, ...B]
: never;

type SubTup2RestAndTrailingVariadic3Test = SubTup2RestAndTrailingVariadic3<[...a: 0[], b: 1, c: 2]>;
>SubTup2RestAndTrailingVariadic3Test : never
> : ^^^^^

10 changes: 10 additions & 0 deletions tests/cases/compiler/inferTypesWithFixedTupleExtendsAtVariadicPosition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,13 @@ type SubTup2TrailingVariadicWithTrailingFixedElements<T extends unknown[]> = T e

type SubTup2TrailingVariadicWithTrailingFixedElementsTest = SubTup2TrailingVariadicWithTrailingFixedElements<[...a: 0[], b: 1, c: 2, d: 3]>;
type SubTup2TrailingVariadicWithTrailingFixedElementsTest2 = SubTup2TrailingVariadicWithTrailingFixedElements<[...a: 0[], b: 1, c: 2, d: 3, e: 4]>;

// repro #63005 - should not crash when implied arity consumes entire source tuple
type SubTup2RestAndTrailingVariadic3<T extends unknown[]> = T extends [
...(infer C)[],
...infer B extends [any, any, any]
]
? [C, ...B]
: never;

type SubTup2RestAndTrailingVariadic3Test = SubTup2RestAndTrailingVariadic3<[...a: 0[], b: 1, c: 2]>;