trailofbits · pull · Jul 10, 2026 · Jul 8, 2026 · Jul 9, 2026 · Jul 9, 2026
diff --git a/src/cmd/compile/internal/ssa/_gen/go.mod b/src/cmd/compile/internal/ssa/_gen/go.mod
@@ -1,4 +1,5 @@
-module _gen
+// N.B. cmd/... modules get special treatment, so avoid that prefix.
+module compile/internal/ssa/_gen
 
 go 1.24
 

diff --git a/src/cmd/vet/testdata/rangeloop/go.mod b/src/cmd/vet/testdata/rangeloop/go.mod
@@ -1,3 +1,4 @@
-module rangeloop
+// N.B. cmd/... modules get special treatment, so avoid that prefix.
+module vet/testdata/rangeloop
 
 go 1.21
diff --git a/src/cmd/vet/testdata/stdversion/go.mod b/src/cmd/vet/testdata/stdversion/go.mod
@@ -1,3 +1,4 @@
-module stdversion
+// N.B. cmd/... modules get special treatment, so avoid that prefix.
+module vet/testdata/stdversion
 
 go 1.21
diff --git a/src/crypto/internal/fips140/aes/_asm/ctr/go.mod b/src/crypto/internal/fips140/aes/_asm/ctr/go.mod
@@ -1,4 +1,4 @@
-module crypto/aes/_asm/ctr
+module crypto/internal/fips140/aes/_asm/ctr
 
 go 1.25
 

diff --git a/src/crypto/internal/fips140/aes/_asm/standard/go.mod b/src/crypto/internal/fips140/aes/_asm/standard/go.mod
@@ -1,4 +1,4 @@
-module crypto/aes/_asm/standard
+module crypto/internal/fips140/aes/_asm/standard
 
 go 1.24
 

diff --git a/src/crypto/internal/fips140/aes/gcm/_asm/gcm/go.mod b/src/crypto/internal/fips140/aes/gcm/_asm/gcm/go.mod
@@ -1,4 +1,4 @@
-module crypto/aes/_asm/gcm
+module crypto/internal/fips140/aes/gcm/_asm/gcm
 
 go 1.24
 

diff --git a/src/crypto/internal/fips140/sha256/_asm/go.mod b/src/crypto/internal/fips140/sha256/_asm/go.mod
@@ -1,4 +1,4 @@
-module crypto/sha256/_asm
+module crypto/internal/fips140/sha256/_asm
 
 go 1.24
 

diff --git a/src/crypto/internal/fips140/sha3/_asm/go.mod b/src/crypto/internal/fips140/sha3/_asm/go.mod
@@ -1,4 +1,4 @@
-module sha3/_asm
+module crypto/internal/fips140/sha3/_asm
 
 go 1.22
 

diff --git a/src/crypto/internal/fips140/sha512/_asm/go.mod b/src/crypto/internal/fips140/sha512/_asm/go.mod
@@ -1,4 +1,4 @@
-module crypto/sha512/_asm
+module crypto/internal/fips140/sha512/_asm
 
 go 1.24
 

diff --git a/src/os/removeall_noat.go b/src/os/removeall_noat.go
@@ -19,6 +19,12 @@ func removeAll(path string) error {
 		return nil
 	}
 
+	// Consistency with Root.RemoveAll: Strip trailing /s from the path,
+	// so RemoveAll("not_a_directory/") succeeds.
+	for len(path) > 1 && IsPathSeparator(path[len(path)-1]) {
+		path = path[:len(path)-1]
+	}
+
 	// The rmdir system call permits removing "." on Plan 9,
 	// so we don't permit it to remain consistent with the
 	// "at" implementation of RemoveAll.

diff --git a/src/runtime/_mkmalloc/go.mod b/src/runtime/_mkmalloc/go.mod
@@ -1,4 +1,4 @@
-module _mkmalloc
+module runtime/_mkmalloc
 
 go 1.26
 

diff --git a/src/simd/archsimd/_gen/go.mod b/src/simd/archsimd/_gen/go.mod
@@ -1,4 +1,4 @@
-module _gen
+module simd/archsimd/_gen
 
 go 1.25.0
 

diff --git a/src/simd/archsimd/_gen/simdgen/arm64/emit.go b/src/simd/archsimd/_gen/simdgen/arm64/emit.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"_gen/unify"
+	"simd/archsimd/_gen/unify"
 )
 
 // asComment formats text as a comment

