internal/tokeninternal: avoid use of AddExistingFiles, for now

findleyr · gopherbot · commit a2c2a7255649 · 2025-05-20T06:59:17.000-07:00
Recently, token.FileSet.AddExistingFiles was added to the standard library. However, our immediate use of it in x/tools is causing problems due to version skew when we import into Google, where the toolchain may be a week or two old. Temporarily avoid the use of this new API. Change-Id: I2cc6d89b32505d07c3b7275b4279f952e0ecf28c Reviewed-on: https://go-review.googlesource.com/c/tools/+/674435 Reviewed-by: Alan Donovan <adonovan@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Robert Findley <rfindley@google.com>
diff --git a/internal/tokeninternal/tokeninternal_go124.go b/internal/tokeninternal/tokeninternal_go124.go
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !go1.25
+// TODO(rfindley): once the new AddExistingFiles API has had some time to soak
+// in std, use it in x/tools and change the condition below to !go1.25.
+
+//go:build !addexistingfiles
 
 package tokeninternal
 
diff --git a/internal/tokeninternal/tokeninternal_go125.go b/internal/tokeninternal/tokeninternal_go125.go
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.25
+// TODO(rfindley): once the new AddExistingFiles API has had some time to soak
+// in std, use it here behind the go1.25 build tag.
+
+//go:build addexistingfiles
 
 package tokeninternal
 
