Skip to content

Commit 2693f77

Browse files
matloobmatloob
committed
Revert "go/types, types2: only use fileVersion if 1.21 or greater"
This reverts CL 603895 Reason for revert: We've decided to change the logic for how upgrades are done and want to submit the new logic in a self contained CL that can be cherry-picked onto release-branch.go1.23 Change-Id: I366af8e95ce1de7311b0385a23f9dd3df175745a Reviewed-on: https://go-review.googlesource.com/c/go/+/605675 Reviewed-by: Cherry Mui <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 1419d0e commit 2693f77

File tree

10 files changed

+22
-87
lines changed

10 files changed

+22
-87
lines changed

‎src/cmd/compile/internal/types2/api_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3036,21 +3036,17 @@ func TestFileVersions(t *testing.T) {
30363036
{"", "go1.20", ""}, // file upgrade ignored
30373037
{"go1.19", "go1.20", "go1.20"}, // file upgrade permitted
30383038
{"go1.20", "go1.19", "go1.20"}, // file downgrade not permitted
3039-
{"go1.21", "go1.20", "go1.21"}, // file downgrade not permitted
3040-
{"go1.22", "go1.21", "go1.21"}, // file downgrade permitted (file and module version are >= go1.21)
3039+
{"go1.21", "go1.19", "go1.19"}, // file downgrade permitted (module version is >= go1.21)
30413040

30423041
// versions containing release numbers
30433042
// (file versions containing release numbers are considered invalid)
30443043
{"go1.19.0", "", "go1.19.0"}, // no file version specified
30453044
{"go1.20", "go1.20.1", "go1.20"}, // file upgrade ignored
30463045
{"go1.20.1", "go1.20", "go1.20.1"}, // file upgrade ignored
3047-
{"go1.21.0", "go1.21.1", "go1.21.0"}, // file upgrade ignored
3048-
{"go1.21", "go1.21.1", "go1.21"}, // file upgrade ignored
30493046
{"go1.20.1", "go1.21", "go1.21"}, // file upgrade permitted
3050-
{"go1.21.1", "go1.21", "go1.21.1"}, // file downgrade ignored
30513047
{"go1.20.1", "go1.19", "go1.20.1"}, // file downgrade not permitted
30523048
{"go1.21.1", "go1.19.1", "go1.21.1"}, // file downgrade not permitted (invalid file version)
3053-
{"go1.22.1", "go1.21", "go1.21"}, // file downgrade permitted (file and module version is >= go1.21)
3049+
{"go1.21.1", "go1.19", "go1.19"}, // file downgrade permitted (module version is >= go1.21)
30543050
} {
30553051
var src string
30563052
if test.fileVersion != "" {

‎src/cmd/compile/internal/types2/check.go

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -353,25 +353,12 @@ func (check *Checker) initFiles(files []*syntax.File) {
353353
// To work around this, downgrades are only allowed when the
354354
// module's Go version is Go 1.21 or later.
355355
//
356-
// Downgrades are also only allowed to Go versions Go 1.21 or later.
357-
// In GOPATH mode, there's no way to set a module version and the
358-
// -lang is set to the local toolchain version to allow the use of
359-
// new features in GOPATH mode. But //go:build lines added before go1.21
360-
// weren't intended to downgrade, so code with //go:build lines for
361-
// go versions earlier than 1.21 may use language features added
362-
// in later versions and compile.
363-
//
364-
// We should probably change the downgradeOk condition to capture this
365-
// instead of adding an extra condition, but to make the change simpler,
366-
// we've tried to limit it to one line.
367-
// TODO(gri): simplify this code after 1.23 has shipped
368-
//
369356
// If there is no valid check.version, then we don't really know what
370357
// Go version to apply.
371358
// Legacy tools may do this, and they historically have accepted everything.
372359
// Preserve that behavior by ignoring //go:build constraints entirely in that
373360
// case (!pkgVersionOk).
374-
if cmp > 0 || cmp < 0 && downgradeOk && fileVersion.cmp(go1_21) >= 0 {
361+
if cmp > 0 || cmp < 0 && downgradeOk {
375362
v = file.GoVersion
376363
}
377364
}

‎src/go/types/api_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,21 +3040,17 @@ func TestFileVersions(t *testing.T) {
30403040
{"", "go1.20", ""}, // file upgrade ignored
30413041
{"go1.19", "go1.20", "go1.20"}, // file upgrade permitted
30423042
{"go1.20", "go1.19", "go1.20"}, // file downgrade not permitted
3043-
{"go1.21", "go1.20", "go1.21"}, // file downgrade not permitted
3044-
{"go1.22", "go1.21", "go1.21"}, // file downgrade permitted (file and module version are >= go1.21)
3043+
{"go1.21", "go1.19", "go1.19"}, // file downgrade permitted (module version is >= go1.21)
30453044

30463045
// versions containing release numbers
30473046
// (file versions containing release numbers are considered invalid)
30483047
{"go1.19.0", "", "go1.19.0"}, // no file version specified
30493048
{"go1.20", "go1.20.1", "go1.20"}, // file upgrade ignored
30503049
{"go1.20.1", "go1.20", "go1.20.1"}, // file upgrade ignored
3051-
{"go1.21.0", "go1.21.1", "go1.21.0"}, // file upgrade ignored
3052-
{"go1.21", "go1.21.1", "go1.21"}, // file upgrade ignored
30533050
{"go1.20.1", "go1.21", "go1.21"}, // file upgrade permitted
3054-
{"go1.21.1", "go1.21", "go1.21.1"}, // file downgrade ignored
30553051
{"go1.20.1", "go1.19", "go1.20.1"}, // file downgrade not permitted
30563052
{"go1.21.1", "go1.19.1", "go1.21.1"}, // file downgrade not permitted (invalid file version)
3057-
{"go1.22.1", "go1.21", "go1.21"}, // file downgrade permitted (file and module version is >= go1.21)
3053+
{"go1.21.1", "go1.19", "go1.19"}, // file downgrade permitted (module version is >= go1.21)
30583054
} {
30593055
var src string
30603056
if test.fileVersion != "" {

‎src/go/types/check.go

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -374,25 +374,12 @@ func (check *Checker) initFiles(files []*ast.File) {
374374
// To work around this, downgrades are only allowed when the
375375
// module's Go version is Go 1.21 or later.
376376
//
377-
// Downgrades are also only allowed to Go versions Go 1.21 or later.
378-
// In GOPATH mode, there's no way to set a module version and the
379-
// -lang is set to the local toolchain version to allow the use of
380-
// new features in GOPATH mode. But //go:build lines added before go1.21
381-
// weren't intended to downgrade, so code with //go:build lines for
382-
// go versions earlier than 1.21 may use language features added
383-
// in later versions and compile.
384-
//
385-
// We should probably change the downgradeOk condition to capture this
386-
// instead of adding an extra condition, but to make the change simpler,
387-
// we've tried to limit it to one line.
388-
// TODO(gri): simplify this code after 1.23 has shipped
389-
//
390377
// If there is no valid check.version, then we don't really know what
391378
// Go version to apply.
392379
// Legacy tools may do this, and they historically have accepted everything.
393380
// Preserve that behavior by ignoring //go:build constraints entirely in that
394381
// case (!pkgVersionOk).
395-
if cmp > 0 || cmp < 0 && downgradeOk && fileVersion.cmp(go1_21) >= 0 {
382+
if cmp > 0 || cmp < 0 && downgradeOk {
396383
v = file.GoVersion
397384
}
398385
}

‎src/internal/types/testdata/check/go1_20_19.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ type Slice []byte
1414
type Array [8]byte
1515

1616
var s Slice
17-
var p = (Array)(s /* ok because downgrades below 1.21 are ignored */)
17+
var p = (Array)(s /* ok because Go 1.20 ignored the //go:build go1.19 */)

‎src/internal/types/testdata/check/go1_21_19.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ type Slice []byte
1414
type Array [8]byte
1515

1616
var s Slice
17-
var p = (Array)(s /* ok because downgrades below 1.21 are ignored */)
17+
var p = (Array)(s /* ERROR "requires go1.20 or later" */)

‎src/internal/types/testdata/check/go1_21_22.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/internal/types/testdata/check/go1_22_21.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/internal/types/testdata/fixedbugs/issue66285.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
// -lang=go1.13
1+
// -lang=go1.21
22

33
// Copyright 2024 The Go Authors. All rights reserved.
44
// Use of this source code is governed by a BSD-style
55
// license that can be found in the LICENSE file.
66

7+
// Note: Downgrading to go1.13 requires at least go1.21,
8+
// hence the need for -lang=go1.21 at the top.
9+
10+
//go:build go1.13
11+
712
package p
813

914
import "io"

‎test/fixedbugs/issue63489a.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
// errorcheck -lang=go1.22
1+
// errorcheck -lang=go1.21
22

33
// Copyright 2023 The Go Authors. All rights reserved.
44
// Use of this source code is governed by a BSD-style
55
// license that can be found in the LICENSE file.
66

7-
// This file has been changed from its original version as
8-
// //go:build language downgrades below go1.21 are no longer
9-
// supported. The original tested a downgrade from go1.21 to
10-
// go1.4 while this new version tests a downgrade from go1.22
11-
// to go1.21
12-
13-
//go:build go1.21
7+
//go:build go1.4
148

159
package p
1610

17-
func f() {
18-
for _ = range 10 { // ERROR "file declares //go:build go1.21"
19-
}
20-
}
11+
const c = 0o123 // ERROR "file declares //go:build go1.4"
12+
13+
// ERROR "file declares //go:build go1.4"
14+
15+
//line issue63489a.go:13:1
16+
const d = 0o124

0 commit comments

Comments
 (0)