diff --git a/src/simd/archsimd/_gen/simdgen/arm64/load.go b/src/simd/archsimd/_gen/simdgen/arm64/load.go
@@ -9,7 +9,7 @@ package arm64
 import (
 	"sort"
 
-	"_gen/unify"
+	"simd/archsimd/_gen/unify"
 
 	"golang.org/x/arch/arm64/instgen/xmlspec"
 )

diff --git a/src/simd/archsimd/_gen/simdgen/gen_simdGenericOps.go b/src/simd/archsimd/_gen/simdgen/gen_simdGenericOps.go
@@ -5,8 +5,8 @@
 package main
 
 import (
-	"_gen/sgutil"
 	"bytes"
+	"simd/archsimd/_gen/sgutil"
 )
 
 // writeSIMDGenericOps generates the generic ops for the current architecture,

diff --git a/src/simd/archsimd/_gen/simdgen/gen_simdIntrinsics.go b/src/simd/archsimd/_gen/simdgen/gen_simdIntrinsics.go
@@ -5,9 +5,9 @@
 package main
 
 import (
-	"_gen/sgutil"
 	"bytes"
 	"fmt"
+	"simd/archsimd/_gen/sgutil"
 	"slices"
 	"text/template"
 )

diff --git a/src/simd/archsimd/_gen/simdgen/gen_simdTypes.go b/src/simd/archsimd/_gen/simdgen/gen_simdTypes.go
@@ -15,7 +15,7 @@ import (
 	"text/template"
 	"unicode"
 
-	"_gen/sgutil"
+	"simd/archsimd/_gen/sgutil"
 )
 
 type simdType struct {

diff --git a/src/simd/archsimd/_gen/simdgen/gen_simdrules.go b/src/simd/archsimd/_gen/simdgen/gen_simdrules.go
@@ -12,7 +12,7 @@ import (
 	"text/template"
 	"unicode"
 
-	"_gen/sgutil"
+	"simd/archsimd/_gen/sgutil"
 )
 
 type tplRuleData struct {

diff --git a/src/simd/archsimd/_gen/simdgen/godefs.go b/src/simd/archsimd/_gen/simdgen/godefs.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"unicode"
 
-	"_gen/unify"
+	"simd/archsimd/_gen/unify"
 )
 
 type Operation struct {

diff --git a/src/simd/archsimd/_gen/simdgen/main.go b/src/simd/archsimd/_gen/simdgen/main.go
@@ -106,8 +106,8 @@ import (
 	"slices"
 	"strings"
 
-	"_gen/simdgen/arm64"
-	"_gen/unify"
+	"simd/archsimd/_gen/simdgen/arm64"
+	"simd/archsimd/_gen/unify"
 
 	"gopkg.in/yaml.v3"
 )

diff --git a/src/simd/archsimd/_gen/simdgen/xed.go b/src/simd/archsimd/_gen/simdgen/xed.go
@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-	"_gen/unify"
+	"simd/archsimd/_gen/unify"
 
 	"golang.org/x/arch/x86/xeddata"
 	"gopkg.in/yaml.v3"

diff --git a/src/simd/archsimd/_gen/tmplgen/main.go b/src/simd/archsimd/_gen/tmplgen/main.go
@@ -8,14 +8,14 @@ package main
 // slice operations and tests
 
 import (
-	"_gen/sgutil"
 	"bufio"
 	"bytes"
 	"flag"
 	"fmt"
 	"go/format"
 	"io"
 	"os"
+	"simd/archsimd/_gen/sgutil"
 	"strings"
 	"text/template"
 )

diff --git a/src/simd/archsimd/_gen/wasmgen/main.go b/src/simd/archsimd/_gen/wasmgen/main.go
@@ -16,7 +16,7 @@ import (
 	"text/template"
 	"unicode"
 
-	"_gen/sgutil"
+	"simd/archsimd/_gen/sgutil"
 )
 
 var (

diff --git a/src/simd/testdata/ip/boringsum.go b/src/simd/testdata/ip/boringsum.go
diff --git a/src/simd/testdata/ip/go.mod b/src/simd/testdata/ip/go.mod
diff --git a/src/simd/testdata/ip/main.go b/src/simd/testdata/ip/main.go
diff --git a/src/simd/testdata/ip/sum.go b/src/simd/testdata/ip/sum.go
diff --git a/src/simd/testdata/ip/sum_amd64.go b/src/simd/testdata/ip/sum_amd64.go