diff --git a/ast/api.go b/ast/api.go index 36151f270..38d7ab9ca 100644 --- a/ast/api.go +++ b/ast/api.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2022 ByteDance Inc. diff --git a/ast/api_compat.go b/ast/api_compat.go index 74119fed6..0ca4d56ca 100644 --- a/ast/api_compat.go +++ b/ast/api_compat.go @@ -1,4 +1,4 @@ -// +build !amd64,!arm64 go1.25 !go1.17 arm64,!go1.20 +// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20 /* * Copyright 2022 ByteDance Inc. diff --git a/ast/api_native_test.go b/ast/api_native_test.go index d82ab6d45..077c29ed6 100644 --- a/ast/api_native_test.go +++ b/ast/api_native_test.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2022 ByteDance Inc. diff --git a/compat.go b/compat.go index ec996493a..1fa670a48 100644 --- a/compat.go +++ b/compat.go @@ -1,4 +1,4 @@ -// +build !amd64,!arm64 go1.25 !go1.17 arm64,!go1.20 +// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20 /* * Copyright 2021 ByteDance Inc. diff --git a/decode_test.go b/decode_test.go index 36c494e2b..f762a1dbf 100644 --- a/decode_test.go +++ b/decode_test.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/decoder/decoder_compat.go b/decoder/decoder_compat.go index 754e5fbc2..75b21746f 100644 --- a/decoder/decoder_compat.go +++ b/decoder/decoder_compat.go @@ -1,5 +1,5 @@ -//go:build (!amd64 && !arm64) || go1.25 || !go1.17 || (arm64 && !go1.20) -// +build !amd64,!arm64 go1.25 !go1.17 arm64,!go1.20 +//go:build (!amd64 && !arm64) || go1.26 || !go1.17 || (arm64 && !go1.20) +// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20 /* * Copyright 2023 ByteDance Inc. diff --git a/decoder/decoder_native.go b/decoder/decoder_native.go index 563ca944b..4313a4e14 100644 --- a/decoder/decoder_native.go +++ b/decoder/decoder_native.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* diff --git a/decoder/decoder_native_test.go b/decoder/decoder_native_test.go index 516d286ac..ce3ff943b 100644 --- a/decoder/decoder_native_test.go +++ b/decoder/decoder_native_test.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/encode_test.go b/encode_test.go index 2185434f8..46e5f05d9 100644 --- a/encode_test.go +++ b/encode_test.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/encoder/encoder_compat.go b/encoder/encoder_compat.go index d48e99b1f..a7350548a 100644 --- a/encoder/encoder_compat.go +++ b/encoder/encoder_compat.go @@ -1,4 +1,4 @@ -// +build !amd64,!arm64 go1.25 !go1.17 arm64,!go1.20 +// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20 /* * Copyright 2023 ByteDance Inc. diff --git a/encoder/encoder_native.go b/encoder/encoder_native.go index 2881da8d7..d38ab3c1a 100644 --- a/encoder/encoder_native.go +++ b/encoder/encoder_native.go @@ -1,4 +1,4 @@ -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2023 ByteDance Inc. diff --git a/encoder/encoder_native_test.go b/encoder/encoder_native_test.go index 2f8b75705..b4f3de832 100644 --- a/encoder/encoder_native_test.go +++ b/encoder/encoder_native_test.go @@ -1,4 +1,4 @@ -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/external_jsonlib_test/go.mod b/external_jsonlib_test/go.mod index 6b2bd24b0..cbf92a4df 100644 --- a/external_jsonlib_test/go.mod +++ b/external_jsonlib_test/go.mod @@ -14,7 +14,7 @@ require ( ) require ( - github.com/bytedance/sonic/loader v0.2.4 // indirect + github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef // indirect github.com/cloudwego/base64x v0.1.5 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect diff --git a/external_jsonlib_test/go.sum b/external_jsonlib_test/go.sum index ce54ab339..b7fa9b8ce 100644 --- a/external_jsonlib_test/go.sum +++ b/external_jsonlib_test/go.sum @@ -1,8 +1,8 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= 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.2.5-0.20250615173055-5c2186ca22ef h1:f7hVOuG4AOH5L3S/lGQXjm3lT/Gm86EKl1JgxJFby/M= +github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= diff --git a/fuzz/go.mod b/fuzz/go.mod index 30698a7c8..15a16b7be 100644 --- a/fuzz/go.mod +++ b/fuzz/go.mod @@ -10,8 +10,8 @@ require ( ) require ( - github.com/bytedance/sonic/loader v0.2.2 // indirect - github.com/cloudwego/base64x v0.1.4 // indirect + github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef // indirect + github.com/cloudwego/base64x v0.1.5 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect diff --git a/fuzz/go.sum b/fuzz/go.sum index 8bcc2570f..6d9bdd837 100644 --- a/fuzz/go.sum +++ b/fuzz/go.sum @@ -1,10 +1,10 @@ github.com/bytedance/gopkg v0.0.0-20221122125632-68358b8ecec6 h1:FCLDGi1EmB7JzjVVYNZiqc/zAJj2BQ5M0lfkVOxbfs8= github.com/bytedance/gopkg v0.0.0-20221122125632-68358b8ecec6/go.mod h1:5FoAH5xUHHCMDvQPy1rnj8moqLkLHFaDVBjHhcFwEi0= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= -github.com/bytedance/sonic/loader v0.2.2 h1:jxAJuN9fOot/cyz5Q6dUuMJF5OqQ6+5GfA8FjjQ0R4o= -github.com/bytedance/sonic/loader v0.2.2/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= -github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= -github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef h1:f7hVOuG4AOH5L3S/lGQXjm3lT/Gm86EKl1JgxJFby/M= +github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= +github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= +github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/generic_test/go.mod b/generic_test/go.mod index 6b078dc8e..a8c693504 100644 --- a/generic_test/go.mod +++ b/generic_test/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/bytedance/sonic/loader v0.2.4 // indirect + github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef // indirect github.com/cloudwego/base64x v0.1.5 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect diff --git a/generic_test/go.sum b/generic_test/go.sum index d6db7fff4..969c78149 100644 --- a/generic_test/go.sum +++ b/generic_test/go.sum @@ -1,6 +1,6 @@ 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.2.5-0.20250615173055-5c2186ca22ef h1:f7hVOuG4AOH5L3S/lGQXjm3lT/Gm86EKl1JgxJFby/M= +github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= diff --git a/go.mod b/go.mod index 70a0b1b96..4bedea584 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/bytedance/sonic go 1.17 require ( - github.com/bytedance/sonic/loader v0.2.4 + github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef github.com/cloudwego/base64x v0.1.5 github.com/davecgh/go-spew v1.1.1 github.com/klauspost/cpuid/v2 v2.0.9 diff --git a/go.sum b/go.sum index 7839159a9..8bde62925 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ 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.2.5-0.20250615173055-5c2186ca22ef h1:f7hVOuG4AOH5L3S/lGQXjm3lT/Gm86EKl1JgxJFby/M= +github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= diff --git a/internal/compat/warn.go b/internal/compat/warn.go index bd9600e5a..4fabaabac 100644 --- a/internal/compat/warn.go +++ b/internal/compat/warn.go @@ -1,4 +1,4 @@ -// +build !amd64,!arm64 go1.25 !go1.17 arm64,!go1.20 +// +build !amd64,!arm64 go1.26 !go1.17 arm64,!go1.20 package compat diff --git a/internal/decoder/api/decoder_amd64.go b/internal/decoder/api/decoder_amd64.go index 551b35b1b..4e7f46fa6 100644 --- a/internal/decoder/api/decoder_amd64.go +++ b/internal/decoder/api/decoder_amd64.go @@ -1,5 +1,5 @@ -//go:build go1.17 && !go1.25 -// +build go1.17,!go1.25 +//go:build go1.17 && !go1.26 +// +build go1.17,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/internal/decoder/api/decoder_arm64.go b/internal/decoder/api/decoder_arm64.go index a56e1579d..5a7d44de1 100644 --- a/internal/decoder/api/decoder_arm64.go +++ b/internal/decoder/api/decoder_arm64.go @@ -1,4 +1,4 @@ -// +build go1.17,!go1.25 +// +build go1.17,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/internal/decoder/jitdec/asm_stubs_amd64_go121.go b/internal/decoder/jitdec/asm_stubs_amd64_go121.go index d6101b2e6..5cd3750bf 100644 --- 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.25 +// +build go1.21,!go1.26 // Copyright 2023 CloudWeGo Authors // diff --git a/internal/decoder/jitdec/assembler_regabi_amd64.go b/internal/decoder/jitdec/assembler_regabi_amd64.go index 20c115e79..10f623095 100644 --- 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.25 -// +build go1.17,!go1.25 +//go:build go1.17 && !go1.26 +// +build go1.17,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/internal/decoder/jitdec/generic_regabi_amd64.go b/internal/decoder/jitdec/generic_regabi_amd64.go index 51a850a8a..2cb41f08d 100644 --- a/internal/decoder/jitdec/generic_regabi_amd64.go +++ b/internal/decoder/jitdec/generic_regabi_amd64.go @@ -1,4 +1,4 @@ -// +build go1.17,!go1.25 +// +build go1.17,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/internal/decoder/jitdec/generic_regabi_amd64_test.s b/internal/decoder/jitdec/generic_regabi_amd64_test.s index f287eaeb4..a08f0e2ad 100644 --- 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.25 +// +build go1.17,!go1.26 // // Copyright 2021 ByteDance Inc. diff --git a/internal/encoder/alg/spec.go b/internal/encoder/alg/spec.go index ecdbfb7bd..e0b2fc9b8 100644 --- a/internal/encoder/alg/spec.go +++ b/internal/encoder/alg/spec.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.16 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.16,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.16 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.16,!go1.26 arm64,go1.20,!go1.26 /** * Copyright 2024 ByteDance Inc. diff --git a/internal/encoder/alg/spec_compat.go b/internal/encoder/alg/spec_compat.go index cd8369834..cd9beab04 100644 --- a/internal/encoder/alg/spec_compat.go +++ b/internal/encoder/alg/spec_compat.go @@ -1,4 +1,4 @@ -// +build !amd64,!arm64 go1.25 !go1.16 arm64,!go1.20 +// +build !amd64,!arm64 go1.26 !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 index 6956bd9ba..34a2ff321 100644 --- a/internal/encoder/x86/asm_stubs_amd64_go121.go +++ b/internal/encoder/x86/asm_stubs_amd64_go121.go @@ -1,5 +1,5 @@ -//go:build go1.21 && !go1.25 -// +build go1.21,!go1.25 +//go:build go1.21 && !go1.26 +// +build go1.21,!go1.26 // Copyright 2023 CloudWeGo Authors // diff --git a/internal/encoder/x86/assembler_regabi_amd64.go b/internal/encoder/x86/assembler_regabi_amd64.go index d6d451329..927c436dd 100644 --- a/internal/encoder/x86/assembler_regabi_amd64.go +++ b/internal/encoder/x86/assembler_regabi_amd64.go @@ -1,5 +1,5 @@ -//go:build go1.17 && !go1.25 -// +build go1.17,!go1.25 +//go:build go1.17 && !go1.26 +// +build go1.17,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/internal/encoder/x86/debug_go117.go b/internal/encoder/x86/debug_go117.go index 1d1338756..6d7659e68 100644 --- a/internal/encoder/x86/debug_go117.go +++ b/internal/encoder/x86/debug_go117.go @@ -1,5 +1,5 @@ -//go:build go1.17 && !go1.25 -// +build go1.17,!go1.25 +//go:build go1.17 && !go1.26 +// +build go1.17,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/internal/native/traceback_test.mock_tmpl b/internal/native/traceback_test.mock_tmpl index c60887882..25df4bf8e 100644 --- a/internal/native/traceback_test.mock_tmpl +++ b/internal/native/traceback_test.mock_tmpl @@ -1,5 +1,5 @@ -// +build !race,amd64,go1.16,!go1.25 +// +build !race,amd64,go1.16,!go1.26 // Code generated by Makefile, DO NOT EDIT. diff --git a/internal/rt/base64_amd64.go b/internal/rt/base64_amd64.go index ec5ea88a0..9b0cfca72 100644 --- a/internal/rt/base64_amd64.go +++ b/internal/rt/base64_amd64.go @@ -1,4 +1,4 @@ -// +build amd64,go1.17,!go1.25 +// +build amd64,go1.17,!go1.26 package rt diff --git a/internal/rt/base64_compat.go b/internal/rt/base64_compat.go index bd3150fe0..e6abcb57d 100644 --- a/internal/rt/base64_compat.go +++ b/internal/rt/base64_compat.go @@ -1,4 +1,4 @@ -// +build !amd64 !go1.17 go1.25 +// +build !amd64 !go1.17 go1.26 package rt diff --git a/internal/rt/gcwb.go b/internal/rt/gcwb.go index bd3e4ef26..c9ad5fb2f 100644 --- a/internal/rt/gcwb.go +++ b/internal/rt/gcwb.go @@ -1,4 +1,4 @@ -// +build go1.21,!go1.25 +// +build go1.21,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/internal/rt/map_nosiwss_go124.go b/internal/rt/map_nosiwss_go124.go index 8ecb9878e..8dda15bb8 100644 --- a/internal/rt/map_nosiwss_go124.go +++ b/internal/rt/map_nosiwss_go124.go @@ -1,5 +1,5 @@ -//go:build go1.24 && !go1.25 && !goexperiment.swissmap -// +build go1.24,!go1.25,!goexperiment.swissmap +//go:build go1.24 && !go1.26 && !goexperiment.swissmap +// +build go1.24,!go1.26,!goexperiment.swissmap package rt diff --git a/internal/rt/map_siwss_go124.go b/internal/rt/map_siwss_go124.go index b5bf7803c..6a7907691 100644 --- a/internal/rt/map_siwss_go124.go +++ b/internal/rt/map_siwss_go124.go @@ -1,5 +1,5 @@ -//go:build go1.24 && !go1.25 && goexperiment.swissmap -// +build go1.24,!go1.25,goexperiment.swissmap +//go:build go1.24 && !go1.26 && goexperiment.swissmap +// +build go1.24,!go1.26,goexperiment.swissmap package rt diff --git a/issue_test/go.mod b/issue_test/go.mod index 6514b7b79..7a879bfc6 100644 --- a/issue_test/go.mod +++ b/issue_test/go.mod @@ -11,7 +11,7 @@ require ( ) require ( - github.com/bytedance/sonic/loader v0.2.4 // indirect + github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef // indirect github.com/cloudwego/base64x v0.1.5 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/issue_test/go.sum b/issue_test/go.sum index 4b0a4671a..e8668eb37 100644 --- a/issue_test/go.sum +++ b/issue_test/go.sum @@ -1,6 +1,6 @@ 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.2.5-0.20250615173055-5c2186ca22ef h1:f7hVOuG4AOH5L3S/lGQXjm3lT/Gm86EKl1JgxJFby/M= +github.com/bytedance/sonic/loader v0.2.5-0.20250615173055-5c2186ca22ef/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= diff --git a/loader/funcdata_compat.go b/loader/funcdata_compat.go index 68bea25d0..c5c802856 100644 --- a/loader/funcdata_compat.go +++ b/loader/funcdata_compat.go @@ -1,5 +1,5 @@ -//go:build !go1.17 || go1.25 -// +build !go1.17 go1.25 +//go:build !go1.17 || go1.26 +// +build !go1.17 go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/loader/funcdata_go123.go b/loader/funcdata_go123.go index e1fa473a3..53a2b180e 100644 --- a/loader/funcdata_go123.go +++ b/loader/funcdata_go123.go @@ -1,5 +1,5 @@ -//go:build go1.23 && !go1.25 -// +build go1.23,!go1.25 +//go:build go1.23 && !go1.26 +// +build go1.23,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/loader/funcdata_latest.go b/loader/funcdata_latest.go index eb64ffa6d..eb4c37578 100644 --- a/loader/funcdata_latest.go +++ b/loader/funcdata_latest.go @@ -1,5 +1,5 @@ -// go:build go1.18 && !go1.25 -// +build go1.18,!go1.25 +// go:build go1.18 && !go1.26 +// +build go1.18,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/rfc_test.go b/rfc_test.go index ee431357a..182eba997 100644 --- a/rfc_test.go +++ b/rfc_test.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 package sonic_test diff --git a/search_test.go b/search_test.go index 1fdadec5f..c3e88fef3 100644 --- a/search_test.go +++ b/search_test.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/sonic.go b/sonic.go index 9645d5e08..1b2f6d74c 100644 --- a/sonic.go +++ b/sonic.go @@ -1,5 +1,5 @@ -//go:build (amd64 && go1.17 && !go1.25) || (arm64 && go1.20 && !go1.25) -// +build amd64,go1.17,!go1.25 arm64,go1.20,!go1.25 +//go:build (amd64 && go1.17 && !go1.26) || (arm64 && go1.20 && !go1.26) +// +build amd64,go1.17,!go1.26 arm64,go1.20,!go1.26 /* * Copyright 2021 ByteDance Inc.