Skip to content

Commit 044b16f

Browse files
committed
internal/gcimporter: extend markBlack workaround go1.22
Although the workaround in CL 621855 was effective for gopls, which uses go1.23, the x/tools builders using go1.22 are still bumping into this data race. This change applies the same workaround to go1.22; the data type has not changed. Fixes golang/go#69912 Fixed golang/go#70015 Change-Id: I9f12f8815a0b089a188b9d02aec9d07eb30a496a Reviewed-on: https://go-review.googlesource.com/c/tools/+/622319 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Robert Findley <[email protected]>
1 parent dabba6a commit 044b16f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

internal/gcimporter/iimport_go123.go renamed to internal/gcimporter/iimport_go122.go

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

5-
//go:build go1.23 && !go1.24
5+
//go:build go1.22 && !go1.24
66

77
package gcimporter
88

@@ -12,8 +12,7 @@ import (
1212
"unsafe"
1313
)
1414

15-
// TODO(rfindley): delete this workaround once gopls no longer compiles with
16-
// go1.23.
15+
// TODO(rfindley): delete this workaround once go1.24 is assured.
1716

1817
func init() {
1918
// Update markBlack so that it correctly sets the color

0 commit comments

Comments
 (0)