diff options
| author | Robert Griesemer <gri@golang.org> | 2024-09-27 10:41:55 -0700 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-09-27 18:18:44 +0000 |
| commit | 99bf122de86ffec5ebd85a688432619d717025fe (patch) | |
| tree | b12ccb4e587d0898a21bb506254ecf093526ffa7 /src | |
| parent | 80316510d3b97c6dc7b6a380e18e9f41467b3c10 (diff) | |
| download | go-99bf122de86ffec5ebd85a688432619d717025fe.tar.xz | |
go/types, types2: remove need for Scope.LookupParent from TestObjectString
Updates #69673.
Change-Id: I0ce5f009c1e95a2722a50d79a74fef83d2547b47
Reviewed-on: https://go-review.googlesource.com/c/go/+/616260
Auto-Submit: Robert Griesemer <gri@google.com>
Reviewed-by: Robert Griesemer <gri@google.com>
Reviewed-by: Alan Donovan <adonovan@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/compile/internal/types2/object_test.go | 7 | ||||
| -rw-r--r-- | src/go/types/object_test.go | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/types2/object_test.go b/src/cmd/compile/internal/types2/object_test.go index 955fa351a4..f19264e4db 100644 --- a/src/cmd/compile/internal/types2/object_test.go +++ b/src/cmd/compile/internal/types2/object_test.go @@ -129,10 +129,15 @@ func TestObjectString(t *testing.T) { if len(names) != 1 && len(names) != 2 { t.Fatalf("%s: invalid object path %s", test.src, test.obj) } - _, obj := pkg.Scope().LookupParent(names[0], nopos) + + var obj Object + for s := pkg.Scope(); s != nil && obj == nil; s = s.Parent() { + obj = s.Lookup(names[0]) + } if obj == nil { t.Fatalf("%s: %s not found", test.src, names[0]) } + if len(names) == 2 { if typ, ok := obj.Type().(interface{ TypeParams() *TypeParamList }); ok { obj = lookupTypeParamObj(typ.TypeParams(), names[1]) diff --git a/src/go/types/object_test.go b/src/go/types/object_test.go index 704d4128ba..0b4fce7bb1 100644 --- a/src/go/types/object_test.go +++ b/src/go/types/object_test.go @@ -130,10 +130,15 @@ func TestObjectString(t *testing.T) { if len(names) != 1 && len(names) != 2 { t.Fatalf("%s: invalid object path %s", test.src, test.obj) } - _, obj := pkg.Scope().LookupParent(names[0], nopos) + + var obj Object + for s := pkg.Scope(); s != nil && obj == nil; s = s.Parent() { + obj = s.Lookup(names[0]) + } if obj == nil { t.Fatalf("%s: %s not found", test.src, names[0]) } + if len(names) == 2 { if typ, ok := obj.Type().(interface{ TypeParams() *TypeParamList }); ok { obj = lookupTypeParamObj(typ.TypeParams(), names[1]) |