Skip to content

Don't fail to find struct fields in stdlib history #29

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
bobg merged 3 commits into from
Dec 12, 2025
Merged

Don't fail to find struct fields in stdlib history #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc4a060
Bug 27 regression test.
bobg Dec 12, 2025
a784552
Rewrite selectorExpr, preferring p.info.Selections and switching on S…
bobg Dec 12, 2025
191ef6d
Merge branch 'main' into bobg/bug27
bobg Dec 12, 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
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- name: Modver
if: ${{ github.event_name == 'pull_request' }}
uses: bobg/modver@v2.12.1
uses: bobg/modver@v2.13.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
pull_request_url: https://github.com/${{ github.repository }}/pull/${{ github.event.number }}
6 changes: 4 additions & 2 deletions _testdata/1/bar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
type one2 struct{}

func (one2) x() {}
func (one2) x() int {
return 42
}

func one2func() func() {
func one2func() func() int {
var y one2
return y.x
}
3 changes: 3 additions & 0 deletions _testdata/bug27/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module bug27

go 1.23
8 changes: 8 additions & 0 deletions _testdata/bug27/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package main

import "crypto/tls"

func main() {
var foo tls.QUICSessionTicketOptions
print(foo.Extra)
}
92 changes: 52 additions & 40 deletions expr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,31 +211,74 @@ func (p *pkgScanner) selectorExpr(expr *ast.SelectorExpr, isCallFun bool) (bool,
return isMax, err
}

if obj, ok := p.info.Uses[expr.Sel]; ok && obj != nil {
var typ string
if sig, ok := obj.Type().(*types.Signature); ok {
if sel, ok := p.info.Selections[expr]; ok {
obj := sel.Obj()
if obj == nil {
return false, nil
}

typ := sel.Recv()
if ptr, ok := typ.(*types.Pointer); ok {
typ = ptr.Elem()
}
typestr := typ.String()
if dot := strings.LastIndex(typestr, "."); dot >= 0 {
typestr = typestr[dot+1:]
}

pkg := obj.Pkg()
if pkg == nil {
return false, nil
}
pkgpath := pkg.Path()

switch sel.Kind() {
case types.FieldVal:
v := p.s.lookup(pkgpath, expr.Sel.Name, typestr)
if v == 0 {
return false, nil
}

selResult := posResult{
version: v,
pos: p.fset.Position(expr.Pos()),
desc: fmt.Sprintf(`"%s".%s.%s`, pkgpath, typestr, expr.Sel.Name),
}
return p.result(selResult), nil

case types.MethodVal:
if !isCallFun {
p.result(posResult{
version: 1,
pos: p.fset.Position(expr.Pos()),
desc: "method used as value",
})
}
if recv := sig.Recv(); recv != nil {
recvtype := recv.Type().String()
if lastDot := strings.LastIndex(recvtype, "."); lastDot >= 0 {
typ = recvtype[lastDot+1:]
fallthrough

case types.MethodExpr:
if v := p.s.lookup(pkgpath, expr.Sel.Name, typestr); v > 0 {
selResult := posResult{
version: v,
pos: p.fset.Position(expr.Pos()),
desc: fmt.Sprintf(`"%s".%s`, pkgpath, expr.Sel.Name),
}
if p.result(selResult) {
return true, nil
}
}
}
return false, nil
}

if obj, ok := p.info.Uses[expr.Sel]; ok && obj != nil {
pkg := obj.Pkg()
if pkg == nil {
return false, nil
}
pkgpath := pkg.Path()

if v := p.s.lookup(pkgpath, expr.Sel.Name, typ); v > 0 {
if v := p.s.lookup(pkgpath, expr.Sel.Name, ""); v > 0 {
selResult := posResult{
version: v,
pos: p.fset.Position(expr.Pos()),
Expand All @@ -245,40 +288,9 @@ func (p *pkgScanner) selectorExpr(expr *ast.SelectorExpr, isCallFun bool) (bool,
return true, nil
}
}
return false, nil
}

sel, ok := p.info.Selections[expr]
if !ok {
return false, nil
}
obj := sel.Obj()
if obj == nil {
return false, nil
}
pkg := obj.Pkg()
if pkg == nil {
return false, nil
}
pkgpath := pkg.Path()

typ := sel.Recv()
if ptr, ok := typ.(*types.Pointer); ok {
typ = ptr.Elem()
}
typestr := typ.String()

v := p.s.lookup(pkgpath, expr.Sel.Name, typestr)
if v == 0 {
return false, nil
}

selResult := posResult{
version: v,
pos: p.fset.Position(expr.Pos()),
desc: fmt.Sprintf(`"%s".%s.%s`, pkgpath, typestr, expr.Sel.Name),
}
return p.result(selResult), nil
return false, nil
}

func (p *pkgScanner) indexExpr(expr *ast.IndexExpr) (bool, error) {
Expand Down
13 changes: 13 additions & 0 deletions regression_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ func TestBug14(t *testing.T) {
}
}

// https://github.com/bobg/mingo/issues/26
func TestBug26(t *testing.T) {
var s Scanner
res, err := s.ScanDir("_testdata/bug26")
Expand All @@ -24,3 +25,15 @@ func TestBug26(t *testing.T) {
t.Errorf("got %d, want 18", v)
}
}

// https://github.com/bobg/mingo/issues/27
func TestBug27(t *testing.T) {
var s Scanner
res, err := s.ScanDir("_testdata/bug27")
if err != nil {
t.Fatal(err)
}
if v := res.Version(); v != 23 {
t.Errorf("got %d, want 23", v)
}
}