From: Robert Griesemer <gri@golang.org>
Date: Fri, 27 Sep 2024 17:41:55 +0000 (-0700)
Subject: go/types, types2: remove need for Scope.LookupParent from TestObjectString
X-Git-Tag: go1.24rc1~809
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=99bf122de86ffec5ebd85a688432619d717025fe;p=gostls13.git

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>
---

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])