microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 16:38:05 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Properly cache types at CFA nodes marked FlowFlags.Shared

Browse Source
This commit is contained in:
Anders Hejlsberg 2019-09-13 07:37:11 -07:00
parent d7c83f023e
commit aadd39a395
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/compiler/checker.ts
View File

@ -17052,10 +17052,13 @@ namespace ts {
else if (flags & FlowFlags.Assignment) {
type = getTypeAtFlowAssignment(<FlowAssignment>flow);
if (!type) {
flow = (<FlowAssignment>flow).antecedent;
continue;
if (!(flags & FlowFlags.Shared)) {
flow = (<FlowAssignment>flow).antecedent;
continue;
}
type = getTypeAtFlowNode((<FlowAssignment>flow).antecedent);
}
else if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis
if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis
const key = getOrSetCacheKey();
if (key && !isIncomplete(type)) {
flow.flags |= FlowFlags.Cached;
@ -17073,18 +17076,26 @@ namespace ts {
}
else if (flags & FlowFlags.Label) {
if ((<FlowLabel>flow).antecedents!.length === 1) {
flow = (<FlowLabel>flow).antecedents![0];
continue;
if (!(flags & FlowFlags.Shared)) {
flow = (<FlowLabel>flow).antecedents![0];
continue;
}
type = getTypeAtFlowNode((<FlowLabel>flow).antecedents![0]);
}
else {
type = flags & FlowFlags.BranchLabel ?
getTypeAtFlowBranchLabel(<FlowLabel>flow) :
getTypeAtFlowLoopLabel(<FlowLabel>flow);
}
type = flags & FlowFlags.BranchLabel ?
getTypeAtFlowBranchLabel(<FlowLabel>flow) :
getTypeAtFlowLoopLabel(<FlowLabel>flow);
}
else if (flags & FlowFlags.ArrayMutation) {
type = getTypeAtFlowArrayMutation(<FlowArrayMutation>flow);
if (!type) {
flow = (<FlowArrayMutation>flow).antecedent;
continue;
if (!(flags & FlowFlags.Shared)) {
flow = (<FlowArrayMutation>flow).antecedent;
continue;
}
type = getTypeAtFlowNode((<FlowArrayMutation>flow).antecedent);
}
}
else if (flags & FlowFlags.Start) {