Skip to content

Commit a040139

Browse files
AndaristAndarist
committed
fix an instance of reusing bad cached value
1 parent 31925e7 commit a040139

4 files changed

Lines changed: 229 additions & 1 deletion

File tree

‎src/compiler/checker.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20384,7 +20384,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
2038420384
instantiationCount++;
2038520385
instantiationDepth++;
2038620386
const result = instantiateTypeWorker(type, mapper, aliasSymbol, aliasTypeArguments);
20387-
mapper.instantiations.set(key, result);
20387+
mapper.instantiations?.set(key, result);
2038820388
instantiationDepth--;
2038920389
return result;
2039020390
}
@@ -26958,6 +26958,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
2695826958
if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
2695926959
// If the fallback type satisfies the constraint, we pick it. Otherwise, we pick the constraint.
2696026960
inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
26961+
// instantiating the constraint could reenter this function if the type parameter's constraint depends on that parameter
26962+
// in such a case the reentering call just returns the preemptively set `.inferredType`
26963+
// but given the `.inferredType` gets changed changed above, the cached instantiations have to be cleared because they were cached for the wrong type
26964+
context.nonFixingMapper.instantiations = undefined;
2696126965
}
2696226966
}
2696326967
}

‎tests/baselines/reference/contextualParameterAndSelfReferentialConstraint1.symbols‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
//// [tests/cases/compiler/contextualParameterAndSelfReferentialConstraint1.ts] ////
2+
3+
=== contextualParameterAndSelfReferentialConstraint1.ts ===
4+
type NoExcessProperties<T, U> = T & {
5+
>NoExcessProperties : Symbol(NoExcessProperties, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 0, 0))
6+
>T : Symbol(T, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 0, 24))
7+
>U : Symbol(U, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 0, 26))
8+
>T : Symbol(T, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 0, 24))
9+
10+
readonly [K in Exclude<keyof U, keyof T>]: never;
11+
>K : Symbol(K, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 1, 12))
12+
>Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --))
13+
>U : Symbol(U, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 0, 26))
14+
>T : Symbol(T, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 0, 24))
15+
16+
};
17+
18+
interface Effect<out A> {
19+
>Effect : Symbol(Effect, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 2, 2))
20+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 4, 17))
21+
22+
readonly EffectTypeId: {
23+
>EffectTypeId : Symbol(Effect.EffectTypeId, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 4, 25))
24+
25+
readonly _A: (_: never) => A;
26+
>_A : Symbol(_A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 5, 26))
27+
>_ : Symbol(_, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 6, 18))
28+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 4, 17))
29+
30+
};
31+
}
32+
33+
declare function pipe<A, B>(a: A, ab: (a: A) => B): B;
34+
>pipe : Symbol(pipe, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 8, 1))
35+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 22))
36+
>B : Symbol(B, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 24))
37+
>a : Symbol(a, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 28))
38+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 22))
39+
>ab : Symbol(ab, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 33))
40+
>a : Symbol(a, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 39))
41+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 22))
42+
>B : Symbol(B, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 24))
43+
>B : Symbol(B, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 24))
44+
45+
interface RepeatOptions<A> {
46+
>RepeatOptions : Symbol(RepeatOptions, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 54))
47+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 12, 24))
48+
49+
until?: (_: A) => boolean;
50+
>until : Symbol(RepeatOptions.until, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 12, 28))
51+
>_ : Symbol(_, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 13, 11))
52+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 12, 24))
53+
}
54+
55+
declare const repeat: {
56+
>repeat : Symbol(repeat, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 16, 13))
57+
58+
<O extends NoExcessProperties<RepeatOptions<A>, O>, A>(
59+
>O : Symbol(O, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 17, 3))
60+
>NoExcessProperties : Symbol(NoExcessProperties, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 0, 0))
61+
>RepeatOptions : Symbol(RepeatOptions, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 10, 54))
62+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 17, 53))
63+
>O : Symbol(O, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 17, 3))
64+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 17, 53))
65+
66+
options: O,
67+
>options : Symbol(options, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 17, 57))
68+
>O : Symbol(O, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 17, 3))
69+
70+
): (self: Effect<A>) => Effect<A>;
71+
>self : Symbol(self, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 19, 6))
72+
>Effect : Symbol(Effect, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 2, 2))
73+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 17, 53))
74+
>Effect : Symbol(Effect, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 2, 2))
75+
>A : Symbol(A, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 17, 53))
76+
77+
};
78+
79+
pipe(
80+
>pipe : Symbol(pipe, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 8, 1))
81+
82+
{} as Effect<boolean>,
83+
>Effect : Symbol(Effect, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 2, 2))
84+
85+
repeat({
86+
>repeat : Symbol(repeat, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 16, 13))
87+
88+
until: (x) => {
89+
>until : Symbol(until, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 24, 10))
90+
>x : Symbol(x, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 25, 12))
91+
92+
return x; // boolean
93+
>x : Symbol(x, Decl(contextualParameterAndSelfReferentialConstraint1.ts, 25, 12))
94+
95+
},
96+
}),
97+
);
98+

