feat: suport go1.25 (#111)

AsterDY · web-flow · commit 317b54f08aae · 2025-08-13T15:01:01.000+08:00
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -19,4 +19,5 @@ jobs:
       - name: Benchmark
         run: |
           cd testdata/test
+          go mod tidy
           go test -benchmem -run=^$ -bench . -benchtime=100ms
diff --git a/.github/workflows/race-test.yml b/.github/workflows/race-test.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.24.x]
+        go-version: [1.25.x]
         os: [ubuntu-24.04-arm, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -24,4 +24,5 @@ jobs:
       - name: Testdata
         run: |
           cd testdata/test
+          go mod tidy
           go test -race -v ./...
diff --git a/conv/j2p/api_amd64.go b/conv/j2p/api_amd64.go
@@ -1,4 +1,4 @@
-//go:build amd64 && !go1.25
+//go:build amd64 && !go1.26
 
 // Copyright 2023 CloudWeGo Authors.
 //
diff --git a/conv/j2p/api_compat.go b/conv/j2p/api_compat.go
@@ -1,4 +1,4 @@
-//go:build !amd64 || go1.25
+//go:build !amd64 || go1.26
 
 // Copyright 2023 CloudWeGo Authors.
 //
diff --git a/conv/j2t/conv_amd64_test.go b/conv/j2t/conv_amd64_test.go
@@ -1,4 +1,4 @@
-//go:build amd64 && !go1.25
+//go:build amd64 && !go1.26
 
 /**
  * Copyright 2023 CloudWeGo Authors.
diff --git a/conv/j2t/impl_amd64.go b/conv/j2t/impl_amd64.go
@@ -1,4 +1,4 @@
-//go:build amd64 && !go1.25
+//go:build amd64 && !go1.26
 
 /**
  * Copyright 2023 CloudWeGo Authors.
diff --git a/conv/j2t/impl_fallback.go b/conv/j2t/impl_fallback.go
@@ -1,4 +1,4 @@
-//go:build !amd64 || go1.25
+//go:build !amd64 || go1.26
 
 /**
  * Copyright 2025 ByteDance Inc.
diff --git a/conv/t2j/conv_amd64_test.go b/conv/t2j/conv_amd64_test.go
@@ -1,5 +1,4 @@
-//go:build amd64 && go1.25
-// +build amd64,go1.25
+//go:build amd64 && go1.26
 
 /**
  * Copyright 2023 CloudWeGo Authors.
diff --git a/go.mod b/go.mod
@@ -3,16 +3,16 @@ module github.com/cloudwego/dynamicgo
 go 1.17
 
 require (
-	github.com/bytedance/sonic v1.13.1
-	github.com/bytedance/sonic/loader v0.2.4
-	github.com/cloudwego/base64x v0.1.5
+	github.com/bytedance/sonic v1.14.0
+	github.com/bytedance/sonic/loader v0.3.0
+	github.com/cloudwego/base64x v0.1.6
 	github.com/cloudwego/gopkg v0.0.0-20240731030152-5e0df5ad4e40
 	github.com/cloudwego/thriftgo v0.3.6
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/fatih/structtag v1.2.0
 	github.com/iancoleman/strcase v0.2.0
 	github.com/jhump/protoreflect v1.8.2
-	github.com/klauspost/cpuid/v2 v2.2.4
+	github.com/klauspost/cpuid/v2 v2.2.9
 	github.com/stretchr/testify v1.9.0
 	google.golang.org/protobuf v1.33.0
 )
@@ -23,7 +23,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
-	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
+	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
@@ -3,15 +3,16 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/bytedance/gopkg v0.0.0-20240711085056-a03554c296f8 h1:rDwLxYTMoKHaw4cS0bQhaTZnkXp5e6ediCggGcRD/CA=
 github.com/bytedance/gopkg v0.0.0-20240711085056-a03554c296f8/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ=
-github.com/bytedance/sonic v1.13.1 h1:Jyd5CIvdFnkOWuKXr+wm4Nyk2h0yAFsr8ucJgEasO3g=
-github.com/bytedance/sonic v1.13.1/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
+github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
+github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
-github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
+github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
 github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
+github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
 github.com/cloudwego/gopkg v0.0.0-20240731030152-5e0df5ad4e40 h1:H1D2KkfXUimnvJ1KPkhYLFrJOiOz33iAwTA8Puatvfw=
 github.com/cloudwego/gopkg v0.0.0-20240731030152-5e0df5ad4e40/go.mod h1:32yKw2zkpTMtuX6amJR0EMK79f0vGPr67UcArCOlZLU=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
@@ -55,8 +56,8 @@ github.com/jhump/protoreflect v1.8.2 h1:k2xE7wcUomeqwY0LDCYA16y4WWfyTcMx5mKhk0d4
 github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -126,10 +127,10 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/internal/json/api_amd64.go b/internal/json/api_amd64.go
@@ -1,4 +1,4 @@
-//go:build amd64 && !go1.25
+//go:build amd64 && !go1.26
 
 // Copyright 2023 CloudWeGo Authors.
 //
diff --git a/internal/json/api_compat.go b/internal/json/api_compat.go
@@ -1,4 +1,4 @@
-//go:build !amd64 || go1.25
+//go:build !amd64 || go1.26
 
 // Copyright 2023 CloudWeGo Authors.
 //
diff --git a/internal/native/avx/native_text_amd64.go b/internal/native/avx/native_text_amd64.go
diff --git a/internal/native/avx2/native_text_amd64.go b/internal/native/avx2/native_text_amd64.go
diff --git a/internal/native/sse/native_text_amd64.go b/internal/native/sse/native_text_amd64.go
diff --git a/internal/rt/growslice_go116.go b/internal/rt/growslice_go116.go
@@ -1,26 +1,25 @@
 //go:build !go1.20
-// +build !go1.20
 
 /**
  * Copyright 2023 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 
+package rt
 
 import _ "unsafe"
 
 //go:linkname growslice runtime.growslice
 //goland:noinspection GoUnusedParameter
-func growslice(et *GoType, old GoSlice, cap int) GoSlice
+func growslice(et *GoType, old GoSlice, cap int) GoSlice
diff --git a/internal/rt/growslice_go120.go b/internal/rt/growslice_go120.go
@@ -1,26 +1,25 @@
 //go:build go1.20
-// +build go1.20
 
 /**
  * Copyright 2023 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 
+package rt
 
 import _ "unsafe"
 
 //go:linkname growslice reflect.growslice
 //goland:noinspection GoUnusedParameter
-func growslice(et *GoType, old GoSlice, cap int) GoSlice
+func growslice(et *GoType, old GoSlice, cap int) GoSlice
diff --git a/tools/asm2asm b/tools/asm2asm
@@ -1 +1 @@
-Subproject commit 329ed4b58256b4a725c31773648a56ba1b3e217c
+Subproject commit 78b9a588bcc6942bdd11237816ce1009f5e269cc

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build amd64 && !go1.25`
	`1`	`+//go:build amd64 && !go1.26`
`2`	`2`
`3`	`3`	`// Copyright 2023 CloudWeGo Authors.`
`4`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build !amd64 \|\| go1.25`
	`1`	`+//go:build !amd64 \|\| go1.26`
`2`	`2`
`3`	`3`	`// Copyright 2023 CloudWeGo Authors.`
`4`	`4`	`//`