Repository navigation
Cut off inference for recursive mapped types - #20370
Merged
Nathan Shively-Sanders (sandersn) merged 5 commits intoDec 1, 2017
Merged
Nathan Shively-Sanders (sandersn) merged 5 commits into
Nathan Shively-Sanders (sandersn) merged 5 commits into
Conversation
Previously, when inferring to a self-referential (or otherwise recursive) homomorphic mapped type from a source type that also has recursive references, type inference would enter infinite recursion. Now there is a more complex stack for mapped type inference. It mirrors the existing symbolStack but (1) includes the source type and (2) is passed through inferTypeForHomomorphicMappedType, which is actually called outside of inferTypes, and so restarts the symbolStack cache every time.
From a self-referential type.
This was referenced Nov 30, 2017
| if (contains(mappedTypeStack, [source, target.symbol], ([s1, t1], [s2, t2]) => s1 === s2 && t1 === t2)) { | ||
| return; | ||
| } | ||
| (mappedTypeStack || (mappedTypeStack = [])).push([source, target.symbol]); |
There was a problem hiding this comment.
function getInferenceStackKey(source: Type, target: Symbol) {
return `${source.id},${getSymbolId(target)}`
}
// ...
const cacheKey = getInferenceStackKey(source, target.symbol);
if (mappedTypeCache && mappedTypeCache.has(cacheKey)) {
return; // future: mappedTypeCache.get(cacheKey)
}
(mappedTypeCache || (mappedTypeCache = createMap())).set(cacheKey, true); // future: replace `true` with initialized candidate type which is filled out by the below `infer` call.
const inferredType = inferTypeForHomomorphicMappedType(source, <MappedType>target, mappedTypeCache);
mappedTypeCache.delete(cacheKey);If the mappedTypeStack values are never needed other than for set membership checking, and the ordering is irrelevant other than for removal, then for efficiency (faster contains checks, no array allocation for each member) we should use a set and not a stack, right?
Member
Author
There was a problem hiding this comment.
Yes. I was going to do that next, but I decided to get Anders Hejlsberg (@ahejlsberg)'s opinion about the general approach beforehand.
Previously it was a pair of [Type, Symbol].
Nathan Shively-Sanders (sandersn)
deleted the
cutoff-inference-for-recursive-mapped-types
branch
December 1, 2017 23:10
ghost
mentioned this pull request
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #19951
Previously, when inferring to a self-referential (or otherwise recursive) homomorphic mapped type from a source type that also has recursive references, type inference would enter infinite recursion.
Now there is a more complex stack for mapped type inference. It mirrors the existing
symbolStackbut (1) includes the source type and (2) is passed throughinferTypeForHomomorphicMappedType, which is actually called outside ofinferTypes, and so restarts thesymbolStackcache every time.Note that it might be possible to avoid restarting inference inside
inferTypeForHomomorphicMappedTypeand share the two caches by using a cache key. I only experimented briefly with this so far.