runtime,internal: move runtime/internal/math to internal/runtime/math

Cleanup and friction reduction.

Updates #65355.

Change-Id: I6c4fcd409d044c00d16561fe9ed2257877d73f5b
Reviewed-on: https://go-review.googlesource.com/c/go/+/600435
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/src/cmd/compile/internal/ssa/_gen/ARM64.rules b/src/cmd/compile/internal/ssa/_gen/ARM64.rules
index 1b588edb043c11eed68cf264dc4c5afcef2b5a7a..721095f653363a692e60544f250491ed3c7d1db7 100644 (file)
--- a/src/cmd/compile/internal/ssa/_gen/ARM64.rules
+++ b/src/cmd/compile/internal/ssa/_gen/ARM64.rules
@@ -1931,7 +1931,7 @@
 
 ((REV|REVW) ((REV|REVW) p)) => p
 
-// runtime/internal/math.MulUintptr intrinsics
+// internal/runtime/math.MulUintptr intrinsics
 
 (Select0 (Mul64uover x y)) => (MUL x y)
 (Select1 (Mul64uover x y)) => (NotEqual (CMPconst (UMULH <typ.UInt64> x y) [0]))

diff --git a/src/cmd/compile/internal/ssagen/ssa.go b/src/cmd/compile/internal/ssagen/ssa.go
index 26d236dcacafb4d073a42664d435d150b3b68910..d0ca5b7f30f13bc57f4402657d14435db3187991 100644 (file)
--- a/src/cmd/compile/internal/ssagen/ssa.go
+++ b/src/cmd/compile/internal/ssagen/ssa.go
@@ -4241,7 +4241,7 @@ func InitTables() {
                        },
                        all...)
        }