‎tests/baselines/reference/contextualParameterAndSelfReferentialConstraint1.types‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
//// [tests/cases/compiler/contextualParameterAndSelfReferentialConstraint1.ts] ////
2+
3+
=== contextualParameterAndSelfReferentialConstraint1.ts ===
4+
type NoExcessProperties<T, U> = T & {
5+
>NoExcessProperties : NoExcessProperties<T, U>
6+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
7+
8+
readonly [K in Exclude<keyof U, keyof T>]: never;
9+
};
10+
11+
interface Effect<out A> {
12+
readonly EffectTypeId: {
13+
>EffectTypeId : { readonly _A: (_: never) => A; }
14+
> : ^^^^^^^^^^^^^^^ ^^^
15+
16+
readonly _A: (_: never) => A;
17+
>_A : (_: never) => A
18+
> : ^ ^^ ^^^^^
19+
>_ : never
20+
> : ^^^^^
21+
22+
};
23+
}
24+
25+
declare function pipe<A, B>(a: A, ab: (a: A) => B): B;
26+
>pipe : <A, B>(a: A, ab: (a: A) => B) => B
27+
> : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^
28+
>a : A
29+
> : ^
30+
>ab : (a: A) => B
31+
> : ^ ^^ ^^^^^
32+
>a : A
33+
> : ^
34+
35+
interface RepeatOptions<A> {
36+
until?: (_: A) => boolean;
37+
>until : ((_: A) => boolean) | undefined
38+
> : ^^ ^^ ^^^^^ ^^^^^^^^^^^^^
39+
>_ : A
40+
> : ^
41+
}
42+
43+
declare const repeat: {
44+
>repeat : <O extends NoExcessProperties<RepeatOptions<A>, O>, A>(options: O) => (self: Effect<A>) => Effect<A>
45+
> : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^^^^
46+
47+
<O extends NoExcessProperties<RepeatOptions<A>, O>, A>(
48+
options: O,
49+
>options : O
50+
> : ^
51+
52+
): (self: Effect<A>) => Effect<A>;
53+
>self : Effect<A>
54+
> : ^^^^^^^^^
55+
56+
};
57+
58+
pipe(
59+
>pipe( {} as Effect<boolean>, repeat({ until: (x) => { return x; // boolean }, }),) : Effect<boolean>
60+
> : ^^^^^^^^^^^^^^^
61+
>pipe : <A, B>(a: A, ab: (a: A) => B) => B
62+
> : ^ ^^ ^^ ^^ ^^ ^^ ^^^^^
63+
64+
{} as Effect<boolean>,
65+
>{} as Effect<boolean> : Effect<boolean>
66+
> : ^^^^^^^^^^^^^^^
67+
>{} : {}
68+
> : ^^
69+
70+
repeat({
71+
>repeat({ until: (x) => { return x; // boolean }, }) : (self: Effect<boolean>) => Effect<boolean>
72+
> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
73+
>repeat : <O extends NoExcessProperties<RepeatOptions<A>, O>, A>(options: O) => (self: Effect<A>) => Effect<A>
74+
> : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^^^^
75+
>{ until: (x) => { return x; // boolean }, } : { until: (x: boolean) => boolean; }
76+
> : ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^
77+
78+
until: (x) => {
79+
>until : (x: boolean) => boolean
80+
> : ^ ^^^^^^^^^^^^^^^^^^^^^
81+
>(x) => { return x; // boolean } : (x: boolean) => boolean
82+
> : ^ ^^^^^^^^^^^^^^^^^^^^^
83+
>x : boolean
84+
> : ^^^^^^^
85+
86+
return x; // boolean
87+
>x : boolean
88+
> : ^^^^^^^
89+
90+
},
91+
}),
92+
);
93+

‎tests/cases/compiler/contextualParameterAndSelfReferentialConstraint1.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// @strict: true
2+
// @noEmit: true
3+
4+
type NoExcessProperties<T, U> = T & {
5+
readonly [K in Exclude<keyof U, keyof T>]: never;
6+
};
7+
8+
interface Effect<out A> {
9+
readonly EffectTypeId: {
10+
readonly _A: (_: never) => A;
11+
};
12+
}
13+
14+
declare function pipe<A, B>(a: A, ab: (a: A) => B): B;
15+
16+
interface RepeatOptions<A> {
17+
until?: (_: A) => boolean;
18+
}
19+
20+
declare const repeat: {
21+
<O extends NoExcessProperties<RepeatOptions<A>, O>, A>(
22+
options: O,
23+
): (self: Effect<A>) => Effect<A>;
24+
};
25+
26+
pipe(
27+
{} as Effect<boolean>,
28+
repeat({
29+
until: (x) => {
30+
return x; // boolean
31+
},
32+
}),
33+
);

0 commit comments

Comments
 (0)