Skip to content

Commit 3670a3f

Browse files
prattmicgvisor-bot
authored andcommitted
Bump gVisor build tags to go1.20
Upstream Go tip has updated its version to 1.19, so we need to bump these build tags to allow tip testing. Ideally we'll get checklinkname (or equivalent) to check these remaining unsafe uses (like internal struct field offsets) soon. For golang/go#51445. PiperOrigin-RevId: 432215030
1 parent 17b93a8 commit 3670a3f

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

pkg/gohacks/gohacks_unsafe.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
//go:build go1.13 && !go1.19
16-
// +build go1.13,!go1.19
15+
//go:build go1.13 && !go1.20
16+
// +build go1.13,!go1.20
1717

1818
// //go:linkname directives type-checked by checklinkname. Any other
1919
// non-linkname assumptions outside the Go 1 compatibility guarantee should

pkg/goid/goid.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
//go:build go1.12 && !go1.19
16-
// +build go1.12,!go1.19
15+
//go:build go1.12 && !go1.20
16+
// +build go1.12,!go1.20
1717

1818
// Check type signatures when updating Go version.
1919

pkg/procid/procid_amd64.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
//go:build amd64 && go1.8 && !go1.19 && go1.1
16-
// +build amd64,go1.8,!go1.19,go1.1
15+
//go:build amd64 && go1.8 && !go1.20 && go1.1
16+
// +build amd64,go1.8,!go1.20,go1.1
1717

1818
// //go:linkname directives type-checked by checklinkname. Any other
1919
// non-linkname assumptions outside the Go 1 compatibility guarantee should

pkg/procid/procid_arm64.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
//go:build arm64 && go1.8 && !go1.19 && go1.1
16-
// +build arm64,go1.8,!go1.19,go1.1
15+
//go:build arm64 && go1.8 && !go1.20 && go1.1
16+
// +build arm64,go1.8,!go1.20,go1.1
1717

1818
// //go:linkname directives type-checked by checklinkname. Any other
1919
// non-linkname assumptions outside the Go 1 compatibility guarantee should

pkg/sync/mutex_unsafe.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// Use of this source code is governed by a BSD-style
44
// license that can be found in the LICENSE file.
55

6-
//go:build go1.13 && !go1.19
7-
// +build go1.13,!go1.19
6+
//go:build go1.13 && !go1.20
7+
// +build go1.13,!go1.20
88

99
// When updating the build constraint (above), check that syncMutex matches the
1010
// standard library sync.Mutex definition.

pkg/sync/runtime_amd64.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// Use of this source code is governed by a BSD-style
44
// license that can be found in the LICENSE file.
55

6-
//go:build amd64 && go1.8 && !go1.19 && !goexperiment.staticlockranking
7-
// +build amd64,go1.8,!go1.19,!goexperiment.staticlockranking
6+
//go:build amd64 && go1.8 && !go1.20 && !goexperiment.staticlockranking
7+
// +build amd64,go1.8,!go1.20,!goexperiment.staticlockranking
88

99
package sync
1010

pkg/sync/runtime_amd64.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
//go:build amd64 && go1.8 && !go1.19 && !goexperiment.staticlockranking
16-
// +build amd64,go1.8,!go1.19,!goexperiment.staticlockranking
15+
//go:build amd64 && go1.17 && !go1.20 && !goexperiment.staticlockranking
16+
// +build amd64,go1.8,!go1.20,!goexperiment.staticlockranking
1717

1818
#include "textflag.h"
1919

pkg/sync/runtime_unsafe.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// Use of this source code is governed by a BSD-style
44
// license that can be found in the LICENSE file.
55

6-
//go:build go1.13 && !go1.19
7-
// +build go1.13,!go1.19
6+
//go:build go1.13 && !go1.20
7+
// +build go1.13,!go1.20
88

99
// //go:linkname directives type-checked by checklinkname. Any other
1010
// non-linkname assumptions outside the Go 1 compatibility guarantee should

0 commit comments

Comments
 (0)