syscall: restore linux raw vfork override

Author: cpunion

internal/plan9asm/filter_linux_test.go

@@ -123,6 +123,9 @@ func TranslateSourceModuleForPkgWithOptions(pkg *packages.Package, sfile string,
 }
 
 func shouldKeepResolvedFunc(pkgPath, goos, goarch, resolved string) bool {
+	if pkgPath == "syscall" && goos == "linux" && (goarch == "arm64" || goarch == "amd64") && strings.HasSuffix(resolved, "rawVforkSyscall") {
+		return false
+	}
 	return true
 }
 

internal/plan9asm/translate.go

@@ -135,12 +135,12 @@ func TestTranslateHelperFunctions(t *testing.T) {
 		t.Fatalf("resolveSymFuncForTarget darwin RawSyscall6 = %q", got)
 	}
 
+	if shouldKeepResolvedFunc("syscall", "linux", "amd64", "syscall.rawVforkSyscall") {
+		t.Fatal("linux rawVforkSyscall should be filtered")
+	}
 	if !shouldKeepResolvedFunc("syscall", "linux", "amd64", "syscall.Syscall") {
 		t.Fatal("normal syscall symbol should be kept")
 	}
-	if !shouldKeepResolvedFunc("syscall", "linux", "amd64", "syscall.rawVforkSyscall") {
-		t.Fatal("linux rawVforkSyscall should be kept")
-	}
 	if !shouldKeepResolvedFunc("syscall", "darwin", "arm64", "syscall.RawSyscall") {
 		t.Fatal("darwin RawSyscall should be kept")
 	}
@@ -153,8 +153,8 @@ func TestTranslateHelperFunctions(t *testing.T) {
 	}
 	funcs := []extplan9asm.Func{{Sym: "·rawVforkSyscall"}, {Sym: "·Keep"}}
 	filtered := FilterFuncs("syscall", "linux", "amd64", funcs, ResolveSymFunc("syscall"))
-	if len(filtered) != len(funcs) {
-		t.Fatalf("FilterFuncs linux = %#v, want all kept", filtered)
+	if len(filtered) != 1 || filtered[0].Sym != "·Keep" {
+		t.Fatalf("FilterFuncs linux = %#v, want only Keep", filtered)
 	}
 	darwinFuncs := []extplan9asm.Func{{Sym: "·RawSyscall"}, {Sym: "·RawSyscall6"}, {Sym: "·Syscall"}}
 	darwinFiltered := FilterFuncs("syscall", "darwin", "arm64", darwinFuncs, resolveDarwinSyscall)

internal/plan9asm/translate_helpers_test.go

@@ -0,0 +1,33 @@
+//go:build linux && (amd64 || arm64) && !go1.22
+// +build linux
+// +build amd64 arm64
+// +build !go1.22
+
+package runtime
+
+import (
+	_ "unsafe"
+
+	c "github.com/goplus/llgo/runtime/internal/clite"
+	cliteos "github.com/goplus/llgo/runtime/internal/clite/os"
+	clitesyscall "github.com/goplus/llgo/runtime/internal/clite/syscall"
+)
+
+//go:linkname c_syscall C.syscall
+func c_syscall(sysno c.Long, __llgo_va_list ...any) c.Long
+
+//go:linkname syscall_rawVforkSyscall syscall.rawVforkSyscall
+func syscall_rawVforkSyscall(trap, a1, a2 uintptr) (r1 uintptr, err uintptr) {
+	if trap == uintptr(clitesyscall.SYS_CLONE) {
+		pid := cliteos.Fork()
+		if pid < 0 {
+			return uintptr(int64(pid)), uintptr(cliteos.Errno())
+		}
+		return uintptr(int64(pid)), 0
+	}
+	r := c_syscall(c.Long(trap), c.Long(a1), c.Long(a2))
+	if r == -1 {
+		return uintptr(r), uintptr(cliteos.Errno())
+	}
+	return uintptr(r), 0
+}

runtime/internal/lib/runtime/link_linux_vfork_go121.go

@@ -0,0 +1,33 @@
+//go:build linux && (amd64 || arm64) && go1.22
+// +build linux
+// +build amd64 arm64
+// +build go1.22
+
+package runtime
+
+import (
+	_ "unsafe"
+
+	c "github.com/goplus/llgo/runtime/internal/clite"
+	cliteos "github.com/goplus/llgo/runtime/internal/clite/os"
+	clitesyscall "github.com/goplus/llgo/runtime/internal/clite/syscall"
+)
+
+//go:linkname c_syscall C.syscall
+func c_syscall(sysno c.Long, __llgo_va_list ...any) c.Long
+
+//go:linkname syscall_rawVforkSyscall syscall.rawVforkSyscall
+func syscall_rawVforkSyscall(trap, a1, a2, a3 uintptr) (r1 uintptr, err uintptr) {
+	if trap == uintptr(clitesyscall.SYS_CLONE) {
+		pid := cliteos.Fork()
+		if pid < 0 {
+			return uintptr(int64(pid)), uintptr(cliteos.Errno())
+		}
+		return uintptr(int64(pid)), 0
+	}
+	r := c_syscall(c.Long(trap), c.Long(a1), c.Long(a2), c.Long(a3))
+	if r == -1 {
+		return uintptr(r), uintptr(cliteos.Errno())
+	}
+	return uintptr(r), 0
+}