@@ -19543,25 +19543,10 @@ type lazyMemberTable struct {
1954319543 indexInfos []*IndexInfo
1954419544 baseTypes []*Type // instantiated base types
1954519545 declared map[string]*ast.Symbol
19546- found map[string]*ast.Symbol // memoized lookups; nil means no such member
1954719546}
1954819547
19549- // isUnresolvedInstantiatedReference reports whether t is a reference to a
19550- // generic class or interface (other than the declaration itself) whose members
19551- // haven't been resolved.
19552- func isUnresolvedInstantiatedReference(t *Type) bool {
19553- if t.flags&TypeFlagsObject == 0 || !mayHaveLazyMembers(t) {
19554- return false
19555- }
19556- source := t.Target()
19557- if source == nil || source == t || source.objectFlags&ObjectFlagsClassOrInterface == 0 || source.objectFlags&ObjectFlagsTuple != 0 {
19558- return false
19559- }
19560- return t.symbol == nil || t.symbol.Flags&ast.SymbolFlagsValueModule == 0
19561- }
19562-
19563- // mayHaveLazyMembers is a quick check for isUnresolvedInstantiatedReference
19564- // for hot paths, as most types they see have resolved members.
19548+ // mayHaveLazyMembers is a quick check for hot paths, as most types they see
19549+ // have resolved members.
1956519550func mayHaveLazyMembers(t *Type) bool {
1956619551 return t.objectFlags&(ObjectFlagsMembersResolved|ObjectFlagsReference) == ObjectFlagsReference
1956719552}
@@ -19586,7 +19571,11 @@ func (c *Checker) getReadyLazyMemberTable(t *Type) *lazyMemberTable {
1958619571}
1958719572
1958819573func (c *Checker) getReadyLazyMemberTableWorker(t *Type) *lazyMemberTable {
19589- if !isUnresolvedInstantiatedReference(t) {
19574+ // Only references to generic classes and interfaces, other than the
19575+ // declaration itself, have lazy member tables.
19576+ source := t.Target()
19577+ if t.flags&TypeFlagsObject == 0 || source == nil || source == t || source.objectFlags&ObjectFlagsClassOrInterface == 0 ||
19578+ source.objectFlags&ObjectFlagsTuple != 0 || t.symbol != nil && t.symbol.Flags&ast.SymbolFlagsValueModule != 0 {
1959019579 return nil
1959119580 }
1959219581 lm := c.lazyMemberTables[t]
@@ -19599,7 +19588,6 @@ func (c *Checker) getReadyLazyMemberTableWorker(t *Type) *lazyMemberTable {
1959919588 mapper: newTypeMapper(typeParameters, typeArguments),
1960019589 typeArguments: typeArguments,
1960119590 declared: map[string]*ast.Symbol{},
19602- found: map[string]*ast.Symbol{},
1960319591 }
1960419592 c.lazyMemberTables[t] = lm
1960519593 c.prepareLazyMembers(t, lm)
@@ -19656,7 +19644,7 @@ func (c *Checker) resolveLazyMembers(t *Type, lm *lazyMemberTable) {
1965619644 members = make(ast.SymbolTable, len(resolved.declaredMembers))
1965719645 for id, symbol := range resolved.declaredMembers {
1965819646 if c.isNamedMember(symbol, id) {
19659- members[id] = c.instantiateLazyDeclaredMember (lm, symbol, id)
19647+ members[id] = c.getLazyDeclaredMember (lm, symbol, id)
1966019648 }
1966119649 }
1966219650 }
@@ -19672,25 +19660,15 @@ func (c *Checker) resolveLazyMembers(t *Type, lm *lazyMemberTable) {
1967219660func (c *Checker) getLazyDeclaredMember(lm *lazyMemberTable, symbol *ast.Symbol, name string) *ast.Symbol {
1967319661 result := lm.declared[name]
1967419662 if result == nil {
19675- result = c.instantiateLazyDeclaredMember(lm, symbol, name)
19663+ result = symbol
19664+ if _, unaffected := slices.BinarySearch(lm.unaffected, name); !unaffected {
19665+ result = c.newInstantiatedSymbol(symbol, lm.mapper)
19666+ }
1967619667 lm.declared[name] = result
1967719668 }
1967819669 return result
1967919670}
1968019671
19681- // instantiateLazyDeclaredMember is getLazyDeclaredMember without memoizing
19682- // the result, for resolving the members in full, after which the table is
19683- // discarded.
19684- func (c *Checker) instantiateLazyDeclaredMember(lm *lazyMemberTable, symbol *ast.Symbol, name string) *ast.Symbol {
19685- if result := lm.declared[name]; result != nil {
19686- return result
19687- }
19688- if _, unaffected := slices.BinarySearch(lm.unaffected, name); unaffected {
19689- return symbol
19690- }
19691- return c.newInstantiatedSymbol(symbol, lm.mapper)
19692- }
19693-
1969419672// getMemberOfStructuredType returns c.resolveStructuredTypeMembers(t).members[name]
1969519673// without resolving the members of t if they are resolved lazily.
1969619674func (c *Checker) getMemberOfStructuredType(t *Type, name string) *ast.Symbol {
@@ -19701,22 +19679,13 @@ func (c *Checker) getMemberOfStructuredType(t *Type, name string) *ast.Symbol {
1970119679}
1970219680
1970319681func (c *Checker) getMemberOfUnresolvedStructuredType(t *Type, name string) *ast.Symbol {
19704- if !isReservedMemberName(name) {
19705- if lm := c.getReadyLazyMemberTable(t); lm != nil {
19706- return c.lookupLazyMember(t, lm, name)
19707- }
19708- }
19709- return c.resolveStructuredTypeMembers(t).members[name]
19710- }
19711-
19712- // lookupLazyMember returns what resolveStructuredTypeMembers(t).members[name]
19713- // would hold: the declared member, or else the property inherited from the
19714- // first base type that has one, where a base may only fill a missing or
19715- // non-value entry (addInheritedMembers).
19716- func (c *Checker) lookupLazyMember(t *Type, lm *lazyMemberTable, name string) *ast.Symbol {
19717- if symbol, ok := lm.found[name]; ok {
19718- return symbol
19682+ lm := c.getReadyLazyMemberTable(t)
19683+ if lm == nil || isReservedMemberName(name) {
19684+ return c.resolveStructuredTypeMembers(t).members[name]
1971919685 }
19686+ // As in resolveObjectTypeMembers: the declared member, or else the property
19687+ // inherited from the first base type that has one, where a base may only
19688+ // fill a missing or non-value entry (addInheritedMembers).
1972019689 var result *ast.Symbol
1972119690 if decl := c.resolveDeclaredMembers(t.Target()).declaredMembers[name]; decl != nil && c.isNamedMember(decl, name) {
1972219691 result = c.getLazyDeclaredMember(lm, decl, name)
@@ -19725,31 +19694,13 @@ func (c *Checker) lookupLazyMember(t *Type, lm *lazyMemberTable, name string) *a
1972519694 if result != nil && result.Flags&ast.SymbolFlagsValue != 0 {
1972619695 break
1972719696 }
19728- if prop := c.getNamedPropertyOfType (baseType, name); prop != nil && isInheritableProperty (prop) {
19697+ if prop := c.getPropertyOfTypeEx (baseType, name, true /*skipObjectFunctionPropertyAugment*/, false /*includeTypeOnlyMembers*/ ); prop != nil && !isStaticPrivateIdentifierProperty (prop) {
1972919698 result = prop
1973019699 }
1973119700 }
19732- lm.found[name] = result
1973319701 return result
1973419702}
1973519703
19736- // getNamedPropertyOfType finds name among getPropertiesOfType(t).
19737- func (c *Checker) getNamedPropertyOfType(t *Type, name string) *ast.Symbol {
19738- reduced := c.getReducedApparentType(t)
19739- if reduced.flags&TypeFlagsObject != 0 {
19740- if symbol := c.getMemberOfStructuredType(reduced, name); symbol != nil && c.isNamedMember(symbol, name) {
19741- return symbol
19742- }
19743- return nil
19744- }
19745- for _, prop := range c.getPropertiesOfType(t) {
19746- if prop.Name == name {
19747- return prop
19748- }
19749- }
19750- return nil
19751- }
19752-
1975319704// everyPropertyOfStructuredType is core.Every(c.resolveStructuredTypeMembers(t).properties, f),
1975419705// without resolving the members of t if they are resolved lazily. f may see a
1975519706// declared member instead of its instantiation, which has the same flags.
@@ -19783,18 +19734,14 @@ func (c *Checker) everyLazyProperty(t *Type, lm *lazyMemberTable, seen *collecti
1978319734 continue
1978419735 }
1978519736 for _, prop := range c.getPropertiesOfType(baseType) {
19786- if isInheritableProperty (prop) && seen.AddIfAbsent(prop.Name) && !f(prop) {
19737+ if !isStaticPrivateIdentifierProperty (prop) && seen.AddIfAbsent(prop.Name) && !f(prop) {
1978719738 return false
1978819739 }
1978919740 }
1979019741 }
1979119742 return true
1979219743}
1979319744
19794- func isInheritableProperty(prop *ast.Symbol) bool {
19795- return !isStaticPrivateIdentifierProperty(prop)
19796- }
19797-
1979819745func (c *Checker) getBaseTypes(t *Type) []*Type {
1979919746 if t.objectFlags&(ObjectFlagsClassOrInterface|ObjectFlagsTuple) == 0 {
1980019747 return nil
0 commit comments