runtime,internal: move runtime/internal/sys to internal/runtime/sys

Cleanup and friction reduction

For #65355.

Change-Id: Ia14c9dc584a529a35b97801dd3e95b9acc99a511
Reviewed-on: https://go-review.googlesource.com/c/go/+/600436
Reviewed-by: Keith Randall <khr@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/.gitignore b/.gitignore
index 7978d68b76edd725e1df2567f81e9e076481ded1..c6512e64a4ef39add1ab95675f894f9fe580f43b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ _testmain.go
 /src/go/build/zcgo.go
 /src/go/doc/headscan
 /src/internal/buildcfg/zbootstrap.go
-/src/runtime/internal/sys/zversion.go
+/src/internal/runtime/sys/zversion.go
 /src/unicode/maketables
 /src/time/tzdata/zzipdata.go
 /test.out

diff --git a/src/cmd/compile/internal/noder/helpers.go b/src/cmd/compile/internal/noder/helpers.go
index 0bff71e65845efc0a158fceb3d35642b3de0341a..45512706d2c590478bb9e70a72a9a755465a3e21 100644 (file)
--- a/src/cmd/compile/internal/noder/helpers.go
+++ b/src/cmd/compile/internal/noder/helpers.go
@@ -114,11 +114,11 @@ func isTypeParam(t types2.Type) bool {
 }
 
 // isNotInHeap reports whether typ is or contains an element of type
