[dev.typeparams] merge: merge branch 'dev.regabi' into 'dev.typeparams'

The following files had merge conflicts and were merged manually:

	src/cmd/compile/fmtmap_test.go
	src/cmd/compile/internal/gc/noder.go
	src/go/parser/error_test.go
	test/assign.go
	test/chan/perm.go
	test/fixedbugs/issue22822.go
	test/fixedbugs/issue4458.go
	test/init.go
	test/interface/explicit.go
	test/map1.go
	test/method2.go

The following files had manual changes to make tests pass:

	test/run.go
	test/used.go
	src/cmd/compile/internal/types2/stdlib_test.go

Change-Id: Ia495aaaa80ce321ee4ec2a9105780fbe913dbd4c

1 files changed, 2 insertions, 2 deletions

diff --git a/test/map1.go b/test/map1.go
index bd4d87b871..a6b27e6ebd 100644
--- a/test/map1.go
+++ b/test/map1.go
@@ -64,5 +64,5 @@ func main() {
 	delete()        // ERROR "missing arguments|not enough arguments"
 	delete(m)       // ERROR "missing second \(key\) argument|not enough arguments"
 	delete(m, 2, 3) // ERROR "too many arguments"
-	delete(1, m)    // ERROR "first argument to delete must be map|is not a map"
-}
\ No newline at end of file
+	delete(1, m)    // ERROR "first argument to delete must be map|argument 1 must be a map|is not a map"
+}