-       addF("runtime/internal/math", "MulUintptr",
+       addF("internal/runtime/math", "MulUintptr",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        if s.config.PtrSize == 4 {
                                return s.newValue2(ssa.OpMul32uover, types.NewTuple(types.Types[types.TUINT], types.Types[types.TUINT]), args[0], args[1])
@@ -5025,14 +5025,14 @@ func InitTables() {
                },
                sys.AMD64, sys.ARM64, sys.PPC64, sys.S390X, sys.MIPS64, sys.RISCV64, sys.Loong64)
        alias("math/bits", "Mul", "math/bits", "Mul64", p8...)
-       alias("runtime/internal/math", "Mul64", "math/bits", "Mul64", p8...)
+       alias("internal/runtime/math", "Mul64", "math/bits", "Mul64", p8...)
        addF("math/bits", "Add64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        return s.newValue3(ssa.OpAdd64carry, types.NewTuple(types.Types[types.TUINT64], types.Types[types.TUINT64]), args[0], args[1], args[2])
                },
                sys.AMD64, sys.ARM64, sys.PPC64, sys.S390X, sys.RISCV64, sys.Loong64, sys.MIPS64)
        alias("math/bits", "Add", "math/bits", "Add64", p8...)
-       alias("runtime/internal/math", "Add64", "math/bits", "Add64", all...)
+       alias("internal/runtime/math", "Add64", "math/bits", "Add64", all...)
        addF("math/bits", "Sub64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        return s.newValue3(ssa.OpSub64borrow, types.NewTuple(types.Types[types.TUINT64], types.Types[types.TUINT64]), args[0], args[1], args[2])

diff --git a/src/cmd/compile/internal/test/inl_test.go b/src/cmd/compile/internal/test/inl_test.go
index f05bb9317d70e8ed591f52df8c1e3d95172ff766..462626958223fc7e6df85c4b3f73ee614299939c 100644 (file)
--- a/src/cmd/compile/internal/test/inl_test.go
+++ b/src/cmd/compile/internal/test/inl_test.go
@@ -98,7 +98,7 @@ func TestIntendedInlining(t *testing.T) {
                        "traceEnabled",
                },
                "runtime/internal/sys": {},
-               "runtime/internal/math": {
+               "internal/runtime/math": {
                        "MulUintptr",
                },
                "bytes": {

diff --git a/src/cmd/compile/internal/walk/builtin.go b/src/cmd/compile/internal/walk/builtin.go
index 512420e6d5800b6049671fdc1f3d25077af75bd5..02e64c12a13c3bd47d27b6c0b7bb0c20ed760d7e 100644 (file)
--- a/src/cmd/compile/internal/walk/builtin.go
+++ b/src/cmd/compile/internal/walk/builtin.go
@@ -799,7 +799,7 @@ func walkUnsafeSlice(n *ir.BinaryExpr, init *ir.Nodes) ir.Node {
        return walkExpr(typecheck.Expr(h), init)
 }
 
-var math_MulUintptr = &types.Sym{Pkg: types.NewPkg("runtime/internal/math", "math"), Name: "MulUintptr"}
+var math_MulUintptr = &types.Sym{Pkg: types.NewPkg("internal/runtime/math", "math"), Name: "MulUintptr"}
 
 func walkUnsafeString(n *ir.BinaryExpr, init *ir.Nodes) ir.Node {
        ptr := safeExpr(n.X, init)

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

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 9146cae492e8ac62e3d51def288f81c0f0529b15..9e22955edafbd079eafa36085830a1bf310dc6d4 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -87,7 +87,7 @@ var depsRules = `
        < internal/runtime/syscall
        < internal/runtime/atomic
        < internal/runtime/exithook
-       < runtime/internal/math
+       < internal/runtime/math
        < runtime
        < sync/atomic
        < internal/race

diff --git a/src/internal/coverage/pkid.go b/src/internal/coverage/pkid.go
index 86ff302507c70b1d408e114f214a1e0e076b537c..a764cc4205e9f78e34c648a996f286f7f75fe9e3 100644 (file)
--- a/src/internal/coverage/pkid.go
+++ b/src/internal/coverage/pkid.go
@@ -28,7 +28,7 @@ package coverage
 //    slot: 3 path='internal/goos'
 //    slot: 4 path='runtime/internal/sys'  hard-coded id: 5
 //    slot: 5 path='internal/abi'  hard-coded id: 4
-//    slot: 6 path='runtime/internal/math'  hard-coded id: 6
+//    slot: 6 path='internal/runtime/math'  hard-coded id: 6
 //    slot: 7 path='internal/bytealg'  hard-coded id: 7
 //    slot: 8 path='internal/goexperiment'
 //    slot: 9 path='internal/runtime/syscall'  hard-coded id: 8
@@ -52,7 +52,7 @@ var rtPkgs = [...]string{
        "internal/chacha8rand",
        "runtime/internal/sys",
        "internal/abi",
-       "runtime/internal/math",
+       "internal/runtime/math",
        "internal/bytealg",
        "internal/goexperiment",
        "internal/runtime/syscall",

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

diff --git a/src/runtime/internal/math/math_test.go b/src/internal/runtime/math/math_test.go
similarity index 98%
rename from src/runtime/internal/math/math_test.go
rename to src/internal/runtime/math/math_test.go
index 303eb63405a1d4b2ce966c6b3fb9cbc94ce36ea4..8405999dc2c5ecfdce214d5ba14f805d8681591e 100644 (file)
--- a/src/runtime/internal/math/math_test.go
+++ b/src/internal/runtime/math/math_test.go
@@ -5,7 +5,7 @@
 package math_test
 
 import (
-       . "runtime/internal/math"
+       . "internal/runtime/math"
        "testing"
 )
 

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

diff --git a/src/runtime/chan.go b/src/runtime/chan.go
index f1cd74a3fd16e22eedf62a9e11730db3b6128fc8..4c854c72bc9842607e35f187ec895c8f6fc022b0 100644 (file)
--- a/src/runtime/chan.go
+++ b/src/runtime/chan.go
@@ -20,7 +20,7 @@ package runtime
 import (
        "internal/abi"
        "internal/runtime/atomic"
-       "runtime/internal/math"
+       "internal/runtime/math"
        "unsafe"
 )
 

diff --git a/src/runtime/hash64.go b/src/runtime/hash64.go
index 05cdb8111372b815568d6e91a2c4608cb731e343..124bb7d77accdd845cb07c593ce8df5b48e4c5d8 100644 (file)
--- a/src/runtime/hash64.go
+++ b/src/runtime/hash64.go
@@ -10,7 +10,7 @@
 package runtime
 
 import (
-       "runtime/internal/math"
+       "internal/runtime/math"
        "unsafe"
 )
 

diff --git a/src/runtime/malloc.go b/src/runtime/malloc.go
index b92a213245d4f721220534eac8b05989a891a8a5..cbb4f67ee87642abf709db53f6b27b49dd0d84ae 100644 (file)
--- a/src/runtime/malloc.go
+++ b/src/runtime/malloc.go
@@ -104,7 +104,7 @@ import (
        "internal/goarch"
        "internal/goos"
        "internal/runtime/atomic"
-       "runtime/internal/math"
+       "internal/runtime/math"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/map.go b/src/runtime/map.go
index 112084f5a74091401e5e8729d7c1fe073a41adff..9169d5733eef4f60915c3c6d436d744d4b5f5ac2 100644 (file)
--- a/src/runtime/map.go
+++ b/src/runtime/map.go
@@ -57,7 +57,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/runtime/atomic"
-       "runtime/internal/math"
+       "internal/runtime/math"
        "unsafe"
 )
 

diff --git a/src/runtime/rand.go b/src/runtime/rand.go
index a66553feebe3edc19f8ffaa347d843685d46cf3a..11be6552aa3314a97bced18420dfd4d8c7a4aece 100644 (file)
--- a/src/runtime/rand.go
+++ b/src/runtime/rand.go
@@ -9,7 +9,7 @@ package runtime
 import (
        "internal/chacha8rand"
        "internal/goarch"
-       "runtime/internal/math"
+       "internal/runtime/math"
        "unsafe"
        _ "unsafe" // for go:linkname
 )

diff --git a/src/runtime/slice.go b/src/runtime/slice.go
index 78475735af3d5788bb36d41bda2996cb6286e0f1..65883ea2f3a327d05a0f091bac9ba955080684a7 100644 (file)
--- a/src/runtime/slice.go
+++ b/src/runtime/slice.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/math"
+       "internal/runtime/math"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/unsafe.go b/src/runtime/unsafe.go
index ca428b56e079223d6e01695929af704d13de4210..85fc8b61ebc0ef6ee0015d503e282f8b50399a0a 100644 (file)
--- a/src/runtime/unsafe.go
+++ b/src/runtime/unsafe.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/math"
+       "internal/runtime/math"
        "unsafe"
 )