-// runtime/internal/sys.NotInHeap.
+// internal/runtime/sys.NotInHeap.
 func isNotInHeap(typ types2.Type) bool {
        typ = types2.Unalias(typ)
        if named, ok := typ.(*types2.Named); ok {
-               if obj := named.Obj(); obj.Name() == "nih" && obj.Pkg().Path() == "runtime/internal/sys" {
+               if obj := named.Obj(); obj.Name() == "nih" && obj.Pkg().Path() == "internal/runtime/sys" {
                        return true
                }
                typ = named.Underlying()

diff --git a/src/cmd/compile/internal/ssagen/ssa.go b/src/cmd/compile/internal/ssagen/ssa.go
index d0ca5b7f30f13bc57f4402657d14435db3187991..e6d5a139572767e686db4e6f58a4c30f30ebdb2f 100644 (file)
--- a/src/cmd/compile/internal/ssagen/ssa.go
+++ b/src/cmd/compile/internal/ssagen/ssa.go
@@ -4287,13 +4287,13 @@ func InitTables() {
                // make it worthwhile as an intrinsic
                brev_arch = append(brev_arch, sys.PPC64)
        }
-       /******** runtime/internal/sys ********/
-       addF("runtime/internal/sys", "Bswap32",
+       /******** internal/runtime/sys ********/
+       addF("internal/runtime/sys", "Bswap32",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        return s.newValue1(ssa.OpBswap32, types.Types[types.TUINT32], args[0])
                },
                brev_arch...)
-       addF("runtime/internal/sys", "Bswap64",
+       addF("internal/runtime/sys", "Bswap64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        return s.newValue1(ssa.OpBswap64, types.Types[types.TUINT64], args[0])
                },
@@ -4309,9 +4309,9 @@ func InitTables() {
 
        // Make Prefetch intrinsics for supported platforms
        // On the unsupported platforms stub function will be eliminated
-       addF("runtime/internal/sys", "Prefetch", makePrefetchFunc(ssa.OpPrefetchCache),
+       addF("internal/runtime/sys", "Prefetch", makePrefetchFunc(ssa.OpPrefetchCache),
                sys.AMD64, sys.ARM64, sys.PPC64)
-       addF("runtime/internal/sys", "PrefetchStreamed", makePrefetchFunc(ssa.OpPrefetchCacheStreamed),
+       addF("internal/runtime/sys", "PrefetchStreamed", makePrefetchFunc(ssa.OpPrefetchCacheStreamed),
                sys.AMD64, sys.ARM64, sys.PPC64)
 
        /******** internal/runtime/atomic ********/
@@ -4837,8 +4837,8 @@ func InitTables() {
                        return s.newValue1(ssa.OpCtz64, types.Types[types.TINT], y)
                },
                sys.S390X)
-       alias("math/bits", "ReverseBytes64", "runtime/internal/sys", "Bswap64", all...)
-       alias("math/bits", "ReverseBytes32", "runtime/internal/sys", "Bswap32", all...)
+       alias("math/bits", "ReverseBytes64", "internal/runtime/sys", "Bswap64", all...)
+       alias("math/bits", "ReverseBytes32", "internal/runtime/sys", "Bswap32", all...)
        // ReverseBytes inlines correctly, no need to intrinsify it.
        // Nothing special is needed for targets where ReverseBytes16 lowers to a rotate
        // On Power10, 16-bit rotate is not available so use BRH instruction
@@ -5051,12 +5051,12 @@ func InitTables() {
                sys.AMD64)
        alias("math/bits", "Div", "math/bits", "Div64", sys.ArchAMD64)
 
-       alias("runtime/internal/sys", "TrailingZeros8", "math/bits", "TrailingZeros8", all...)
-       alias("runtime/internal/sys", "TrailingZeros32", "math/bits", "TrailingZeros32", all...)
-       alias("runtime/internal/sys", "TrailingZeros64", "math/bits", "TrailingZeros64", all...)
-       alias("runtime/internal/sys", "Len8", "math/bits", "Len8", all...)
-       alias("runtime/internal/sys", "Len64", "math/bits", "Len64", all...)
-       alias("runtime/internal/sys", "OnesCount64", "math/bits", "OnesCount64", all...)
+       alias("internal/runtime/sys", "TrailingZeros8", "math/bits", "TrailingZeros8", all...)
+       alias("internal/runtime/sys", "TrailingZeros32", "math/bits", "TrailingZeros32", all...)
+       alias("internal/runtime/sys", "TrailingZeros64", "math/bits", "TrailingZeros64", all...)
+       alias("internal/runtime/sys", "Len8", "math/bits", "Len8", all...)
+       alias("internal/runtime/sys", "Len64", "math/bits", "Len64", all...)
+       alias("internal/runtime/sys", "OnesCount64", "math/bits", "OnesCount64", all...)
 
        /******** sync/atomic ********/
 

diff --git a/src/cmd/compile/internal/test/inl_test.go b/src/cmd/compile/internal/test/inl_test.go
index 462626958223fc7e6df85c4b3f73ee614299939c..58f5df953b46d4571d7346ff08bdff602d1f8f22 100644 (file)
--- a/src/cmd/compile/internal/test/inl_test.go
+++ b/src/cmd/compile/internal/test/inl_test.go
@@ -97,7 +97,7 @@ func TestIntendedInlining(t *testing.T) {
                        "traceLocker.ok",
                        "traceEnabled",
                },
-               "runtime/internal/sys": {},
+               "internal/runtime/sys": {},
                "internal/runtime/math": {
                        "MulUintptr",
                },
@@ -246,9 +246,9 @@ func TestIntendedInlining(t *testing.T) {
        if runtime.GOARCH != "386" {
                // As explained above, TrailingZeros64 and TrailingZeros32 are not Go code on 386.
                // The same applies to Bswap32.
-               want["runtime/internal/sys"] = append(want["runtime/internal/sys"], "TrailingZeros64")
-               want["runtime/internal/sys"] = append(want["runtime/internal/sys"], "TrailingZeros32")
-               want["runtime/internal/sys"] = append(want["runtime/internal/sys"], "Bswap32")
+               want["internal/runtime/sys"] = append(want["internal/runtime/sys"], "TrailingZeros64")
+               want["internal/runtime/sys"] = append(want["internal/runtime/sys"], "TrailingZeros32")
+               want["internal/runtime/sys"] = append(want["internal/runtime/sys"], "Bswap32")
        }
        if runtime.GOARCH == "amd64" || runtime.GOARCH == "arm64" || runtime.GOARCH == "loong64" || runtime.GOARCH == "mips" || runtime.GOARCH == "mips64" || runtime.GOARCH == "ppc64" || runtime.GOARCH == "riscv64" || runtime.GOARCH == "s390x" {
                // internal/runtime/atomic.Loaduintptr is only intrinsified on these platforms.

diff --git a/src/cmd/compile/internal/types/pkg.go b/src/cmd/compile/internal/types/pkg.go
index c6ce7889afbb7bd7abc4d32a30e53278bda7b44f..9f64b84db4566c349a24f6eb5d8483ad9a6f80d0 100644 (file)
--- a/src/cmd/compile/internal/types/pkg.go
+++ b/src/cmd/compile/internal/types/pkg.go
@@ -16,7 +16,7 @@ import (
 var pkgMap = make(map[string]*Pkg)
 
 type Pkg struct {
-       Path    string // string literal used in import statement, e.g. "runtime/internal/sys"
+       Path    string // string literal used in import statement, e.g. "internal/runtime/sys"
        Name    string // package name, e.g. "sys"
        Prefix  string // escaped path for use in symbol table
        Syms    map[string]*Sym

diff --git a/src/cmd/compile/internal/types/type.go b/src/cmd/compile/internal/types/type.go
index 88052dc97b6791b94044c4cd5671312f7af3c0c9..41fdefe830a3521c8fdcb6f21dfb31c331082d76 100644 (file)
--- a/src/cmd/compile/internal/types/type.go
+++ b/src/cmd/compile/internal/types/type.go
@@ -1650,7 +1650,7 @@ func NewNamed(obj Object) *Type {
                t.SetIsShape(true)
                t.SetHasShape(true)
        }
-       if sym.Pkg.Path == "runtime/internal/sys" && sym.Name == "nih" {
+       if sym.Pkg.Path == "internal/runtime/sys" && sym.Name == "nih" {
                // Recognize the special not-in-heap type. Any type including
                // this type will also be not-in-heap.
                // This logic is duplicated in go/types and

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index c033beabdbb37470c97ee38ab82ceff48331392b..910d5290e592d9dba84d1d7b07e22782149a377e 100644 (file)
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -639,7 +639,7 @@ var gentab = []struct {
 }{
        {"go/build", "zcgo.go", mkzcgo},
        {"cmd/go/internal/cfg", "zdefaultcc.go", mkzdefaultcc},
-       {"runtime/internal/sys", "zversion.go", mkzversion},
+       {"internal/runtime/sys", "zversion.go", mkzversion},
        {"time/tzdata", "zzipdata.go", mktzdata},
 }
 
@@ -1707,7 +1707,7 @@ func checkNotStale(env []string, goBinary string, targets ...string) {
        out := runEnv(workdir, CheckExit, env, append(goCmd, targets...)...)
        if strings.Contains(out, "\tSTALE ") {
                os.Setenv("GODEBUG", "gocachehash=1")
-               for _, target := range []string{"runtime/internal/sys", "cmd/dist", "cmd/link"} {
+               for _, target := range []string{"internal/runtime/sys", "cmd/dist", "cmd/link"} {
                        if strings.Contains(out, "STALE "+target) {
                                run(workdir, ShowOutput|CheckExit, goBinary, "list", "-f={{.ImportPath}} {{.Stale}}", target)
                                break

diff --git a/src/cmd/distpack/pack.go b/src/cmd/distpack/pack.go
index 552524936699f7b3ae34796e9b6ee49aa9563450..a4f18da8bd4bc66bc59bad9efcd7992ecac917b6 100644 (file)
--- a/src/cmd/distpack/pack.go
+++ b/src/cmd/distpack/pack.go
@@ -132,7 +132,7 @@ func main() {
                // Generated during cmd/dist. See ../dist/build.go:/gentab.
                "src/cmd/go/internal/cfg/zdefaultcc.go",
                "src/go/build/zcgo.go",
-               "src/runtime/internal/sys/zversion.go",
+               "src/internal/runtime/sys/zversion.go",
                "src/time/tzdata/zzipdata.go",
 
                // Generated during cmd/dist by bootstrapBuildTools.

diff --git a/src/cmd/distpack/test.go b/src/cmd/distpack/test.go
index 22b54b5fe123bba472ba7e9c6162486e0b6d5a6d..108907d0e6bbeede580702d5c0db22f51efa4de9 100644 (file)
--- a/src/cmd/distpack/test.go
+++ b/src/cmd/distpack/test.go
@@ -35,7 +35,7 @@ var srcRules = []testRule{
        {name: "go/pkg/**", exclude: true},
        {name: "go/src/cmd/dist/dist", exclude: true},
        {name: "go/src/cmd/dist/dist.exe", exclude: true},
-       {name: "go/src/runtime/internal/sys/zversion.go", exclude: true},
+       {name: "go/src/internal/runtime/sys/zversion.go", exclude: true},
        {name: "go/src/time/tzdata/zzipdata.go", exclude: true},
 }
 

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index b45a905880b877f7aea0cfc8333fa0da68988a8f..5720a397f7a5669fb187d8a5c7df4754bac9f83a 100644 (file)
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -943,14 +943,14 @@ func TestNewReleaseRebuildsStalePackagesInGOPATH(t *testing.T) {
        tg.run("install", "p1")
        tg.wantNotStale("p1", "", "./testgo list claims p1 is stale, incorrectly, before any changes")
 
-       // Changing mtime of runtime/internal/sys/sys.go
+       // Changing mtime of internal/runtime/sys/sys.go
        // should have no effect: only the content matters.
        // In fact this should be true even outside a release branch.
-       sys := tg.path("goroot/src/runtime/internal/sys/sys.go")
+       sys := tg.path("goroot/src/internal/runtime/sys/sys.go")
        tg.sleep()
        restore := addVar(sys, 0)
        restore()
-       tg.wantNotStale("p1", "", "./testgo list claims p1 is stale, incorrectly, after updating mtime of runtime/internal/sys/sys.go")
+       tg.wantNotStale("p1", "", "./testgo list claims p1 is stale, incorrectly, after updating mtime of internal/runtime/sys/sys.go")
 
        // But changing content of any file should have an effect.
        // Previously zversion.go was the only one that mattered;

diff --git a/src/cmd/internal/objabi/pkgspecial.go b/src/cmd/internal/objabi/pkgspecial.go
index 2772226c9394ffa8ad0b13d151d3936246bb53dc..f288096a025f07b661186d55f9a55f7a8fe74e67 100644 (file)
--- a/src/cmd/internal/objabi/pkgspecial.go
+++ b/src/cmd/internal/objabi/pkgspecial.go
@@ -48,7 +48,7 @@ var runtimePkgs = []string{
        "internal/runtime/atomic",
        "internal/runtime/exithook",
        "internal/runtime/math",
-       "runtime/internal/sys",
+       "internal/runtime/sys",
        "internal/runtime/syscall",
 
        "internal/abi",

diff --git a/src/cmd/internal/objabi/stack.go b/src/cmd/internal/objabi/stack.go
index 7c7ff4e0586851e2ae79f35150d7fe017f76fc59..d50a7c1afd82b3ed503151e4f3ff0493dd32c85b 100644 (file)
--- a/src/cmd/internal/objabi/stack.go
+++ b/src/cmd/internal/objabi/stack.go
@@ -18,7 +18,7 @@ func StackNosplit(race bool) int {
 // stack guard size. Larger multipliers are used for non-optimized
 // builds that have larger stack frames or for specific targets.
 func stackGuardMultiplier(race bool) int {
-       // This arithmetic must match that in runtime/internal/sys/consts.go:StackGuardMultiplier.
+       // This arithmetic must match that in internal/runtime/sys/consts.go:StackGuardMultiplier.
        n := 1
        // On AIX, a larger stack is needed for syscalls.
        if buildcfg.GOOS == "aix" {

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 9e22955edafbd079eafa36085830a1bf310dc6d4..a0bcb4f27a0be0a2b740cdb7a203eb010e9cd8c2 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -83,7 +83,7 @@ var depsRules = `
        < internal/stringslite
        < internal/itoa
        < internal/unsafeheader
-       < runtime/internal/sys
+       < internal/runtime/sys
        < internal/runtime/syscall
        < internal/runtime/atomic
        < internal/runtime/exithook

diff --git a/src/internal/coverage/pkid.go b/src/internal/coverage/pkid.go
index a764cc4205e9f78e34c648a996f286f7f75fe9e3..46de9fd0ced2e07c8b54f67866a38a9d851409d9 100644 (file)
--- a/src/internal/coverage/pkid.go
+++ b/src/internal/coverage/pkid.go
@@ -26,7 +26,7 @@ package coverage
 //    slot: 1 path='internal/goarch'  hard-coded id: 2
 //    slot: 2 path='internal/runtime/atomic'  hard-coded id: 3
 //    slot: 3 path='internal/goos'
-//    slot: 4 path='runtime/internal/sys'  hard-coded id: 5
+//    slot: 4 path='internal/runtime/sys'  hard-coded id: 5
 //    slot: 5 path='internal/abi'  hard-coded id: 4
 //    slot: 6 path='internal/runtime/math'  hard-coded id: 6
 //    slot: 7 path='internal/bytealg'  hard-coded id: 7
@@ -50,7 +50,7 @@ var rtPkgs = [...]string{
        "internal/runtime/atomic",
        "internal/goos",
        "internal/chacha8rand",
-       "runtime/internal/sys",
+       "internal/runtime/sys",
        "internal/abi",
        "internal/runtime/math",
        "internal/bytealg",

diff --git a/src/runtime/internal/sys/consts.go b/src/internal/runtime/sys/consts.go
similarity index 100%
rename from src/runtime/internal/sys/consts.go
rename to src/internal/runtime/sys/consts.go

diff --git a/src/runtime/internal/sys/consts_norace.go b/src/internal/runtime/sys/consts_norace.go
similarity index 100%
rename from src/runtime/internal/sys/consts_norace.go
rename to src/internal/runtime/sys/consts_norace.go

diff --git a/src/runtime/internal/sys/consts_race.go b/src/internal/runtime/sys/consts_race.go
similarity index 100%
rename from src/runtime/internal/sys/consts_race.go
rename to src/internal/runtime/sys/consts_race.go

diff --git a/src/runtime/internal/sys/intrinsics.go b/src/internal/runtime/sys/intrinsics.go
similarity index 100%
rename from src/runtime/internal/sys/intrinsics.go
rename to src/internal/runtime/sys/intrinsics.go

diff --git a/src/runtime/internal/sys/intrinsics_test.go b/src/internal/runtime/sys/intrinsics_test.go
similarity index 97%
rename from src/runtime/internal/sys/intrinsics_test.go
rename to src/internal/runtime/sys/intrinsics_test.go
index 67998850019f12e7ad930dc83ab30a314ecdf1eb..d466f3e53966dcd7b269e5bfc5147ce4ee5f4476 100644 (file)
--- a/src/runtime/internal/sys/intrinsics_test.go
+++ b/src/internal/runtime/sys/intrinsics_test.go
@@ -5,7 +5,7 @@
 package sys_test
 
 import (
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "testing"
 )
 

diff --git a/src/runtime/internal/sys/nih.go b/src/internal/runtime/sys/nih.go
similarity index 100%
rename from src/runtime/internal/sys/nih.go
rename to src/internal/runtime/sys/nih.go

diff --git a/src/runtime/internal/sys/sys.go b/src/internal/runtime/sys/sys.go
similarity index 100%
rename from src/runtime/internal/sys/sys.go
rename to src/internal/runtime/sys/sys.go

diff --git a/src/reflect/deepequal.go b/src/reflect/deepequal.go
index 502ea9f146be27b8af825bc3adee58f2029abe46..041c3e1f7e016c662f861458ed272346dfaa8282 100644 (file)
--- a/src/reflect/deepequal.go
+++ b/src/reflect/deepequal.go
@@ -41,7 +41,7 @@ func deepValueEqual(v1, v2 Value, visited map[visit]bool) bool {
                case Pointer:
                        if !v1.typ().Pointers() {
                                // not-in-heap pointers can't be cyclic.
-                               // At least, all of our current uses of runtime/internal/sys.NotInHeap
+                               // At least, all of our current uses of internal/runtime/sys.NotInHeap
                                // have that property. The runtime ones aren't cyclic (and we don't use
                                // DeepEqual on them anyway), and the cgo-generated ones are
                                // all empty structs.

diff --git a/src/runtime/HACKING.md b/src/runtime/HACKING.md
index e1a43ba88e3d4978f0646e01635045debd1b0e19..f0c60f3af9e131816bf77f49b0715ca6e62fc475 100644 (file)
--- a/src/runtime/HACKING.md
+++ b/src/runtime/HACKING.md
@@ -235,7 +235,7 @@ There are three mechanisms for allocating unmanaged memory:
   objects of the same type.
 
 In general, types that are allocated using any of these should be
-marked as not in heap by embedding `runtime/internal/sys.NotInHeap`.
+marked as not in heap by embedding `internal/runtime/sys.NotInHeap`.
 
 Objects that are allocated in unmanaged memory **must not** contain
 heap pointers unless the following rules are also obeyed:

diff --git a/src/runtime/arena.go b/src/runtime/arena.go
index 96197099ca59c90049ddf7a25912740f754be39f..936e3604bf3e577690983f1b680089e8bd48b6d9 100644 (file)
--- a/src/runtime/arena.go
+++ b/src/runtime/arena.go
@@ -87,7 +87,7 @@ import (
        "internal/goarch"
        "internal/runtime/atomic"
        "internal/runtime/math"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go
index 1e3a50291838d1dcb00309035b033d83e9c9bf4f..c37135fbbe4b166a966fcbfcacb21cbbaffa5985 100644 (file)
--- a/src/runtime/cgo/cgo.go
+++ b/src/runtime/cgo/cgo.go
@@ -32,7 +32,7 @@ package cgo
 */
 import "C"
 
-import "runtime/internal/sys"
+import "internal/runtime/sys"
 
 // Incomplete is used specifically for the semantics of incomplete C types.
 type Incomplete struct {

diff --git a/src/runtime/cgocall.go b/src/runtime/cgocall.go
index b943b1c2d6b4f84a2c11e5e101c692d1f0d8cb43..ae91627972d2ea38b6b44bd0ee63d6d1ca953994 100644 (file)
--- a/src/runtime/cgocall.go
+++ b/src/runtime/cgocall.go
@@ -88,7 +88,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/goexperiment"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/cpuprof.go b/src/runtime/cpuprof.go
index 100a78258a2cd8965107425673caf6fa40553c0b..ea4d3a8cb0bb33495ef6a104a7860ee7f88a8655 100644 (file)
--- a/src/runtime/cpuprof.go
+++ b/src/runtime/cpuprof.go
@@ -14,7 +14,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/debuglog.go b/src/runtime/debuglog.go
index 695cd204f59278fbc46d1dd00adf09ed3668c085..25186af7e04252192c84a6229dd7fb6102212482 100644 (file)
--- a/src/runtime/debuglog.go
+++ b/src/runtime/debuglog.go
@@ -18,7 +18,7 @@ package runtime
 import (
        "internal/abi"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/export_test.go b/src/runtime/export_test.go
index d55da1028dbb1cf4f45b519577df06b4ca34ab8f..759463755ac5d98c468c16dae163a604ea139e19 100644 (file)
--- a/src/runtime/export_test.go
+++ b/src/runtime/export_test.go
@@ -11,7 +11,7 @@ import (
        "internal/goarch"
        "internal/goos"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/histogram.go b/src/runtime/histogram.go
index 95230d1f39d5a67b68d2d5e996157e9237352336..920a9561d23a28bcaa1394559aff94a183daa551 100644 (file)
--- a/src/runtime/histogram.go
+++ b/src/runtime/histogram.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/iface.go b/src/runtime/iface.go
index 41a10ae01215d82cb9bd72aeca9e42633d2c31e2..5316182f4ab24a24c72aca00af150a571652fe86 100644 (file)
--- a/src/runtime/iface.go
+++ b/src/runtime/iface.go
@@ -8,7 +8,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/malloc.go b/src/runtime/malloc.go
index cbb4f67ee87642abf709db53f6b27b49dd0d84ae..b24ebec27d23479b01c0edd3a7a25285f8785e4f 100644 (file)
--- a/src/runtime/malloc.go
+++ b/src/runtime/malloc.go
@@ -105,7 +105,7 @@ import (
        "internal/goos"
        "internal/runtime/atomic"
        "internal/runtime/math"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 
@@ -1555,7 +1555,7 @@ var persistentChunks *notInHeap
 // sysStat must be non-nil.
 //
 // Consider marking persistentalloc'd types not in heap by embedding
-// runtime/internal/sys.NotInHeap.
+// internal/runtime/sys.NotInHeap.
 func persistentalloc(size, align uintptr, sysStat *sysMemStat) unsafe.Pointer {
        var p *notInHeap
        systemstack(func() {
@@ -1697,7 +1697,7 @@ func (l *linearAlloc) alloc(size, align uintptr, sysStat *sysMemStat) unsafe.Poi
 // like sysAlloc or persistentAlloc.
 //
 // In general, it's better to use real types which embed
-// runtime/internal/sys.NotInHeap, but this serves as a generic type
+// internal/runtime/sys.NotInHeap, but this serves as a generic type
 // for situations where that isn't possible (like in the allocators).
 //
 // TODO: Use this as the return type of sysAlloc, persistentAlloc, etc?

diff --git a/src/runtime/mbitmap.go b/src/runtime/mbitmap.go
index 689fac103ccff67cd3546e0fd488066e9a82aca1..a25995f46fc0280af4b08ea2d1eb680567ed812a 100644 (file)
--- a/src/runtime/mbitmap.go
+++ b/src/runtime/mbitmap.go
@@ -59,7 +59,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mcache.go b/src/runtime/mcache.go
index e8da133a69490e1f274c581f667c493d43d694c5..97a5f70e9c78f7930d3d25ceea4ddc457f869e02 100644 (file)
--- a/src/runtime/mcache.go
+++ b/src/runtime/mcache.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mcentral.go b/src/runtime/mcentral.go
index bf597e1936da49575cb71f2017f5a042ff035d58..1a4819bc2c43a5e188d1a298a8e7af1db2856868 100644 (file)
--- a/src/runtime/mcentral.go
+++ b/src/runtime/mcentral.go
@@ -14,7 +14,7 @@ package runtime
 
 import (
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
 )
 
 // Central list of free objects of a given size.

diff --git a/src/runtime/mcheckmark.go b/src/runtime/mcheckmark.go
index 258f8892727c04dc9febe728d5a5887888316d4e..f5560cf50f1fdcef355f5cad3b8f45afcd1d6739 100644 (file)
--- a/src/runtime/mcheckmark.go
+++ b/src/runtime/mcheckmark.go
@@ -15,7 +15,7 @@ package runtime
 import (
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mfinal.go b/src/runtime/mfinal.go
index 78313fb74c6b78cbc57f7fa6baa51476418e2f40..a926a8ec357c4fc581c19e2f0ebd0550fd4e97c4 100644 (file)
--- a/src/runtime/mfinal.go
+++ b/src/runtime/mfinal.go
@@ -10,7 +10,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mfixalloc.go b/src/runtime/mfixalloc.go
index 7760ada3977adfa4d33f1a64c55800dcce74092e..be977af7372539205fc16d2b1bca8f0f12bbd42c 100644 (file)
--- a/src/runtime/mfixalloc.go
+++ b/src/runtime/mfixalloc.go
@@ -9,7 +9,7 @@
 package runtime
 
 import (
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 
@@ -27,7 +27,7 @@ import (
 // smashed by freeing and reallocating.
 //
 // Consider marking fixalloc'd types not in heap by embedding
-// runtime/internal/sys.NotInHeap.
+// internal/runtime/sys.NotInHeap.
 type fixalloc struct {
        size   uintptr
        first  func(arg, p unsafe.Pointer) // called first time p is returned

diff --git a/src/runtime/mgcmark.go b/src/runtime/mgcmark.go
index 61e917df41089b19f6cb805e09670091da77dd5b..9a48d15552f32bdccfd93471181b0077ec1c8a68 100644 (file)
--- a/src/runtime/mgcmark.go
+++ b/src/runtime/mgcmark.go
@@ -10,7 +10,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mgcscavenge.go b/src/runtime/mgcscavenge.go
index 4f0bd9c28dc015ce98a66493d8013cef42f1708d..3d869ecdd20f7c605f650915b8b3d4dd2b4629a9 100644 (file)
--- a/src/runtime/mgcscavenge.go
+++ b/src/runtime/mgcscavenge.go
@@ -93,7 +93,7 @@ package runtime
 import (
        "internal/goos"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mgcstack.go b/src/runtime/mgcstack.go
index f4a83f5f59c27ab350895faec0980687444e7880..bc5911f1414e9ecff9f60ba398761fbed7698db5 100644 (file)
--- a/src/runtime/mgcstack.go
+++ b/src/runtime/mgcstack.go
@@ -96,7 +96,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mgcwork.go b/src/runtime/mgcwork.go
index b91a6bd464d7d523830ca4f7babef7ac508aeeb4..2d66fa400231de62d2015bbb6fdd592420f07ebd 100644 (file)
--- a/src/runtime/mgcwork.go
+++ b/src/runtime/mgcwork.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mheap.go b/src/runtime/mheap.go
index 35fd08af50c3c1bd93dc2b491249c7e6b048f462..e4b1fa0574d0e9ea3cb0a8f0e9526fa704a51d09 100644 (file)
--- a/src/runtime/mheap.go
+++ b/src/runtime/mheap.go
@@ -12,7 +12,7 @@ import (
        "internal/cpu"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mpagecache.go b/src/runtime/mpagecache.go
index 245b0cbfef2cf40165338cd71377c1dc24345b8d..0ed3e80c30d1d2e3092ec9d7cb0da2b3153d6ca0 100644 (file)
--- a/src/runtime/mpagecache.go
+++ b/src/runtime/mpagecache.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/mpallocbits.go b/src/runtime/mpallocbits.go
index d8a9d25789d69a9d67e1ce7d88b41d2b676f8c08..e8e70f36bee8614b0bf6705d92e73fde5bbf151f 100644 (file)
--- a/src/runtime/mpallocbits.go
+++ b/src/runtime/mpallocbits.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/sys"
+       "internal/runtime/sys"
 )
 
 // pageBits is a bitmap representing one bit per page in a palloc chunk.

diff --git a/src/runtime/mprof.go b/src/runtime/mprof.go
index 006274757e66f1d9e132415d1070bde3f7be44d3..a9adc7b6f74566726d9f491306012a20dc0c2f55 100644 (file)
--- a/src/runtime/mprof.go
+++ b/src/runtime/mprof.go
@@ -12,7 +12,7 @@ import (
        "internal/goarch"
        "internal/profilerecord"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/netpoll.go b/src/runtime/netpoll.go
index 7b37d91b24a4d46445dadbb6da257d84bcd8c5d1..36b9edfe21780a650993574eac497faff33fe0ae 100644 (file)
--- a/src/runtime/netpoll.go
+++ b/src/runtime/netpoll.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 
@@ -714,7 +714,7 @@ func (c *pollCache) alloc() *pollDesc {
 // makeArg converts pd to an interface{}.
 // makeArg does not do any allocation. Normally, such
 // a conversion requires an allocation because pointers to
-// types which embed runtime/internal/sys.NotInHeap (which pollDesc is)
+// types which embed internal/runtime/sys.NotInHeap (which pollDesc is)
 // must be stored in interfaces indirectly. See issue 42076.
 func (pd *pollDesc) makeArg() (i any) {
        x := (*eface)(unsafe.Pointer(&i))

diff --git a/src/runtime/panic.go b/src/runtime/panic.go
index 98e96b12bf522c7865b4d52a0a63be8ce9c906f7..bd1ea096aa2a013de74c713b3eaeed4c6a3a262a 100644 (file)
--- a/src/runtime/panic.go
+++ b/src/runtime/panic.go
@@ -8,8 +8,8 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/runtime/atomic"
+       "internal/runtime/sys"
        "internal/stringslite"
-       "runtime/internal/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/proc.go b/src/runtime/proc.go
index c4f175b0b76b220cf1c5f99f3801b38c1055f7f4..2cf8a31971f9518e55052b118c4e1a58d1df7dc4 100644 (file)
--- a/src/runtime/proc.go
+++ b/src/runtime/proc.go
@@ -11,8 +11,8 @@ import (
        "internal/goos"
        "internal/runtime/atomic"
        "internal/runtime/exithook"
+       "internal/runtime/sys"
        "internal/stringslite"
-       "runtime/internal/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/runtime2.go b/src/runtime/runtime2.go
index 4a789639611fb732228086acfed57dacdde521c6..62ed77aae56fedf798a30a3601f02922dcccb572 100644 (file)
--- a/src/runtime/runtime2.go
+++ b/src/runtime/runtime2.go
@@ -9,7 +9,7 @@ import (
        "internal/chacha8rand"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/signal_arm64.go b/src/runtime/signal_arm64.go
index 4a96b3c2e70681388ac6b945dfc586b127ff9e63..af7d29f9de1d31d457d0d65b833b477eb934a1c7 100644 (file)
--- a/src/runtime/signal_arm64.go
+++ b/src/runtime/signal_arm64.go
@@ -9,7 +9,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/signal_linux_s390x.go b/src/runtime/signal_linux_s390x.go
index 18c3b115efc87f05b249d2ba51173d4388fdba2e..54e9d1fb9df6167f5cc457ab0f7311210c2a0813 100644 (file)
--- a/src/runtime/signal_linux_s390x.go
+++ b/src/runtime/signal_linux_s390x.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/signal_mipsx.go b/src/runtime/signal_mipsx.go
index ba92655152e84b2dc791892d6da9228f8669e8f6..924e654c6cd50347508b03027439e2fd8301b41b 100644 (file)
--- a/src/runtime/signal_mipsx.go
+++ b/src/runtime/signal_mipsx.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/signal_ppc64x.go b/src/runtime/signal_ppc64x.go
index b5722f99c66a227083aa83e3d58c4765bd5b2b37..20f874c2ec438d5d68ad87c28fde6a480117f738 100644 (file)
--- a/src/runtime/signal_ppc64x.go
+++ b/src/runtime/signal_ppc64x.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/signal_unix.go b/src/runtime/signal_unix.go
index 8ba498bdb238d5d9f9293d8ac83563934af775d2..a42972bb35686daeadb1e59dbe82d7b4cd5eeea3 100644 (file)
--- a/src/runtime/signal_unix.go
+++ b/src/runtime/signal_unix.go
@@ -9,7 +9,7 @@ package runtime
 import (
        "internal/abi"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/signal_windows.go b/src/runtime/signal_windows.go
index 4b7960c1f01130fa6c5f349fb0859c11de443f76..b0c653ee46dd0bcb553029b8c7d47ff9fe5ed66d 100644 (file)
--- a/src/runtime/signal_windows.go
+++ b/src/runtime/signal_windows.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/slice.go b/src/runtime/slice.go
index 65883ea2f3a327d05a0f091bac9ba955080684a7..ecc2e2921b3bbd260684ed650c0f05dbb63f5635 100644 (file)
--- a/src/runtime/slice.go
+++ b/src/runtime/slice.go
@@ -8,7 +8,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/runtime/math"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 
@@ -18,7 +18,7 @@ type slice struct {
        cap   int
 }
 
-// A notInHeapSlice is a slice backed by runtime/internal/sys.NotInHeap memory.
+// A notInHeapSlice is a slice backed by internal/runtime/sys.NotInHeap memory.
 type notInHeapSlice struct {
        array *notInHeap
        len   int

diff --git a/src/runtime/stack.go b/src/runtime/stack.go
index cdf859a7ff1342f39015018bceeb7cc5c4118066..bdfeb21c18e62fdcab5717397187baec32f10d3f 100644 (file)
--- a/src/runtime/stack.go
+++ b/src/runtime/stack.go
@@ -10,7 +10,7 @@ import (
        "internal/goarch"
        "internal/goos"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/stkframe.go b/src/runtime/stkframe.go
index 42b69477511da67d2cf9f0b0ab71725316f41ff8..2bab5a3a0ea8d0d1e4e64e751d294f136777b59e 100644 (file)
--- a/src/runtime/stkframe.go
+++ b/src/runtime/stkframe.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go
index 10cdcf9c6ee8b4c1feb3f62d67fe395febbed4f8..f889d6699266953f4d89fee087b765c9a5479a82 100644 (file)
--- a/src/runtime/symtab.go
+++ b/src/runtime/symtab.go
@@ -8,7 +8,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/symtabinl_test.go b/src/runtime/symtabinl_test.go
index 3c7cb2e595b99ed782abfc483a9a64bce0b9f246..db682e0c9caa8c03a49ed297d1fb44b4bfa48079 100644 (file)
--- a/src/runtime/symtabinl_test.go
+++ b/src/runtime/symtabinl_test.go
@@ -6,8 +6,8 @@ package runtime
 
 import (
        "internal/abi"
+       "internal/runtime/sys"
        "internal/stringslite"
-       "runtime/internal/sys"
 )
 
 func XTestInlineUnwinder(t TestingT) {

diff --git a/src/runtime/sys_wasm.go b/src/runtime/sys_wasm.go
index 27f9432bd45d595e2df396809e96e84892006516..f88b992e9c39a38a4670047152f7627001e3c51f 100644 (file)
--- a/src/runtime/sys_wasm.go
+++ b/src/runtime/sys_wasm.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/time.go b/src/runtime/time.go
index fc664f49eb8d7ca07da5b8dcdba90f54d1e4d38a..79f0514c6eec0af57559b69284c28be6222ef118 100644 (file)
--- a/src/runtime/time.go
+++ b/src/runtime/time.go
@@ -9,7 +9,7 @@ package runtime
 import (
        "internal/abi"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/traceallocfree.go b/src/runtime/traceallocfree.go
index e6a2a79c691bb8993dfb668d8e57ba784b620769..985d90eacb933de47d03f6cdf83676151789ddf9 100644 (file)
--- a/src/runtime/traceallocfree.go
+++ b/src/runtime/traceallocfree.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
 )
 
 // Batch type values for the alloc/free experiment.

diff --git a/src/runtime/traceback.go b/src/runtime/traceback.go
index 03c02f77713af7c5c71c8c61ece46b0ff63cab52..8946ec2528424b2cbf2ac6566bc0b1bb7a0db8a2 100644 (file)
--- a/src/runtime/traceback.go
+++ b/src/runtime/traceback.go
@@ -8,8 +8,8 @@ import (
        "internal/abi"
        "internal/bytealg"
        "internal/goarch"
+       "internal/runtime/sys"
        "internal/stringslite"
-       "runtime/internal/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/tracebuf.go b/src/runtime/tracebuf.go
index db4adf53e9866097264f94a8f0dc108435c5d4fc..908a63d273958d3294bbc4367a634c71caa67946 100644 (file)
--- a/src/runtime/tracebuf.go
+++ b/src/runtime/tracebuf.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/traceevent.go b/src/runtime/traceevent.go
index 2a869fb515094c7d327d78036514d8eca296529e..9adbc52fd3dea8ff9f860d6a143fb3b2c9444cde 100644 (file)
--- a/src/runtime/traceevent.go
+++ b/src/runtime/traceevent.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
 )
 
 // Event types in the trace, args are given in square brackets.

diff --git a/src/runtime/tracemap.go b/src/runtime/tracemap.go
index 5b2718c8d685c358ea09b6aa58f04ba05750f4e4..9efa325c112984a6bd08514202c319d45e163dcb 100644 (file)
--- a/src/runtime/tracemap.go
+++ b/src/runtime/tracemap.go
@@ -19,7 +19,7 @@ import (
        "internal/cpu"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/src/runtime/traceregion.go b/src/runtime/traceregion.go
index 43eef9c92bb9031c5848f09fe47f62dc415a1f01..b45093ec862b8a2fb4507110571d0f10a53338e9 100644 (file)
--- a/src/runtime/traceregion.go
+++ b/src/runtime/traceregion.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/runtime/atomic"
-       "runtime/internal/sys"
+       "internal/runtime/sys"
        "unsafe"
 )
 

diff --git a/test/intrinsic.dir/main.go b/test/intrinsic.dir/main.go
index 951aa159d6709a2c9a6453ff90c9e858fcf858c6..21e3eff80564ab34dbbc9377d3af518af88b9c55 100644 (file)
--- a/test/intrinsic.dir/main.go
+++ b/test/intrinsic.dir/main.go
@@ -6,7 +6,7 @@ package main
 
 import (
        "fmt"
-       T "runtime/internal/sys"
+       T "internal/runtime/sys"
 )
 
 var A = []uint64{0x0102030405060708, 0x1122334455667788}