[chore] update to modernc.org/sqlite v1.38.0 with our concurrency workaround (#4256)

see: https://gitlab.com/cznic/sqlite/-/tags/v1.38.0
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4256
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>

go.mod

@@ -8,7 +8,7 @@ toolchain go1.24.3
 replace github.com/go-swagger/go-swagger => codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix
 
 // Replace modernc/sqlite with our version that fixes the concurrency INTERRUPT issue
-replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.1-concurrency-workaround
+replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.38.0-concurrency-workaround
 
 require (
 	code.superseriousbusiness.org/activity v1.15.0
@@ -236,7 +236,7 @@ require (
 	google.golang.org/grpc v1.72.1 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	modernc.org/libc v1.65.7 // indirect
+	modernc.org/libc v1.65.10 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )

go.sum

@@ -501,8 +501,8 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDf
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.7.12 h1:YwGP/rrea2/CnCtUHgjuolG/PnMxdQtPMO5PvaE2/nY=
 github.com/yuin/goldmark v1.7.12/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
-gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.1-concurrency-workaround h1:rnIFKdAYacPbG6bVRO4FhyTF5rv+aLT05ziDh9UuCdk=
+gitlab.com/NyaaaWhatsUpDoc/sqlite v1.38.0-concurrency-workaround h1:C5sLzVJmDHukxwLHWgOK+bc7suJjwp+WKId/dqI305s=
-gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.1-concurrency-workaround/go.mod h1:XwdRtsE1MpiBcL54+MbKcaDvcuej+IYSMfLN6gSKV8g=
+gitlab.com/NyaaaWhatsUpDoc/sqlite v1.38.0-concurrency-workaround/go.mod h1:1Bj+yES4SVvBZ4cBOpVZ6QgesMCKpJZDq0nxYzOpmNE=
 go.mongodb.org/mongo-driver v1.17.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ=
 go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
@@ -685,12 +685,12 @@ modernc.org/cc/v4 v4.26.1 h1:+X5NtzVBn0KgsBCBe+xkDC7twLb/jNVj9FPgiwSQO3s=
 modernc.org/cc/v4 v4.26.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
 modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU=
 modernc.org/ccgo/v4 v4.28.0/go.mod h1:JygV3+9AV6SmPhDasu4JgquwU81XAKLd3OKTUDNOiKE=
-modernc.org/fileutil v1.3.1 h1:8vq5fe7jdtEvoCf3Zf9Nm0Q05sH6kGx0Op2CPx1wTC8=
+modernc.org/fileutil v1.3.3 h1:3qaU+7f7xxTUmvU1pJTZiDLAIoJVdUSSauJNHg9yXoA=
-modernc.org/fileutil v1.3.1/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
+modernc.org/fileutil v1.3.3/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/libc v1.65.7 h1:Ia9Z4yzZtWNtUIuiPuQ7Qf7kxYrxP1/jeHZzG8bFu00=
+modernc.org/libc v1.65.10 h1:ZwEk8+jhW7qBjHIT+wd0d9VjitRyQef9BnzlzGwMODc=
-modernc.org/libc v1.65.7/go.mod h1:011EQibzzio/VX3ygj1qGFt5kMjP0lHb0qCW5/D/pQU=
+modernc.org/libc v1.65.10/go.mod h1:StFvYpx7i/mXtBAfVOjaU0PWZOvIRoZSgXhrwXzr8Po=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=

vendor/modernc.org/libc/Makefile

@@ -35,9 +35,10 @@ edit:
 	@if [ -f "Session.vim" ]; then gvim -S & else gvim -p Makefile go.mod builder.json & fi
 
 editor:
-	gofmt -l -s -w *.go
+	# gofmt -l -s -w *.go
 	go test -c -o /dev/null
 	go build -o /dev/null -v generator*.go
+	go build -o /dev/null -v genasm.go
 
 generate: download
 	mkdir -p $(DIR) || true

vendor/modernc.org/libc/build_all_targets.sh

@@ -35,9 +35,9 @@ do
 	echo "GOOS=linux GOARCH=loong64"
 	GOOS=linux GOARCH=loong64 go build -tags=$tag -v ./...
 	GOOS=linux GOARCH=loong64 go test -tags=$tag -c -o /dev/null
-	echo "GOOS=linux GOARCH=mips64le"
+	# echo "GOOS=linux GOARCH=mips64le"
-	GOOS=linux GOARCH=mips64le go build -tags=$tag -v ./...
+	# GOOS=linux GOARCH=mips64le go build -tags=$tag -v ./...
-	GOOS=linux GOARCH=mips64le go test -tags=$tag -c -o /dev/null
+	# GOOS=linux GOARCH=mips64le go test -tags=$tag -c -o /dev/null
 	echo "GOOS=linux GOARCH=ppc64le"
 	GOOS=linux GOARCH=ppc64le go build -tags=$tag -v ./...
 	GOOS=linux GOARCH=ppc64le go test -tags=$tag -c -o /dev/null

vendor/modernc.org/libc/libc_windows.go

@@ -244,10 +244,18 @@ var (
 	procWcsncpy  = modcrt.NewProc("wcsncpy")
 	procWcsrchr  = modcrt.NewProc("wcsrchr")
 
-	moducrt         = windows.NewLazySystemDLL("ucrtbase.dll")
+	moducrt             = windows.NewLazySystemDLL("ucrtbase.dll")
-	procFindfirst32 = moducrt.NewProc("_findfirst32")
+	procFindfirst32     = moducrt.NewProc("_findfirst32")
-	procFindnext32  = moducrt.NewProc("_findnext32")
+	procFindnext32      = moducrt.NewProc("_findnext32")
-	procStat64i32   = moducrt.NewProc("_stat64i32")
+	procStat64i32       = moducrt.NewProc("_stat64i32")
+	procWchmod          = moducrt.NewProc("_wchmod")
+	procWfindfirst32    = moducrt.NewProc("_wfindfirst32")
+	procWfindfirst64i32 = moducrt.NewProc("_wfindfirst64i32")
+	procWfindnext32     = moducrt.NewProc("_wfindnext32")
+	procWfindnext64i32  = moducrt.NewProc("_wfindnext64i32")
+	procWmkdir          = moducrt.NewProc("_wmkdir")
+	procWstat32         = moducrt.NewProc("_wstat32")
+	procWstat64i32      = moducrt.NewProc("_wstat64i32")
 )
 
 var (
@@ -7775,3 +7783,75 @@ func X_strnicmp(tls *TLS, __Str1 uintptr, __Str2 uintptr, __MaxCount types.Size_
 func X__builtin_ctz(t *TLS, n uint32) int32 {
 	return int32(mbits.TrailingZeros32(n))
 }
+
+// intptr_t _wfindfirst64i32(const wchar_t *filespec, struct _wfinddata64i32_t *fileinfo);
+func X_wfindfirst64i32(tls *TLS, filespec, fileinfo uintptr) (r types.Intptr_t) {
+	r0, _, err := procWfindfirst64i32.Call(filespec, fileinfo)
+	if err != windows.NOERROR {
+		tls.setErrno(int32(err.(windows.Errno)))
+	}
+	return types.Intptr_t(r0)
+}
+
+// int _wfindnext64i32(intptr_t handle, struct _wfinddata64i32_t *fileinfo);
+func X_wfindnext64i32(tls *TLS, handle types.Intptr_t, fileinfo uintptr) (r int32) {
+	r0, _, err := procWfindnext64i32.Call(uintptr(handle), fileinfo)
+	if err != windows.NOERROR {
+		tls.setErrno(int32(err.(windows.Errno)))
+	}
+	return int32(r0)
+}
+
+// int _wchmod( const wchar_t *filename, int pmode );
+func X_wchmod(tls *TLS, filename uintptr, pmode int32) (r int32) {
+	r0, _, err := procWchmod.Call(filename, uintptr(pmode))
+	if err != windows.NOERROR {
+		tls.setErrno(int32(err.(windows.Errno)))
+	}
+	return int32(r0)
+}
+
+// int _wmkdir(const wchar_t *dirname);
+func X_wmkdir(tls *TLS, dirname uintptr) (r int32) {
+	r0, _, err := procWmkdir.Call(dirname)
+	if err != windows.NOERROR {
+		tls.setErrno(int32(err.(windows.Errno)))
+	}
+	return int32(r0)
+}
+
+// int _wstat64i32(const wchar_t *path, struct _stat64i32 *buffer);
+func X_wstat64i32(tls *TLS, path, buffer uintptr) (r int32) {
+	r0, _, err := procWstat64i32.Call(path, buffer)
+	if err != windows.NOERROR {
+		tls.setErrno(int32(err.(windows.Errno)))
+	}
+	return int32(r0)
+}
+
+// intptr_t _wfindfirst32(const wchar_t *filespec, struct _wfinddata32_t *fileinfo);
+func X_wfindfirst32(tls *TLS, filespec, fileinfo uintptr) (r types.Intptr_t) {
+	r0, _, err := procWfindfirst32.Call(filespec, fileinfo)
+	if err != windows.NOERROR {
+		tls.setErrno(int32(err.(windows.Errno)))
+	}
+	return types.Intptr_t(r0)
+}
+
+// int _wfindnext32(intptr_t handle, struct _wfinddata32_t *fileinfo);
+func X_wfindnext32(tls *TLS, handle types.Intptr_t, fileinfo uintptr) (r int32) {
+	r0, _, err := procWfindnext32.Call(uintptr(handle), fileinfo)
+	if err != windows.NOERROR {
+		tls.setErrno(int32(err.(windows.Errno)))
+	}
+	return int32(r0)
+}
+
+// int _wstat32(const wchar_t *path, struct __stat32 *buffer);
+func X_wstat32(tls *TLS, path, buffer uintptr) (r int32) {
+	r0, _, err := procWstat32.Call(path, buffer)
+	if err != windows.NOERROR {
+		tls.setErrno(int32(err.(windows.Errno)))
+	}
+	return int32(r0)
+}

vendor/modernc.org/libc/tls_linux_amd64.go

@@ -0,0 +1,16 @@
+// Copyright 2025 The Libc Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package libc // import "modernc.org/libc"
+
+func TLSAlloc(p0 *TLS, p1 int) uintptr
+func TLSFree(p0 *TLS, p1 int)
+
+func tlsAlloc(tls *TLS, n int) uintptr {
+	return tls.Alloc(n)
+}
+
+func tlsFre(tls *TLS, n int) {
+	tls.Free(n)
+}

vendor/modernc.org/libc/tls_linux_amd64.s

@@ -0,0 +1,21 @@
+// Code generated  for linux/amd64 by 'genasm []', DO NOT EDIT.
+
+#include "textflag.h"
+
+TEXT ·TLSAlloc(SB),$24-24
+	MOVQ p0+0(FP), AX
+	MOVQ AX, 0(SP)
+	MOVQ p1+8(FP), AX
+	MOVQ AX, 8(SP)
+	CALL ·tlsAlloc(SB)
+	MOVQ 16(SP), AX
+	MOVQ AX, ret+16(FP)
+	RET
+
+TEXT ·TLSFree(SB),$16-16
+	MOVQ p0+0(FP), AX
+	MOVQ AX, 0(SP)
+	MOVQ p1+8(FP), AX
+	MOVQ AX, 8(SP)
+	CALL ·tlsFree(SB)
+	RET

vendor/modernc.org/sqlite/Makefile

@@ -59,7 +59,6 @@ edit:
 	@if [ -f "Session.vim" ]; then gvim -S & else gvim -p Makefile go.mod builder.json all_test.go & fi
 
 editor:
-	gofmt -l -s -w .
 	go test -c -o /dev/null
 	go build -v  -o /dev/null ./...
 	cd vendor_libsqlite3 && go build -o /dev/null main.go

vendor/modernc.org/sqlite/doc.go

@@ -27,21 +27,21 @@
 //
 //	OS      Arch    SQLite version
 //	------------------------------
-//	darwin	amd64   3.49.0
+//	darwin	amd64   3.50.1
-//	darwin	arm64   3.49.0
+//	darwin	arm64   3.50.1
-//	freebsd	amd64   3.49.0
+//	freebsd	amd64   3.50.1
-//	freebsd	arm64   3.49.0
+//	freebsd	arm64   3.50.1
-//	linux	386     3.49.0
+//	linux	386     3.50.1
-//	linux	amd64   3.49.0
+//	linux	amd64   3.50.1
-//	linux	arm     3.49.0
+//	linux	arm     3.50.1
-//	linux	arm64   3.49.0
+//	linux	arm64   3.50.1
-//	linux	loong64 3.49.0
+//	linux	loong64 3.50.1
-//	linux	ppc64le 3.49.0
+//	linux	ppc64le 3.50.1
-//	linux	riscv64 3.49.0
+//	linux	riscv64 3.50.1
-//	linux	s390x   3.49.0
+//	linux	s390x   3.50.1
-//	windows	386     3.49.0
+//	windows	386     3.50.1
-//	windows	amd64   3.49.0
+//	windows	amd64   3.50.1
-//	windows	arm64   3.49.0
+//	windows	arm64   3.50.1
 //
 // # Benchmarks
 //
@@ -55,6 +55,8 @@
 //
 // # Changelog
 //
+//   - 2025-06-09 v1.38.0: Upgrade to SQLite 3.50.1.
+// 
 //   - 2025-02-26 v1.36.0: Upgrade to SQLite 3.49.0.
 //
 //   - 2024-11-16 v1.34.0: Implement ResetSession and IsValid methods in connection

vendor/modernc.org/sqlite/sqlite.go

@@ -603,6 +603,10 @@ func (s *stmt) query(ctx context.Context, args []driver.NamedValue) (r driver.Ro
 	var allocs []uintptr
 
 	defer func() {
+		if r == nil && err == nil {
+			r, err = newRows(s.c, pstmt, allocs, true)
+		}
+
 		if pstmt != 0 {
 			// ensure stmt finalized.
 			e := s.c.finalize(pstmt)
@@ -613,10 +617,6 @@ func (s *stmt) query(ctx context.Context, args []driver.NamedValue) (r driver.Ro
 				err = e
 			}
 		}
-
-		if r == nil && err == nil {
-			r, err = newRows(s.c, pstmt, allocs, true)
-		}
 	}()
 
 	for psql := s.psql; *(*byte)(unsafe.Pointer(psql)) != 0; {
@@ -2154,7 +2154,9 @@ func functionArgs(tls *libc.TLS, argc int32, argv uintptr) []driver.Value {
 			size := sqlite3.Xsqlite3_value_bytes(tls, valPtr)
 			blobPtr := sqlite3.Xsqlite3_value_blob(tls, valPtr)
 			v := make([]byte, size)
-			copy(v, (*libc.RawMem)(unsafe.Pointer(blobPtr))[:size:size])
+			if size != 0 {
+				copy(v, (*libc.RawMem)(unsafe.Pointer(blobPtr))[:size:size])
+			}
 			args[i] = v
 		default:
 			panic(fmt.Sprintf("unexpected argument type %q passed by sqlite", valType))

vendor/modules.txt

@@ -1368,7 +1368,7 @@ gopkg.in/yaml.v2
 # gopkg.in/yaml.v3 v3.0.1
 ## explicit
 gopkg.in/yaml.v3
-# modernc.org/libc v1.65.7
+# modernc.org/libc v1.65.10
 ## explicit; go 1.23.0
 modernc.org/libc
 modernc.org/libc/errno
@@ -1402,7 +1402,7 @@ modernc.org/mathutil
 # modernc.org/memory v1.11.0
 ## explicit; go 1.23.0
 modernc.org/memory
-# modernc.org/sqlite v1.37.1 => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.1-concurrency-workaround
+# modernc.org/sqlite v1.37.1 => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.38.0-concurrency-workaround
 ## explicit; go 1.23.0
 modernc.org/sqlite
 modernc.org/sqlite/lib
@@ -1410,4 +1410,4 @@ modernc.org/sqlite/lib
 ## explicit; go 1.22.0
 mvdan.cc/xurls/v2
 # github.com/go-swagger/go-swagger => codeberg.org/superseriousbusiness/go-swagger v0.31.0-gts-go1.23-fix
-# modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.1-concurrency-workaround
+# modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.38.0-concurrency-workaround