Skip to content

Ports #7373 and #7163 in release-1.8 #7377

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

Merged
vladima merged 2 commits into from
Mar 3, 2016
+13 −0
Merged

Ports #7373 and #7163 in release-1.8 #7377

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7f415d
Merge pull request #7163 from Microsoft/cachePairs
vladima Feb 22, 2016
365e544
Merge pull request #7373 from Microsoft/limitInferenceDepth
vladima Mar 3, 2016
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
13 changes: 13 additions & 0 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6444,8 +6444,10 @@ namespace ts {
function inferTypes(context: InferenceContext, source: Type, target: Type) {
let sourceStack: Type[];
let targetStack: Type[];
const maxDepth = 5;
let depth = 0;
let inferiority = 0;
const visited: Map<boolean> = {};
inferFromTypes(source, target);

function isInProcess(source: Type, target: Type) {
Expand Down Expand Up @@ -6571,10 +6573,21 @@ namespace ts {
if (isInProcess(source, target)) {
return;
}
// we delibirately limit the depth we examine to infer types: this speeds up the overall inference process
// and user rarely expects inferences to be made from the deeply nested constituents.
if (depth > maxDepth) {
return;
}
if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
return;
}

const key = source.id + "," + target.id;
if (hasProperty(visited, key)) {
return;
}
visited[key] = true;

if (depth === 0) {
sourceStack = [];
targetStack = [];
Expand Down