[dev.typeparams] cmd/compile/internal/types2: set compiler error message for undeclar...

Change-Id: Ie2950cdc5406915935f114bfd97ef03d965f9069
Reviewed-on: https://go-review.googlesource.com/c/go/+/274616
Trust: Robert Griesemer <gri@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/types2/typexpr.go b/src/cmd/compile/internal/types2/typexpr.go
index 0c27e5e04bd71363211811917f5850a206733359..2d568b7e87ba08d20de83ab7953c0fe3847cb104 100644 (file)
--- a/src/cmd/compile/internal/types2/typexpr.go
+++ b/src/cmd/compile/internal/types2/typexpr.go
@@ -32,7 +32,11 @@ func (check *Checker) ident(x *operand, e *syntax.Name, def *Named, wantType boo
                if e.Value == "_" {
                        check.errorf(e, "cannot use _ as value or type")
                } else {
-                       check.errorf(e, "undeclared name: %s", e.Value)
+                       if check.conf.CompilerErrorMessages {
+                               check.errorf(e, "undefined: %s", e.Value)
+                       } else {
+                               check.errorf(e, "undeclared name: %s", e.Value)
+                       }
                }
                return
        }

diff --git a/test/typeparam/tparam1.go b/test/typeparam/tparam1.go
index 5d6dcb6a62d3034a493e8a818e664b5086060d59..70439333269a704bc5f911bf7d68ac41be17ca92 100644 (file)
--- a/test/typeparam/tparam1.go
+++ b/test/typeparam/tparam1.go
@@ -10,8 +10,8 @@ package tparam1
 
 // The predeclared identifier "any" is only visible as a constraint
 // in a type parameter list.
-var _ any // ERROR "undeclared"
-func _(_ any) // ERROR "undeclared"
+var _ any // ERROR "undefined"
+func _(_ any) // ERROR "undefined"
 type _[_ any /* ok here */ ] struct{}
 
 const N = 10