feat: support Go 1.26 (#898)

AsterDY · reward416 · commit b10591e90767 · 2026-04-01T16:31:50.000+08:00
diff --git a/ast/api.go b/ast/api.go
@@ -1,5 +1,5 @@
-//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26)
-// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26
+//go:build (amd64 && go1.17 && !go1.27) || (arm64 && go1.20 && !go1.27)
+// +build amd64,go1.17,!go1.27 arm64,go1.20,!go1.27
 
 /*
  * Copyright 2022 ByteDance Inc.
diff --git a/ast/api_compat.go b/ast/api_compat.go
@@ -1,4 +1,4 @@
-// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20
+// +build !amd64,!arm64 go1.27 !go1.17 arm64,!go1.20
 
 /*
 * Copyright 2022 ByteDance Inc.
diff --git a/ast/api_native_test.go b/ast/api_native_test.go
@@ -1,5 +1,5 @@
-//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26)
-// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26
+//go:build (amd64 && go1.17 && !go1.27) || (arm64 && go1.20 && !go1.27)
+// +build amd64,go1.17,!go1.27 arm64,go1.20,!go1.27
 
 /*
  * Copyright 2022 ByteDance Inc.
diff --git a/compat.go b/compat.go
@@ -1,4 +1,4 @@
-// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20
+// +build !amd64,!arm64 go1.27 !go1.17 arm64,!go1.20
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/decode_test.go b/decode_test.go
@@ -1,5 +1,5 @@
-//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26)
-// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26
+//go:build (amd64 && go1.17 && !go1.27) || (arm64 && go1.20 && !go1.27)
+// +build amd64,go1.17,!go1.27 arm64,go1.20,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/decoder/decoder_compat.go b/decoder/decoder_compat.go
@@ -1,5 +1,5 @@
-//go:build (!amd64 && !arm64) || go1.26 || !go1.17 || (arm64 && !go1.20)
-// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20
+//go:build (!amd64 && !arm64) || go1.27 || !go1.17 || (arm64 && !go1.20)
+// +build !amd64,!arm64 go1.27 !go1.17 arm64,!go1.20
 
 /*
 * Copyright 2023 ByteDance Inc.
diff --git a/decoder/decoder_native.go b/decoder/decoder_native.go
@@ -1,5 +1,5 @@
-//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26)
-// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26
+//go:build (amd64 && go1.17 && !go1.27) || (arm64 && go1.20 && !go1.27)
+// +build amd64,go1.17,!go1.27 arm64,go1.20,!go1.27
 
 
 /*
diff --git a/decoder/decoder_native_test.go b/decoder/decoder_native_test.go
@@ -1,5 +1,5 @@
-//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26)
-// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26
+//go:build (amd64 && go1.17 && !go1.27) || (arm64 && go1.20 && !go1.27)
+// +build amd64,go1.17,!go1.27 arm64,go1.20,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/encode_test.go b/encode_test.go
@@ -1,5 +1,5 @@
-//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26)
-// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26
+//go:build (amd64 && go1.17 && !go1.27) || (arm64 && go1.20 && !go1.27)
+// +build amd64,go1.17,!go1.27 arm64,go1.20,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/encoder/encoder_compat.go b/encoder/encoder_compat.go
@@ -1,4 +1,4 @@
-// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20
+// +build !amd64,!arm64 go1.27 !go1.17 arm64,!go1.20
 
 /*
 * Copyright 2023 ByteDance Inc.
diff --git a/encoder/encoder_native.go b/encoder/encoder_native.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26
+// +build amd64,go1.17,!go1.27 arm64,go1.20,!go1.27
 
 /*
  * Copyright 2023 ByteDance Inc.
diff --git a/encoder/encoder_native_test.go b/encoder/encoder_native_test.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26
+// +build amd64,go1.17,!go1.27 arm64,go1.20,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/go.mod b/go.mod
@@ -2,6 +2,8 @@ module github.com/bytedance/sonic
 
 go 1.18
 
+replace github.com/bytedance/sonic/loader => ./loader
+
 require (
 	github.com/bytedance/gopkg v0.1.3
 	github.com/bytedance/sonic/loader v0.4.0
diff --git a/internal/compat/warn.go b/internal/compat/warn.go
@@ -1,4 +1,4 @@
-// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20
+// +build !amd64,!arm64 go1.27 !go1.17 arm64,!go1.20
 
 package compat
 
@@ -8,5 +8,5 @@ import (
 )
 
 func Warn(prefix string) {
-    fmt.Fprintf(os.Stderr, "WARNING: %s only supports (go1.17~1.24 && amd64 CPU) or (go1.20~1.24 && arm64 CPU), but your environment is not suitable and will fallback to encoding/json\n", prefix)
+    fmt.Fprintf(os.Stderr, "WARNING: %s only supports (go1.17~1.26 and amd64 CPU) or (go1.20~1.26 and arm64 CPU), but your environment is not suitable and will fallback to encoding/json\n", prefix)
 }
diff --git a/internal/decoder/api/decoder_amd64.go b/internal/decoder/api/decoder_amd64.go
@@ -1,5 +1,5 @@
-//go:build go1.17 && !go1.26
-// +build go1.17,!go1.26
+//go:build go1.17 && !go1.27
+// +build go1.17,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/internal/decoder/api/decoder_arm64.go b/internal/decoder/api/decoder_arm64.go
@@ -1,4 +1,4 @@
-// +build go1.17,!go1.26
+// +build go1.17,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/internal/decoder/jitdec/asm_stubs_amd64_go121.go b/internal/decoder/jitdec/asm_stubs_amd64_go121.go
@@ -1,4 +1,4 @@
-// +build go1.21,!go1.26
+// +build go1.21,!go1.27
 
 // Copyright 2023 CloudWeGo Authors
 //
diff --git a/internal/decoder/jitdec/assembler_regabi_amd64.go b/internal/decoder/jitdec/assembler_regabi_amd64.go
@@ -1,5 +1,5 @@
-//go:build go1.17 && !go1.26
-// +build go1.17,!go1.26
+//go:build go1.17 && !go1.27
+// +build go1.17,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/internal/decoder/jitdec/generic_regabi_amd64.go b/internal/decoder/jitdec/generic_regabi_amd64.go
@@ -1,4 +1,4 @@
-// +build go1.17,!go1.26
+// +build go1.17,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/internal/decoder/jitdec/generic_regabi_amd64_test.s b/internal/decoder/jitdec/generic_regabi_amd64_test.s
@@ -1,4 +1,4 @@
-// +build go1.17,!go1.26
+// +build go1.17
 
 //
 // Copyright 2021 ByteDance Inc.
diff --git a/internal/encoder/alg/spec.go b/internal/encoder/alg/spec.go
@@ -1,5 +1,5 @@
-//go:build (amd64 && go1.16 && !go1.26) || (arm64 && go1.20 && !go1.26)
-// +build amd64,go1.16,!go1.26 arm64,go1.20,!go1.26
+//go:build (amd64 && go1.16 && !go1.27) || (arm64 && go1.20 && !go1.27)
+// +build amd64,go1.16,!go1.27 arm64,go1.20,!go1.27
 
 /**
  * Copyright 2024 ByteDance Inc.
diff --git a/internal/encoder/alg/spec_compat.go b/internal/encoder/alg/spec_compat.go
@@ -1,4 +1,4 @@
-// +build !amd64,!arm64 go1.26 !go1.16 arm64,!go1.20
+// +build !amd64,!arm64 go1.27 !go1.16 arm64,!go1.20
 
 /**
  * Copyright 2024 ByteDance Inc.
diff --git a/internal/encoder/x86/asm_stubs_amd64_go121.go b/internal/encoder/x86/asm_stubs_amd64_go121.go
@@ -1,5 +1,5 @@
-//go:build !arm64 && go1.21 && !go1.26
-// +build !arm64,go1.21,!go1.26
+//go:build !arm64 && go1.21 && !go1.27
+// +build !arm64,go1.21,!go1.27
 
 // Copyright 2023 CloudWeGo Authors
 //
diff --git a/internal/encoder/x86/assembler_regabi_amd64.go b/internal/encoder/x86/assembler_regabi_amd64.go
@@ -1,5 +1,5 @@
-//go:build !arm64 && go1.17 && !go1.26
-// +build !arm64,go1.17,!go1.26
+//go:build !arm64 && go1.17 && !go1.27
+// +build !arm64,go1.17,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/internal/encoder/x86/debug_go117.go b/internal/encoder/x86/debug_go117.go
@@ -1,5 +1,5 @@
-//go:build !arm64 && go1.17 && !go1.26
-// +build !arm64,go1.17,!go1.26
+//go:build !arm64 && go1.17 && !go1.27
+// +build !arm64,go1.17,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/internal/rt/base64_amd64.go b/internal/rt/base64_amd64.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.26
+// +build amd64,go1.17,!go1.27
 
 package rt
 
diff --git a/internal/rt/base64_compat.go b/internal/rt/base64_compat.go
@@ -1,4 +1,4 @@
-// +build !amd64 !go1.17 go1.26
+// +build !amd64 !go1.17 go1.27
 
 package rt
 
diff --git a/internal/rt/fastvalue.go b/internal/rt/fastvalue.go
@@ -71,10 +71,6 @@ func (self *GoType) String() string {
 	return self.Pack().String()
 }
 
-func (self *GoType) Indirect() bool {
-	return self.KindFlags&F_direct == 0
-}
-
 type GoItab struct {
 	it unsafe.Pointer
 	Vt *GoType
diff --git a/internal/rt/gcwb.go b/internal/rt/gcwb.go
@@ -1,4 +1,4 @@
-// +build go1.21,!go1.26
+// +build go1.21,!go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/internal/rt/gotype_go126.go b/internal/rt/gotype_go126.go
@@ -0,0 +1,25 @@
+//go:build go1.26
+// +build go1.26
+
+/*
+ * Copyright 2021 ByteDance Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rt
+
+// In Go 1.26+, TFlagDirectIface is in the TFlag (Flags) field, not Kind_.
+func (self *GoType) Indirect() bool {
+	return self.Flags&F_direct == 0
+}
diff --git a/internal/rt/gotype_legacy.go b/internal/rt/gotype_legacy.go
@@ -0,0 +1,25 @@
+//go:build !go1.26
+// +build !go1.26
+
+/*
+ * Copyright 2021 ByteDance Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rt
+
+// In Go < 1.26, KindDirectIface is in the Kind_ (KindFlags) field.
+func (self *GoType) Indirect() bool {
+	return self.KindFlags&F_direct == 0
+}
diff --git a/internal/rt/map_go124.go b/internal/rt/map_go124.go
diff --git a/internal/rt/map_go126.go b/internal/rt/map_go126.go
@@ -1,5 +1,5 @@
-//go:build go1.24 && !go1.26 && goexperiment.swissmap
-// +build go1.24,!go1.26,goexperiment.swissmap
+//go:build go1.26 || goexperiment.swissmap
+// +build go1.26 goexperiment.swissmap
 
 package rt
 
diff --git a/loader/funcdata_compat.go b/loader/funcdata_compat.go
@@ -1,5 +1,5 @@
-//go:build !go1.17 || go1.26
-// +build !go1.17 go1.26
+//go:build !go1.17 || go1.27
+// +build !go1.17 go1.27
 
 /*
  * Copyright 2021 ByteDance Inc.
diff --git a/loader/funcdata_go126.go b/loader/funcdata_go126.go
diff --git a/loader/funcdata_legacy.go b/loader/funcdata_legacy.go
diff --git a/loader/moduledata.go b/loader/moduledata.go
diff --git a/rfc_test.go b/rfc_test.go
diff --git a/search_test.go b/search_test.go
diff --git a/sonic.go b/sonic.go
diff --git a/unquote/unquote.go b/unquote/unquote.go
diff --git a/unquote/unquote_fallback.go b/unquote/unquote_fallback.go
diff --git a/utf8/utf8.go b/utf8/utf8.go
diff --git a/utf8/utf8_fallback.go b/utf8/utf8_fallback.go
diff --git a/utf8/utf8_native_test.go b/utf8/utf8_native_test.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20`
	`1`	`+// +build !amd64,!arm64 go1.27 !go1.17 arm64,!go1.20`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* Copyright 2022 ByteDance Inc.`