[dev.typeparams] cmd/compile: pass -lang flag value to new type checker

This enables another test.

Change-Id: I80763b97d939e225158a083299b2e0d189268bc7
Reviewed-on: https://go-review.googlesource.com/c/go/+/289569
Trust: Robert Griesemer <gri@golang.org>
Trust: Dan Scales <danscales@google.com>
Reviewed-by: Dan Scales <danscales@google.com>

diff --git a/src/cmd/compile/internal/noder/irgen.go b/src/cmd/compile/internal/noder/irgen.go
index 1cef98742d5b34ea4def3b7acbf65d1437880543..475e3bbddd8135fb42afc38db55287543004eeac 100644 (file)
--- a/src/cmd/compile/internal/noder/irgen.go
+++ b/src/cmd/compile/internal/noder/irgen.go
@@ -35,6 +35,7 @@ func check2(noders []*noder) {
 
        // typechecking
        conf := types2.Config{
+               GoVersion:             base.Flag.Lang,
                InferFromConstraints:  true,
                IgnoreLabels:          true, // parser already checked via syntax.CheckBranches mode
                CompilerErrorMessages: true, // use error strings matching existing compiler errors

diff --git a/test/fixedbugs/issue31747.go b/test/fixedbugs/issue31747.go
index 420fe30735e868506fa1d0211729b00cf6667333..319a721337efc6ae470c5e77401456c1d266b342 100644 (file)
--- a/test/fixedbugs/issue31747.go
+++ b/test/fixedbugs/issue31747.go
@@ -8,7 +8,7 @@ package p
 
 // numeric literals
 const (
-       _ = 1_000 // ERROR "underscores in numeric literals requires go1.13 or later \(-lang was set to go1.12; check go.mod\)"
+       _ = 1_000 // ERROR "underscores in numeric literals requires go1.13 or later \(-lang was set to go1.12; check go.mod\)|requires go1.13"
        _ = 0b111 // ERROR "binary literals requires go1.13 or later"
        _ = 0o567 // ERROR "0o/0O-style octal literals requires go1.13 or later"
        _ = 0xabc // ok
@@ -29,6 +29,6 @@ const (
 // signed shift counts
 var (
        s int
-       _ = 1 << s // ERROR "invalid operation: 1 << s \(signed shift count type int\) requires go1.13 or later"
+       _ = 1 << s // ERROR "invalid operation: 1 << s \(signed shift count type int\) requires go1.13 or later|signed shift count"
        _ = 1 >> s // ERROR "signed shift count"
 )

diff --git a/test/run.go b/test/run.go
index 492d9de5a6bf937951c245549705c44018ca4b72..b1d6fe241424c8b0870fcc45845da676da5c7f59 100644 (file)
--- a/test/run.go
+++ b/test/run.go
@@ -1963,7 +1963,6 @@ var excluded = map[string]bool{
        "fixedbugs/issue25958.go":  true, // types2 doesn't report a follow-on error (pref: types2)
        "fixedbugs/issue28079b.go": true, // types2 reports follow-on errors
        "fixedbugs/issue28268.go":  true, // types2 reports follow-on errors
-       "fixedbugs/issue31747.go":  true, // types2 is missing support for -lang flag
        "fixedbugs/issue33460.go":  true, // types2 reports alternative positions in separate error
        "fixedbugs/issue34329.go":  true, // types2 is missing support for -lang flag
        "fixedbugs/issue41575.go":  true, // types2 reports alternative positions in separate error