Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Unalias before checking if is interface #3472

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Unalias before checking if is interface #3472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
552bef4
Unalias before checing if is interface
StevenACoffman Jan 7, 2025
56904f1
More unalias
StevenACoffman Jan 7, 2025
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
10 changes: 6 additions & 4 deletions codegen/config/binder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ func isIntf(t types.Type) bool {
if t == nil {
return true
}
_, ok := t.(*types.Interface)
_, ok := types.Unalias(t).(*types.Interface)
return ok
}

Expand Down Expand Up @@ -499,6 +499,7 @@ func isValid(t types.Type) bool {
}

func (b *Binder) CopyModifiersFromAst(t *ast.Type, base types.Type) types.Type {
base = types.Unalias(base)
if t.Elem != nil {
child := b.CopyModifiersFromAst(t.Elem, base)
if _, isStruct := child.Underlying().(*types.Struct); isStruct && !b.cfg.OmitSliceElementPointers {
Expand Down Expand Up @@ -528,11 +529,11 @@ func IsNilable(t types.Type) bool {
return IsNilable(namedType.Underlying())
}
_, isPtr := t.(*types.Pointer)
_, isMap := t.(*types.Map)
_, isNilableMap := t.(*types.Map)
_, isInterface := t.(*types.Interface)
_, isSlice := t.(*types.Slice)
_, isChan := t.(*types.Chan)
return isPtr || isMap || isInterface || isSlice || isChan
return isPtr || isNilableMap || isInterface || isSlice || isChan
}

func hasMethod(it types.Type, name string) bool {
Expand All @@ -553,8 +554,9 @@ func hasMethod(it types.Type, name string) bool {
}

func basicUnderlying(it types.Type) *types.Basic {
it = types.Unalias(it)
if ptr, isPtr := it.(*types.Pointer); isPtr {
it = ptr.Elem()
it = types.Unalias(ptr.Elem())
}
namedType, ok := it.(*types.Named)
if !ok {
Expand Down
Loading