diff options
| author | Than McIntosh <thanm@google.com> | 2019-11-01 10:44:44 -0400 |
|---|---|---|
| committer | Than McIntosh <thanm@google.com> | 2019-11-01 10:45:24 -0400 |
| commit | c0555a2a7a0ca83fdbb55219299fcfe1ff33e4df (patch) | |
| tree | 25c35dc6bf5b8134906338df0f612fbe75089ca7 /src/cmd | |
| parent | 219922e95b8e49cfb94da9de0c48edb22a2e7054 (diff) | |
| parent | 8405cd3005a5274e80e41676146629c4086b6380 (diff) | |
| download | go-c0555a2a7a0ca83fdbb55219299fcfe1ff33e4df.tar.xz | |
[dev.link] all: merge branch 'master' into dev.link
Fixed a couple of minor conflicts in lib.go and deadcode.go
relating to debug logging.
Change-Id: I58335fc42ab1f1f3409fd8354da4f26419e8fb22
Diffstat (limited to 'src/cmd')
212 files changed, 6115 insertions, 4292 deletions
diff --git a/src/cmd/asm/internal/asm/testdata/mips64.s b/src/cmd/asm/internal/asm/testdata/mips64.s index 2d1bc18cec..e80f4d83d1 100644 --- a/src/cmd/asm/internal/asm/testdata/mips64.s +++ b/src/cmd/asm/internal/asm/testdata/mips64.s @@ -130,27 +130,27 @@ TEXT foo(SB),DUPOK|NOSPLIT,$0 // { // outcode(int($1), &$2, 0, &$4); // } - MOVW FCR0, R1 + MOVW FCR31, R1 // 4441f800 // LMOVW freg ',' fpscr // { // outcode(int($1), &$2, 0, &$4); // } - MOVW R1, FCR0 + MOVW R1, FCR31 // 44c1f800 // LMOVW rreg ',' mreg // { // outcode(int($1), &$2, 0, &$4); // } - MOVW R1, M1 - MOVV R1, M1 + MOVW R1, M1 // 40810800 + MOVV R1, M1 // 40a10800 // LMOVW mreg ',' rreg // { // outcode(int($1), &$2, 0, &$4); // } - MOVW M1, R1 - MOVV M1, R1 + MOVW M1, R1 // 40010800 + MOVV M1, R1 // 40210800 // @@ -406,6 +406,7 @@ label4: NEGW R1, R2 // 00011023 NEGV R1, R2 // 0001102f + RET // END // diff --git a/src/cmd/compile/fmtmap_test.go b/src/cmd/compile/fmtmap_test.go index ebbaf01b17..51b79c6a89 100644 --- a/src/cmd/compile/fmtmap_test.go +++ b/src/cmd/compile/fmtmap_test.go @@ -171,37 +171,37 @@ var knownFormats = map[string]string{ "map[*cmd/compile/internal/gc.Node]*cmd/compile/internal/ssa.Value %v": "", "map[*cmd/compile/internal/gc.Node][]*cmd/compile/internal/gc.Node %v": "", "map[cmd/compile/internal/ssa.ID]uint32 %v": "", - "map[int64]uint32 %v": "", - "math/big.Accuracy %s": "", - "reflect.Type %s": "", - "rune %#U": "", - "rune %c": "", - "rune %q": "", - "string %-*s": "", - "string %-16s": "", - "string %-6s": "", - "string %q": "", - "string %s": "", - "string %v": "", - "time.Duration %d": "", - "time.Duration %v": "", - "uint %04x": "", - "uint %5d": "", - "uint %d": "", - "uint %x": "", - "uint16 %d": "", - "uint16 %x": "", - "uint32 %#U": "", - "uint32 %#x": "", - "uint32 %d": "", - "uint32 %v": "", - "uint32 %x": "", - "uint64 %08x": "", - "uint64 %b": "", - "uint64 %d": "", - "uint64 %x": "", - "uint8 %d": "", - "uint8 %v": "", - "uint8 %x": "", - "uintptr %d": "", + "map[int64]uint32 %v": "", + "math/big.Accuracy %s": "", + "reflect.Type %s": "", + "rune %#U": "", + "rune %c": "", + "rune %q": "", + "string %-*s": "", + "string %-16s": "", + "string %-6s": "", + "string %q": "", + "string %s": "", + "string %v": "", + "time.Duration %d": "", + "time.Duration %v": "", + "uint %04x": "", + "uint %5d": "", + "uint %d": "", + "uint %x": "", + "uint16 %d": "", + "uint16 %x": "", + "uint32 %#U": "", + "uint32 %#x": "", + "uint32 %d": "", + "uint32 %v": "", + "uint32 %x": "", + "uint64 %08x": "", + "uint64 %b": "", + "uint64 %d": "", + "uint64 %x": "", + "uint8 %d": "", + "uint8 %v": "", + "uint8 %x": "", + "uintptr %d": "", } diff --git a/src/cmd/compile/internal/amd64/galign.go b/src/cmd/compile/internal/amd64/galign.go index 4e7e762d7d..af58440502 100644 --- a/src/cmd/compile/internal/amd64/galign.go +++ b/src/cmd/compile/internal/amd64/galign.go @@ -17,7 +17,6 @@ func Init(arch *gc.Arch) { arch.MAXWIDTH = 1 << 50 arch.ZeroRange = zerorange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnop diff --git a/src/cmd/compile/internal/amd64/ggen.go b/src/cmd/compile/internal/amd64/ggen.go index f43800efe7..0c1456f4d0 100644 --- a/src/cmd/compile/internal/amd64/ggen.go +++ b/src/cmd/compile/internal/amd64/ggen.go @@ -121,26 +121,6 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, state *uint32) *obj.Pr return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - // Note: this code must not clobber any registers. - op := x86.AMOVQ - if gc.Widthptr == 4 { - op = x86.AMOVL - } - sym := n.Sym.Linksym() - size := n.Type.Size() - for i := int64(0); i < size; i += int64(gc.Widthptr) { - p := pp.Prog(op) - p.From.Type = obj.TYPE_CONST - p.From.Offset = 0 - p.To.Type = obj.TYPE_MEM - p.To.Name = obj.NAME_AUTO - p.To.Reg = x86.REG_SP - p.To.Offset = n.Xoffset + i - p.To.Sym = sym - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { // This is a hardware nop (1-byte 0x90) instruction, // even though we describe it as an explicit XCHGL here. diff --git a/src/cmd/compile/internal/amd64/ssa.go b/src/cmd/compile/internal/amd64/ssa.go index 480ff6523a..088a4a16c7 100644 --- a/src/cmd/compile/internal/amd64/ssa.go +++ b/src/cmd/compile/internal/amd64/ssa.go @@ -1091,7 +1091,7 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) { gc.AddAux(&p.From, v) p.To.Type = obj.TYPE_REG p.To.Reg = v.Reg0() - case ssa.OpAMD64XCHGL, ssa.OpAMD64XCHGQ: + case ssa.OpAMD64XCHGB, ssa.OpAMD64XCHGL, ssa.OpAMD64XCHGQ: r := v.Reg0() if r != v.Args[0].Reg() { v.Fatalf("input[0] and output[0] not in same register %s", v.LongString()) diff --git a/src/cmd/compile/internal/arm/galign.go b/src/cmd/compile/internal/arm/galign.go index 8469dbdd73..20e2f43a91 100644 --- a/src/cmd/compile/internal/arm/galign.go +++ b/src/cmd/compile/internal/arm/galign.go @@ -17,7 +17,6 @@ func Init(arch *gc.Arch) { arch.MAXWIDTH = (1 << 32) - 1 arch.SoftFloat = objabi.GOARM == 5 arch.ZeroRange = zerorange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnop diff --git a/src/cmd/compile/internal/arm/ggen.go b/src/cmd/compile/internal/arm/ggen.go index e9a92af108..bd8d7ff40b 100644 --- a/src/cmd/compile/internal/arm/ggen.go +++ b/src/cmd/compile/internal/arm/ggen.go @@ -47,27 +47,6 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, r0 *uint32) *obj.Prog return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - // Note: this code must not clobber any registers. - sym := n.Sym.Linksym() - size := n.Type.Size() - p := pp.Prog(arm.AMOVW) - p.From.Type = obj.TYPE_CONST - p.From.Offset = 0 - p.To.Type = obj.TYPE_REG - p.To.Reg = arm.REGTMP - for i := int64(0); i < size; i += 4 { - p := pp.Prog(arm.AMOVW) - p.From.Type = obj.TYPE_REG - p.From.Reg = arm.REGTMP - p.To.Type = obj.TYPE_MEM - p.To.Name = obj.NAME_AUTO - p.To.Reg = arm.REGSP - p.To.Offset = n.Xoffset + i - p.To.Sym = sym - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { p := pp.Prog(arm.AAND) p.From.Type = obj.TYPE_REG diff --git a/src/cmd/compile/internal/arm64/galign.go b/src/cmd/compile/internal/arm64/galign.go index f01fe8a571..40d6e17ae2 100644 --- a/src/cmd/compile/internal/arm64/galign.go +++ b/src/cmd/compile/internal/arm64/galign.go @@ -17,7 +17,6 @@ func Init(arch *gc.Arch) { arch.PadFrame = padframe arch.ZeroRange = zerorange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnop diff --git a/src/cmd/compile/internal/arm64/ggen.go b/src/cmd/compile/internal/arm64/ggen.go index 2f925656bc..dbe7495cca 100644 --- a/src/cmd/compile/internal/arm64/ggen.go +++ b/src/cmd/compile/internal/arm64/ggen.go @@ -63,22 +63,6 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, _ *uint32) *obj.Prog { return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - // Note: this code must not clobber any registers. - sym := n.Sym.Linksym() - size := n.Type.Size() - for i := int64(0); i < size; i += 8 { - p := pp.Prog(arm64.AMOVD) - p.From.Type = obj.TYPE_REG - p.From.Reg = arm64.REGZERO - p.To.Type = obj.TYPE_MEM - p.To.Name = obj.NAME_AUTO - p.To.Reg = arm64.REGSP - p.To.Offset = n.Xoffset + i - p.To.Sym = sym - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { p := pp.Prog(arm64.AHINT) p.From.Type = obj.TYPE_CONST diff --git a/src/cmd/compile/internal/arm64/ssa.go b/src/cmd/compile/internal/arm64/ssa.go index 252e875669..24b6383bbc 100644 --- a/src/cmd/compile/internal/arm64/ssa.go +++ b/src/cmd/compile/internal/arm64/ssa.go @@ -452,6 +452,7 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) { ssa.OpARM64MOVDstore, ssa.OpARM64FMOVSstore, ssa.OpARM64FMOVDstore, + ssa.OpARM64STLRB, ssa.OpARM64STLR, ssa.OpARM64STLRW: p := s.Prog(v.Op.Asm()) diff --git a/src/cmd/compile/internal/gc/go.go b/src/cmd/compile/internal/gc/go.go index d05f754f30..c14fb4d3fa 100644 --- a/src/cmd/compile/internal/gc/go.go +++ b/src/cmd/compile/internal/gc/go.go @@ -270,11 +270,6 @@ type Arch struct { // SSAGenBlock emits end-of-block Progs. SSAGenValue should be called // for all values in the block before SSAGenBlock. SSAGenBlock func(s *SSAGenState, b, next *ssa.Block) - - // ZeroAuto emits code to zero the given auto stack variable. - // ZeroAuto must not use any non-temporary registers. - // ZeroAuto will only be called for variables which contain a pointer. - ZeroAuto func(*Progs, *Node) } var thearch Arch diff --git a/src/cmd/compile/internal/gc/mpfloat.go b/src/cmd/compile/internal/gc/mpfloat.go index d15f26784e..401aef319d 100644 --- a/src/cmd/compile/internal/gc/mpfloat.go +++ b/src/cmd/compile/internal/gc/mpfloat.go @@ -179,11 +179,6 @@ func (a *Mpflt) Neg() { } func (a *Mpflt) SetString(as string) { - // TODO(gri) why is this needed? - for len(as) > 0 && (as[0] == ' ' || as[0] == '\t') { - as = as[1:] - } - f, _, err := a.Val.Parse(as, 0) if err != nil { yyerror("malformed constant: %s (%v)", as, err) diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go index dff559a7ba..f76b6d4c02 100644 --- a/src/cmd/compile/internal/gc/ssa.go +++ b/src/cmd/compile/internal/gc/ssa.go @@ -3337,7 +3337,7 @@ func init() { s.vars[&memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v) return s.newValue1(ssa.OpSelect0, types.Types[TUINT8], v) }, - sys.AMD64, sys.ARM64, sys.S390X, sys.MIPS64, sys.PPC64) + sys.AMD64, sys.ARM64, sys.S390X, sys.MIPS, sys.MIPS64, sys.PPC64) addF("runtime/internal/atomic", "Load64", func(s *state, n *Node, args []*ssa.Value) *ssa.Value { v := s.newValue2(ssa.OpAtomicLoad64, types.NewTuple(types.Types[TUINT64], types.TypeMem), args[0], s.mem()) @@ -3366,6 +3366,12 @@ func init() { return nil }, sys.AMD64, sys.ARM64, sys.S390X, sys.MIPS, sys.MIPS64, sys.PPC64) + addF("runtime/internal/atomic", "Store8", + func(s *state, n *Node, args []*ssa.Value) *ssa.Value { + s.vars[&memVar] = s.newValue3(ssa.OpAtomicStore8, types.TypeMem, args[0], args[1], s.mem()) + return nil + }, + sys.AMD64, sys.ARM64, sys.S390X, sys.MIPS, sys.MIPS64, sys.PPC64) addF("runtime/internal/atomic", "Store64", func(s *state, n *Node, args []*ssa.Value) *ssa.Value { s.vars[&memVar] = s.newValue3(ssa.OpAtomicStore64, types.TypeMem, args[0], args[1], s.mem()) @@ -4099,7 +4105,7 @@ func (s *state) openDeferRecord(n *Node) { // runtime panic code to use. But in the defer exit code, we will // call the function directly if it is a static function. closureVal := s.expr(fn) - closure := s.openDeferSave(fn, fn.Type, closureVal) + closure := s.openDeferSave(nil, fn.Type, closureVal) opendefer.closureNode = closure.Aux.(*Node) if !(fn.Op == ONAME && fn.Class() == PFUNC) { opendefer.closure = closure @@ -4112,14 +4118,14 @@ func (s *state) openDeferRecord(n *Node) { // We must always store the function value in a stack slot for the // runtime panic code to use. But in the defer exit code, we will // call the method directly. - closure := s.openDeferSave(fn, fn.Type, closureVal) + closure := s.openDeferSave(nil, fn.Type, closureVal) opendefer.closureNode = closure.Aux.(*Node) } else { if fn.Op != ODOTINTER { Fatalf("OCALLINTER: n.Left not an ODOTINTER: %v", fn.Op) } closure, rcvr := s.getClosureAndRcvr(fn) - opendefer.closure = s.openDeferSave(fn, closure.Type, closure) + opendefer.closure = s.openDeferSave(nil, closure.Type, closure) // Important to get the receiver type correct, so it is recognized // as a pointer for GC purposes. opendefer.rcvr = s.openDeferSave(nil, fn.Type.Recv().Type, rcvr) @@ -4127,7 +4133,12 @@ func (s *state) openDeferRecord(n *Node) { opendefer.rcvrNode = opendefer.rcvr.Aux.(*Node) } for _, argn := range n.Rlist.Slice() { - v := s.openDeferSave(argn, argn.Type, s.expr(argn)) + var v *ssa.Value + if canSSAType(argn.Type) { + v = s.openDeferSave(nil, argn.Type, s.expr(argn)) + } else { + v = s.openDeferSave(argn, argn.Type, nil) + } args = append(args, v) argNodes = append(argNodes, v.Aux.(*Node)) } @@ -4144,13 +4155,22 @@ func (s *state) openDeferRecord(n *Node) { s.store(types.Types[TUINT8], s.deferBitsAddr, newDeferBits) } -// openDeferSave generates SSA nodes to store a value val (with type t) for an -// open-coded defer on the stack at an explicit autotmp location, so it can be -// reloaded and used for the appropriate call on exit. n is the associated node, -// which is only needed if the associated type is non-SSAable. It returns an SSA -// value representing a pointer to the stack location. +// openDeferSave generates SSA nodes to store a value (with type t) for an +// open-coded defer at an explicit autotmp location on the stack, so it can be +// reloaded and used for the appropriate call on exit. If type t is SSAable, then +// val must be non-nil (and n should be nil) and val is the value to be stored. If +// type t is non-SSAable, then n must be non-nil (and val should be nil) and n is +// evaluated (via s.addr() below) to get the value that is to be stored. The +// function returns an SSA value representing a pointer to the autotmp location. func (s *state) openDeferSave(n *Node, t *types.Type, val *ssa.Value) *ssa.Value { - argTemp := tempAt(val.Pos.WithNotStmt(), s.curfn, t) + canSSA := canSSAType(t) + var pos src.XPos + if canSSA { + pos = val.Pos + } else { + pos = n.Pos + } + argTemp := tempAt(pos.WithNotStmt(), s.curfn, t) argTemp.Name.SetOpenDeferSlot(true) var addrArgTemp *ssa.Value // Use OpVarLive to make sure stack slots for the args, etc. are not @@ -4179,10 +4199,7 @@ func (s *state) openDeferSave(n *Node, t *types.Type, val *ssa.Value) *ssa.Value // uninitialized pointer value. argTemp.Name.SetNeedzero(true) } - if !canSSAType(t) { - if n.Op != ONAME { - panic(fmt.Sprintf("Non-SSAable value should be a named location: %v", n)) - } + if !canSSA { a := s.addr(n, false) s.move(t, addrArgTemp, a) return addrArgTemp diff --git a/src/cmd/compile/internal/gc/swt.go b/src/cmd/compile/internal/gc/swt.go index 2970993056..0d5df2e0bd 100644 --- a/src/cmd/compile/internal/gc/swt.go +++ b/src/cmd/compile/internal/gc/swt.go @@ -32,7 +32,7 @@ func typecheckTypeSwitch(n *Node) { // declaration itself. So if there are no cases, we won't // notice that it went unused. if v := n.Left.Left; v != nil && !v.isBlank() && n.List.Len() == 0 { - yyerrorl(v.Pos, "%v declared and not used", v.Sym) + yyerrorl(v.Pos, "%v declared but not used", v.Sym) } var defCase, nilCase *Node diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go index 140acb9062..7fb4a51817 100644 --- a/src/cmd/compile/internal/gc/typecheck.go +++ b/src/cmd/compile/internal/gc/typecheck.go @@ -2782,7 +2782,7 @@ func typecheckcomplit(n *Node) (res *Node) { } elemType := n.Right.Right.Type - length := typecheckarraylit(elemType, -1, n.List.Slice()) + length := typecheckarraylit(elemType, -1, n.List.Slice(), "array literal") n.Op = OARRAYLIT n.Type = types.NewArray(elemType, length) @@ -2804,12 +2804,12 @@ func typecheckcomplit(n *Node) (res *Node) { n.Type = nil case TARRAY: - typecheckarraylit(t.Elem(), t.NumElem(), n.List.Slice()) + typecheckarraylit(t.Elem(), t.NumElem(), n.List.Slice(), "array literal") n.Op = OARRAYLIT n.Right = nil case TSLICE: - length := typecheckarraylit(t.Elem(), -1, n.List.Slice()) + length := typecheckarraylit(t.Elem(), -2, n.List.Slice(), "slice literal") n.Op = OSLICELIT n.Right = nodintconst(length) @@ -2960,7 +2960,8 @@ func typecheckcomplit(n *Node) (res *Node) { return n } -func typecheckarraylit(elemType *types.Type, bound int64, elts []*Node) int64 { +// typecheckarraylit type-checks a sequence of slice/array literal elements. +func typecheckarraylit(elemType *types.Type, bound int64, elts []*Node, ctx string) int64 { // If there are key/value pairs, create a map to keep seen // keys so we can check for duplicate indices. var indices map[int64]bool @@ -2995,12 +2996,12 @@ func typecheckarraylit(elemType *types.Type, bound int64, elts []*Node) int64 { r := *vp r = pushtype(r, elemType) r = typecheck(r, ctxExpr) - *vp = assignconv(r, elemType, "array or slice literal") + *vp = assignconv(r, elemType, ctx) if key >= 0 { if indices != nil { if indices[key] { - yyerror("duplicate index in array literal: %d", key) + yyerror("duplicate index in %s: %d", ctx, key) } else { indices[key] = true } diff --git a/src/cmd/compile/internal/gc/walk.go b/src/cmd/compile/internal/gc/walk.go index 7d9f0cbd58..2ec279bf37 100644 --- a/src/cmd/compile/internal/gc/walk.go +++ b/src/cmd/compile/internal/gc/walk.go @@ -50,10 +50,10 @@ func walk(fn *Node) { if defn.Left.Name.Used() { continue } - yyerrorl(defn.Left.Pos, "%v declared and not used", ln.Sym) + yyerrorl(defn.Left.Pos, "%v declared but not used", ln.Sym) defn.Left.Name.SetUsed(true) // suppress repeats } else { - yyerrorl(ln.Pos, "%v declared and not used", ln.Sym) + yyerrorl(ln.Pos, "%v declared but not used", ln.Sym) } } @@ -3965,8 +3965,12 @@ func walkCheckPtrArithmetic(n *Node, init *Nodes) *Node { // Calling cheapexpr(n, init) below leads to a recursive call // to walkexpr, which leads us back here again. Use n.Opt to // prevent infinite loops. - if n.Opt() == &walkCheckPtrArithmeticMarker { + if opt := n.Opt(); opt == &walkCheckPtrArithmeticMarker { return n + } else if opt != nil { + // We use n.Opt() here because today it's not used for OCONVNOP. If that changes, + // there's no guarantee that temporarily replacing it is safe, so just hard fail here. + Fatalf("unexpected Opt: %v", opt) } n.SetOpt(&walkCheckPtrArithmeticMarker) defer n.SetOpt(nil) diff --git a/src/cmd/compile/internal/mips/galign.go b/src/cmd/compile/internal/mips/galign.go index 596dbd7fa0..be40c16dde 100644 --- a/src/cmd/compile/internal/mips/galign.go +++ b/src/cmd/compile/internal/mips/galign.go @@ -20,7 +20,6 @@ func Init(arch *gc.Arch) { arch.MAXWIDTH = (1 << 31) - 1 arch.SoftFloat = (objabi.GOMIPS == "softfloat") arch.ZeroRange = zerorange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnop arch.SSAMarkMoves = func(s *gc.SSAGenState, b *ssa.Block) {} diff --git a/src/cmd/compile/internal/mips/ggen.go b/src/cmd/compile/internal/mips/ggen.go index eab60756ba..5e867721c3 100644 --- a/src/cmd/compile/internal/mips/ggen.go +++ b/src/cmd/compile/internal/mips/ggen.go @@ -43,22 +43,6 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, _ *uint32) *obj.Prog { return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - // Note: this code must not clobber any registers. - sym := n.Sym.Linksym() - size := n.Type.Size() - for i := int64(0); i < size; i += 4 { - p := pp.Prog(mips.AMOVW) - p.From.Type = obj.TYPE_REG - p.From.Reg = mips.REGZERO - p.To.Type = obj.TYPE_MEM - p.To.Name = obj.NAME_AUTO - p.To.Reg = mips.REGSP - p.To.Offset = n.Xoffset + i - p.To.Sym = sym - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { p := pp.Prog(mips.ANOR) p.From.Type = obj.TYPE_REG diff --git a/src/cmd/compile/internal/mips/ssa.go b/src/cmd/compile/internal/mips/ssa.go index bac8574b5c..7efd8e105b 100644 --- a/src/cmd/compile/internal/mips/ssa.go +++ b/src/cmd/compile/internal/mips/ssa.go @@ -497,20 +497,36 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) { p.To.Name = obj.NAME_EXTERN p.To.Sym = gc.ExtendCheckFunc[v.AuxInt] s.UseArgs(12) // space used in callee args area by assembly stubs - case ssa.OpMIPSLoweredAtomicLoad: + case ssa.OpMIPSLoweredAtomicLoad8, + ssa.OpMIPSLoweredAtomicLoad32: s.Prog(mips.ASYNC) - p := s.Prog(mips.AMOVW) + var op obj.As + switch v.Op { + case ssa.OpMIPSLoweredAtomicLoad8: + op = mips.AMOVB + case ssa.OpMIPSLoweredAtomicLoad32: + op = mips.AMOVW + } + p := s.Prog(op) p.From.Type = obj.TYPE_MEM p.From.Reg = v.Args[0].Reg() p.To.Type = obj.TYPE_REG p.To.Reg = v.Reg0() s.Prog(mips.ASYNC) - case ssa.OpMIPSLoweredAtomicStore: + case ssa.OpMIPSLoweredAtomicStore8, + ssa.OpMIPSLoweredAtomicStore32: s.Prog(mips.ASYNC) - p := s.Prog(mips.AMOVW) + var op obj.As + switch v.Op { + case ssa.OpMIPSLoweredAtomicStore8: + op = mips.AMOVB + case ssa.OpMIPSLoweredAtomicStore32: + op = mips.AMOVW + } + p := s.Prog(op) p.From.Type = obj.TYPE_REG p.From.Reg = v.Args[1].Reg() p.To.Type = obj.TYPE_MEM diff --git a/src/cmd/compile/internal/mips64/galign.go b/src/cmd/compile/internal/mips64/galign.go index 07e9f98be5..90c381a50b 100644 --- a/src/cmd/compile/internal/mips64/galign.go +++ b/src/cmd/compile/internal/mips64/galign.go @@ -20,7 +20,6 @@ func Init(arch *gc.Arch) { arch.MAXWIDTH = 1 << 50 arch.SoftFloat = objabi.GOMIPS64 == "softfloat" arch.ZeroRange = zerorange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnop diff --git a/src/cmd/compile/internal/mips64/ggen.go b/src/cmd/compile/internal/mips64/ggen.go index 80c1f0296c..04e7a66e41 100644 --- a/src/cmd/compile/internal/mips64/ggen.go +++ b/src/cmd/compile/internal/mips64/ggen.go @@ -47,22 +47,6 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, _ *uint32) *obj.Prog { return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - // Note: this code must not clobber any registers. - sym := n.Sym.Linksym() - size := n.Type.Size() - for i := int64(0); i < size; i += 8 { - p := pp.Prog(mips.AMOVV) - p.From.Type = obj.TYPE_REG - p.From.Reg = mips.REGZERO - p.To.Type = obj.TYPE_MEM - p.To.Name = obj.NAME_AUTO - p.To.Reg = mips.REGSP - p.To.Offset = n.Xoffset + i - p.To.Sym = sym - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { p := pp.Prog(mips.ANOR) p.From.Type = obj.TYPE_REG diff --git a/src/cmd/compile/internal/mips64/ssa.go b/src/cmd/compile/internal/mips64/ssa.go index a70db3576c..28652f0cc4 100644 --- a/src/cmd/compile/internal/mips64/ssa.go +++ b/src/cmd/compile/internal/mips64/ssa.go @@ -516,9 +516,12 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) { p.To.Type = obj.TYPE_REG p.To.Reg = v.Reg0() s.Prog(mips.ASYNC) - case ssa.OpMIPS64LoweredAtomicStore32, ssa.OpMIPS64LoweredAtomicStore64: + case ssa.OpMIPS64LoweredAtomicStore8, ssa.OpMIPS64LoweredAtomicStore32, ssa.OpMIPS64LoweredAtomicStore64: as := mips.AMOVV - if v.Op == ssa.OpMIPS64LoweredAtomicStore32 { + switch v.Op { + case ssa.OpMIPS64LoweredAtomicStore8: + as = mips.AMOVB + case ssa.OpMIPS64LoweredAtomicStore32: as = mips.AMOVW } s.Prog(mips.ASYNC) diff --git a/src/cmd/compile/internal/ppc64/galign.go b/src/cmd/compile/internal/ppc64/galign.go index c6866e65e7..c8ef567dc3 100644 --- a/src/cmd/compile/internal/ppc64/galign.go +++ b/src/cmd/compile/internal/ppc64/galign.go @@ -19,7 +19,6 @@ func Init(arch *gc.Arch) { arch.MAXWIDTH = 1 << 60 arch.ZeroRange = zerorange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnopdefer diff --git a/src/cmd/compile/internal/ppc64/ggen.go b/src/cmd/compile/internal/ppc64/ggen.go index a63a0f0f77..a5a772b491 100644 --- a/src/cmd/compile/internal/ppc64/ggen.go +++ b/src/cmd/compile/internal/ppc64/ggen.go @@ -42,22 +42,6 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, _ *uint32) *obj.Prog { return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - // Note: this code must not clobber any registers. - sym := n.Sym.Linksym() - size := n.Type.Size() - for i := int64(0); i < size; i += 8 { - p := pp.Prog(ppc64.AMOVD) - p.From.Type = obj.TYPE_REG - p.From.Reg = ppc64.REGZERO - p.To.Type = obj.TYPE_MEM - p.To.Name = obj.NAME_AUTO - p.To.Reg = ppc64.REGSP - p.To.Offset = n.Xoffset + i - p.To.Sym = sym - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { p := pp.Prog(ppc64.AOR) p.From.Type = obj.TYPE_REG diff --git a/src/cmd/compile/internal/ppc64/ssa.go b/src/cmd/compile/internal/ppc64/ssa.go index 4f852b883a..4af6e9d5ed 100644 --- a/src/cmd/compile/internal/ppc64/ssa.go +++ b/src/cmd/compile/internal/ppc64/ssa.go @@ -335,12 +335,16 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) { pisync.To.Type = obj.TYPE_NONE gc.Patch(p2, pisync) - case ssa.OpPPC64LoweredAtomicStore32, + case ssa.OpPPC64LoweredAtomicStore8, + ssa.OpPPC64LoweredAtomicStore32, ssa.OpPPC64LoweredAtomicStore64: // SYNC or LWSYNC - // MOVD/MOVW arg1,(arg0) + // MOVB/MOVW/MOVD arg1,(arg0) st := ppc64.AMOVD - if v.Op == ssa.OpPPC64LoweredAtomicStore32 { + switch v.Op { + case ssa.OpPPC64LoweredAtomicStore8: + st = ppc64.AMOVB + case ssa.OpPPC64LoweredAtomicStore32: st = ppc64.AMOVW } arg0 := v.Args[0].Reg() diff --git a/src/cmd/compile/internal/s390x/galign.go b/src/cmd/compile/internal/s390x/galign.go index 26359abe66..cb68fd36c1 100644 --- a/src/cmd/compile/internal/s390x/galign.go +++ b/src/cmd/compile/internal/s390x/galign.go @@ -15,7 +15,6 @@ func Init(arch *gc.Arch) { arch.MAXWIDTH = 1 << 50 arch.ZeroRange = zerorange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnop diff --git a/src/cmd/compile/internal/s390x/ggen.go b/src/cmd/compile/internal/s390x/ggen.go index 16af190b2f..5a837d8574 100644 --- a/src/cmd/compile/internal/s390x/ggen.go +++ b/src/cmd/compile/internal/s390x/ggen.go @@ -83,23 +83,6 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, _ *uint32) *obj.Prog { return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - // Note: this code must not clobber any registers or the - // condition code. - sym := n.Sym.Linksym() - size := n.Type.Size() - for i := int64(0); i < size; i += int64(gc.Widthptr) { - p := pp.Prog(s390x.AMOVD) - p.From.Type = obj.TYPE_CONST - p.From.Offset = 0 - p.To.Type = obj.TYPE_MEM - p.To.Name = obj.NAME_AUTO - p.To.Reg = s390x.REGSP - p.To.Offset = n.Xoffset + i - p.To.Sym = sym - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { return pp.Prog(s390x.ANOPH) } diff --git a/src/cmd/compile/internal/s390x/ssa.go b/src/cmd/compile/internal/s390x/ssa.go index 2be6c1ab94..af45a561c6 100644 --- a/src/cmd/compile/internal/s390x/ssa.go +++ b/src/cmd/compile/internal/s390x/ssa.go @@ -725,7 +725,7 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) { gc.AddAux(&p.From, v) p.To.Type = obj.TYPE_REG p.To.Reg = v.Reg0() - case ssa.OpS390XMOVWatomicstore, ssa.OpS390XMOVDatomicstore: + case ssa.OpS390XMOVBatomicstore, ssa.OpS390XMOVWatomicstore, ssa.OpS390XMOVDatomicstore: p := s.Prog(v.Op.Asm()) p.From.Type = obj.TYPE_REG p.From.Reg = v.Args[1].Reg() diff --git a/src/cmd/compile/internal/ssa/branchelim.go b/src/cmd/compile/internal/ssa/branchelim.go index 298eed362a..c7c3f8c15f 100644 --- a/src/cmd/compile/internal/ssa/branchelim.go +++ b/src/cmd/compile/internal/ssa/branchelim.go @@ -220,7 +220,7 @@ func elimIf(f *Func, loadAddr *sparseSet, dom *Block) bool { // that has the same line number as the Pos for b itself, and // puts a statement mark on it, and returns whether it succeeded // in this operation. - setBlockPos := func (b *Block) bool { + setBlockPos := func(b *Block) bool { pos := b.Pos for _, v := range b.Values { if pos.SameFileAndLine(v.Pos) && !isPoorStatementOp(v.Op) { diff --git a/src/cmd/compile/internal/ssa/gen/AMD64.rules b/src/cmd/compile/internal/ssa/gen/AMD64.rules index d4484084a1..65f229169a 100644 --- a/src/cmd/compile/internal/ssa/gen/AMD64.rules +++ b/src/cmd/compile/internal/ssa/gen/AMD64.rules @@ -4,13 +4,11 @@ // Lowering arithmetic (Add(64|32|16|8) x y) -> (ADD(Q|L|L|L) x y) -(AddPtr x y) && config.PtrSize == 8 -> (ADDQ x y) -(AddPtr x y) && config.PtrSize == 4 -> (ADDL x y) +(AddPtr x y) -> (ADDQ x y) (Add(32|64)F x y) -> (ADDS(S|D) x y) (Sub(64|32|16|8) x y) -> (SUB(Q|L|L|L) x y) -(SubPtr x y) && config.PtrSize == 8 -> (SUBQ x y) -(SubPtr x y) && config.PtrSize == 4 -> (SUBL x y) +(SubPtr x y) -> (SUBQ x y) (Sub(32|64)F x y) -> (SUBS(S|D) x y) (Mul(64|32|16|8) x y) -> (MUL(Q|L|L|L) x y) @@ -76,9 +74,8 @@ (Not x) -> (XORLconst [1] x) // Lowering pointer arithmetic -(OffPtr [off] ptr) && config.PtrSize == 8 && is32Bit(off) -> (ADDQconst [off] ptr) -(OffPtr [off] ptr) && config.PtrSize == 8 -> (ADDQ (MOVQconst [off]) ptr) -(OffPtr [off] ptr) && config.PtrSize == 4 -> (ADDLconst [off] ptr) +(OffPtr [off] ptr) && is32Bit(off) -> (ADDQconst [off] ptr) +(OffPtr [off] ptr) -> (ADDQ (MOVQconst [off]) ptr) // Lowering other arithmetic (Ctz64 <t> x) -> (CMOVQEQ (Select0 <t> (BSFQ x)) (MOVQconst <t> [64]) (Select1 <types.TypeFlags> (BSFQ x))) @@ -217,18 +214,16 @@ (Geq(32|64)F x y) -> (SETGEF (UCOMIS(S|D) x y)) (Eq(64|32|16|8|B) x y) -> (SETEQ (CMP(Q|L|W|B|B) x y)) -(EqPtr x y) && config.PtrSize == 8 -> (SETEQ (CMPQ x y)) -(EqPtr x y) && config.PtrSize == 4 -> (SETEQ (CMPL x y)) +(EqPtr x y) -> (SETEQ (CMPQ x y)) (Eq(32|64)F x y) -> (SETEQF (UCOMIS(S|D) x y)) (Neq(64|32|16|8|B) x y) -> (SETNE (CMP(Q|L|W|B|B) x y)) -(NeqPtr x y) && config.PtrSize == 8 -> (SETNE (CMPQ x y)) -(NeqPtr x y) && config.PtrSize == 4 -> (SETNE (CMPL x y)) +(NeqPtr x y) -> (SETNE (CMPQ x y)) (Neq(32|64)F x y) -> (SETNEF (UCOMIS(S|D) x y)) // Lowering loads -(Load <t> ptr mem) && (is64BitInt(t) || isPtr(t) && config.PtrSize == 8) -> (MOVQload ptr mem) -(Load <t> ptr mem) && (is32BitInt(t) || isPtr(t) && config.PtrSize == 4) -> (MOVLload ptr mem) +(Load <t> ptr mem) && (is64BitInt(t) || isPtr(t)) -> (MOVQload ptr mem) +(Load <t> ptr mem) && is32BitInt(t) -> (MOVLload ptr mem) (Load <t> ptr mem) && is16BitInt(t) -> (MOVWload ptr mem) (Load <t> ptr mem) && (t.IsBoolean() || is8BitInt(t)) -> (MOVBload ptr mem) (Load <t> ptr mem) && is32BitFloat(t) -> (MOVSSload ptr mem) @@ -420,8 +415,7 @@ (Const64 [val]) -> (MOVQconst [val]) (Const32F [val]) -> (MOVSSconst [val]) (Const64F [val]) -> (MOVSDconst [val]) -(ConstNil) && config.PtrSize == 8 -> (MOVQconst [0]) -(ConstNil) && config.PtrSize == 4 -> (MOVLconst [0]) +(ConstNil) -> (MOVQconst [0]) (ConstBool [b]) -> (MOVLconst [b]) // Lowering calls @@ -476,21 +470,16 @@ (CMOV(QEQ|QGT|QGE|QCS|QLS|LEQ|LGT|LGE|LCS|LLS|WEQ|WGT|WGE|WCS|WLS) y _ (FlagLT_UGT)) -> y // Miscellaneous -(IsNonNil p) && config.PtrSize == 8 -> (SETNE (TESTQ p p)) -(IsNonNil p) && config.PtrSize == 4 -> (SETNE (TESTL p p)) -(IsInBounds idx len) && config.PtrSize == 8 -> (SETB (CMPQ idx len)) -(IsInBounds idx len) && config.PtrSize == 4 -> (SETB (CMPL idx len)) -(IsSliceInBounds idx len) && config.PtrSize == 8 -> (SETBE (CMPQ idx len)) -(IsSliceInBounds idx len) && config.PtrSize == 4 -> (SETBE (CMPL idx len)) +(IsNonNil p) -> (SETNE (TESTQ p p)) +(IsInBounds idx len) -> (SETB (CMPQ idx len)) +(IsSliceInBounds idx len) -> (SETBE (CMPQ idx len)) (NilCheck ptr mem) -> (LoweredNilCheck ptr mem) (GetG mem) -> (LoweredGetG mem) (GetClosurePtr) -> (LoweredGetClosurePtr) (GetCallerPC) -> (LoweredGetCallerPC) (GetCallerSP) -> (LoweredGetCallerSP) -(Addr {sym} base) && config.PtrSize == 8 -> (LEAQ {sym} base) -(Addr {sym} base) && config.PtrSize == 4 -> (LEAL {sym} base) -(LocalAddr {sym} base _) && config.PtrSize == 8 -> (LEAQ {sym} base) -(LocalAddr {sym} base _) && config.PtrSize == 4 -> (LEAL {sym} base) +(Addr {sym} base) -> (LEAQ {sym} base) +(LocalAddr {sym} base _) -> (LEAQ {sym} base) (MOVBstore [off] {sym} ptr y:(SETL x) mem) && y.Uses == 1 -> (SETLstore [off] {sym} ptr x mem) (MOVBstore [off] {sym} ptr y:(SETLE x) mem) && y.Uses == 1 -> (SETLEstore [off] {sym} ptr x mem) @@ -528,15 +517,14 @@ (AtomicLoad8 ptr mem) -> (MOVBatomicload ptr mem) (AtomicLoad32 ptr mem) -> (MOVLatomicload ptr mem) (AtomicLoad64 ptr mem) -> (MOVQatomicload ptr mem) -(AtomicLoadPtr ptr mem) && config.PtrSize == 8 -> (MOVQatomicload ptr mem) -(AtomicLoadPtr ptr mem) && config.PtrSize == 4 -> (MOVLatomicload ptr mem) +(AtomicLoadPtr ptr mem) -> (MOVQatomicload ptr mem) // Atomic stores. We use XCHG to prevent the hardware reordering a subsequent load. // TODO: most runtime uses of atomic stores don't need that property. Use normal stores for those? +(AtomicStore8 ptr val mem) -> (Select1 (XCHGB <types.NewTuple(typ.UInt8,types.TypeMem)> val ptr mem)) (AtomicStore32 ptr val mem) -> (Select1 (XCHGL <types.NewTuple(typ.UInt32,types.TypeMem)> val ptr mem)) (AtomicStore64 ptr val mem) -> (Select1 (XCHGQ <types.NewTuple(typ.UInt64,types.TypeMem)> val ptr mem)) -(AtomicStorePtrNoWB ptr val mem) && config.PtrSize == 8 -> (Select1 (XCHGQ <types.NewTuple(typ.BytePtr,types.TypeMem)> val ptr mem)) -(AtomicStorePtrNoWB ptr val mem) && config.PtrSize == 4 -> (Select1 (XCHGL <types.NewTuple(typ.BytePtr,types.TypeMem)> val ptr mem)) +(AtomicStorePtrNoWB ptr val mem) -> (Select1 (XCHGQ <types.NewTuple(typ.BytePtr,types.TypeMem)> val ptr mem)) // Atomic exchanges. (AtomicExchange32 ptr val mem) -> (XCHGL val ptr mem) diff --git a/src/cmd/compile/internal/ssa/gen/AMD64Ops.go b/src/cmd/compile/internal/ssa/gen/AMD64Ops.go index 5924fa497a..cd2d0d61d1 100644 --- a/src/cmd/compile/internal/ssa/gen/AMD64Ops.go +++ b/src/cmd/compile/internal/ssa/gen/AMD64Ops.go @@ -746,6 +746,7 @@ func init() { // store arg0 to arg1+auxint+aux, arg2=mem. // These ops return a tuple of <old contents of *(arg1+auxint+aux), memory>. // Note: arg0 and arg1 are backwards compared to MOVLstore (to facilitate resultInArg0)! + {name: "XCHGB", argLength: 3, reg: gpstorexchg, asm: "XCHGB", aux: "SymOff", resultInArg0: true, faultOnNilArg1: true, hasSideEffects: true, symEffect: "RdWr"}, {name: "XCHGL", argLength: 3, reg: gpstorexchg, asm: "XCHGL", aux: "SymOff", resultInArg0: true, faultOnNilArg1: true, hasSideEffects: true, symEffect: "RdWr"}, {name: "XCHGQ", argLength: 3, reg: gpstorexchg, asm: "XCHGQ", aux: "SymOff", resultInArg0: true, faultOnNilArg1: true, hasSideEffects: true, symEffect: "RdWr"}, diff --git a/src/cmd/compile/internal/ssa/gen/ARM64.rules b/src/cmd/compile/internal/ssa/gen/ARM64.rules index 26ae004572..f0033a0526 100644 --- a/src/cmd/compile/internal/ssa/gen/ARM64.rules +++ b/src/cmd/compile/internal/ssa/gen/ARM64.rules @@ -589,6 +589,7 @@ (AtomicLoad64 ptr mem) -> (LDAR ptr mem) (AtomicLoadPtr ptr mem) -> (LDAR ptr mem) +(AtomicStore8 ptr val mem) -> (STLRB ptr val mem) (AtomicStore32 ptr val mem) -> (STLRW ptr val mem) (AtomicStore64 ptr val mem) -> (STLR ptr val mem) (AtomicStorePtrNoWB ptr val mem) -> (STLR ptr val mem) diff --git a/src/cmd/compile/internal/ssa/gen/ARM64Ops.go b/src/cmd/compile/internal/ssa/gen/ARM64Ops.go index e1f045fcf8..59a6004b97 100644 --- a/src/cmd/compile/internal/ssa/gen/ARM64Ops.go +++ b/src/cmd/compile/internal/ssa/gen/ARM64Ops.go @@ -611,6 +611,7 @@ func init() { // atomic stores. // store arg1 to arg0. arg2=mem. returns memory. auxint must be zero. + {name: "STLRB", argLength: 3, reg: gpstore, asm: "STLRB", faultOnNilArg0: true, hasSideEffects: true}, {name: "STLR", argLength: 3, reg: gpstore, asm: "STLR", faultOnNilArg0: true, hasSideEffects: true}, {name: "STLRW", argLength: 3, reg: gpstore, asm: "STLRW", faultOnNilArg0: true, hasSideEffects: true}, diff --git a/src/cmd/compile/internal/ssa/gen/MIPS.rules b/src/cmd/compile/internal/ssa/gen/MIPS.rules index 2932f13ac7..b6c5a9349d 100644 --- a/src/cmd/compile/internal/ssa/gen/MIPS.rules +++ b/src/cmd/compile/internal/ssa/gen/MIPS.rules @@ -351,11 +351,11 @@ (InterCall [argwid] entry mem) -> (CALLinter [argwid] entry mem) // atomic intrinsics -(AtomicLoad32 ptr mem) -> (LoweredAtomicLoad ptr mem) -(AtomicLoadPtr ptr mem) -> (LoweredAtomicLoad ptr mem) +(AtomicLoad(8|32) ptr mem) -> (LoweredAtomicLoad(8|32) ptr mem) +(AtomicLoadPtr ptr mem) -> (LoweredAtomicLoad32 ptr mem) -(AtomicStore32 ptr val mem) -> (LoweredAtomicStore ptr val mem) -(AtomicStorePtrNoWB ptr val mem) -> (LoweredAtomicStore ptr val mem) +(AtomicStore(8|32) ptr val mem) -> (LoweredAtomicStore(8|32) ptr val mem) +(AtomicStorePtrNoWB ptr val mem) -> (LoweredAtomicStore32 ptr val mem) (AtomicExchange32 ptr val mem) -> (LoweredAtomicExchange ptr val mem) (AtomicAdd32 ptr val mem) -> (LoweredAtomicAdd ptr val mem) @@ -708,6 +708,6 @@ (CMOVZ a (MOVWconst [0]) c) -> (CMOVZzero a c) // atomic -(LoweredAtomicStore ptr (MOVWconst [0]) mem) -> (LoweredAtomicStorezero ptr mem) +(LoweredAtomicStore32 ptr (MOVWconst [0]) mem) -> (LoweredAtomicStorezero ptr mem) (LoweredAtomicAdd ptr (MOVWconst [c]) mem) && is16Bit(c) -> (LoweredAtomicAddconst [c] ptr mem) diff --git a/src/cmd/compile/internal/ssa/gen/MIPS64.rules b/src/cmd/compile/internal/ssa/gen/MIPS64.rules index f3d0a08e28..4e5b9d8104 100644 --- a/src/cmd/compile/internal/ssa/gen/MIPS64.rules +++ b/src/cmd/compile/internal/ssa/gen/MIPS64.rules @@ -403,6 +403,7 @@ (AtomicLoad64 ptr mem) -> (LoweredAtomicLoad64 ptr mem) (AtomicLoadPtr ptr mem) -> (LoweredAtomicLoad64 ptr mem) +(AtomicStore8 ptr val mem) -> (LoweredAtomicStore8 ptr val mem) (AtomicStore32 ptr val mem) -> (LoweredAtomicStore32 ptr val mem) (AtomicStore64 ptr val mem) -> (LoweredAtomicStore64 ptr val mem) (AtomicStorePtrNoWB ptr val mem) -> (LoweredAtomicStore64 ptr val mem) diff --git a/src/cmd/compile/internal/ssa/gen/MIPS64Ops.go b/src/cmd/compile/internal/ssa/gen/MIPS64Ops.go index 184b119f89..a5eabcf9eb 100644 --- a/src/cmd/compile/internal/ssa/gen/MIPS64Ops.go +++ b/src/cmd/compile/internal/ssa/gen/MIPS64Ops.go @@ -367,6 +367,7 @@ func init() { // atomic stores. // store arg1 to arg0. arg2=mem. returns memory. + {name: "LoweredAtomicStore8", argLength: 3, reg: gpstore, faultOnNilArg0: true, hasSideEffects: true}, {name: "LoweredAtomicStore32", argLength: 3, reg: gpstore, faultOnNilArg0: true, hasSideEffects: true}, {name: "LoweredAtomicStore64", argLength: 3, reg: gpstore, faultOnNilArg0: true, hasSideEffects: true}, // store zero to arg0. arg1=mem. returns memory. diff --git a/src/cmd/compile/internal/ssa/gen/MIPSOps.go b/src/cmd/compile/internal/ssa/gen/MIPSOps.go index 0f7b985e06..b82358b24a 100644 --- a/src/cmd/compile/internal/ssa/gen/MIPSOps.go +++ b/src/cmd/compile/internal/ssa/gen/MIPSOps.go @@ -262,15 +262,17 @@ func init() { // load from arg0. arg1=mem. // returns <value,memory> so they can be properly ordered with other loads. // SYNC - // MOVW (Rarg0), Rout + // MOV(B|W) (Rarg0), Rout // SYNC - {name: "LoweredAtomicLoad", argLength: 2, reg: gpload, faultOnNilArg0: true}, + {name: "LoweredAtomicLoad8", argLength: 2, reg: gpload, faultOnNilArg0: true}, + {name: "LoweredAtomicLoad32", argLength: 2, reg: gpload, faultOnNilArg0: true}, // store arg1 to arg0. arg2=mem. returns memory. // SYNC - // MOVW Rarg1, (Rarg0) + // MOV(B|W) Rarg1, (Rarg0) // SYNC - {name: "LoweredAtomicStore", argLength: 3, reg: gpstore, faultOnNilArg0: true, hasSideEffects: true}, + {name: "LoweredAtomicStore8", argLength: 3, reg: gpstore, faultOnNilArg0: true, hasSideEffects: true}, + {name: "LoweredAtomicStore32", argLength: 3, reg: gpstore, faultOnNilArg0: true, hasSideEffects: true}, {name: "LoweredAtomicStorezero", argLength: 2, reg: gpstore0, faultOnNilArg0: true, hasSideEffects: true}, // atomic exchange. diff --git a/src/cmd/compile/internal/ssa/gen/PPC64.rules b/src/cmd/compile/internal/ssa/gen/PPC64.rules index 239414f01b..13fe1ab2e9 100644 --- a/src/cmd/compile/internal/ssa/gen/PPC64.rules +++ b/src/cmd/compile/internal/ssa/gen/PPC64.rules @@ -931,7 +931,7 @@ (AtomicLoad(8|32|64|Ptr) ptr mem) -> (LoweredAtomicLoad(8|32|64|Ptr) [1] ptr mem) (AtomicLoadAcq32 ptr mem) -> (LoweredAtomicLoad32 [0] ptr mem) -(AtomicStore(32|64) ptr val mem) -> (LoweredAtomicStore(32|64) [1] ptr val mem) +(AtomicStore(8|32|64) ptr val mem) -> (LoweredAtomicStore(8|32|64) [1] ptr val mem) (AtomicStoreRel32 ptr val mem) -> (LoweredAtomicStore32 [0] ptr val mem) //(AtomicStorePtrNoWB ptr val mem) -> (STLR ptr val mem) diff --git a/src/cmd/compile/internal/ssa/gen/PPC64Ops.go b/src/cmd/compile/internal/ssa/gen/PPC64Ops.go index a6bcc26543..b72563b53c 100644 --- a/src/cmd/compile/internal/ssa/gen/PPC64Ops.go +++ b/src/cmd/compile/internal/ssa/gen/PPC64Ops.go @@ -495,6 +495,7 @@ func init() { faultOnNilArg1: true, }, + {name: "LoweredAtomicStore8", argLength: 3, reg: gpstore, typ: "Mem", aux: "Int64", faultOnNilArg0: true, hasSideEffects: true}, {name: "LoweredAtomicStore32", argLength: 3, reg: gpstore, typ: "Mem", aux: "Int64", faultOnNilArg0: true, hasSideEffects: true}, {name: "LoweredAtomicStore64", argLength: 3, reg: gpstore, typ: "Mem", aux: "Int64", faultOnNilArg0: true, hasSideEffects: true}, diff --git a/src/cmd/compile/internal/ssa/gen/S390X.rules b/src/cmd/compile/internal/ssa/gen/S390X.rules index d7cb972b81..2c56c66581 100644 --- a/src/cmd/compile/internal/ssa/gen/S390X.rules +++ b/src/cmd/compile/internal/ssa/gen/S390X.rules @@ -146,7 +146,7 @@ // reordering. Other sequences of memory operations (load-load, // store-store and load-store) are already guaranteed not to be reordered. (AtomicLoad(8|32|Acq32|64|Ptr) ptr mem) -> (MOV(BZ|WZ|WZ|D|D)atomicload ptr mem) -(AtomicStore(32|64|PtrNoWB) ptr val mem) -> (SYNC (MOV(W|D|D)atomicstore ptr val mem)) +(AtomicStore(8|32|64|PtrNoWB) ptr val mem) -> (SYNC (MOV(B|W|D|D)atomicstore ptr val mem)) // Store-release doesn't require store-load ordering. (AtomicStoreRel32 ptr val mem) -> (MOVWatomicstore ptr val mem) diff --git a/src/cmd/compile/internal/ssa/gen/S390XOps.go b/src/cmd/compile/internal/ssa/gen/S390XOps.go index 4689102c43..4adaeae242 100644 --- a/src/cmd/compile/internal/ssa/gen/S390XOps.go +++ b/src/cmd/compile/internal/ssa/gen/S390XOps.go @@ -495,6 +495,7 @@ func init() { // Atomic stores. These are just normal stores. // store arg1 to arg0+auxint+aux. arg2=mem. + {name: "MOVBatomicstore", argLength: 3, reg: gpstore, asm: "MOVB", aux: "SymOff", typ: "Mem", clobberFlags: true, faultOnNilArg0: true, hasSideEffects: true, symEffect: "Write"}, {name: "MOVWatomicstore", argLength: 3, reg: gpstore, asm: "MOVW", aux: "SymOff", typ: "Mem", clobberFlags: true, faultOnNilArg0: true, hasSideEffects: true, symEffect: "Write"}, {name: "MOVDatomicstore", argLength: 3, reg: gpstore, asm: "MOVD", aux: "SymOff", typ: "Mem", clobberFlags: true, faultOnNilArg0: true, hasSideEffects: true, symEffect: "Write"}, diff --git a/src/cmd/compile/internal/ssa/gen/generic.rules b/src/cmd/compile/internal/ssa/gen/generic.rules index 1503a5da6c..67b6461869 100644 --- a/src/cmd/compile/internal/ssa/gen/generic.rules +++ b/src/cmd/compile/internal/ssa/gen/generic.rules @@ -803,7 +803,7 @@ // Putting struct{*byte} and similar into direct interfaces. (IMake typ (StructMake1 val)) -> (IMake typ val) -(StructSelect [0] x:(IData _)) -> x +(StructSelect [0] (IData x)) -> (IData x) // un-SSAable values use mem->mem copies (Store {t} dst (Load src mem) mem) && !fe.CanSSA(t.(*types.Type)) -> @@ -823,9 +823,9 @@ (Store _ (ArrayMake0) mem) -> mem (Store dst (ArrayMake1 e) mem) -> (Store {e.Type} dst e mem) -// Putting [1]{*byte} and similar into direct interfaces. +// Putting [1]*byte and similar into direct interfaces. (IMake typ (ArrayMake1 val)) -> (IMake typ val) -(ArraySelect [0] x:(IData _)) -> x +(ArraySelect [0] (IData x)) -> (IData x) // string ops // Decomposing StringMake and lowering of StringPtr and StringLen diff --git a/src/cmd/compile/internal/ssa/gen/genericOps.go b/src/cmd/compile/internal/ssa/gen/genericOps.go index 7bd79312e3..1ffca8118f 100644 --- a/src/cmd/compile/internal/ssa/gen/genericOps.go +++ b/src/cmd/compile/internal/ssa/gen/genericOps.go @@ -316,8 +316,7 @@ var genericOps = []opData{ // See section 7.2 in ieee754. {name: "Fma", argLength: 3}, // compute (a*b)+c without intermediate rounding - // Data movement, max argument length for Phi is indefinite so just pick - // a really large number + // Data movement. Max argument length for Phi is indefinite. {name: "Phi", argLength: -1, zeroWidth: true}, // select an argument based on which predecessor block we came from {name: "Copy", argLength: 1}, // output = arg0 // Convert converts between pointers and integers. @@ -546,6 +545,7 @@ var genericOps = []opData{ {name: "AtomicLoad64", argLength: 2, typ: "(UInt64,Mem)"}, // Load from arg0. arg1=memory. Returns loaded value and new memory. {name: "AtomicLoadPtr", argLength: 2, typ: "(BytePtr,Mem)"}, // Load from arg0. arg1=memory. Returns loaded value and new memory. {name: "AtomicLoadAcq32", argLength: 2, typ: "(UInt32,Mem)"}, // Load from arg0. arg1=memory. Lock acquisition, returns loaded value and new memory. + {name: "AtomicStore8", argLength: 3, typ: "Mem", hasSideEffects: true}, // Store arg1 to *arg0. arg2=memory. Returns memory. {name: "AtomicStore32", argLength: 3, typ: "Mem", hasSideEffects: true}, // Store arg1 to *arg0. arg2=memory. Returns memory. {name: "AtomicStore64", argLength: 3, typ: "Mem", hasSideEffects: true}, // Store arg1 to *arg0. arg2=memory. Returns memory. {name: "AtomicStorePtrNoWB", argLength: 3, typ: "Mem", hasSideEffects: true}, // Store arg1 to *arg0. arg2=memory. Returns memory. diff --git a/src/cmd/compile/internal/ssa/opGen.go b/src/cmd/compile/internal/ssa/opGen.go index 1bac391914..9f112c10f1 100644 --- a/src/cmd/compile/internal/ssa/opGen.go +++ b/src/cmd/compile/internal/ssa/opGen.go @@ -877,6 +877,7 @@ const ( OpAMD64MOVBatomicload OpAMD64MOVLatomicload OpAMD64MOVQatomicload + OpAMD64XCHGB OpAMD64XCHGL OpAMD64XCHGQ OpAMD64XADDLlock @@ -1434,6 +1435,7 @@ const ( OpARM64LDAR OpARM64LDARB OpARM64LDARW + OpARM64STLRB OpARM64STLR OpARM64STLRW OpARM64LoweredAtomicExchange64 @@ -1535,8 +1537,10 @@ const ( OpMIPSCALLstatic OpMIPSCALLclosure OpMIPSCALLinter - OpMIPSLoweredAtomicLoad - OpMIPSLoweredAtomicStore + OpMIPSLoweredAtomicLoad8 + OpMIPSLoweredAtomicLoad32 + OpMIPSLoweredAtomicStore8 + OpMIPSLoweredAtomicStore32 OpMIPSLoweredAtomicStorezero OpMIPSLoweredAtomicExchange OpMIPSLoweredAtomicAdd @@ -1655,6 +1659,7 @@ const ( OpMIPS64LoweredAtomicLoad8 OpMIPS64LoweredAtomicLoad32 OpMIPS64LoweredAtomicLoad64 + OpMIPS64LoweredAtomicStore8 OpMIPS64LoweredAtomicStore32 OpMIPS64LoweredAtomicStore64 OpMIPS64LoweredAtomicStorezero32 @@ -1848,6 +1853,7 @@ const ( OpPPC64CALLinter OpPPC64LoweredZero OpPPC64LoweredMove + OpPPC64LoweredAtomicStore8 OpPPC64LoweredAtomicStore32 OpPPC64LoweredAtomicStore64 OpPPC64LoweredAtomicLoad8 @@ -2068,6 +2074,7 @@ const ( OpS390XMOVBZatomicload OpS390XMOVWZatomicload OpS390XMOVDatomicload + OpS390XMOVBatomicstore OpS390XMOVWatomicstore OpS390XMOVDatomicstore OpS390XLAA @@ -2553,6 +2560,7 @@ const ( OpAtomicLoad64 OpAtomicLoadPtr OpAtomicLoadAcq32 + OpAtomicStore8 OpAtomicStore32 OpAtomicStore64 OpAtomicStorePtrNoWB @@ -11407,6 +11415,25 @@ var opcodeTable = [...]opInfo{ }, }, { + name: "XCHGB", + auxType: auxSymOff, + argLen: 3, + resultInArg0: true, + faultOnNilArg1: true, + hasSideEffects: true, + symEffect: SymRdWr, + asm: x86.AXCHGB, + reg: regInfo{ + inputs: []inputInfo{ + {0, 65519}, // AX CX DX BX BP SI DI R8 R9 R10 R11 R12 R13 R14 R15 + {1, 4295032831}, // AX CX DX BX SP BP SI DI R8 R9 R10 R11 R12 R13 R14 R15 SB + }, + outputs: []outputInfo{ + {0, 65519}, // AX CX DX BX BP SI DI R8 R9 R10 R11 R12 R13 R14 R15 + }, + }, + }, + { name: "XCHGL", auxType: auxSymOff, argLen: 3, @@ -18877,6 +18904,19 @@ var opcodeTable = [...]opInfo{ }, }, { + name: "STLRB", + argLen: 3, + faultOnNilArg0: true, + hasSideEffects: true, + asm: arm64.ASTLRB, + reg: regInfo{ + inputs: []inputInfo{ + {1, 805044223}, // R0 R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R19 R20 R21 R22 R23 R24 R25 R26 g R30 + {0, 9223372038733561855}, // R0 R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R19 R20 R21 R22 R23 R24 R25 R26 g R30 SP SB + }, + }, + }, + { name: "STLR", argLen: 3, faultOnNilArg0: true, @@ -20278,7 +20318,20 @@ var opcodeTable = [...]opInfo{ }, }, { - name: "LoweredAtomicLoad", + name: "LoweredAtomicLoad8", + argLen: 2, + faultOnNilArg0: true, + reg: regInfo{ + inputs: []inputInfo{ + {0, 140738025226238}, // R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 R22 R24 R25 R28 SP g R31 SB + }, + outputs: []outputInfo{ + {0, 335544318}, // R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 R22 R24 R25 R28 R31 + }, + }, + }, + { + name: "LoweredAtomicLoad32", argLen: 2, faultOnNilArg0: true, reg: regInfo{ @@ -20291,7 +20344,19 @@ var opcodeTable = [...]opInfo{ }, }, { - name: "LoweredAtomicStore", + name: "LoweredAtomicStore8", + argLen: 3, + faultOnNilArg0: true, + hasSideEffects: true, + reg: regInfo{ + inputs: []inputInfo{ + {1, 469762046}, // R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 R22 R24 R25 R28 g R31 + {0, 140738025226238}, // R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 R22 R24 R25 R28 SP g R31 SB + }, + }, + }, + { + name: "LoweredAtomicStore32", argLen: 3, faultOnNilArg0: true, hasSideEffects: true, @@ -21883,6 +21948,18 @@ var opcodeTable = [...]opInfo{ }, }, { + name: "LoweredAtomicStore8", + argLen: 3, + faultOnNilArg0: true, + hasSideEffects: true, + reg: regInfo{ + inputs: []inputInfo{ + {1, 234881022}, // R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 R22 R24 R25 g R31 + {0, 4611686018695823358}, // R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 R22 R24 R25 SP g R31 SB + }, + }, + }, + { name: "LoweredAtomicStore32", argLen: 3, faultOnNilArg0: true, @@ -24490,6 +24567,19 @@ var opcodeTable = [...]opInfo{ }, }, { + name: "LoweredAtomicStore8", + auxType: auxInt64, + argLen: 3, + faultOnNilArg0: true, + hasSideEffects: true, + reg: regInfo{ + inputs: []inputInfo{ + {0, 1073733630}, // SP SB R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R14 R15 R16 R17 R18 R19 R20 R21 R22 R23 R24 R25 R26 R27 R28 R29 + {1, 1073733630}, // SP SB R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R14 R15 R16 R17 R18 R19 R20 R21 R22 R23 R24 R25 R26 R27 R28 R29 + }, + }, + }, + { name: "LoweredAtomicStore32", auxType: auxInt64, argLen: 3, @@ -27633,6 +27723,22 @@ var opcodeTable = [...]opInfo{ }, }, { + name: "MOVBatomicstore", + auxType: auxSymOff, + argLen: 3, + clobberFlags: true, + faultOnNilArg0: true, + hasSideEffects: true, + symEffect: SymWrite, + asm: s390x.AMOVB, + reg: regInfo{ + inputs: []inputInfo{ + {0, 4295023614}, // R1 R2 R3 R4 R5 R6 R7 R8 R9 R11 R12 R14 SP SB + {1, 56319}, // R0 R1 R2 R3 R4 R5 R6 R7 R8 R9 R11 R12 R14 SP + }, + }, + }, + { name: "MOVWatomicstore", auxType: auxSymOff, argLen: 3, @@ -31348,6 +31454,12 @@ var opcodeTable = [...]opInfo{ generic: true, }, { + name: "AtomicStore8", + argLen: 3, + hasSideEffects: true, + generic: true, + }, + { name: "AtomicStore32", argLen: 3, hasSideEffects: true, diff --git a/src/cmd/compile/internal/ssa/poset.go b/src/cmd/compile/internal/ssa/poset.go index e3a5485d13..f5a2b3a8c2 100644 --- a/src/cmd/compile/internal/ssa/poset.go +++ b/src/cmd/compile/internal/ssa/poset.go @@ -407,56 +407,82 @@ func (po *poset) newconst(n *Value) { po.upushconst(i, 0) } -// aliasnode records that n2 is an alias of n1 -func (po *poset) aliasnode(n1, n2 *Value) { +// aliasnewnode records that a single node n2 (not in the poset yet) is an alias +// of the master node n1. +func (po *poset) aliasnewnode(n1, n2 *Value) { + i1, i2 := po.values[n1.ID], po.values[n2.ID] + if i1 == 0 || i2 != 0 { + panic("aliasnewnode invalid arguments") + } + + po.values[n2.ID] = i1 + po.upushalias(n2.ID, 0) +} + +// aliasnodes records that all the nodes i2s are aliases of a single master node n1. +// aliasnodes takes care of rearranging the DAG, changing references of parent/children +// of nodes in i2s, so that they point to n1 instead. +// Complexity is O(n) (with n being the total number of nodes in the poset, not just +// the number of nodes being aliased). +func (po *poset) aliasnodes(n1 *Value, i2s bitset) { i1 := po.values[n1.ID] if i1 == 0 { panic("aliasnode for non-existing node") } + if i2s.Test(i1) { + panic("aliasnode i2s contains n1 node") + } - i2 := po.values[n2.ID] - if i2 != 0 { - // Rename all references to i2 into i1 - // (do not touch i1 itself, otherwise we can create useless self-loops) - for idx, n := range po.nodes { - if uint32(idx) != i1 { - l, r := n.l, n.r - if l.Target() == i2 { - po.setchl(uint32(idx), newedge(i1, l.Strict())) - po.upush(undoSetChl, uint32(idx), l) - } - if r.Target() == i2 { - po.setchr(uint32(idx), newedge(i1, r.Strict())) - po.upush(undoSetChr, uint32(idx), r) - } - } + // Go through all the nodes to adjust parent/chidlren of nodes in i2s + for idx, n := range po.nodes { + // Do not touch i1 itself, otherwise we can create useless self-loops + if uint32(idx) == i1 { + continue } + l, r := n.l, n.r - // Reassign all existing IDs that point to i2 to i1. - // This includes n2.ID. - for k, v := range po.values { - if v == i2 { - po.values[k] = i1 - po.upushalias(k, i2) - } + // Rename all references to i2s into i1 + if i2s.Test(l.Target()) { + po.setchl(uint32(idx), newedge(i1, l.Strict())) + po.upush(undoSetChl, uint32(idx), l) + } + if i2s.Test(r.Target()) { + po.setchr(uint32(idx), newedge(i1, r.Strict())) + po.upush(undoSetChr, uint32(idx), r) } - if n2.isGenericIntConst() { - val := n2.AuxInt - if po.flags&posetFlagUnsigned != 0 { - val = int64(n2.AuxUnsigned()) + // Connect all chidren of i2s to i1 (unless those children + // are in i2s as well, in which case it would be useless) + if i2s.Test(uint32(idx)) { + if l != 0 && !i2s.Test(l.Target()) { + po.addchild(i1, l.Target(), l.Strict()) } - if po.constants[val] != i2 { - panic("aliasing constant which is not registered") + if r != 0 && !i2s.Test(r.Target()) { + po.addchild(i1, r.Target(), r.Strict()) } - po.constants[val] = i1 - po.upushconst(i1, i2) + po.setchl(uint32(idx), 0) + po.setchr(uint32(idx), 0) + po.upush(undoSetChl, uint32(idx), l) + po.upush(undoSetChr, uint32(idx), r) + } + } + + // Reassign all existing IDs that point to i2 to i1. + // This includes n2.ID. + for k, v := range po.values { + if i2s.Test(v) { + po.values[k] = i1 + po.upushalias(k, v) } + } - } else { - // n2.ID wasn't seen before, so record it as alias to i1 - po.values[n2.ID] = i1 - po.upushalias(n2.ID, 0) + // If one of the aliased nodes is a constant, then make sure + // po.constants is updated to point to the master node. + for val, idx := range po.constants { + if i2s.Test(idx) { + po.constants[val] = i1 + po.upushconst(i1, idx) + } } } @@ -603,25 +629,56 @@ func (po *poset) mergeroot(r1, r2 uint32) uint32 { return r } -// collapsepath marks i1 and i2 as equal and collapses as equal all -// nodes across all paths between i1 and i2. If a strict edge is +// collapsepath marks n1 and n2 as equal and collapses as equal all +// nodes across all paths between n1 and n2. If a strict edge is // found, the function does not modify the DAG and returns false. +// Complexity is O(n). func (po *poset) collapsepath(n1, n2 *Value) bool { i1, i2 := po.values[n1.ID], po.values[n2.ID] if po.reaches(i1, i2, true) { return false } - // TODO: for now, only handle the simple case of i2 being child of i1 - l, r := po.children(i1) - if l.Target() == i2 || r.Target() == i2 { - po.aliasnode(n1, n2) - po.addchild(i1, i2, false) - return true - } + // Find all the paths from i1 to i2 + paths := po.findpaths(i1, i2) + // Mark all nodes in all the paths as aliases of n1 + // (excluding n1 itself) + paths.Clear(i1) + po.aliasnodes(n1, paths) return true } +// findpaths is a recursive function that calculates all paths from cur to dst +// and return them as a bitset (the index of a node is set in the bitset if +// that node is on at least one path from cur to dst). +// We do a DFS from cur (stopping going deep any time we reach dst, if ever), +// and mark as part of the paths any node that has a children which is already +// part of the path (or is dst itself). +func (po *poset) findpaths(cur, dst uint32) bitset { + seen := newBitset(int(po.lastidx + 1)) + path := newBitset(int(po.lastidx + 1)) + path.Set(dst) + po.findpaths1(cur, dst, seen, path) + return path +} + +func (po *poset) findpaths1(cur, dst uint32, seen bitset, path bitset) { + if cur == dst { + return + } + seen.Set(cur) + l, r := po.chl(cur), po.chr(cur) + if !seen.Test(l) { + po.findpaths1(l, dst, seen, path) + } + if !seen.Test(r) { + po.findpaths1(r, dst, seen, path) + } + if path.Test(l) || path.Test(r) { + path.Set(cur) + } +} + // Check whether it is recorded that i1!=i2 func (po *poset) isnoneq(i1, i2 uint32) bool { if i1 == i2 { @@ -1093,11 +1150,11 @@ func (po *poset) SetEqual(n1, n2 *Value) bool { i1 = po.newnode(n1) po.roots = append(po.roots, i1) po.upush(undoNewRoot, i1, 0) - po.aliasnode(n1, n2) + po.aliasnewnode(n1, n2) case f1 && !f2: - po.aliasnode(n1, n2) + po.aliasnewnode(n1, n2) case !f1 && f2: - po.aliasnode(n2, n1) + po.aliasnewnode(n2, n1) case f1 && f2: if i1 == i2 { // Already aliased, ignore @@ -1127,11 +1184,9 @@ func (po *poset) SetEqual(n1, n2 *Value) bool { // Set n2 as alias of n1. This will also update all the references // to n2 to become references to n1 - po.aliasnode(n1, n2) - - // Connect i2 (now dummy) as child of i1. This allows to keep the correct - // order with its children. - po.addchild(i1, i2, false) + i2s := newBitset(int(po.lastidx) + 1) + i2s.Set(i2) + po.aliasnodes(n1, i2s) } return true } diff --git a/src/cmd/compile/internal/ssa/poset_test.go b/src/cmd/compile/internal/ssa/poset_test.go index 6f048a30a8..a6db1d1c24 100644 --- a/src/cmd/compile/internal/ssa/poset_test.go +++ b/src/cmd/compile/internal/ssa/poset_test.go @@ -438,7 +438,127 @@ func TestPosetStrict(t *testing.T) { }) } -func TestSetEqual(t *testing.T) { +func TestPosetCollapse(t *testing.T) { + testPosetOps(t, false, []posetTestOp{ + {Checkpoint, 0, 0}, + // Create a complex graph of <= relations among nodes between 10 and 25. + {SetOrderOrEqual, 10, 15}, + {SetOrderOrEqual, 15, 20}, + {SetOrderOrEqual, 20, vconst(20)}, + {SetOrderOrEqual, vconst(20), 25}, + {SetOrderOrEqual, 10, 12}, + {SetOrderOrEqual, 12, 16}, + {SetOrderOrEqual, 16, vconst(20)}, + {SetOrderOrEqual, 10, 17}, + {SetOrderOrEqual, 17, 25}, + {SetOrderOrEqual, 15, 18}, + {SetOrderOrEqual, 18, vconst(20)}, + {SetOrderOrEqual, 15, 19}, + {SetOrderOrEqual, 19, 25}, + + // These are other paths not part of the main collapsing path + {SetOrderOrEqual, 10, 11}, + {SetOrderOrEqual, 11, 26}, + {SetOrderOrEqual, 13, 25}, + {SetOrderOrEqual, 100, 25}, + {SetOrderOrEqual, 101, 15}, + {SetOrderOrEqual, 102, 10}, + {SetOrderOrEqual, 25, 103}, + {SetOrderOrEqual, 20, 104}, + + {Checkpoint, 0, 0}, + // Collapse everything by setting 10 >= 25: this should make everything equal + {SetOrderOrEqual, 25, 10}, + + // Check that all nodes are pairwise equal now + {Equal, 10, 12}, + {Equal, 10, 15}, + {Equal, 10, 16}, + {Equal, 10, 17}, + {Equal, 10, 18}, + {Equal, 10, 19}, + {Equal, 10, vconst(20)}, + {Equal, 10, vconst2(20)}, + {Equal, 10, 25}, + + {Equal, 12, 15}, + {Equal, 12, 16}, + {Equal, 12, 17}, + {Equal, 12, 18}, + {Equal, 12, 19}, + {Equal, 12, vconst(20)}, + {Equal, 12, vconst2(20)}, + {Equal, 12, 25}, + + {Equal, 15, 16}, + {Equal, 15, 17}, + {Equal, 15, 18}, + {Equal, 15, 19}, + {Equal, 15, vconst(20)}, + {Equal, 15, vconst2(20)}, + {Equal, 15, 25}, + + {Equal, 16, 17}, + {Equal, 16, 18}, + {Equal, 16, 19}, + {Equal, 16, vconst(20)}, + {Equal, 16, vconst2(20)}, + {Equal, 16, 25}, + + {Equal, 17, 18}, + {Equal, 17, 19}, + {Equal, 17, vconst(20)}, + {Equal, 17, vconst2(20)}, + {Equal, 17, 25}, + + {Equal, 18, 19}, + {Equal, 18, vconst(20)}, + {Equal, 18, vconst2(20)}, + {Equal, 18, 25}, + + {Equal, 19, vconst(20)}, + {Equal, 19, vconst2(20)}, + {Equal, 19, 25}, + + {Equal, vconst(20), vconst2(20)}, + {Equal, vconst(20), 25}, + + {Equal, vconst2(20), 25}, + + // ... but not 11/26/100/101/102, which were on a different path + {Equal_Fail, 10, 11}, + {Equal_Fail, 10, 26}, + {Equal_Fail, 10, 100}, + {Equal_Fail, 10, 101}, + {Equal_Fail, 10, 102}, + {OrderedOrEqual, 10, 26}, + {OrderedOrEqual, 25, 26}, + {OrderedOrEqual, 13, 25}, + {OrderedOrEqual, 13, 10}, + + {Undo, 0, 0}, + {OrderedOrEqual, 10, 25}, + {Equal_Fail, 10, 12}, + {Equal_Fail, 10, 15}, + {Equal_Fail, 10, 25}, + + {Undo, 0, 0}, + }) + + testPosetOps(t, false, []posetTestOp{ + {Checkpoint, 0, 0}, + {SetOrderOrEqual, 10, 15}, + {SetOrderOrEqual, 15, 20}, + {SetOrderOrEqual, 20, 25}, + {SetOrder, 10, 16}, + {SetOrderOrEqual, 16, 20}, + // Check that we cannot collapse here because of the strict relation 10<16 + {SetOrderOrEqual_Fail, 20, 10}, + {Undo, 0, 0}, + }) +} + +func TestPosetSetEqual(t *testing.T) { testPosetOps(t, false, []posetTestOp{ // 10<=20<=30<40, 20<=100<110 {Checkpoint, 0, 0}, diff --git a/src/cmd/compile/internal/ssa/rewriteAMD64.go b/src/cmd/compile/internal/ssa/rewriteAMD64.go index 45634a25eb..4f02554e1a 100644 --- a/src/cmd/compile/internal/ssa/rewriteAMD64.go +++ b/src/cmd/compile/internal/ssa/rewriteAMD64.go @@ -646,6 +646,8 @@ func rewriteValueAMD64(v *Value) bool { return rewriteValueAMD64_OpAtomicStore32_0(v) case OpAtomicStore64: return rewriteValueAMD64_OpAtomicStore64_0(v) + case OpAtomicStore8: + return rewriteValueAMD64_OpAtomicStore8_0(v) case OpAtomicStorePtrNoWB: return rewriteValueAMD64_OpAtomicStorePtrNoWB_0(v) case OpAvg64u: @@ -50035,70 +50037,28 @@ func rewriteValueAMD64_OpAdd8_0(v *Value) bool { } } func rewriteValueAMD64_OpAddPtr_0(v *Value) bool { - b := v.Block - config := b.Func.Config // match: (AddPtr x y) - // cond: config.PtrSize == 8 // result: (ADDQ x y) for { y := v.Args[1] x := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64ADDQ) v.AddArg(x) v.AddArg(y) return true } - // match: (AddPtr x y) - // cond: config.PtrSize == 4 - // result: (ADDL x y) - for { - y := v.Args[1] - x := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64ADDL) - v.AddArg(x) - v.AddArg(y) - return true - } - return false } func rewriteValueAMD64_OpAddr_0(v *Value) bool { - b := v.Block - config := b.Func.Config // match: (Addr {sym} base) - // cond: config.PtrSize == 8 // result: (LEAQ {sym} base) for { sym := v.Aux base := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64LEAQ) v.Aux = sym v.AddArg(base) return true } - // match: (Addr {sym} base) - // cond: config.PtrSize == 4 - // result: (LEAL {sym} base) - for { - sym := v.Aux - base := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64LEAL) - v.Aux = sym - v.AddArg(base) - return true - } - return false } func rewriteValueAMD64_OpAnd16_0(v *Value) bool { // match: (And16 x y) @@ -50309,37 +50269,16 @@ func rewriteValueAMD64_OpAtomicLoad8_0(v *Value) bool { } } func rewriteValueAMD64_OpAtomicLoadPtr_0(v *Value) bool { - b := v.Block - config := b.Func.Config // match: (AtomicLoadPtr ptr mem) - // cond: config.PtrSize == 8 // result: (MOVQatomicload ptr mem) for { mem := v.Args[1] ptr := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64MOVQatomicload) v.AddArg(ptr) v.AddArg(mem) return true } - // match: (AtomicLoadPtr ptr mem) - // cond: config.PtrSize == 4 - // result: (MOVLatomicload ptr mem) - for { - mem := v.Args[1] - ptr := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64MOVLatomicload) - v.AddArg(ptr) - v.AddArg(mem) - return true - } - return false } func rewriteValueAMD64_OpAtomicOr8_0(v *Value) bool { // match: (AtomicOr8 ptr val mem) @@ -50391,47 +50330,41 @@ func rewriteValueAMD64_OpAtomicStore64_0(v *Value) bool { return true } } -func rewriteValueAMD64_OpAtomicStorePtrNoWB_0(v *Value) bool { +func rewriteValueAMD64_OpAtomicStore8_0(v *Value) bool { b := v.Block - config := b.Func.Config typ := &b.Func.Config.Types - // match: (AtomicStorePtrNoWB ptr val mem) - // cond: config.PtrSize == 8 - // result: (Select1 (XCHGQ <types.NewTuple(typ.BytePtr,types.TypeMem)> val ptr mem)) + // match: (AtomicStore8 ptr val mem) + // result: (Select1 (XCHGB <types.NewTuple(typ.UInt8,types.TypeMem)> val ptr mem)) for { mem := v.Args[2] ptr := v.Args[0] val := v.Args[1] - if !(config.PtrSize == 8) { - break - } v.reset(OpSelect1) - v0 := b.NewValue0(v.Pos, OpAMD64XCHGQ, types.NewTuple(typ.BytePtr, types.TypeMem)) + v0 := b.NewValue0(v.Pos, OpAMD64XCHGB, types.NewTuple(typ.UInt8, types.TypeMem)) v0.AddArg(val) v0.AddArg(ptr) v0.AddArg(mem) v.AddArg(v0) return true } +} +func rewriteValueAMD64_OpAtomicStorePtrNoWB_0(v *Value) bool { + b := v.Block + typ := &b.Func.Config.Types // match: (AtomicStorePtrNoWB ptr val mem) - // cond: config.PtrSize == 4 - // result: (Select1 (XCHGL <types.NewTuple(typ.BytePtr,types.TypeMem)> val ptr mem)) + // result: (Select1 (XCHGQ <types.NewTuple(typ.BytePtr,types.TypeMem)> val ptr mem)) for { mem := v.Args[2] ptr := v.Args[0] val := v.Args[1] - if !(config.PtrSize == 4) { - break - } v.reset(OpSelect1) - v0 := b.NewValue0(v.Pos, OpAMD64XCHGL, types.NewTuple(typ.BytePtr, types.TypeMem)) + v0 := b.NewValue0(v.Pos, OpAMD64XCHGQ, types.NewTuple(typ.BytePtr, types.TypeMem)) v0.AddArg(val) v0.AddArg(ptr) v0.AddArg(mem) v.AddArg(v0) return true } - return false } func rewriteValueAMD64_OpAvg64u_0(v *Value) bool { // match: (Avg64u x y) @@ -51754,31 +51687,13 @@ func rewriteValueAMD64_OpConstBool_0(v *Value) bool { } } func rewriteValueAMD64_OpConstNil_0(v *Value) bool { - b := v.Block - config := b.Func.Config // match: (ConstNil) - // cond: config.PtrSize == 8 // result: (MOVQconst [0]) for { - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64MOVQconst) v.AuxInt = 0 return true } - // match: (ConstNil) - // cond: config.PtrSize == 4 - // result: (MOVLconst [0]) - for { - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64MOVLconst) - v.AuxInt = 0 - return true - } - return false } func rewriteValueAMD64_OpCtz16_0(v *Value) bool { b := v.Block @@ -52283,16 +52198,11 @@ func rewriteValueAMD64_OpEqB_0(v *Value) bool { } func rewriteValueAMD64_OpEqPtr_0(v *Value) bool { b := v.Block - config := b.Func.Config // match: (EqPtr x y) - // cond: config.PtrSize == 8 // result: (SETEQ (CMPQ x y)) for { y := v.Args[1] x := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64SETEQ) v0 := b.NewValue0(v.Pos, OpAMD64CMPQ, types.TypeFlags) v0.AddArg(x) @@ -52300,23 +52210,6 @@ func rewriteValueAMD64_OpEqPtr_0(v *Value) bool { v.AddArg(v0) return true } - // match: (EqPtr x y) - // cond: config.PtrSize == 4 - // result: (SETEQ (CMPL x y)) - for { - y := v.Args[1] - x := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64SETEQ) - v0 := b.NewValue0(v.Pos, OpAMD64CMPL, types.TypeFlags) - v0.AddArg(x) - v0.AddArg(y) - v.AddArg(v0) - return true - } - return false } func rewriteValueAMD64_OpFloor_0(v *Value) bool { // match: (Floor x) @@ -52741,16 +52634,11 @@ func rewriteValueAMD64_OpInterCall_0(v *Value) bool { } func rewriteValueAMD64_OpIsInBounds_0(v *Value) bool { b := v.Block - config := b.Func.Config // match: (IsInBounds idx len) - // cond: config.PtrSize == 8 // result: (SETB (CMPQ idx len)) for { len := v.Args[1] idx := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64SETB) v0 := b.NewValue0(v.Pos, OpAMD64CMPQ, types.TypeFlags) v0.AddArg(idx) @@ -52758,35 +52646,13 @@ func rewriteValueAMD64_OpIsInBounds_0(v *Value) bool { v.AddArg(v0) return true } - // match: (IsInBounds idx len) - // cond: config.PtrSize == 4 - // result: (SETB (CMPL idx len)) - for { - len := v.Args[1] - idx := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64SETB) - v0 := b.NewValue0(v.Pos, OpAMD64CMPL, types.TypeFlags) - v0.AddArg(idx) - v0.AddArg(len) - v.AddArg(v0) - return true - } - return false } func rewriteValueAMD64_OpIsNonNil_0(v *Value) bool { b := v.Block - config := b.Func.Config // match: (IsNonNil p) - // cond: config.PtrSize == 8 // result: (SETNE (TESTQ p p)) for { p := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64SETNE) v0 := b.NewValue0(v.Pos, OpAMD64TESTQ, types.TypeFlags) v0.AddArg(p) @@ -52794,35 +52660,14 @@ func rewriteValueAMD64_OpIsNonNil_0(v *Value) bool { v.AddArg(v0) return true } - // match: (IsNonNil p) - // cond: config.PtrSize == 4 - // result: (SETNE (TESTL p p)) - for { - p := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64SETNE) - v0 := b.NewValue0(v.Pos, OpAMD64TESTL, types.TypeFlags) - v0.AddArg(p) - v0.AddArg(p) - v.AddArg(v0) - return true - } - return false } func rewriteValueAMD64_OpIsSliceInBounds_0(v *Value) bool { b := v.Block - config := b.Func.Config // match: (IsSliceInBounds idx len) - // cond: config.PtrSize == 8 // result: (SETBE (CMPQ idx len)) for { len := v.Args[1] idx := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64SETBE) v0 := b.NewValue0(v.Pos, OpAMD64CMPQ, types.TypeFlags) v0.AddArg(idx) @@ -52830,23 +52675,6 @@ func rewriteValueAMD64_OpIsSliceInBounds_0(v *Value) bool { v.AddArg(v0) return true } - // match: (IsSliceInBounds idx len) - // cond: config.PtrSize == 4 - // result: (SETBE (CMPL idx len)) - for { - len := v.Args[1] - idx := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64SETBE) - v0 := b.NewValue0(v.Pos, OpAMD64CMPL, types.TypeFlags) - v0.AddArg(idx) - v0.AddArg(len) - v.AddArg(v0) - return true - } - return false } func rewriteValueAMD64_OpLeq16_0(v *Value) bool { b := v.Block @@ -53149,16 +52977,14 @@ func rewriteValueAMD64_OpLess8U_0(v *Value) bool { } } func rewriteValueAMD64_OpLoad_0(v *Value) bool { - b := v.Block - config := b.Func.Config // match: (Load <t> ptr mem) - // cond: (is64BitInt(t) || isPtr(t) && config.PtrSize == 8) + // cond: (is64BitInt(t) || isPtr(t)) // result: (MOVQload ptr mem) for { t := v.Type mem := v.Args[1] ptr := v.Args[0] - if !(is64BitInt(t) || isPtr(t) && config.PtrSize == 8) { + if !(is64BitInt(t) || isPtr(t)) { break } v.reset(OpAMD64MOVQload) @@ -53167,13 +52993,13 @@ func rewriteValueAMD64_OpLoad_0(v *Value) bool { return true } // match: (Load <t> ptr mem) - // cond: (is32BitInt(t) || isPtr(t) && config.PtrSize == 4) + // cond: is32BitInt(t) // result: (MOVLload ptr mem) for { t := v.Type mem := v.Args[1] ptr := v.Args[0] - if !(is32BitInt(t) || isPtr(t) && config.PtrSize == 4) { + if !(is32BitInt(t)) { break } v.reset(OpAMD64MOVLload) @@ -53244,39 +53070,17 @@ func rewriteValueAMD64_OpLoad_0(v *Value) bool { return false } func rewriteValueAMD64_OpLocalAddr_0(v *Value) bool { - b := v.Block - config := b.Func.Config // match: (LocalAddr {sym} base _) - // cond: config.PtrSize == 8 // result: (LEAQ {sym} base) for { sym := v.Aux _ = v.Args[1] base := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64LEAQ) v.Aux = sym v.AddArg(base) return true } - // match: (LocalAddr {sym} base _) - // cond: config.PtrSize == 4 - // result: (LEAL {sym} base) - for { - sym := v.Aux - _ = v.Args[1] - base := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64LEAL) - v.Aux = sym - v.AddArg(base) - return true - } - return false } func rewriteValueAMD64_OpLsh16x16_0(v *Value) bool { b := v.Block @@ -54939,16 +54743,11 @@ func rewriteValueAMD64_OpNeqB_0(v *Value) bool { } func rewriteValueAMD64_OpNeqPtr_0(v *Value) bool { b := v.Block - config := b.Func.Config // match: (NeqPtr x y) - // cond: config.PtrSize == 8 // result: (SETNE (CMPQ x y)) for { y := v.Args[1] x := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64SETNE) v0 := b.NewValue0(v.Pos, OpAMD64CMPQ, types.TypeFlags) v0.AddArg(x) @@ -54956,23 +54755,6 @@ func rewriteValueAMD64_OpNeqPtr_0(v *Value) bool { v.AddArg(v0) return true } - // match: (NeqPtr x y) - // cond: config.PtrSize == 4 - // result: (SETNE (CMPL x y)) - for { - y := v.Args[1] - x := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64SETNE) - v0 := b.NewValue0(v.Pos, OpAMD64CMPL, types.TypeFlags) - v0.AddArg(x) - v0.AddArg(y) - v.AddArg(v0) - return true - } - return false } func rewriteValueAMD64_OpNilCheck_0(v *Value) bool { // match: (NilCheck ptr mem) @@ -54999,15 +54781,14 @@ func rewriteValueAMD64_OpNot_0(v *Value) bool { } func rewriteValueAMD64_OpOffPtr_0(v *Value) bool { b := v.Block - config := b.Func.Config typ := &b.Func.Config.Types // match: (OffPtr [off] ptr) - // cond: config.PtrSize == 8 && is32Bit(off) + // cond: is32Bit(off) // result: (ADDQconst [off] ptr) for { off := v.AuxInt ptr := v.Args[0] - if !(config.PtrSize == 8 && is32Bit(off)) { + if !(is32Bit(off)) { break } v.reset(OpAMD64ADDQconst) @@ -55016,14 +54797,10 @@ func rewriteValueAMD64_OpOffPtr_0(v *Value) bool { return true } // match: (OffPtr [off] ptr) - // cond: config.PtrSize == 8 // result: (ADDQ (MOVQconst [off]) ptr) for { off := v.AuxInt ptr := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64ADDQ) v0 := b.NewValue0(v.Pos, OpAMD64MOVQconst, typ.UInt64) v0.AuxInt = off @@ -55031,21 +54808,6 @@ func rewriteValueAMD64_OpOffPtr_0(v *Value) bool { v.AddArg(ptr) return true } - // match: (OffPtr [off] ptr) - // cond: config.PtrSize == 4 - // result: (ADDLconst [off] ptr) - for { - off := v.AuxInt - ptr := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64ADDLconst) - v.AuxInt = off - v.AddArg(ptr) - return true - } - return false } func rewriteValueAMD64_OpOr16_0(v *Value) bool { // match: (Or16 x y) @@ -57203,37 +56965,16 @@ func rewriteValueAMD64_OpSub8_0(v *Value) bool { } } func rewriteValueAMD64_OpSubPtr_0(v *Value) bool { - b := v.Block - config := b.Func.Config // match: (SubPtr x y) - // cond: config.PtrSize == 8 // result: (SUBQ x y) for { y := v.Args[1] x := v.Args[0] - if !(config.PtrSize == 8) { - break - } v.reset(OpAMD64SUBQ) v.AddArg(x) v.AddArg(y) return true } - // match: (SubPtr x y) - // cond: config.PtrSize == 4 - // result: (SUBL x y) - for { - y := v.Args[1] - x := v.Args[0] - if !(config.PtrSize == 4) { - break - } - v.reset(OpAMD64SUBL) - v.AddArg(x) - v.AddArg(y) - return true - } - return false } func rewriteValueAMD64_OpTrunc_0(v *Value) bool { // match: (Trunc x) diff --git a/src/cmd/compile/internal/ssa/rewriteARM64.go b/src/cmd/compile/internal/ssa/rewriteARM64.go index a5f74fab51..e9bde5ec8a 100644 --- a/src/cmd/compile/internal/ssa/rewriteARM64.go +++ b/src/cmd/compile/internal/ssa/rewriteARM64.go @@ -431,6 +431,8 @@ func rewriteValueARM64(v *Value) bool { return rewriteValueARM64_OpAtomicStore32_0(v) case OpAtomicStore64: return rewriteValueARM64_OpAtomicStore64_0(v) + case OpAtomicStore8: + return rewriteValueARM64_OpAtomicStore8_0(v) case OpAtomicStorePtrNoWB: return rewriteValueARM64_OpAtomicStorePtrNoWB_0(v) case OpAvg64u: @@ -27669,6 +27671,20 @@ func rewriteValueARM64_OpAtomicStore64_0(v *Value) bool { return true } } +func rewriteValueARM64_OpAtomicStore8_0(v *Value) bool { + // match: (AtomicStore8 ptr val mem) + // result: (STLRB ptr val mem) + for { + mem := v.Args[2] + ptr := v.Args[0] + val := v.Args[1] + v.reset(OpARM64STLRB) + v.AddArg(ptr) + v.AddArg(val) + v.AddArg(mem) + return true + } +} func rewriteValueARM64_OpAtomicStorePtrNoWB_0(v *Value) bool { // match: (AtomicStorePtrNoWB ptr val mem) // result: (STLR ptr val mem) diff --git a/src/cmd/compile/internal/ssa/rewriteMIPS.go b/src/cmd/compile/internal/ssa/rewriteMIPS.go index 72e596517f..d17be4422b 100644 --- a/src/cmd/compile/internal/ssa/rewriteMIPS.go +++ b/src/cmd/compile/internal/ssa/rewriteMIPS.go @@ -41,12 +41,16 @@ func rewriteValueMIPS(v *Value) bool { return rewriteValueMIPS_OpAtomicExchange32_0(v) case OpAtomicLoad32: return rewriteValueMIPS_OpAtomicLoad32_0(v) + case OpAtomicLoad8: + return rewriteValueMIPS_OpAtomicLoad8_0(v) case OpAtomicLoadPtr: return rewriteValueMIPS_OpAtomicLoadPtr_0(v) case OpAtomicOr8: return rewriteValueMIPS_OpAtomicOr8_0(v) case OpAtomicStore32: return rewriteValueMIPS_OpAtomicStore32_0(v) + case OpAtomicStore8: + return rewriteValueMIPS_OpAtomicStore8_0(v) case OpAtomicStorePtrNoWB: return rewriteValueMIPS_OpAtomicStorePtrNoWB_0(v) case OpAvg32u: @@ -245,8 +249,8 @@ func rewriteValueMIPS(v *Value) bool { return rewriteValueMIPS_OpMIPSCMOVZzero_0(v) case OpMIPSLoweredAtomicAdd: return rewriteValueMIPS_OpMIPSLoweredAtomicAdd_0(v) - case OpMIPSLoweredAtomicStore: - return rewriteValueMIPS_OpMIPSLoweredAtomicStore_0(v) + case OpMIPSLoweredAtomicStore32: + return rewriteValueMIPS_OpMIPSLoweredAtomicStore32_0(v) case OpMIPSMOVBUload: return rewriteValueMIPS_OpMIPSMOVBUload_0(v) case OpMIPSMOVBUreg: @@ -826,11 +830,23 @@ func rewriteValueMIPS_OpAtomicExchange32_0(v *Value) bool { } func rewriteValueMIPS_OpAtomicLoad32_0(v *Value) bool { // match: (AtomicLoad32 ptr mem) - // result: (LoweredAtomicLoad ptr mem) + // result: (LoweredAtomicLoad32 ptr mem) for { mem := v.Args[1] ptr := v.Args[0] - v.reset(OpMIPSLoweredAtomicLoad) + v.reset(OpMIPSLoweredAtomicLoad32) + v.AddArg(ptr) + v.AddArg(mem) + return true + } +} +func rewriteValueMIPS_OpAtomicLoad8_0(v *Value) bool { + // match: (AtomicLoad8 ptr mem) + // result: (LoweredAtomicLoad8 ptr mem) + for { + mem := v.Args[1] + ptr := v.Args[0] + v.reset(OpMIPSLoweredAtomicLoad8) v.AddArg(ptr) v.AddArg(mem) return true @@ -838,11 +854,11 @@ func rewriteValueMIPS_OpAtomicLoad32_0(v *Value) bool { } func rewriteValueMIPS_OpAtomicLoadPtr_0(v *Value) bool { // match: (AtomicLoadPtr ptr mem) - // result: (LoweredAtomicLoad ptr mem) + // result: (LoweredAtomicLoad32 ptr mem) for { mem := v.Args[1] ptr := v.Args[0] - v.reset(OpMIPSLoweredAtomicLoad) + v.reset(OpMIPSLoweredAtomicLoad32) v.AddArg(ptr) v.AddArg(mem) return true @@ -923,12 +939,26 @@ func rewriteValueMIPS_OpAtomicOr8_0(v *Value) bool { } func rewriteValueMIPS_OpAtomicStore32_0(v *Value) bool { // match: (AtomicStore32 ptr val mem) - // result: (LoweredAtomicStore ptr val mem) + // result: (LoweredAtomicStore32 ptr val mem) + for { + mem := v.Args[2] + ptr := v.Args[0] + val := v.Args[1] + v.reset(OpMIPSLoweredAtomicStore32) + v.AddArg(ptr) + v.AddArg(val) + v.AddArg(mem) + return true + } +} +func rewriteValueMIPS_OpAtomicStore8_0(v *Value) bool { + // match: (AtomicStore8 ptr val mem) + // result: (LoweredAtomicStore8 ptr val mem) for { mem := v.Args[2] ptr := v.Args[0] val := v.Args[1] - v.reset(OpMIPSLoweredAtomicStore) + v.reset(OpMIPSLoweredAtomicStore8) v.AddArg(ptr) v.AddArg(val) v.AddArg(mem) @@ -937,12 +967,12 @@ func rewriteValueMIPS_OpAtomicStore32_0(v *Value) bool { } func rewriteValueMIPS_OpAtomicStorePtrNoWB_0(v *Value) bool { // match: (AtomicStorePtrNoWB ptr val mem) - // result: (LoweredAtomicStore ptr val mem) + // result: (LoweredAtomicStore32 ptr val mem) for { mem := v.Args[2] ptr := v.Args[0] val := v.Args[1] - v.reset(OpMIPSLoweredAtomicStore) + v.reset(OpMIPSLoweredAtomicStore32) v.AddArg(ptr) v.AddArg(val) v.AddArg(mem) @@ -3000,8 +3030,8 @@ func rewriteValueMIPS_OpMIPSLoweredAtomicAdd_0(v *Value) bool { } return false } -func rewriteValueMIPS_OpMIPSLoweredAtomicStore_0(v *Value) bool { - // match: (LoweredAtomicStore ptr (MOVWconst [0]) mem) +func rewriteValueMIPS_OpMIPSLoweredAtomicStore32_0(v *Value) bool { + // match: (LoweredAtomicStore32 ptr (MOVWconst [0]) mem) // result: (LoweredAtomicStorezero ptr mem) for { mem := v.Args[2] diff --git a/src/cmd/compile/internal/ssa/rewriteMIPS64.go b/src/cmd/compile/internal/ssa/rewriteMIPS64.go index 08b1f43841..869ccd3b19 100644 --- a/src/cmd/compile/internal/ssa/rewriteMIPS64.go +++ b/src/cmd/compile/internal/ssa/rewriteMIPS64.go @@ -57,6 +57,8 @@ func rewriteValueMIPS64(v *Value) bool { return rewriteValueMIPS64_OpAtomicStore32_0(v) case OpAtomicStore64: return rewriteValueMIPS64_OpAtomicStore64_0(v) + case OpAtomicStore8: + return rewriteValueMIPS64_OpAtomicStore8_0(v) case OpAtomicStorePtrNoWB: return rewriteValueMIPS64_OpAtomicStorePtrNoWB_0(v) case OpAvg64u: @@ -938,6 +940,20 @@ func rewriteValueMIPS64_OpAtomicStore64_0(v *Value) bool { return true } } +func rewriteValueMIPS64_OpAtomicStore8_0(v *Value) bool { + // match: (AtomicStore8 ptr val mem) + // result: (LoweredAtomicStore8 ptr val mem) + for { + mem := v.Args[2] + ptr := v.Args[0] + val := v.Args[1] + v.reset(OpMIPS64LoweredAtomicStore8) + v.AddArg(ptr) + v.AddArg(val) + v.AddArg(mem) + return true + } +} func rewriteValueMIPS64_OpAtomicStorePtrNoWB_0(v *Value) bool { // match: (AtomicStorePtrNoWB ptr val mem) // result: (LoweredAtomicStore64 ptr val mem) diff --git a/src/cmd/compile/internal/ssa/rewritePPC64.go b/src/cmd/compile/internal/ssa/rewritePPC64.go index 1b462b28bb..a95364ece4 100644 --- a/src/cmd/compile/internal/ssa/rewritePPC64.go +++ b/src/cmd/compile/internal/ssa/rewritePPC64.go @@ -71,6 +71,8 @@ func rewriteValuePPC64(v *Value) bool { return rewriteValuePPC64_OpAtomicStore32_0(v) case OpAtomicStore64: return rewriteValuePPC64_OpAtomicStore64_0(v) + case OpAtomicStore8: + return rewriteValuePPC64_OpAtomicStore8_0(v) case OpAtomicStoreRel32: return rewriteValuePPC64_OpAtomicStoreRel32_0(v) case OpAvg64u: @@ -1132,6 +1134,21 @@ func rewriteValuePPC64_OpAtomicStore64_0(v *Value) bool { return true } } +func rewriteValuePPC64_OpAtomicStore8_0(v *Value) bool { + // match: (AtomicStore8 ptr val mem) + // result: (LoweredAtomicStore8 [1] ptr val mem) + for { + mem := v.Args[2] + ptr := v.Args[0] + val := v.Args[1] + v.reset(OpPPC64LoweredAtomicStore8) + v.AuxInt = 1 + v.AddArg(ptr) + v.AddArg(val) + v.AddArg(mem) + return true + } +} func rewriteValuePPC64_OpAtomicStoreRel32_0(v *Value) bool { // match: (AtomicStoreRel32 ptr val mem) // result: (LoweredAtomicStore32 [0] ptr val mem) diff --git a/src/cmd/compile/internal/ssa/rewriteS390X.go b/src/cmd/compile/internal/ssa/rewriteS390X.go index 343a7381ea..645e8f2d9a 100644 --- a/src/cmd/compile/internal/ssa/rewriteS390X.go +++ b/src/cmd/compile/internal/ssa/rewriteS390X.go @@ -60,6 +60,8 @@ func rewriteValueS390X(v *Value) bool { return rewriteValueS390X_OpAtomicStore32_0(v) case OpAtomicStore64: return rewriteValueS390X_OpAtomicStore64_0(v) + case OpAtomicStore8: + return rewriteValueS390X_OpAtomicStore8_0(v) case OpAtomicStorePtrNoWB: return rewriteValueS390X_OpAtomicStorePtrNoWB_0(v) case OpAtomicStoreRel32: @@ -1153,6 +1155,23 @@ func rewriteValueS390X_OpAtomicStore64_0(v *Value) bool { return true } } +func rewriteValueS390X_OpAtomicStore8_0(v *Value) bool { + b := v.Block + // match: (AtomicStore8 ptr val mem) + // result: (SYNC (MOVBatomicstore ptr val mem)) + for { + mem := v.Args[2] + ptr := v.Args[0] + val := v.Args[1] + v.reset(OpS390XSYNC) + v0 := b.NewValue0(v.Pos, OpS390XMOVBatomicstore, types.TypeMem) + v0.AddArg(ptr) + v0.AddArg(val) + v0.AddArg(mem) + v.AddArg(v0) + return true + } +} func rewriteValueS390X_OpAtomicStorePtrNoWB_0(v *Value) bool { b := v.Block // match: (AtomicStorePtrNoWB ptr val mem) diff --git a/src/cmd/compile/internal/ssa/rewritegeneric.go b/src/cmd/compile/internal/ssa/rewritegeneric.go index d7e7974e2b..dd0ddd4195 100644 --- a/src/cmd/compile/internal/ssa/rewritegeneric.go +++ b/src/cmd/compile/internal/ssa/rewritegeneric.go @@ -6142,18 +6142,18 @@ func rewriteValuegeneric_OpArraySelect_0(v *Value) bool { v.AddArg(x) return true } - // match: (ArraySelect [0] x:(IData _)) - // result: x + // match: (ArraySelect [0] (IData x)) + // result: (IData x) for { if v.AuxInt != 0 { break } - x := v.Args[0] - if x.Op != OpIData { + v_0 := v.Args[0] + if v_0.Op != OpIData { break } - v.reset(OpCopy) - v.Type = x.Type + x := v_0.Args[0] + v.reset(OpIData) v.AddArg(x) return true } @@ -43502,18 +43502,18 @@ func rewriteValuegeneric_OpStructSelect_10(v *Value) bool { v0.AddArg(mem) return true } - // match: (StructSelect [0] x:(IData _)) - // result: x + // match: (StructSelect [0] (IData x)) + // result: (IData x) for { if v.AuxInt != 0 { break } - x := v.Args[0] - if x.Op != OpIData { + v_0 := v.Args[0] + if v_0.Op != OpIData { break } - v.reset(OpCopy) - v.Type = x.Type + x := v_0.Args[0] + v.reset(OpIData) v.AddArg(x) return true } diff --git a/src/cmd/compile/internal/syntax/parser_test.go b/src/cmd/compile/internal/syntax/parser_test.go index 3cf55defc7..673339d667 100644 --- a/src/cmd/compile/internal/syntax/parser_test.go +++ b/src/cmd/compile/internal/syntax/parser_test.go @@ -96,7 +96,7 @@ func walkDirs(t *testing.T, dir string, action func(string)) { } } else if fi.IsDir() && fi.Name() != "testdata" { path := filepath.Join(dir, fi.Name()) - if !strings.HasSuffix(path, "/test") { + if !strings.HasSuffix(path, string(filepath.Separator)+"test") { dirs = append(dirs, path) } } diff --git a/src/cmd/compile/internal/wasm/ssa.go b/src/cmd/compile/internal/wasm/ssa.go index 75b306e168..e075892348 100644 --- a/src/cmd/compile/internal/wasm/ssa.go +++ b/src/cmd/compile/internal/wasm/ssa.go @@ -19,7 +19,6 @@ func Init(arch *gc.Arch) { arch.MAXWIDTH = 1 << 50 arch.ZeroRange = zeroRange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnop @@ -45,21 +44,6 @@ func zeroRange(pp *gc.Progs, p *obj.Prog, off, cnt int64, state *uint32) *obj.Pr return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - sym := n.Sym.Linksym() - size := n.Type.Size() - for i := int64(0); i < size; i += 8 { - p := pp.Prog(wasm.AGet) - p.From = obj.Addr{Type: obj.TYPE_REG, Reg: wasm.REG_SP} - - p = pp.Prog(wasm.AI64Const) - p.From = obj.Addr{Type: obj.TYPE_CONST, Offset: 0} - - p = pp.Prog(wasm.AI64Store) - p.To = obj.Addr{Type: obj.TYPE_MEM, Name: obj.NAME_AUTO, Offset: n.Xoffset + i, Sym: sym} - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { return pp.Prog(wasm.ANop) } diff --git a/src/cmd/compile/internal/x86/galign.go b/src/cmd/compile/internal/x86/galign.go index 7f53ee3731..56c6989d93 100644 --- a/src/cmd/compile/internal/x86/galign.go +++ b/src/cmd/compile/internal/x86/galign.go @@ -30,7 +30,6 @@ func Init(arch *gc.Arch) { arch.MAXWIDTH = (1 << 32) - 1 arch.ZeroRange = zerorange - arch.ZeroAuto = zeroAuto arch.Ginsnop = ginsnop arch.Ginsnopdefer = ginsnop diff --git a/src/cmd/compile/internal/x86/ggen.go b/src/cmd/compile/internal/x86/ggen.go index f247180a2e..a33ddc81e3 100644 --- a/src/cmd/compile/internal/x86/ggen.go +++ b/src/cmd/compile/internal/x86/ggen.go @@ -37,22 +37,6 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, ax *uint32) *obj.Prog return p } -func zeroAuto(pp *gc.Progs, n *gc.Node) { - // Note: this code must not clobber any registers. - sym := n.Sym.Linksym() - size := n.Type.Size() - for i := int64(0); i < size; i += 4 { - p := pp.Prog(x86.AMOVL) - p.From.Type = obj.TYPE_CONST - p.From.Offset = 0 - p.To.Type = obj.TYPE_MEM - p.To.Name = obj.NAME_AUTO - p.To.Reg = x86.REG_SP - p.To.Offset = n.Xoffset + i - p.To.Sym = sym - } -} - func ginsnop(pp *gc.Progs) *obj.Prog { // See comment in ../amd64/ggen.go. p := pp.Prog(x86.AXCHGL) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index 6c8e558f29..9eb9e8f241 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -605,26 +605,26 @@ func startInstall(dir string) chan struct{} { // runInstall installs the library, package, or binary associated with dir, // which is relative to $GOROOT/src. -func runInstall(dir string, ch chan struct{}) { - if dir == "net" || dir == "os/user" || dir == "crypto/x509" { - fatalf("go_bootstrap cannot depend on cgo package %s", dir) +func runInstall(pkg string, ch chan struct{}) { + if pkg == "net" || pkg == "os/user" || pkg == "crypto/x509" { + fatalf("go_bootstrap cannot depend on cgo package %s", pkg) } defer close(ch) - if dir == "unsafe" { + if pkg == "unsafe" { return } if vflag > 0 { if goos != gohostos || goarch != gohostarch { - errprintf("%s (%s/%s)\n", dir, goos, goarch) + errprintf("%s (%s/%s)\n", pkg, goos, goarch) } else { - errprintf("%s\n", dir) + errprintf("%s\n", pkg) } } - workdir := pathf("%s/%s", workdir, dir) + workdir := pathf("%s/%s", workdir, pkg) xmkdirall(workdir) var clean []string @@ -634,11 +634,14 @@ func runInstall(dir string, ch chan struct{}) { } }() - // path = full path to dir. - path := pathf("%s/src/%s", goroot, dir) + // dir = full path to pkg. + dir := pathf("%s/src/%s", goroot, pkg) name := filepath.Base(dir) - ispkg := !strings.HasPrefix(dir, "cmd/") || strings.Contains(dir, "/internal/") + // ispkg predicts whether the package should be linked as a binary, based + // on the name. There should be no "main" packages in vendor, since + // 'go mod vendor' will only copy imported packages there. + ispkg := !strings.HasPrefix(pkg, "cmd/") || strings.Contains(pkg, "/internal/") || strings.Contains(pkg, "/vendor/") // Start final link command line. // Note: code below knows that link.p[targ] is the target. @@ -650,7 +653,7 @@ func runInstall(dir string, ch chan struct{}) { if ispkg { // Go library (package). ispackcmd = true - link = []string{"pack", pathf("%s/pkg/%s_%s/%s.a", goroot, goos, goarch, dir)} + link = []string{"pack", packagefile(pkg)} targ = len(link) - 1 xmkdirall(filepath.Dir(link[targ])) } else { @@ -675,7 +678,7 @@ func runInstall(dir string, ch chan struct{}) { // Gather files that are sources for this target. // Everything in that directory, and any target-specific // additions. - files := xreaddir(path) + files := xreaddir(dir) // Remove files beginning with . or _, // which are likely to be editor temporary files. @@ -687,7 +690,7 @@ func runInstall(dir string, ch chan struct{}) { }) for _, dt := range deptab { - if dir == dt.prefix || strings.HasSuffix(dt.prefix, "/") && strings.HasPrefix(dir, dt.prefix) { + if pkg == dt.prefix || strings.HasSuffix(dt.prefix, "/") && strings.HasPrefix(pkg, dt.prefix) { for _, p := range dt.dep { p = os.ExpandEnv(p) files = append(files, p) @@ -699,7 +702,7 @@ func runInstall(dir string, ch chan struct{}) { // Convert to absolute paths. for i, p := range files { if !filepath.IsAbs(p) { - files[i] = pathf("%s/%s", path, p) + files[i] = pathf("%s/%s", dir, p) } } @@ -715,7 +718,7 @@ func runInstall(dir string, ch chan struct{}) { return false ok: t := mtime(p) - if !t.IsZero() && !strings.HasSuffix(p, ".a") && !shouldbuild(p, dir) { + if !t.IsZero() && !strings.HasSuffix(p, ".a") && !shouldbuild(p, pkg) { return false } if strings.HasSuffix(p, ".go") { @@ -742,7 +745,7 @@ func runInstall(dir string, ch chan struct{}) { } // For package runtime, copy some files into the work space. - if dir == "runtime" { + if pkg == "runtime" { xmkdirall(pathf("%s/pkg/include", goroot)) // For use by assembly and C files. copyfile(pathf("%s/pkg/include/textflag.h", goroot), @@ -764,7 +767,7 @@ func runInstall(dir string, ch chan struct{}) { if vflag > 1 { errprintf("generate %s\n", p) } - gt.gen(path, p) + gt.gen(dir, p) // Do not add generated file to clean list. // In runtime, we want to be able to // build the package with the go tool, @@ -782,22 +785,31 @@ func runInstall(dir string, ch chan struct{}) { built: } - // Make sure dependencies are installed. - var deps []string + // Resolve imported packages to actual package paths. + // Make sure they're installed. + importMap := make(map[string]string) for _, p := range gofiles { - deps = append(deps, readimports(p)...) + for _, imp := range readimports(p) { + importMap[imp] = resolveVendor(imp, dir) + } + } + sortedImports := make([]string, 0, len(importMap)) + for imp := range importMap { + sortedImports = append(sortedImports, imp) } - for _, dir1 := range deps { - startInstall(dir1) + sort.Strings(sortedImports) + + for _, dep := range importMap { + startInstall(dep) } - for _, dir1 := range deps { - install(dir1) + for _, dep := range importMap { + install(dep) } if goos != gohostos || goarch != gohostarch { // We've generated the right files; the go command can do the build. if vflag > 1 { - errprintf("skip build for cross-compile %s\n", dir) + errprintf("skip build for cross-compile %s\n", pkg) } return } @@ -830,18 +842,35 @@ func runInstall(dir string, ch chan struct{}) { if err := ioutil.WriteFile(goasmh, nil, 0666); err != nil { fatalf("cannot write empty go_asm.h: %s", err) } - bgrun(&wg, path, asmabis...) + bgrun(&wg, dir, asmabis...) bgwait(&wg) } + // Build an importcfg file for the compiler. + buf := &bytes.Buffer{} + for _, imp := range sortedImports { + if imp == "unsafe" { + continue + } + dep := importMap[imp] + if imp != dep { + fmt.Fprintf(buf, "importmap %s=%s\n", imp, dep) + } + fmt.Fprintf(buf, "packagefile %s=%s\n", dep, packagefile(dep)) + } + importcfg := pathf("%s/importcfg", workdir) + if err := ioutil.WriteFile(importcfg, buf.Bytes(), 0666); err != nil { + fatalf("cannot write importcfg file: %v", err) + } + var archive string // The next loop will compile individual non-Go files. // Hand the Go files to the compiler en masse. // For packages containing assembly, this writes go_asm.h, which // the assembly files will need. - pkg := dir - if strings.HasPrefix(dir, "cmd/") && strings.Count(dir, "/") == 1 { - pkg = "main" + pkgName := pkg + if strings.HasPrefix(pkg, "cmd/") && strings.Count(pkg, "/") == 1 { + pkgName = "main" } b := pathf("%s/_go_.a", workdir) clean = append(clean, b) @@ -852,11 +881,11 @@ func runInstall(dir string, ch chan struct{}) { } // Compile Go code. - compile := []string{pathf("%s/compile", tooldir), "-std", "-pack", "-o", b, "-p", pkg} + compile := []string{pathf("%s/compile", tooldir), "-std", "-pack", "-o", b, "-p", pkgName, "-importcfg", importcfg} if gogcflags != "" { compile = append(compile, strings.Fields(gogcflags)...) } - if dir == "runtime" { + if pkg == "runtime" { compile = append(compile, "-+") } if len(sfiles) > 0 { @@ -874,7 +903,7 @@ func runInstall(dir string, ch chan struct{}) { // We use bgrun and immediately wait for it instead of calling run() synchronously. // This executes all jobs through the bgwork channel and allows the process // to exit cleanly in case an error occurs. - bgrun(&wg, path, compile...) + bgrun(&wg, dir, compile...) bgwait(&wg) // Compile the files. @@ -888,7 +917,7 @@ func runInstall(dir string, ch chan struct{}) { // Change the last character of the output file (which was c or s). b = b[:len(b)-1] + "o" compile = append(compile, "-o", b, p) - bgrun(&wg, path, compile...) + bgrun(&wg, dir, compile...) link = append(link, b) if doclean { @@ -909,6 +938,12 @@ func runInstall(dir string, ch chan struct{}) { bgwait(&wg) } +// packagefile returns the path to a compiled .a file for the given package +// path. Paths may need to be resolved with resolveVendor first. +func packagefile(pkg string) string { + return pathf("%s/pkg/%s_%s/%s.a", goroot, goos, goarch, pkg) +} + // matchfield reports whether the field (x,y,z) matches this build. // all the elements in the field must be satisfied. func matchfield(f string) bool { @@ -940,7 +975,7 @@ func matchtag(tag string) bool { // of GOOS and GOARCH. // We also allow the special tag cmd_go_bootstrap. // See ../go/bootstrap.go and package go/build. -func shouldbuild(file, dir string) bool { +func shouldbuild(file, pkg string) bool { // Check file name for GOOS or GOARCH. name := filepath.Base(file) excluded := func(list []string, ok string) bool { @@ -982,7 +1017,7 @@ func shouldbuild(file, dir string) bool { if code == "package documentation" { return false } - if code == "package main" && dir != "cmd/go" && dir != "cmd/cgo" { + if code == "package main" && pkg != "cmd/go" && pkg != "cmd/cgo" { return false } if !strings.HasPrefix(p, "//") { @@ -1485,6 +1520,7 @@ var cgoEnabled = map[string]bool{ "freebsd/386": true, "freebsd/amd64": true, "freebsd/arm": true, + "freebsd/arm64": true, "illumos/amd64": true, "linux/386": true, "linux/amd64": true, diff --git a/src/cmd/dist/imports.go b/src/cmd/dist/imports.go index bf64d6668a..05dd84d0f1 100644 --- a/src/cmd/dist/imports.go +++ b/src/cmd/dist/imports.go @@ -11,7 +11,10 @@ package main import ( "bufio" "errors" + "fmt" "io" + "path" + "path/filepath" "strconv" "strings" "unicode/utf8" @@ -243,3 +246,31 @@ func readimports(file string) []string { return imports } + +// resolveVendor returns a unique package path imported with the given import +// path from srcDir. +// +// resolveVendor assumes that a package is vendored if and only if its first +// path component contains a dot. If a package is vendored, its import path +// is returned with a "vendor" or "cmd/vendor" prefix, depending on srcDir. +// Otherwise, the import path is returned verbatim. +func resolveVendor(imp, srcDir string) string { + var first string + if i := strings.Index(imp, "/"); i < 0 { + first = imp + } else { + first = imp[:i] + } + isStandard := !strings.Contains(first, ".") + if isStandard { + return imp + } + + if strings.HasPrefix(srcDir, filepath.Join(goroot, "src", "cmd")) { + return path.Join("cmd", "vendor", imp) + } else if strings.HasPrefix(srcDir, filepath.Join(goroot, "src")) { + return path.Join("vendor", imp) + } else { + panic(fmt.Sprintf("srcDir %q not in GOOROT/src", srcDir)) + } +} diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 83bcc86172..eeddd9474c 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -418,7 +418,7 @@ func (t *tester) registerTests() { cmd.Args = append(cmd.Args, "-tags=race") } cmd.Args = append(cmd.Args, "std") - if !t.race { + if t.shouldTestCmd() { cmd.Args = append(cmd.Args, "cmd") } cmd.Stderr = new(bytes.Buffer) @@ -1455,6 +1455,17 @@ func (t *tester) shouldUsePrecompiledStdTest() bool { return err == nil } +func (t *tester) shouldTestCmd() bool { + if t.race { + return false + } + if goos == "js" && goarch == "wasm" { + // Issues 25911, 35220 + return false + } + return true +} + // prebuiltGoPackageTestBinary returns the path where we'd expect // the pre-built go test binary to be on disk when dist test is run with // a single argument. diff --git a/src/cmd/fix/main.go b/src/cmd/fix/main.go index f54a5e0d96..80b3c76350 100644 --- a/src/cmd/fix/main.go +++ b/src/cmd/fix/main.go @@ -15,11 +15,11 @@ import ( "go/token" "io/ioutil" "os" - "os/exec" "path/filepath" - "runtime" "sort" "strings" + + "cmd/internal/diff" ) var ( @@ -186,7 +186,7 @@ func processFile(filename string, useStdin bool) error { } if *doDiff { - data, err := diff(src, newSrc) + data, err := diff.Diff("go-fix", src, newSrc) if err != nil { return fmt.Errorf("computing diff: %s", err) } @@ -237,46 +237,3 @@ func isGoFile(f os.FileInfo) bool { name := f.Name() return !f.IsDir() && !strings.HasPrefix(name, ".") && strings.HasSuffix(name, ".go") } - -func writeTempFile(dir, prefix string, data []byte) (string, error) { - file, err := ioutil.TempFile(dir, prefix) - if err != nil { - return "", err - } - _, err = file.Write(data) - if err1 := file.Close(); err == nil { - err = err1 - } - if err != nil { - os.Remove(file.Name()) - return "", err - } - return file.Name(), nil -} - -func diff(b1, b2 []byte) (data []byte, err error) { - f1, err := writeTempFile("", "go-fix", b1) - if err != nil { - return - } - defer os.Remove(f1) - - f2, err := writeTempFile("", "go-fix", b2) - if err != nil { - return - } - defer os.Remove(f2) - - cmd := "diff" - if runtime.GOOS == "plan9" { - cmd = "/bin/ape/diff" - } - - data, err = exec.Command(cmd, "-u", f1, f2).CombinedOutput() - if len(data) > 0 { - // diff exits with a non-zero status when the files don't match. - // Ignore that failure as long as we get output. - err = nil - } - return -} diff --git a/src/cmd/fix/main_test.go b/src/cmd/fix/main_test.go index 8868140ade..ee74f24c6e 100644 --- a/src/cmd/fix/main_test.go +++ b/src/cmd/fix/main_test.go @@ -9,6 +9,8 @@ import ( "go/parser" "strings" "testing" + + "cmd/internal/diff" ) type testCase struct { @@ -123,7 +125,7 @@ func TestRewrite(t *testing.T) { } func tdiff(t *testing.T, a, b string) { - data, err := diff([]byte(a), []byte(b)) + data, err := diff.Diff("go-fix-test", []byte(a), []byte(b)) if err != nil { t.Error(err) return diff --git a/src/cmd/go.mod b/src/cmd/go.mod index 77ec02a8a9..6b2c45a9bb 100644 --- a/src/cmd/go.mod +++ b/src/cmd/go.mod @@ -6,7 +6,8 @@ require ( github.com/google/pprof v0.0.0-20190515194954-54271f7e092f github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44 // indirect golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1 - golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c + golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 + golang.org/x/mod v0.1.1-0.20191029194233-18c3998b6452 golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 // indirect golang.org/x/tools v0.0.0-20191018203202-04252eccb9d5 ) diff --git a/src/cmd/go.sum b/src/cmd/go.sum index 6a3d609416..7fd4eaddad 100644 --- a/src/cmd/go.sum +++ b/src/cmd/go.sum @@ -5,11 +5,15 @@ github.com/ianlancetaylor/demangle v0.0.0-20180524225900-fc6590592b44/go.mod h1: golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1 h1:A71BZbKSu+DtCNry/x5JKn20C+64DirDHmePEA8k0FY= golang.org/x/arch v0.0.0-20190815191158-8a70ba74b3a1/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/mod v0.1.1-0.20191029194233-18c3998b6452 h1:ES2W0A+AqNBCkgWga22gheu9IUDjq3TDmeCdY1A7jhk= +golang.org/x/mod v0.1.1-0.20191029194233-18c3998b6452/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 h1:vsphBvatvfbhlb4PO1BYSr9dzugGxJ/SQHoNufZJq1w= golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= @@ -17,4 +21,6 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20191018203202-04252eccb9d5 h1:TFUhCYbgGMOGnRxJv+j0iAcxCjk8oGjXXWNejQBhUUs= golang.org/x/tools v0.0.0-20191018203202-04252eccb9d5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/src/cmd/go/internal/dirhash/hash_test.go b/src/cmd/go/internal/dirhash/hash_test.go deleted file mode 100644 index ed463c1949..0000000000 --- a/src/cmd/go/internal/dirhash/hash_test.go +++ /dev/null @@ -1,135 +0,0 @@ -// Copyright 2018 The Go 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 dirhash - -import ( - "archive/zip" - "crypto/sha256" - "encoding/base64" - "fmt" - "io" - "io/ioutil" - "os" - "path/filepath" - "strings" - "testing" -) - -func h(s string) string { - return fmt.Sprintf("%x", sha256.Sum256([]byte(s))) -} - -func htop(k string, s string) string { - sum := sha256.Sum256([]byte(s)) - return k + ":" + base64.StdEncoding.EncodeToString(sum[:]) -} - -func TestHash1(t *testing.T) { - files := []string{"xyz", "abc"} - open := func(name string) (io.ReadCloser, error) { - return ioutil.NopCloser(strings.NewReader("data for " + name)), nil - } - want := htop("h1", fmt.Sprintf("%s %s\n%s %s\n", h("data for abc"), "abc", h("data for xyz"), "xyz")) - out, err := Hash1(files, open) - if err != nil { - t.Fatal(err) - } - if out != want { - t.Errorf("Hash1(...) = %s, want %s", out, want) - } - - _, err = Hash1([]string{"xyz", "a\nbc"}, open) - if err == nil { - t.Error("Hash1: expected error on newline in filenames") - } -} - -func TestHashDir(t *testing.T) { - dir, err := ioutil.TempDir("", "dirhash-test-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) - if err := ioutil.WriteFile(filepath.Join(dir, "xyz"), []byte("data for xyz"), 0666); err != nil { - t.Fatal(err) - } - if err := ioutil.WriteFile(filepath.Join(dir, "abc"), []byte("data for abc"), 0666); err != nil { - t.Fatal(err) - } - want := htop("h1", fmt.Sprintf("%s %s\n%s %s\n", h("data for abc"), "prefix/abc", h("data for xyz"), "prefix/xyz")) - out, err := HashDir(dir, "prefix", Hash1) - if err != nil { - t.Fatalf("HashDir: %v", err) - } - if out != want { - t.Errorf("HashDir(...) = %s, want %s", out, want) - } -} - -func TestHashZip(t *testing.T) { - f, err := ioutil.TempFile("", "dirhash-test-") - if err != nil { - t.Fatal(err) - } - defer os.Remove(f.Name()) - defer f.Close() - - z := zip.NewWriter(f) - w, err := z.Create("prefix/xyz") - if err != nil { - t.Fatal(err) - } - w.Write([]byte("data for xyz")) - w, err = z.Create("prefix/abc") - if err != nil { - t.Fatal(err) - } - w.Write([]byte("data for abc")) - if err := z.Close(); err != nil { - t.Fatal(err) - } - if err := f.Close(); err != nil { - t.Fatal(err) - } - - want := htop("h1", fmt.Sprintf("%s %s\n%s %s\n", h("data for abc"), "prefix/abc", h("data for xyz"), "prefix/xyz")) - out, err := HashZip(f.Name(), Hash1) - if err != nil { - t.Fatalf("HashDir: %v", err) - } - if out != want { - t.Errorf("HashDir(...) = %s, want %s", out, want) - } -} - -func TestDirFiles(t *testing.T) { - dir, err := ioutil.TempDir("", "dirfiles-test-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) - if err := ioutil.WriteFile(filepath.Join(dir, "xyz"), []byte("data for xyz"), 0666); err != nil { - t.Fatal(err) - } - if err := ioutil.WriteFile(filepath.Join(dir, "abc"), []byte("data for abc"), 0666); err != nil { - t.Fatal(err) - } - if err := os.Mkdir(filepath.Join(dir, "subdir"), 0777); err != nil { - t.Fatal(err) - } - if err := ioutil.WriteFile(filepath.Join(dir, "subdir", "xyz"), []byte("data for subdir xyz"), 0666); err != nil { - t.Fatal(err) - } - prefix := "foo/bar@v2.3.4" - out, err := DirFiles(dir, prefix) - if err != nil { - t.Fatalf("DirFiles: %v", err) - } - for _, file := range out { - if !strings.HasPrefix(file, prefix) { - t.Errorf("Dir file = %s, want prefix %s", file, prefix) - } - } -} diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go index b80b181642..da704777f5 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go @@ -237,7 +237,7 @@ func runEnv(cmd *base.Command, args []string) { base.Fatalf("go env -w: arguments must be KEY=VALUE: invalid argument: %s", arg) } key, val := arg[:i], arg[i+1:] - if err := checkEnvWrite(key, val, env); err != nil { + if err := checkEnvWrite(key, val); err != nil { base.Fatalf("go env -w: %v", err) } if _, ok := add[key]; ok { @@ -259,7 +259,7 @@ func runEnv(cmd *base.Command, args []string) { } del := make(map[string]bool) for _, arg := range args { - if err := checkEnvWrite(arg, "", env); err != nil { + if err := checkEnvWrite(arg, ""); err != nil { base.Fatalf("go env -u: %v", err) } del[arg] = true @@ -330,7 +330,7 @@ func printEnvAsJSON(env []cfg.EnvVar) { } } -func checkEnvWrite(key, val string, env []cfg.EnvVar) error { +func checkEnvWrite(key, val string) error { switch key { case "GOEXE", "GOGCCFLAGS", "GOHOSTARCH", "GOHOSTOS", "GOMOD", "GOTOOLDIR": return fmt.Errorf("%s cannot be modified", key) diff --git a/src/cmd/go/internal/get/path.go b/src/cmd/go/internal/get/path.go index 95169fa5f1..ce2e0cdd70 100644 --- a/src/cmd/go/internal/get/path.go +++ b/src/cmd/go/internal/get/path.go @@ -11,7 +11,7 @@ import ( "unicode/utf8" ) -// The following functions are copied verbatim from cmd/go/internal/module/module.go, +// The following functions are copied verbatim from golang.org/x/mod/module/module.go, // with a change to additionally reject Windows short-names, // and one to accept arbitrary letters (golang.org/issue/29101). // diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go index 6b8ecc46b1..6a6f77e367 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go @@ -593,7 +593,7 @@ func loadImport(pre *preload, path, srcDir string, parent *Package, stk *ImportS return setErrorPos(perr, importPos) } if mode&ResolveImport != 0 { - if perr := disallowVendor(srcDir, parent, parentPath, path, p, stk); perr != p { + if perr := disallowVendor(srcDir, path, p, stk); perr != p { return setErrorPos(perr, importPos) } } @@ -1321,11 +1321,10 @@ func findInternal(path string) (index int, ok bool) { return 0, false } -// disallowVendor checks that srcDir (containing package importerPath, if non-empty) -// is allowed to import p as path. +// disallowVendor checks that srcDir is allowed to import p as path. // If the import is allowed, disallowVendor returns the original package p. // If not, it returns a new package containing just an appropriate error. -func disallowVendor(srcDir string, importer *Package, importerPath, path string, p *Package, stk *ImportStack) *Package { +func disallowVendor(srcDir string, path string, p *Package, stk *ImportStack) *Package { // The stack includes p.ImportPath. // If that's the only thing on the stack, we started // with a name given on the command line, not an diff --git a/src/cmd/go/internal/modcmd/download.go b/src/cmd/go/internal/modcmd/download.go index 3a86d8ac06..1687cc5794 100644 --- a/src/cmd/go/internal/modcmd/download.go +++ b/src/cmd/go/internal/modcmd/download.go @@ -5,16 +5,17 @@ package modcmd import ( - "cmd/go/internal/cfg" "encoding/json" "os" "cmd/go/internal/base" + "cmd/go/internal/cfg" "cmd/go/internal/modfetch" "cmd/go/internal/modload" - "cmd/go/internal/module" "cmd/go/internal/par" "cmd/go/internal/work" + + "golang.org/x/mod/module" ) var cmdDownload = &base.Command{ diff --git a/src/cmd/go/internal/modcmd/edit.go b/src/cmd/go/internal/modcmd/edit.go index 97cc0fa02f..2a52f55404 100644 --- a/src/cmd/go/internal/modcmd/edit.go +++ b/src/cmd/go/internal/modcmd/edit.go @@ -16,10 +16,11 @@ import ( "cmd/go/internal/base" "cmd/go/internal/modfetch" - "cmd/go/internal/modfile" "cmd/go/internal/modload" - "cmd/go/internal/module" "cmd/go/internal/work" + + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) var cmdEdit = &base.Command{ diff --git a/src/cmd/go/internal/modcmd/graph.go b/src/cmd/go/internal/modcmd/graph.go index 5dbbf332fb..27ae9354f3 100644 --- a/src/cmd/go/internal/modcmd/graph.go +++ b/src/cmd/go/internal/modcmd/graph.go @@ -8,15 +8,16 @@ package modcmd import ( "bufio" - "cmd/go/internal/cfg" "os" "sort" "cmd/go/internal/base" + "cmd/go/internal/cfg" "cmd/go/internal/modload" - "cmd/go/internal/module" "cmd/go/internal/par" "cmd/go/internal/work" + + "golang.org/x/mod/module" ) var cmdGraph = &base.Command{ diff --git a/src/cmd/go/internal/modcmd/tidy.go b/src/cmd/go/internal/modcmd/tidy.go index 1f5a18e05e..584a432d66 100644 --- a/src/cmd/go/internal/modcmd/tidy.go +++ b/src/cmd/go/internal/modcmd/tidy.go @@ -14,8 +14,9 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/modfetch" "cmd/go/internal/modload" - "cmd/go/internal/module" "cmd/go/internal/work" + + "golang.org/x/mod/module" ) var cmdTidy = &base.Command{ diff --git a/src/cmd/go/internal/modcmd/vendor.go b/src/cmd/go/internal/modcmd/vendor.go index 71246b2f68..0c00d1222e 100644 --- a/src/cmd/go/internal/modcmd/vendor.go +++ b/src/cmd/go/internal/modcmd/vendor.go @@ -18,9 +18,10 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/imports" "cmd/go/internal/modload" - "cmd/go/internal/module" - "cmd/go/internal/semver" "cmd/go/internal/work" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) var cmdVendor = &base.Command{ diff --git a/src/cmd/go/internal/modcmd/verify.go b/src/cmd/go/internal/modcmd/verify.go index 72f16a793b..831e5cf85b 100644 --- a/src/cmd/go/internal/modcmd/verify.go +++ b/src/cmd/go/internal/modcmd/verify.go @@ -6,17 +6,18 @@ package modcmd import ( "bytes" - "cmd/go/internal/cfg" "fmt" "io/ioutil" "os" "cmd/go/internal/base" - "cmd/go/internal/dirhash" + "cmd/go/internal/cfg" "cmd/go/internal/modfetch" "cmd/go/internal/modload" - "cmd/go/internal/module" "cmd/go/internal/work" + + "golang.org/x/mod/module" + "golang.org/x/mod/sumdb/dirhash" ) var cmdVerify = &base.Command{ diff --git a/src/cmd/go/internal/modcmd/why.go b/src/cmd/go/internal/modcmd/why.go index 93d64dcb59..40d238519b 100644 --- a/src/cmd/go/internal/modcmd/why.go +++ b/src/cmd/go/internal/modcmd/why.go @@ -5,12 +5,14 @@ package modcmd import ( + "fmt" + "strings" + "cmd/go/internal/base" "cmd/go/internal/modload" - "cmd/go/internal/module" "cmd/go/internal/work" - "fmt" - "strings" + + "golang.org/x/mod/module" ) var cmdWhy = &base.Command{ diff --git a/src/cmd/go/internal/modconv/convert.go b/src/cmd/go/internal/modconv/convert.go index 558664a8b3..f465a9f395 100644 --- a/src/cmd/go/internal/modconv/convert.go +++ b/src/cmd/go/internal/modconv/convert.go @@ -13,10 +13,11 @@ import ( "cmd/go/internal/base" "cmd/go/internal/modfetch" - "cmd/go/internal/modfile" - "cmd/go/internal/module" "cmd/go/internal/par" - "cmd/go/internal/semver" + + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) // ConvertLegacyConfig converts legacy config to modfile. diff --git a/src/cmd/go/internal/modconv/convert_test.go b/src/cmd/go/internal/modconv/convert_test.go index 8ff229bd14..a2a2601967 100644 --- a/src/cmd/go/internal/modconv/convert_test.go +++ b/src/cmd/go/internal/modconv/convert_test.go @@ -19,8 +19,9 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/modfetch" "cmd/go/internal/modfetch/codehost" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func TestMain(m *testing.M) { diff --git a/src/cmd/go/internal/modconv/dep.go b/src/cmd/go/internal/modconv/dep.go index ccd1fc7b75..2e673c3ab9 100644 --- a/src/cmd/go/internal/modconv/dep.go +++ b/src/cmd/go/internal/modconv/dep.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" - "cmd/go/internal/modfile" - "cmd/go/internal/module" - "cmd/go/internal/semver" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) func ParseGopkgLock(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modconv/glide.go b/src/cmd/go/internal/modconv/glide.go index 18ab57814d..d1de3f7139 100644 --- a/src/cmd/go/internal/modconv/glide.go +++ b/src/cmd/go/internal/modconv/glide.go @@ -7,8 +7,8 @@ package modconv import ( "strings" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func ParseGlideLock(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modconv/glock.go b/src/cmd/go/internal/modconv/glock.go index 164a8e70d9..b8dc204617 100644 --- a/src/cmd/go/internal/modconv/glock.go +++ b/src/cmd/go/internal/modconv/glock.go @@ -7,8 +7,8 @@ package modconv import ( "strings" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func ParseGLOCKFILE(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modconv/godeps.go b/src/cmd/go/internal/modconv/godeps.go index 6398dbe7cd..09c0fa3dda 100644 --- a/src/cmd/go/internal/modconv/godeps.go +++ b/src/cmd/go/internal/modconv/godeps.go @@ -7,8 +7,8 @@ package modconv import ( "encoding/json" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func ParseGodepsJSON(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modconv/modconv.go b/src/cmd/go/internal/modconv/modconv.go index a58673382e..dc0607235f 100644 --- a/src/cmd/go/internal/modconv/modconv.go +++ b/src/cmd/go/internal/modconv/modconv.go @@ -4,7 +4,7 @@ package modconv -import "cmd/go/internal/modfile" +import "golang.org/x/mod/modfile" var Converters = map[string]func(string, []byte) (*modfile.File, error){ "GLOCKFILE": ParseGLOCKFILE, diff --git a/src/cmd/go/internal/modconv/tsv.go b/src/cmd/go/internal/modconv/tsv.go index 106cddedd3..4649579f65 100644 --- a/src/cmd/go/internal/modconv/tsv.go +++ b/src/cmd/go/internal/modconv/tsv.go @@ -7,8 +7,8 @@ package modconv import ( "strings" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func ParseDependenciesTSV(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modconv/vconf.go b/src/cmd/go/internal/modconv/vconf.go index f62eba7762..9bad2baf8f 100644 --- a/src/cmd/go/internal/modconv/vconf.go +++ b/src/cmd/go/internal/modconv/vconf.go @@ -7,8 +7,8 @@ package modconv import ( "strings" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func ParseVendorConf(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modconv/vjson.go b/src/cmd/go/internal/modconv/vjson.go index eec86b7339..1bd025c980 100644 --- a/src/cmd/go/internal/modconv/vjson.go +++ b/src/cmd/go/internal/modconv/vjson.go @@ -7,8 +7,8 @@ package modconv import ( "encoding/json" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func ParseVendorJSON(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modconv/vmanifest.go b/src/cmd/go/internal/modconv/vmanifest.go index c0ef2a9862..bcf00083a5 100644 --- a/src/cmd/go/internal/modconv/vmanifest.go +++ b/src/cmd/go/internal/modconv/vmanifest.go @@ -7,8 +7,8 @@ package modconv import ( "encoding/json" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func ParseVendorManifest(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modconv/vyml.go b/src/cmd/go/internal/modconv/vyml.go index 8a06519932..cfa41941d5 100644 --- a/src/cmd/go/internal/modconv/vyml.go +++ b/src/cmd/go/internal/modconv/vyml.go @@ -7,8 +7,8 @@ package modconv import ( "strings" - "cmd/go/internal/modfile" - "cmd/go/internal/module" + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" ) func ParseVendorYML(file string, data []byte) (*modfile.File, error) { diff --git a/src/cmd/go/internal/modfetch/bootstrap.go b/src/cmd/go/internal/modfetch/bootstrap.go index 8f31589ebf..e4020b0b41 100644 --- a/src/cmd/go/internal/modfetch/bootstrap.go +++ b/src/cmd/go/internal/modfetch/bootstrap.go @@ -6,7 +6,7 @@ package modfetch -import "cmd/go/internal/module" +import "golang.org/x/mod/module" func useSumDB(mod module.Version) bool { return false diff --git a/src/cmd/go/internal/modfetch/cache.go b/src/cmd/go/internal/modfetch/cache.go index 340ffa2272..58b510301d 100644 --- a/src/cmd/go/internal/modfetch/cache.go +++ b/src/cmd/go/internal/modfetch/cache.go @@ -18,10 +18,11 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/lockedfile" "cmd/go/internal/modfetch/codehost" - "cmd/go/internal/module" "cmd/go/internal/par" "cmd/go/internal/renameio" - "cmd/go/internal/semver" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) var QuietLookup bool // do not print about lookups diff --git a/src/cmd/go/internal/modfetch/codehost/git.go b/src/cmd/go/internal/modfetch/codehost/git.go index 4a08f8ded6..e329cbc58e 100644 --- a/src/cmd/go/internal/modfetch/codehost/git.go +++ b/src/cmd/go/internal/modfetch/codehost/git.go @@ -22,8 +22,9 @@ import ( "cmd/go/internal/lockedfile" "cmd/go/internal/par" - "cmd/go/internal/semver" "cmd/go/internal/web" + + "golang.org/x/mod/semver" ) // GitRepo returns the code repository at the given Git remote reference. diff --git a/src/cmd/go/internal/modfetch/codehost/svn.go b/src/cmd/go/internal/modfetch/codehost/svn.go new file mode 100644 index 0000000000..6ec9e59c9c --- /dev/null +++ b/src/cmd/go/internal/modfetch/codehost/svn.go @@ -0,0 +1,154 @@ +// Copyright 2019 The Go 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 codehost + +import ( + "archive/zip" + "encoding/xml" + "fmt" + "io" + "os" + "path" + "path/filepath" + "time" +) + +func svnParseStat(rev, out string) (*RevInfo, error) { + var log struct { + Logentry struct { + Revision int64 `xml:"revision,attr"` + Date string `xml:"date"` + } `xml:"logentry"` + } + if err := xml.Unmarshal([]byte(out), &log); err != nil { + return nil, vcsErrorf("unexpected response from svn log --xml: %v\n%s", err, out) + } + + t, err := time.Parse(time.RFC3339, log.Logentry.Date) + if err != nil { + return nil, vcsErrorf("unexpected response from svn log --xml: %v\n%s", err, out) + } + + info := &RevInfo{ + Name: fmt.Sprintf("%d", log.Logentry.Revision), + Short: fmt.Sprintf("%012d", log.Logentry.Revision), + Time: t.UTC(), + Version: rev, + } + return info, nil +} + +func svnReadZip(dst io.Writer, workDir, rev, subdir, remote string) (err error) { + // The subversion CLI doesn't provide a command to write the repository + // directly to an archive, so we need to export it to the local filesystem + // instead. Unfortunately, the local filesystem might apply arbitrary + // normalization to the filenames, so we need to obtain those directly. + // + // 'svn export' prints the filenames as they are written, but from reading the + // svn source code (as of revision 1868933), those filenames are encoded using + // the system locale rather than preserved byte-for-byte from the origin. For + // our purposes, that won't do, but we don't want to go mucking around with + // the user's locale settings either — that could impact error messages, and + // we don't know what locales the user has available or what LC_* variables + // their platform supports. + // + // Instead, we'll do a two-pass export: first we'll run 'svn list' to get the + // canonical filenames, then we'll 'svn export' and look for those filenames + // in the local filesystem. (If there is an encoding problem at that point, we + // would probably reject the resulting module anyway.) + + remotePath := remote + if subdir != "" { + remotePath += "/" + subdir + } + + out, err := Run(workDir, []string{ + "svn", "list", + "--non-interactive", + "--xml", + "--incremental", + "--recursive", + "--revision", rev, + "--", remotePath, + }) + if err != nil { + return err + } + + type listEntry struct { + Kind string `xml:"kind,attr"` + Name string `xml:"name"` + Size int64 `xml:"size"` + } + var list struct { + Entries []listEntry `xml:"entry"` + } + if err := xml.Unmarshal(out, &list); err != nil { + return vcsErrorf("unexpected response from svn list --xml: %v\n%s", err, out) + } + + exportDir := filepath.Join(workDir, "export") + // Remove any existing contents from a previous (failed) run. + if err := os.RemoveAll(exportDir); err != nil { + return err + } + defer os.RemoveAll(exportDir) // best-effort + + _, err = Run(workDir, []string{ + "svn", "export", + "--non-interactive", + "--quiet", + + // Suppress any platform- or host-dependent transformations. + "--native-eol", "LF", + "--ignore-externals", + "--ignore-keywords", + + "--revision", rev, + "--", remotePath, + exportDir, + }) + if err != nil { + return err + } + + // Scrape the exported files out of the filesystem and encode them in the zipfile. + + // “All files in the zip file are expected to be + // nested in a single top-level directory, whose name is not specified.” + // We'll (arbitrarily) choose the base of the remote path. + basePath := path.Join(path.Base(remote), subdir) + + zw := zip.NewWriter(dst) + for _, e := range list.Entries { + if e.Kind != "file" { + continue + } + + zf, err := zw.Create(path.Join(basePath, e.Name)) + if err != nil { + return err + } + + f, err := os.Open(filepath.Join(exportDir, e.Name)) + if err != nil { + if os.IsNotExist(err) { + return vcsErrorf("file reported by 'svn list', but not written by 'svn export': %s", e.Name) + } + return fmt.Errorf("error opening file created by 'svn export': %v", err) + } + + n, err := io.Copy(zf, f) + f.Close() + if err != nil { + return err + } + if n != e.Size { + return vcsErrorf("file size differs between 'svn list' and 'svn export': file %s listed as %v bytes, but exported as %v bytes", e.Name, e.Size, n) + } + } + + return zw.Close() +} diff --git a/src/cmd/go/internal/modfetch/codehost/vcs.go b/src/cmd/go/internal/modfetch/codehost/vcs.go index c9f77bf3b2..7284557f4b 100644 --- a/src/cmd/go/internal/modfetch/codehost/vcs.go +++ b/src/cmd/go/internal/modfetch/codehost/vcs.go @@ -5,7 +5,7 @@ package codehost import ( - "encoding/xml" + "errors" "fmt" "internal/lazyregexp" "io" @@ -122,19 +122,20 @@ func newVCSRepo(vcs, remote string) (Repo, error) { const vcsWorkDirType = "vcs1." type vcsCmd struct { - vcs string // vcs name "hg" - init func(remote string) []string // cmd to init repo to track remote - tags func(remote string) []string // cmd to list local tags - tagRE *lazyregexp.Regexp // regexp to extract tag names from output of tags cmd - branches func(remote string) []string // cmd to list local branches - branchRE *lazyregexp.Regexp // regexp to extract branch names from output of tags cmd - badLocalRevRE *lazyregexp.Regexp // regexp of names that must not be served out of local cache without doing fetch first - statLocal func(rev, remote string) []string // cmd to stat local rev - parseStat func(rev, out string) (*RevInfo, error) // cmd to parse output of statLocal - fetch []string // cmd to fetch everything from remote - latest string // name of latest commit on remote (tip, HEAD, etc) - readFile func(rev, file, remote string) []string // cmd to read rev's file - readZip func(rev, subdir, remote, target string) []string // cmd to read rev's subdir as zip file + vcs string // vcs name "hg" + init func(remote string) []string // cmd to init repo to track remote + tags func(remote string) []string // cmd to list local tags + tagRE *lazyregexp.Regexp // regexp to extract tag names from output of tags cmd + branches func(remote string) []string // cmd to list local branches + branchRE *lazyregexp.Regexp // regexp to extract branch names from output of tags cmd + badLocalRevRE *lazyregexp.Regexp // regexp of names that must not be served out of local cache without doing fetch first + statLocal func(rev, remote string) []string // cmd to stat local rev + parseStat func(rev, out string) (*RevInfo, error) // cmd to parse output of statLocal + fetch []string // cmd to fetch everything from remote + latest string // name of latest commit on remote (tip, HEAD, etc) + readFile func(rev, file, remote string) []string // cmd to read rev's file + readZip func(rev, subdir, remote, target string) []string // cmd to read rev's subdir as zip file + doReadZip func(dst io.Writer, workDir, rev, subdir, remote string) error // arbitrary function to read rev's subdir as zip file } var re = lazyregexp.New @@ -191,7 +192,7 @@ var vcsCmds = map[string]*vcsCmd{ readFile: func(rev, file, remote string) []string { return []string{"svn", "cat", "--", remote + "/" + file + "@" + rev} }, - // TODO: zip + doReadZip: svnReadZip, }, "bzr": { @@ -418,7 +419,7 @@ func (r *vcsRepo) DescendsFrom(rev, tag string) (bool, error) { } func (r *vcsRepo) ReadZip(rev, subdir string, maxSize int64) (zip io.ReadCloser, err error) { - if r.cmd.readZip == nil { + if r.cmd.readZip == nil && r.cmd.doReadZip == nil { return nil, vcsErrorf("ReadZip not implemented for %s", r.cmd.vcs) } @@ -435,7 +436,17 @@ func (r *vcsRepo) ReadZip(rev, subdir string, maxSize int64) (zip io.ReadCloser, if err != nil { return nil, err } - if r.cmd.vcs == "fossil" { + if r.cmd.doReadZip != nil { + lw := &limitedWriter{ + W: f, + N: maxSize, + ErrLimitReached: errors.New("ReadZip: encoded file exceeds allowed size"), + } + err = r.cmd.doReadZip(lw, r.dir, rev, subdir, r.remote) + if err == nil { + _, err = f.Seek(0, io.SeekStart) + } + } else if r.cmd.vcs == "fossil" { // If you run // fossil zip -R .fossil --name prefix trunk /tmp/x.zip // fossil fails with "unable to create directory /tmp" [sic]. @@ -502,31 +513,6 @@ func hgParseStat(rev, out string) (*RevInfo, error) { return info, nil } -func svnParseStat(rev, out string) (*RevInfo, error) { - var log struct { - Logentry struct { - Revision int64 `xml:"revision,attr"` - Date string `xml:"date"` - } `xml:"logentry"` - } - if err := xml.Unmarshal([]byte(out), &log); err != nil { - return nil, vcsErrorf("unexpected response from svn log --xml: %v\n%s", err, out) - } - - t, err := time.Parse(time.RFC3339, log.Logentry.Date) - if err != nil { - return nil, vcsErrorf("unexpected response from svn log --xml: %v\n%s", err, out) - } - - info := &RevInfo{ - Name: fmt.Sprintf("%d", log.Logentry.Revision), - Short: fmt.Sprintf("%012d", log.Logentry.Revision), - Time: t.UTC(), - Version: rev, - } - return info, nil -} - func bzrParseStat(rev, out string) (*RevInfo, error) { var revno int64 var tm time.Time @@ -606,3 +592,25 @@ func fossilParseStat(rev, out string) (*RevInfo, error) { } return nil, vcsErrorf("unexpected response from fossil info: %q", out) } + +type limitedWriter struct { + W io.Writer + N int64 + ErrLimitReached error +} + +func (l *limitedWriter) Write(p []byte) (n int, err error) { + if l.N > 0 { + max := len(p) + if l.N < int64(max) { + max = int(l.N) + } + n, err = l.W.Write(p[:max]) + l.N -= int64(n) + if err != nil || n >= len(p) { + return n, err + } + } + + return n, l.ErrLimitReached +} diff --git a/src/cmd/go/internal/modfetch/coderepo.go b/src/cmd/go/internal/modfetch/coderepo.go index 600b2e75c3..477d4bf3b7 100644 --- a/src/cmd/go/internal/modfetch/coderepo.go +++ b/src/cmd/go/internal/modfetch/coderepo.go @@ -16,9 +16,10 @@ import ( "time" "cmd/go/internal/modfetch/codehost" - "cmd/go/internal/modfile" - "cmd/go/internal/module" - "cmd/go/internal/semver" + + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) // A codeRepo implements modfetch.Repo using an underlying codehost.Repo. diff --git a/src/cmd/go/internal/modfetch/coderepo_test.go b/src/cmd/go/internal/modfetch/coderepo_test.go index 663324b3dd..397f274978 100644 --- a/src/cmd/go/internal/modfetch/coderepo_test.go +++ b/src/cmd/go/internal/modfetch/coderepo_test.go @@ -6,7 +6,11 @@ package modfetch import ( "archive/zip" + "crypto/sha256" + "encoding/hex" + "hash" "internal/testenv" + "io" "io/ioutil" "log" "os" @@ -17,6 +21,8 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/modfetch/codehost" + + "golang.org/x/mod/sumdb/dirhash" ) func TestMain(m *testing.M) { @@ -52,20 +58,22 @@ var altVgotests = map[string]string{ } type codeRepoTest struct { - vcs string - path string - lookerr string - mpath string - rev string - err string - version string - name string - short string - time time.Time - gomod string - gomoderr string - zip []string - ziperr string + vcs string + path string + lookErr string + mpath string + rev string + err string + version string + name string + short string + time time.Time + gomod string + gomodErr string + zip []string + zipErr string + zipSum string + zipFileHash string } var codeRepoTests = []codeRepoTest{ @@ -82,6 +90,8 @@ var codeRepoTests = []codeRepoTest{ "README.md", "pkg/p.go", }, + zipSum: "h1:zVEjciLdlk/TPWCOyZo7k24T+tOKRQC+u8MKq/xS80I=", + zipFileHash: "738a00ddbfe8c329dce6b48e1f23c8e22a92db50f3cfb2653caa0d62676bc09c", }, { vcs: "git", @@ -96,6 +106,8 @@ var codeRepoTests = []codeRepoTest{ "README.md", "pkg/p.go", }, + zipSum: "h1:nOznk2xKsLGkTnXe0q9t1Ewt9jxK+oadtafSUqHM3Ec=", + zipFileHash: "bacb08f391e29d2eaaef8281b5c129ee6d890e608ee65877e0003c0181a766c8", }, { vcs: "git", @@ -116,6 +128,8 @@ var codeRepoTests = []codeRepoTest{ "README.md", "pkg/p.go", }, + zipSum: "h1:e040hOoWGeuJLawDjK9DW6med+cz9FxMFYDMOVG8ctQ=", + zipFileHash: "74caab65cfbea427c341fa815f3bb0378681d8f0e3cf62a7f207014263ec7be3", }, { vcs: "git", @@ -140,6 +154,8 @@ var codeRepoTests = []codeRepoTest{ "README.md", "pkg/p.go", }, + zipSum: "h1:e040hOoWGeuJLawDjK9DW6med+cz9FxMFYDMOVG8ctQ=", + zipFileHash: "74caab65cfbea427c341fa815f3bb0378681d8f0e3cf62a7f207014263ec7be3", }, { vcs: "git", @@ -201,6 +217,8 @@ var codeRepoTests = []codeRepoTest{ "pkg/p.go", "LICENSE", }, + zipSum: "h1:iMsJ/9uQsk6MnZNnJK311f11QiSlmN92Q2aSjCywuJY=", + zipFileHash: "95801bfa69c5197ae809af512946d22f22850068527cd78100ae3f176bc8043b", }, { vcs: "git", @@ -217,16 +235,20 @@ var codeRepoTests = []codeRepoTest{ "go.mod", "pkg/p.go", }, + zipSum: "h1:M69k7q+8bQ+QUpHov45Z/NoR8rj3DsQJUnXLWvf01+Q=", + zipFileHash: "58af45fb248d320ea471f568e006379e2b8d71d6d1663f9b19b2e00fd9ac9265", }, { - vcs: "git", - path: "github.com/rsc/vgotest1/v2", - rev: "v2.0.1", - version: "v2.0.1", - name: "ea65f87c8f52c15ea68f3bdd9925ef17e20d91e9", - short: "ea65f87c8f52", - time: time.Date(2018, 2, 19, 23, 14, 23, 0, time.UTC), - gomod: "module \"github.com/rsc/vgotest1/v2\" // root go.mod\n", + vcs: "git", + path: "github.com/rsc/vgotest1/v2", + rev: "v2.0.1", + version: "v2.0.1", + name: "ea65f87c8f52c15ea68f3bdd9925ef17e20d91e9", + short: "ea65f87c8f52", + time: time.Date(2018, 2, 19, 23, 14, 23, 0, time.UTC), + gomod: "module \"github.com/rsc/vgotest1/v2\" // root go.mod\n", + zipSum: "h1:QmgYy/zt+uoWhDpcsgrSVzYFvKtBEjl5zT/FRz9GTzA=", + zipFileHash: "1aedf1546d322a0121879ddfd6d0e8bfbd916d2cafbeb538ddb440e04b04b9ef", }, { vcs: "git", @@ -249,25 +271,29 @@ var codeRepoTests = []codeRepoTest{ err: "github.com/rsc/vgotest1/go.mod and .../v2/go.mod both have .../v2 module paths at revision v2.0.4", }, { - vcs: "git", - path: "github.com/rsc/vgotest1/v2", - rev: "v2.0.5", - version: "v2.0.5", - name: "2f615117ce481c8efef46e0cc0b4b4dccfac8fea", - short: "2f615117ce48", - time: time.Date(2018, 2, 20, 0, 3, 59, 0, time.UTC), - gomod: "module \"github.com/rsc/vgotest1/v2\" // v2/go.mod\n", + vcs: "git", + path: "github.com/rsc/vgotest1/v2", + rev: "v2.0.5", + version: "v2.0.5", + name: "2f615117ce481c8efef46e0cc0b4b4dccfac8fea", + short: "2f615117ce48", + time: time.Date(2018, 2, 20, 0, 3, 59, 0, time.UTC), + gomod: "module \"github.com/rsc/vgotest1/v2\" // v2/go.mod\n", + zipSum: "h1:RIEb9q1SUSEQOzMn0zfl/LQxGFWlhWEAdeEguf1MLGU=", + zipFileHash: "7d92c2c328c5e9b0694101353705d5843746ec1d93a1e986d0da54c8a14dfe6d", }, { // redirect to github - vcs: "git", - path: "rsc.io/quote", - rev: "v1.0.0", - version: "v1.0.0", - name: "f488df80bcdbd3e5bafdc24ad7d1e79e83edd7e6", - short: "f488df80bcdb", - time: time.Date(2018, 2, 14, 0, 45, 20, 0, time.UTC), - gomod: "module \"rsc.io/quote\"\n", + vcs: "git", + path: "rsc.io/quote", + rev: "v1.0.0", + version: "v1.0.0", + name: "f488df80bcdbd3e5bafdc24ad7d1e79e83edd7e6", + short: "f488df80bcdb", + time: time.Date(2018, 2, 14, 0, 45, 20, 0, time.UTC), + gomod: "module \"rsc.io/quote\"\n", + zipSum: "h1:haUSojyo3j2M9g7CEUFG8Na09dtn7QKxvPGaPVQdGwM=", + zipFileHash: "5c08ba2c09a364f93704aaa780e7504346102c6ef4fe1333a11f09904a732078", }, { // redirect to static hosting proxy @@ -281,22 +307,26 @@ var codeRepoTests = []codeRepoTest{ }, { // redirect to googlesource - vcs: "git", - path: "golang.org/x/text", - rev: "4e4a3210bb", - version: "v0.3.1-0.20180208041248-4e4a3210bb54", - name: "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1", - short: "4e4a3210bb54", - time: time.Date(2018, 2, 8, 4, 12, 48, 0, time.UTC), + vcs: "git", + path: "golang.org/x/text", + rev: "4e4a3210bb", + version: "v0.3.1-0.20180208041248-4e4a3210bb54", + name: "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1", + short: "4e4a3210bb54", + time: time.Date(2018, 2, 8, 4, 12, 48, 0, time.UTC), + zipSum: "h1:Yxu6pHX9X2RECiuw/Q5/4uvajuaowck8zOFKXgbfNBk=", + zipFileHash: "ac2c165a5c10aa5a7545dea60a08e019270b982fa6c8bdcb5943931de64922fe", }, { - vcs: "git", - path: "github.com/pkg/errors", - rev: "v0.8.0", - version: "v0.8.0", - name: "645ef00459ed84a119197bfb8d8205042c6df63d", - short: "645ef00459ed", - time: time.Date(2016, 9, 29, 1, 48, 1, 0, time.UTC), + vcs: "git", + path: "github.com/pkg/errors", + rev: "v0.8.0", + version: "v0.8.0", + name: "645ef00459ed84a119197bfb8d8205042c6df63d", + short: "645ef00459ed", + time: time.Date(2016, 9, 29, 1, 48, 1, 0, time.UTC), + zipSum: "h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=", + zipFileHash: "e4fa69ba057356614edbc1da881a7d3ebb688505be49f65965686bcb859e2fae", }, { // package in subdirectory - custom domain @@ -304,7 +334,7 @@ var codeRepoTests = []codeRepoTest{ // but gopkg.in is special. vcs: "git", path: "gopkg.in/yaml.v2/abc", - lookerr: "invalid module path \"gopkg.in/yaml.v2/abc\"", + lookErr: "invalid module path \"gopkg.in/yaml.v2/abc\"", }, { // package in subdirectory - github @@ -315,54 +345,64 @@ var codeRepoTests = []codeRepoTest{ err: "missing github.com/rsc/quote/buggy/go.mod at revision c4d4236f9242", }, { - vcs: "git", - path: "gopkg.in/yaml.v2", - rev: "d670f940", - version: "v2.0.0", - name: "d670f9405373e636a5a2765eea47fac0c9bc91a4", - short: "d670f9405373", - time: time.Date(2018, 1, 9, 11, 43, 31, 0, time.UTC), - gomod: "module gopkg.in/yaml.v2\n", + vcs: "git", + path: "gopkg.in/yaml.v2", + rev: "d670f940", + version: "v2.0.0", + name: "d670f9405373e636a5a2765eea47fac0c9bc91a4", + short: "d670f9405373", + time: time.Date(2018, 1, 9, 11, 43, 31, 0, time.UTC), + gomod: "module gopkg.in/yaml.v2\n", + zipSum: "h1:uUkhRGrsEyx/laRdeS6YIQKIys8pg+lRSRdVMTYjivs=", + zipFileHash: "7b0a141b1b0b49772ab4eecfd11dfd6609a94a5e868cab04a3abb1861ffaa877", }, { - vcs: "git", - path: "gopkg.in/check.v1", - rev: "20d25e280405", - version: "v1.0.0-20161208181325-20d25e280405", - name: "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec", - short: "20d25e280405", - time: time.Date(2016, 12, 8, 18, 13, 25, 0, time.UTC), - gomod: "module gopkg.in/check.v1\n", + vcs: "git", + path: "gopkg.in/check.v1", + rev: "20d25e280405", + version: "v1.0.0-20161208181325-20d25e280405", + name: "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec", + short: "20d25e280405", + time: time.Date(2016, 12, 8, 18, 13, 25, 0, time.UTC), + gomod: "module gopkg.in/check.v1\n", + zipSum: "h1:829vOVxxusYHC+IqBtkX5mbKtsY9fheQiQn0MZRVLfQ=", + zipFileHash: "9e7cb3f4f1e66d722306442b0dbe1f6f43d74d1736d54c510537bdfb1d6f432f", }, { - vcs: "git", - path: "gopkg.in/yaml.v2", - rev: "v2", - version: "v2.2.5-0.20191002202810-970885f01c8b", - name: "970885f01c8bc1fecb7ab1c8ce8e7609bda45530", - short: "970885f01c8b", - time: time.Date(2019, 10, 2, 20, 28, 10, 0, time.UTC), - gomod: "module \"gopkg.in/yaml.v2\"\n\nrequire (\n\t\"gopkg.in/check.v1\" v0.0.0-20161208181325-20d25e280405\n)\n", + vcs: "git", + path: "gopkg.in/yaml.v2", + rev: "v2", + version: "v2.2.5-0.20191002202810-970885f01c8b", + name: "970885f01c8bc1fecb7ab1c8ce8e7609bda45530", + short: "970885f01c8b", + time: time.Date(2019, 10, 2, 20, 28, 10, 0, time.UTC), + gomod: "module \"gopkg.in/yaml.v2\"\n\nrequire (\n\t\"gopkg.in/check.v1\" v0.0.0-20161208181325-20d25e280405\n)\n", + zipSum: "h1:c7zdkYUaqShimBvZzvhOA+Absl0aDaGKX267vSm0Z7E=", + zipFileHash: "5856a108e1aa8ec9c35f4479f8e806652b326b648c80abd08fc403707f4eb5f1", }, { - vcs: "git", - path: "vcs-test.golang.org/go/mod/gitrepo1", - rev: "master", - version: "v1.2.4-annotated", - name: "ede458df7cd0fdca520df19a33158086a8a68e81", - short: "ede458df7cd0", - time: time.Date(2018, 4, 17, 19, 43, 22, 0, time.UTC), - gomod: "module vcs-test.golang.org/go/mod/gitrepo1\n", + vcs: "git", + path: "vcs-test.golang.org/go/mod/gitrepo1", + rev: "master", + version: "v1.2.4-annotated", + name: "ede458df7cd0fdca520df19a33158086a8a68e81", + short: "ede458df7cd0", + time: time.Date(2018, 4, 17, 19, 43, 22, 0, time.UTC), + gomod: "module vcs-test.golang.org/go/mod/gitrepo1\n", + zipSum: "h1:YJYZRsM9BHFTlVr8YADjT0cJH8uFIDtoc5NLiVqZEx8=", + zipFileHash: "c15e49d58b7a4c37966cbe5bc01a0330cd5f2927e990e1839bda1d407766d9c5", }, { - vcs: "git", - path: "gopkg.in/natefinch/lumberjack.v2", - rev: "latest", - version: "v2.0.0-20170531160350-a96e63847dc3", - name: "a96e63847dc3c67d17befa69c303767e2f84e54f", - short: "a96e63847dc3", - time: time.Date(2017, 5, 31, 16, 3, 50, 0, time.UTC), - gomod: "module gopkg.in/natefinch/lumberjack.v2\n", + vcs: "git", + path: "gopkg.in/natefinch/lumberjack.v2", + rev: "latest", + version: "v2.0.0-20170531160350-a96e63847dc3", + name: "a96e63847dc3c67d17befa69c303767e2f84e54f", + short: "a96e63847dc3", + time: time.Date(2017, 5, 31, 16, 3, 50, 0, time.UTC), + gomod: "module gopkg.in/natefinch/lumberjack.v2\n", + zipSum: "h1:AFxeG48hTWHhDTQDk/m2gorfVHUEa9vo3tp3D7TzwjI=", + zipFileHash: "b5de0da7bbbec76709eef1ac71b6c9ff423b9fbf3bb97b56743450d4937b06d5", }, { vcs: "git", @@ -381,14 +421,16 @@ var codeRepoTests = []codeRepoTest{ gomod: "module gopkg.in/natefinch/lumberjack.v2\n", }, { - vcs: "git", - path: "vcs-test.golang.org/go/v2module/v2", - rev: "v2.0.0", - version: "v2.0.0", - name: "203b91c896acd173aa719e4cdcb7d463c4b090fa", - short: "203b91c896ac", - time: time.Date(2019, 4, 3, 15, 52, 15, 0, time.UTC), - gomod: "module vcs-test.golang.org/go/v2module/v2\n\ngo 1.12\n", + vcs: "git", + path: "vcs-test.golang.org/go/v2module/v2", + rev: "v2.0.0", + version: "v2.0.0", + name: "203b91c896acd173aa719e4cdcb7d463c4b090fa", + short: "203b91c896ac", + time: time.Date(2019, 4, 3, 15, 52, 15, 0, time.UTC), + gomod: "module vcs-test.golang.org/go/v2module/v2\n\ngo 1.12\n", + zipSum: "h1:JItBZ+gwA5WvtZEGEbuDL4lUttGtLrs53lmdurq3bOg=", + zipFileHash: "9ea9ae1673cffcc44b7fdd3cc89953d68c102449b46c982dbf085e4f2e394da5", }, } @@ -411,21 +453,23 @@ func TestCodeRepo(t *testing.T) { } repo, err := Lookup("direct", tt.path) - if tt.lookerr != "" { - if err != nil && err.Error() == tt.lookerr { + if tt.lookErr != "" { + if err != nil && err.Error() == tt.lookErr { return } - t.Errorf("Lookup(%q): %v, want error %q", tt.path, err, tt.lookerr) + t.Errorf("Lookup(%q): %v, want error %q", tt.path, err, tt.lookErr) } if err != nil { t.Fatalf("Lookup(%q): %v", tt.path, err) } + if tt.mpath == "" { tt.mpath = tt.path } if mpath := repo.ModulePath(); mpath != tt.mpath { t.Errorf("repo.ModulePath() = %q, want %q", mpath, tt.mpath) } + info, err := repo.Stat(tt.rev) if err != nil { if tt.err != "" { @@ -451,56 +495,86 @@ func TestCodeRepo(t *testing.T) { if !info.Time.Equal(tt.time) { t.Errorf("info.Time = %v, want %v", info.Time, tt.time) } - if tt.gomod != "" || tt.gomoderr != "" { + + if tt.gomod != "" || tt.gomodErr != "" { data, err := repo.GoMod(tt.version) - if err != nil && tt.gomoderr == "" { + if err != nil && tt.gomodErr == "" { t.Errorf("repo.GoMod(%q): %v", tt.version, err) - } else if err != nil && tt.gomoderr != "" { - if err.Error() != tt.gomoderr { - t.Errorf("repo.GoMod(%q): %v, want %q", tt.version, err, tt.gomoderr) + } else if err != nil && tt.gomodErr != "" { + if err.Error() != tt.gomodErr { + t.Errorf("repo.GoMod(%q): %v, want %q", tt.version, err, tt.gomodErr) } - } else if tt.gomoderr != "" { - t.Errorf("repo.GoMod(%q) = %q, want error %q", tt.version, data, tt.gomoderr) + } else if tt.gomodErr != "" { + t.Errorf("repo.GoMod(%q) = %q, want error %q", tt.version, data, tt.gomodErr) } else if string(data) != tt.gomod { t.Errorf("repo.GoMod(%q) = %q, want %q", tt.version, data, tt.gomod) } } - if tt.zip != nil || tt.ziperr != "" { + + needHash := !testing.Short() && (tt.zipFileHash != "" || tt.zipSum != "") + if tt.zip != nil || tt.zipErr != "" || needHash { f, err := ioutil.TempFile(tmpdir, tt.version+".zip.") if err != nil { t.Fatalf("ioutil.TempFile: %v", err) } zipfile := f.Name() - err = repo.Zip(f, tt.version) + defer func() { + f.Close() + os.Remove(zipfile) + }() + + var w io.Writer + var h hash.Hash + if needHash { + h = sha256.New() + w = io.MultiWriter(f, h) + } else { + w = f + } + err = repo.Zip(w, tt.version) f.Close() if err != nil { - if tt.ziperr != "" { - if err.Error() == tt.ziperr { + if tt.zipErr != "" { + if err.Error() == tt.zipErr { return } - t.Fatalf("repo.Zip(%q): %v, want error %q", tt.version, err, tt.ziperr) + t.Fatalf("repo.Zip(%q): %v, want error %q", tt.version, err, tt.zipErr) } t.Fatalf("repo.Zip(%q): %v", tt.version, err) } - if tt.ziperr != "" { - t.Errorf("repo.Zip(%q): success, want error %q", tt.version, tt.ziperr) + if tt.zipErr != "" { + t.Errorf("repo.Zip(%q): success, want error %q", tt.version, tt.zipErr) } - prefix := tt.path + "@" + tt.version + "/" - z, err := zip.OpenReader(zipfile) - if err != nil { - t.Fatalf("open zip %s: %v", zipfile, err) - } - var names []string - for _, file := range z.File { - if !strings.HasPrefix(file.Name, prefix) { - t.Errorf("zip entry %v does not start with prefix %v", file.Name, prefix) - continue + + if tt.zip != nil { + prefix := tt.path + "@" + tt.version + "/" + z, err := zip.OpenReader(zipfile) + if err != nil { + t.Fatalf("open zip %s: %v", zipfile, err) + } + var names []string + for _, file := range z.File { + if !strings.HasPrefix(file.Name, prefix) { + t.Errorf("zip entry %v does not start with prefix %v", file.Name, prefix) + continue + } + names = append(names, file.Name[len(prefix):]) + } + z.Close() + if !reflect.DeepEqual(names, tt.zip) { + t.Fatalf("zip = %v\nwant %v\n", names, tt.zip) } - names = append(names, file.Name[len(prefix):]) } - z.Close() - if !reflect.DeepEqual(names, tt.zip) { - t.Fatalf("zip = %v\nwant %v\n", names, tt.zip) + + if needHash { + sum, err := dirhash.HashZip(zipfile, dirhash.Hash1) + if err != nil { + t.Errorf("repo.Zip(%q): %v", tt.version, err) + } else if sum != tt.zipSum { + t.Errorf("repo.Zip(%q): got file with sum %q, want %q", tt.version, sum, tt.zipSum) + } else if zipFileHash := hex.EncodeToString(h.Sum(nil)); zipFileHash != tt.zipFileHash { + t.Errorf("repo.Zip(%q): got file with hash %q, want %q (but content has correct sum)", tt.version, zipFileHash, tt.zipFileHash) + } } } } @@ -508,26 +582,26 @@ func TestCodeRepo(t *testing.T) { t.Run(strings.ReplaceAll(tt.path, "/", "_")+"/"+tt.rev, f(tt)) if strings.HasPrefix(tt.path, vgotest1git) { for vcs, alt := range altVgotests { - // Note: Communicating with f through tt; should be cleaned up. - old := tt - tt.vcs = vcs - tt.path = alt + strings.TrimPrefix(tt.path, vgotest1git) - if strings.HasPrefix(tt.mpath, vgotest1git) { - tt.mpath = alt + strings.TrimPrefix(tt.mpath, vgotest1git) + altTest := tt + altTest.vcs = vcs + altTest.path = alt + strings.TrimPrefix(altTest.path, vgotest1git) + if strings.HasPrefix(altTest.mpath, vgotest1git) { + altTest.mpath = alt + strings.TrimPrefix(altTest.mpath, vgotest1git) } var m map[string]string if alt == vgotest1hg { m = hgmap } - tt.version = remap(tt.version, m) - tt.name = remap(tt.name, m) - tt.short = remap(tt.short, m) - tt.rev = remap(tt.rev, m) - tt.err = remap(tt.err, m) - tt.gomoderr = remap(tt.gomoderr, m) - tt.ziperr = remap(tt.ziperr, m) - t.Run(strings.ReplaceAll(tt.path, "/", "_")+"/"+tt.rev, f(tt)) - tt = old + altTest.version = remap(altTest.version, m) + altTest.name = remap(altTest.name, m) + altTest.short = remap(altTest.short, m) + altTest.rev = remap(altTest.rev, m) + altTest.err = remap(altTest.err, m) + altTest.gomodErr = remap(altTest.gomodErr, m) + altTest.zipErr = remap(altTest.zipErr, m) + altTest.zipSum = "" + altTest.zipFileHash = "" + t.Run(strings.ReplaceAll(altTest.path, "/", "_")+"/"+altTest.rev, f(altTest)) } } } diff --git a/src/cmd/go/internal/modfetch/fetch.go b/src/cmd/go/internal/modfetch/fetch.go index 7d20f66041..7e9601f876 100644 --- a/src/cmd/go/internal/modfetch/fetch.go +++ b/src/cmd/go/internal/modfetch/fetch.go @@ -19,10 +19,11 @@ import ( "cmd/go/internal/base" "cmd/go/internal/cfg" - "cmd/go/internal/dirhash" - "cmd/go/internal/module" "cmd/go/internal/par" "cmd/go/internal/renameio" + + "golang.org/x/mod/module" + "golang.org/x/mod/sumdb/dirhash" ) var downloadCache par.Cache diff --git a/src/cmd/go/internal/modfetch/proxy.go b/src/cmd/go/internal/modfetch/proxy.go index d4187063b0..dcea71adb3 100644 --- a/src/cmd/go/internal/modfetch/proxy.go +++ b/src/cmd/go/internal/modfetch/proxy.go @@ -22,9 +22,10 @@ import ( "cmd/go/internal/base" "cmd/go/internal/cfg" "cmd/go/internal/modfetch/codehost" - "cmd/go/internal/module" - "cmd/go/internal/semver" "cmd/go/internal/web" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) var HelpGoproxy = &base.Command{ diff --git a/src/cmd/go/internal/modfetch/pseudo.go b/src/cmd/go/internal/modfetch/pseudo.go index 8c063b9107..57dee11d07 100644 --- a/src/cmd/go/internal/modfetch/pseudo.go +++ b/src/cmd/go/internal/modfetch/pseudo.go @@ -40,9 +40,10 @@ import ( "strings" "time" - "cmd/go/internal/module" - "cmd/go/internal/semver" "internal/lazyregexp" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) var pseudoVersionRE = lazyregexp.New(`^v[0-9]+\.(0\.0-|\d+\.\d+-([^+]*\.)?0\.)\d{14}-[A-Za-z0-9]+(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$`) diff --git a/src/cmd/go/internal/modfetch/repo.go b/src/cmd/go/internal/modfetch/repo.go index be52a8dc11..2ecd13cabe 100644 --- a/src/cmd/go/internal/modfetch/repo.go +++ b/src/cmd/go/internal/modfetch/repo.go @@ -17,9 +17,10 @@ import ( "cmd/go/internal/get" "cmd/go/internal/modfetch/codehost" "cmd/go/internal/par" - "cmd/go/internal/semver" "cmd/go/internal/str" web "cmd/go/internal/web" + + "golang.org/x/mod/semver" ) const traceRepo = false // trace all repo actions, for debugging diff --git a/src/cmd/go/internal/modfetch/sumdb.go b/src/cmd/go/internal/modfetch/sumdb.go index d8530ff1d5..1ed71dfb85 100644 --- a/src/cmd/go/internal/modfetch/sumdb.go +++ b/src/cmd/go/internal/modfetch/sumdb.go @@ -24,11 +24,11 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/get" "cmd/go/internal/lockedfile" - "cmd/go/internal/module" - "cmd/go/internal/note" "cmd/go/internal/str" - "cmd/go/internal/sumdb" "cmd/go/internal/web" + "golang.org/x/mod/module" + "golang.org/x/mod/sumdb" + "golang.org/x/mod/sumdb/note" ) // useSumDB reports whether to use the Go checksum database for the given module. diff --git a/src/cmd/go/internal/modfetch/unzip.go b/src/cmd/go/internal/modfetch/unzip.go index ac13ede257..7bde1b4620 100644 --- a/src/cmd/go/internal/modfetch/unzip.go +++ b/src/cmd/go/internal/modfetch/unzip.go @@ -15,8 +15,8 @@ import ( "strings" "cmd/go/internal/modfetch/codehost" - "cmd/go/internal/module" "cmd/go/internal/str" + "golang.org/x/mod/module" ) func Unzip(dir, zipfile, prefix string, maxSize int64) error { diff --git a/src/cmd/go/internal/modfile/read_test.go b/src/cmd/go/internal/modfile/read_test.go deleted file mode 100644 index 32401304b9..0000000000 --- a/src/cmd/go/internal/modfile/read_test.go +++ /dev/null @@ -1,388 +0,0 @@ -// Copyright 2018 The Go 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 modfile - -import ( - "bytes" - "fmt" - "io/ioutil" - "os" - "os/exec" - "path/filepath" - "reflect" - "strings" - "testing" -) - -// exists reports whether the named file exists. -func exists(name string) bool { - _, err := os.Stat(name) - return err == nil -} - -// Test that reading and then writing the golden files -// does not change their output. -func TestPrintGolden(t *testing.T) { - outs, err := filepath.Glob("testdata/*.golden") - if err != nil { - t.Fatal(err) - } - for _, out := range outs { - testPrint(t, out, out) - } -} - -// testPrint is a helper for testing the printer. -// It reads the file named in, reformats it, and compares -// the result to the file named out. -func testPrint(t *testing.T, in, out string) { - data, err := ioutil.ReadFile(in) - if err != nil { - t.Error(err) - return - } - - golden, err := ioutil.ReadFile(out) - if err != nil { - t.Error(err) - return - } - - base := "testdata/" + filepath.Base(in) - f, err := parse(in, data) - if err != nil { - t.Error(err) - return - } - - ndata := Format(f) - - if !bytes.Equal(ndata, golden) { - t.Errorf("formatted %s incorrectly: diff shows -golden, +ours", base) - tdiff(t, string(golden), string(ndata)) - return - } -} - -func TestParseLax(t *testing.T) { - badFile := []byte(`module m - surprise attack - x y ( - z - ) - exclude v1.2.3 - replace <-!!! - `) - _, err := ParseLax("file", badFile, nil) - if err != nil { - t.Fatalf("ParseLax did not ignore irrelevant errors: %v", err) - } -} - -// Test that when files in the testdata directory are parsed -// and printed and parsed again, we get the same parse tree -// both times. -func TestPrintParse(t *testing.T) { - outs, err := filepath.Glob("testdata/*") - if err != nil { - t.Fatal(err) - } - for _, out := range outs { - data, err := ioutil.ReadFile(out) - if err != nil { - t.Error(err) - continue - } - - base := "testdata/" + filepath.Base(out) - f, err := parse(base, data) - if err != nil { - t.Errorf("parsing original: %v", err) - continue - } - - ndata := Format(f) - f2, err := parse(base, ndata) - if err != nil { - t.Errorf("parsing reformatted: %v", err) - continue - } - - eq := eqchecker{file: base} - if err := eq.check(f, f2); err != nil { - t.Errorf("not equal (parse/Format/parse): %v", err) - } - - pf1, err := Parse(base, data, nil) - if err != nil { - switch base { - case "testdata/replace2.in", "testdata/gopkg.in.golden": - t.Errorf("should parse %v: %v", base, err) - } - } - if err == nil { - pf2, err := Parse(base, ndata, nil) - if err != nil { - t.Errorf("Parsing reformatted: %v", err) - continue - } - eq := eqchecker{file: base} - if err := eq.check(pf1, pf2); err != nil { - t.Errorf("not equal (parse/Format/Parse): %v", err) - } - - ndata2, err := pf1.Format() - if err != nil { - t.Errorf("reformat: %v", err) - } - pf3, err := Parse(base, ndata2, nil) - if err != nil { - t.Errorf("Parsing reformatted2: %v", err) - continue - } - eq = eqchecker{file: base} - if err := eq.check(pf1, pf3); err != nil { - t.Errorf("not equal (Parse/Format/Parse): %v", err) - } - ndata = ndata2 - } - - if strings.HasSuffix(out, ".in") { - golden, err := ioutil.ReadFile(strings.TrimSuffix(out, ".in") + ".golden") - if err != nil { - t.Error(err) - continue - } - if !bytes.Equal(ndata, golden) { - t.Errorf("formatted %s incorrectly: diff shows -golden, +ours", base) - tdiff(t, string(golden), string(ndata)) - return - } - } - } -} - -// An eqchecker holds state for checking the equality of two parse trees. -type eqchecker struct { - file string - pos Position -} - -// errorf returns an error described by the printf-style format and arguments, -// inserting the current file position before the error text. -func (eq *eqchecker) errorf(format string, args ...interface{}) error { - return fmt.Errorf("%s:%d: %s", eq.file, eq.pos.Line, - fmt.Sprintf(format, args...)) -} - -// check checks that v and w represent the same parse tree. -// If not, it returns an error describing the first difference. -func (eq *eqchecker) check(v, w interface{}) error { - return eq.checkValue(reflect.ValueOf(v), reflect.ValueOf(w)) -} - -var ( - posType = reflect.TypeOf(Position{}) - commentsType = reflect.TypeOf(Comments{}) -) - -// checkValue checks that v and w represent the same parse tree. -// If not, it returns an error describing the first difference. -func (eq *eqchecker) checkValue(v, w reflect.Value) error { - // inner returns the innermost expression for v. - // if v is a non-nil interface value, it returns the concrete - // value in the interface. - inner := func(v reflect.Value) reflect.Value { - for { - if v.Kind() == reflect.Interface && !v.IsNil() { - v = v.Elem() - continue - } - break - } - return v - } - - v = inner(v) - w = inner(w) - if v.Kind() == reflect.Invalid && w.Kind() == reflect.Invalid { - return nil - } - if v.Kind() == reflect.Invalid { - return eq.errorf("nil interface became %s", w.Type()) - } - if w.Kind() == reflect.Invalid { - return eq.errorf("%s became nil interface", v.Type()) - } - - if v.Type() != w.Type() { - return eq.errorf("%s became %s", v.Type(), w.Type()) - } - - if p, ok := v.Interface().(Expr); ok { - eq.pos, _ = p.Span() - } - - switch v.Kind() { - default: - return eq.errorf("unexpected type %s", v.Type()) - - case reflect.Bool, reflect.Int, reflect.String: - vi := v.Interface() - wi := w.Interface() - if vi != wi { - return eq.errorf("%v became %v", vi, wi) - } - - case reflect.Slice: - vl := v.Len() - wl := w.Len() - for i := 0; i < vl || i < wl; i++ { - if i >= vl { - return eq.errorf("unexpected %s", w.Index(i).Type()) - } - if i >= wl { - return eq.errorf("missing %s", v.Index(i).Type()) - } - if err := eq.checkValue(v.Index(i), w.Index(i)); err != nil { - return err - } - } - - case reflect.Struct: - // Fields in struct must match. - t := v.Type() - n := t.NumField() - for i := 0; i < n; i++ { - tf := t.Field(i) - switch { - default: - if err := eq.checkValue(v.Field(i), w.Field(i)); err != nil { - return err - } - - case tf.Type == posType: // ignore positions - case tf.Type == commentsType: // ignore comment assignment - } - } - - case reflect.Ptr, reflect.Interface: - if v.IsNil() != w.IsNil() { - if v.IsNil() { - return eq.errorf("unexpected %s", w.Elem().Type()) - } - return eq.errorf("missing %s", v.Elem().Type()) - } - if err := eq.checkValue(v.Elem(), w.Elem()); err != nil { - return err - } - } - return nil -} - -// diff returns the output of running diff on b1 and b2. -func diff(b1, b2 []byte) (data []byte, err error) { - f1, err := ioutil.TempFile("", "testdiff") - if err != nil { - return nil, err - } - defer os.Remove(f1.Name()) - defer f1.Close() - - f2, err := ioutil.TempFile("", "testdiff") - if err != nil { - return nil, err - } - defer os.Remove(f2.Name()) - defer f2.Close() - - f1.Write(b1) - f2.Write(b2) - - data, err = exec.Command("diff", "-u", f1.Name(), f2.Name()).CombinedOutput() - if len(data) > 0 { - // diff exits with a non-zero status when the files don't match. - // Ignore that failure as long as we get output. - err = nil - } - return -} - -// tdiff logs the diff output to t.Error. -func tdiff(t *testing.T, a, b string) { - data, err := diff([]byte(a), []byte(b)) - if err != nil { - t.Error(err) - return - } - t.Error(string(data)) -} - -var modulePathTests = []struct { - input []byte - expected string -}{ - {input: []byte("module \"github.com/rsc/vgotest\""), expected: "github.com/rsc/vgotest"}, - {input: []byte("module github.com/rsc/vgotest"), expected: "github.com/rsc/vgotest"}, - {input: []byte("module \"github.com/rsc/vgotest\""), expected: "github.com/rsc/vgotest"}, - {input: []byte("module github.com/rsc/vgotest"), expected: "github.com/rsc/vgotest"}, - {input: []byte("module `github.com/rsc/vgotest`"), expected: "github.com/rsc/vgotest"}, - {input: []byte("module \"github.com/rsc/vgotest/v2\""), expected: "github.com/rsc/vgotest/v2"}, - {input: []byte("module github.com/rsc/vgotest/v2"), expected: "github.com/rsc/vgotest/v2"}, - {input: []byte("module \"gopkg.in/yaml.v2\""), expected: "gopkg.in/yaml.v2"}, - {input: []byte("module gopkg.in/yaml.v2"), expected: "gopkg.in/yaml.v2"}, - {input: []byte("module \"gopkg.in/check.v1\"\n"), expected: "gopkg.in/check.v1"}, - {input: []byte("module \"gopkg.in/check.v1\n\""), expected: ""}, - {input: []byte("module gopkg.in/check.v1\n"), expected: "gopkg.in/check.v1"}, - {input: []byte("module \"gopkg.in/check.v1\"\r\n"), expected: "gopkg.in/check.v1"}, - {input: []byte("module gopkg.in/check.v1\r\n"), expected: "gopkg.in/check.v1"}, - {input: []byte("module \"gopkg.in/check.v1\"\n\n"), expected: "gopkg.in/check.v1"}, - {input: []byte("module gopkg.in/check.v1\n\n"), expected: "gopkg.in/check.v1"}, - {input: []byte("module \n\"gopkg.in/check.v1\"\n\n"), expected: ""}, - {input: []byte("module \ngopkg.in/check.v1\n\n"), expected: ""}, - {input: []byte("module \"gopkg.in/check.v1\"asd"), expected: ""}, - {input: []byte("module \n\"gopkg.in/check.v1\"\n\n"), expected: ""}, - {input: []byte("module \ngopkg.in/check.v1\n\n"), expected: ""}, - {input: []byte("module \"gopkg.in/check.v1\"asd"), expected: ""}, - {input: []byte("module \nmodule a/b/c "), expected: "a/b/c"}, - {input: []byte("module \" \""), expected: " "}, - {input: []byte("module "), expected: ""}, - {input: []byte("module \" a/b/c \""), expected: " a/b/c "}, - {input: []byte("module \"github.com/rsc/vgotest1\" // with a comment"), expected: "github.com/rsc/vgotest1"}, -} - -func TestModulePath(t *testing.T) { - for _, test := range modulePathTests { - t.Run(string(test.input), func(t *testing.T) { - result := ModulePath(test.input) - if result != test.expected { - t.Fatalf("ModulePath(%q): %s, want %s", string(test.input), result, test.expected) - } - }) - } -} - -func TestGoVersion(t *testing.T) { - for _, test := range []struct { - desc, input string - ok bool - }{ - {desc: "empty", input: "module m\ngo \n", ok: false}, - {desc: "one", input: "module m\ngo 1\n", ok: false}, - {desc: "two", input: "module m\ngo 1.22\n", ok: true}, - {desc: "three", input: "module m\ngo 1.22.333", ok: false}, - {desc: "before", input: "module m\ngo v1.2\n", ok: false}, - {desc: "after", input: "module m\ngo 1.2rc1\n", ok: false}, - {desc: "space", input: "module m\ngo 1.2 3.4\n", ok: false}, - } { - t.Run(test.desc, func(t *testing.T) { - if _, err := Parse("go.mod", []byte(test.input), nil); err == nil && !test.ok { - t.Error("unexpected success") - } else if err != nil && test.ok { - t.Errorf("unexpected error: %v", err) - } - }) - } -} diff --git a/src/cmd/go/internal/modfile/rule_test.go b/src/cmd/go/internal/modfile/rule_test.go deleted file mode 100644 index edd289053b..0000000000 --- a/src/cmd/go/internal/modfile/rule_test.go +++ /dev/null @@ -1,163 +0,0 @@ -// Copyright 2018 The Go 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 modfile - -import ( - "bytes" - "fmt" - "testing" - - "cmd/go/internal/module" -) - -var addRequireTests = []struct { - in string - path string - vers string - out string -}{ - { - ` - module m - require x.y/z v1.2.3 - `, - "x.y/z", "v1.5.6", - ` - module m - require x.y/z v1.5.6 - `, - }, - { - ` - module m - require x.y/z v1.2.3 - `, - "x.y/w", "v1.5.6", - ` - module m - require ( - x.y/z v1.2.3 - x.y/w v1.5.6 - ) - `, - }, - { - ` - module m - require x.y/z v1.2.3 - require x.y/q/v2 v2.3.4 - `, - "x.y/w", "v1.5.6", - ` - module m - require x.y/z v1.2.3 - require ( - x.y/q/v2 v2.3.4 - x.y/w v1.5.6 - ) - `, - }, -} - -var setRequireTests = []struct { - in string - mods []struct { - path string - vers string - } - out string -}{ - { - `module m - require ( - x.y/b v1.2.3 - - x.y/a v1.2.3 - ) - `, - []struct { - path string - vers string - }{ - {"x.y/a", "v1.2.3"}, - {"x.y/b", "v1.2.3"}, - {"x.y/c", "v1.2.3"}, - }, - `module m - require ( - x.y/a v1.2.3 - x.y/b v1.2.3 - x.y/c v1.2.3 - ) - `, - }, -} - -func TestAddRequire(t *testing.T) { - for i, tt := range addRequireTests { - t.Run(fmt.Sprintf("#%d", i), func(t *testing.T) { - f, err := Parse("in", []byte(tt.in), nil) - if err != nil { - t.Fatal(err) - } - g, err := Parse("out", []byte(tt.out), nil) - if err != nil { - t.Fatal(err) - } - golden, err := g.Format() - if err != nil { - t.Fatal(err) - } - - if err := f.AddRequire(tt.path, tt.vers); err != nil { - t.Fatal(err) - } - out, err := f.Format() - if err != nil { - t.Fatal(err) - } - if !bytes.Equal(out, golden) { - t.Errorf("have:\n%s\nwant:\n%s", out, golden) - } - }) - } -} - -func TestSetRequire(t *testing.T) { - for i, tt := range setRequireTests { - t.Run(fmt.Sprintf("#%d", i), func(t *testing.T) { - f, err := Parse("in", []byte(tt.in), nil) - if err != nil { - t.Fatal(err) - } - g, err := Parse("out", []byte(tt.out), nil) - if err != nil { - t.Fatal(err) - } - golden, err := g.Format() - if err != nil { - t.Fatal(err) - } - var mods []*Require - for _, mod := range tt.mods { - mods = append(mods, &Require{ - Mod: module.Version{ - Path: mod.path, - Version: mod.vers, - }, - }) - } - - f.SetRequire(mods) - out, err := f.Format() - if err != nil { - t.Fatal(err) - } - if !bytes.Equal(out, golden) { - t.Errorf("have:\n%s\nwant:\n%s", out, golden) - } - }) - } -} diff --git a/src/cmd/go/internal/modfile/testdata/block.golden b/src/cmd/go/internal/modfile/testdata/block.golden deleted file mode 100644 index 4aa2d634fc..0000000000 --- a/src/cmd/go/internal/modfile/testdata/block.golden +++ /dev/null @@ -1,29 +0,0 @@ -// comment -x "y" z - -// block -block ( // block-eol - // x-before-line - - "x" ( y // x-eol - "x1" - "x2" - // line - "x3" - "x4" - - "x5" - - // y-line - "y" // y-eol - - "z" // z-eol -) // block-eol2 - -block2 ( - x - y - z -) - -// eof diff --git a/src/cmd/go/internal/modfile/testdata/block.in b/src/cmd/go/internal/modfile/testdata/block.in deleted file mode 100644 index 1dfae65f5c..0000000000 --- a/src/cmd/go/internal/modfile/testdata/block.in +++ /dev/null @@ -1,29 +0,0 @@ -// comment -x "y" z - -// block -block ( // block-eol - // x-before-line - - "x" ( y // x-eol - "x1" - "x2" - // line - "x3" - "x4" - - "x5" - - // y-line - "y" // y-eol - - "z" // z-eol -) // block-eol2 - - -block2 (x - y - z -) - -// eof diff --git a/src/cmd/go/internal/modfile/testdata/comment.golden b/src/cmd/go/internal/modfile/testdata/comment.golden deleted file mode 100644 index 75f3b84478..0000000000 --- a/src/cmd/go/internal/modfile/testdata/comment.golden +++ /dev/null @@ -1,10 +0,0 @@ -// comment -module "x" // eol - -// mid comment - -// comment 2 -// comment 2 line 2 -module "y" // eoy - -// comment 3 diff --git a/src/cmd/go/internal/modfile/testdata/comment.in b/src/cmd/go/internal/modfile/testdata/comment.in deleted file mode 100644 index bfc2492b26..0000000000 --- a/src/cmd/go/internal/modfile/testdata/comment.in +++ /dev/null @@ -1,8 +0,0 @@ -// comment -module "x" // eol -// mid comment - -// comment 2 -// comment 2 line 2 -module "y" // eoy -// comment 3 diff --git a/src/cmd/go/internal/modfile/testdata/empty.golden b/src/cmd/go/internal/modfile/testdata/empty.golden deleted file mode 100644 index e69de29bb2..0000000000 --- a/src/cmd/go/internal/modfile/testdata/empty.golden +++ /dev/null diff --git a/src/cmd/go/internal/modfile/testdata/empty.in b/src/cmd/go/internal/modfile/testdata/empty.in deleted file mode 100644 index e69de29bb2..0000000000 --- a/src/cmd/go/internal/modfile/testdata/empty.in +++ /dev/null diff --git a/src/cmd/go/internal/modfile/testdata/gopkg.in.golden b/src/cmd/go/internal/modfile/testdata/gopkg.in.golden deleted file mode 100644 index 41669b3a73..0000000000 --- a/src/cmd/go/internal/modfile/testdata/gopkg.in.golden +++ /dev/null @@ -1,6 +0,0 @@ -module x - -require ( - gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528 - gopkg.in/yaml.v2 v2.2.1 -) diff --git a/src/cmd/go/internal/modfile/testdata/module.golden b/src/cmd/go/internal/modfile/testdata/module.golden deleted file mode 100644 index 78ba94398c..0000000000 --- a/src/cmd/go/internal/modfile/testdata/module.golden +++ /dev/null @@ -1 +0,0 @@ -module abc diff --git a/src/cmd/go/internal/modfile/testdata/module.in b/src/cmd/go/internal/modfile/testdata/module.in deleted file mode 100644 index 08f383623f..0000000000 --- a/src/cmd/go/internal/modfile/testdata/module.in +++ /dev/null @@ -1 +0,0 @@ -module "abc" diff --git a/src/cmd/go/internal/modfile/testdata/replace.golden b/src/cmd/go/internal/modfile/testdata/replace.golden deleted file mode 100644 index 5d6abcfcda..0000000000 --- a/src/cmd/go/internal/modfile/testdata/replace.golden +++ /dev/null @@ -1,5 +0,0 @@ -module abc - -replace xyz v1.2.3 => /tmp/z - -replace xyz v1.3.4 => my/xyz v1.3.4-me diff --git a/src/cmd/go/internal/modfile/testdata/replace.in b/src/cmd/go/internal/modfile/testdata/replace.in deleted file mode 100644 index 685249946a..0000000000 --- a/src/cmd/go/internal/modfile/testdata/replace.in +++ /dev/null @@ -1,5 +0,0 @@ -module "abc" - -replace "xyz" v1.2.3 => "/tmp/z" - -replace "xyz" v1.3.4 => "my/xyz" v1.3.4-me diff --git a/src/cmd/go/internal/modfile/testdata/replace2.golden b/src/cmd/go/internal/modfile/testdata/replace2.golden deleted file mode 100644 index e1d9c728df..0000000000 --- a/src/cmd/go/internal/modfile/testdata/replace2.golden +++ /dev/null @@ -1,10 +0,0 @@ -module abc - -replace ( - xyz v1.2.3 => /tmp/z - xyz v1.3.4 => my/xyz v1.3.4-me - xyz v1.4.5 => "/tmp/my dir" - xyz v1.5.6 => my/xyz v1.5.6 - - xyz => my/other/xyz v1.5.4 -) diff --git a/src/cmd/go/internal/modfile/testdata/replace2.in b/src/cmd/go/internal/modfile/testdata/replace2.in deleted file mode 100644 index 786469866f..0000000000 --- a/src/cmd/go/internal/modfile/testdata/replace2.in +++ /dev/null @@ -1,10 +0,0 @@ -module "abc" - -replace ( - "xyz" v1.2.3 => "/tmp/z" - "xyz" v1.3.4 => "my/xyz" "v1.3.4-me" - xyz "v1.4.5" => "/tmp/my dir" - xyz v1.5.6 => my/xyz v1.5.6 - - xyz => my/other/xyz v1.5.4 -) diff --git a/src/cmd/go/internal/modfile/testdata/rule1.golden b/src/cmd/go/internal/modfile/testdata/rule1.golden deleted file mode 100644 index 8a5c725894..0000000000 --- a/src/cmd/go/internal/modfile/testdata/rule1.golden +++ /dev/null @@ -1,7 +0,0 @@ -module "x" - -module "y" - -require "x" - -require x diff --git a/src/cmd/go/internal/modget/get.go b/src/cmd/go/internal/modget/get.go index 6bb8cdf55c..b3b4dea778 100644 --- a/src/cmd/go/internal/modget/get.go +++ b/src/cmd/go/internal/modget/get.go @@ -6,24 +6,26 @@ package modget import ( + "errors" + "fmt" + "os" + "path/filepath" + "sort" + "strings" + "sync" + "cmd/go/internal/base" "cmd/go/internal/get" "cmd/go/internal/imports" "cmd/go/internal/load" "cmd/go/internal/modload" - "cmd/go/internal/module" "cmd/go/internal/mvs" "cmd/go/internal/par" "cmd/go/internal/search" - "cmd/go/internal/semver" "cmd/go/internal/work" - "errors" - "fmt" - "os" - "path/filepath" - "sort" - "strings" - "sync" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) var CmdGet = &base.Command{ diff --git a/src/cmd/go/internal/modload/build.go b/src/cmd/go/internal/modload/build.go index acbebb6d66..352ec73758 100644 --- a/src/cmd/go/internal/modload/build.go +++ b/src/cmd/go/internal/modload/build.go @@ -6,13 +6,6 @@ package modload import ( "bytes" - "cmd/go/internal/base" - "cmd/go/internal/cfg" - "cmd/go/internal/modfetch" - "cmd/go/internal/modinfo" - "cmd/go/internal/module" - "cmd/go/internal/search" - "cmd/go/internal/semver" "encoding/hex" "fmt" "internal/goroot" @@ -20,6 +13,15 @@ import ( "path/filepath" "runtime/debug" "strings" + + "cmd/go/internal/base" + "cmd/go/internal/cfg" + "cmd/go/internal/modfetch" + "cmd/go/internal/modinfo" + "cmd/go/internal/search" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) var ( diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go index cda56fa7c8..8a18da37d5 100644 --- a/src/cmd/go/internal/modload/import.go +++ b/src/cmd/go/internal/modload/import.go @@ -18,11 +18,12 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/load" "cmd/go/internal/modfetch" - "cmd/go/internal/module" "cmd/go/internal/par" "cmd/go/internal/search" - "cmd/go/internal/semver" "cmd/go/internal/str" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) type ImportMissingError struct { diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go index 984fbaf1f1..48ffe99643 100644 --- a/src/cmd/go/internal/modload/init.go +++ b/src/cmd/go/internal/modload/init.go @@ -25,12 +25,13 @@ import ( "cmd/go/internal/modconv" "cmd/go/internal/modfetch" "cmd/go/internal/modfetch/codehost" - "cmd/go/internal/modfile" - "cmd/go/internal/module" "cmd/go/internal/mvs" "cmd/go/internal/renameio" "cmd/go/internal/search" - "cmd/go/internal/semver" + + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) var ( diff --git a/src/cmd/go/internal/modload/list.go b/src/cmd/go/internal/modload/list.go index cd162f8875..c4327276bf 100644 --- a/src/cmd/go/internal/modload/list.go +++ b/src/cmd/go/internal/modload/list.go @@ -13,9 +13,10 @@ import ( "cmd/go/internal/base" "cmd/go/internal/cfg" "cmd/go/internal/modinfo" - "cmd/go/internal/module" "cmd/go/internal/par" "cmd/go/internal/search" + + "golang.org/x/mod/module" ) func ListModules(args []string, listU, listVersions bool) []*modinfo.ModulePublic { diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go index 5f28d7cf14..01ee40e42e 100644 --- a/src/cmd/go/internal/modload/load.go +++ b/src/cmd/go/internal/modload/load.go @@ -22,13 +22,14 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/imports" "cmd/go/internal/modfetch" - "cmd/go/internal/modfile" - "cmd/go/internal/module" "cmd/go/internal/mvs" "cmd/go/internal/par" "cmd/go/internal/search" - "cmd/go/internal/semver" "cmd/go/internal/str" + + "golang.org/x/mod/modfile" + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) // buildList is the list of modules to use for building packages. diff --git a/src/cmd/go/internal/modload/query.go b/src/cmd/go/internal/modload/query.go index 75c18f25cc..976d35665d 100644 --- a/src/cmd/go/internal/modload/query.go +++ b/src/cmd/go/internal/modload/query.go @@ -14,10 +14,11 @@ import ( "cmd/go/internal/imports" "cmd/go/internal/modfetch" - "cmd/go/internal/module" "cmd/go/internal/search" - "cmd/go/internal/semver" "cmd/go/internal/str" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" ) // Query looks up a revision of a given module given a version query string. diff --git a/src/cmd/go/internal/modload/query_test.go b/src/cmd/go/internal/modload/query_test.go index b91cbb5a70..9c91c05e5f 100644 --- a/src/cmd/go/internal/modload/query_test.go +++ b/src/cmd/go/internal/modload/query_test.go @@ -17,7 +17,8 @@ import ( "cmd/go/internal/cfg" "cmd/go/internal/modfetch" "cmd/go/internal/modfetch/codehost" - "cmd/go/internal/module" + + "golang.org/x/mod/module" ) func TestMain(m *testing.M) { diff --git a/src/cmd/go/internal/modload/search.go b/src/cmd/go/internal/modload/search.go index 98c384161b..a303f51858 100644 --- a/src/cmd/go/internal/modload/search.go +++ b/src/cmd/go/internal/modload/search.go @@ -13,8 +13,9 @@ import ( "cmd/go/internal/base" "cmd/go/internal/cfg" "cmd/go/internal/imports" - "cmd/go/internal/module" "cmd/go/internal/search" + + "golang.org/x/mod/module" ) // matchPackages returns a list of packages in the list of modules diff --git a/src/cmd/go/internal/module/module_test.go b/src/cmd/go/internal/module/module_test.go deleted file mode 100644 index e61fa9f525..0000000000 --- a/src/cmd/go/internal/module/module_test.go +++ /dev/null @@ -1,343 +0,0 @@ -// Copyright 2018 The Go 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 module - -import "testing" - -var checkTests = []struct { - path string - version string - ok bool -}{ - {"rsc.io/quote", "0.1.0", false}, - {"rsc io/quote", "v1.0.0", false}, - - {"github.com/go-yaml/yaml", "v0.8.0", true}, - {"github.com/go-yaml/yaml", "v1.0.0", true}, - {"github.com/go-yaml/yaml", "v2.0.0", false}, - {"github.com/go-yaml/yaml", "v2.1.5", false}, - {"github.com/go-yaml/yaml", "v3.0.0", false}, - - {"github.com/go-yaml/yaml/v2", "v1.0.0", false}, - {"github.com/go-yaml/yaml/v2", "v2.0.0", true}, - {"github.com/go-yaml/yaml/v2", "v2.1.5", true}, - {"github.com/go-yaml/yaml/v2", "v3.0.0", false}, - - {"gopkg.in/yaml.v0", "v0.8.0", true}, - {"gopkg.in/yaml.v0", "v1.0.0", false}, - {"gopkg.in/yaml.v0", "v2.0.0", false}, - {"gopkg.in/yaml.v0", "v2.1.5", false}, - {"gopkg.in/yaml.v0", "v3.0.0", false}, - - {"gopkg.in/yaml.v1", "v0.8.0", false}, - {"gopkg.in/yaml.v1", "v1.0.0", true}, - {"gopkg.in/yaml.v1", "v2.0.0", false}, - {"gopkg.in/yaml.v1", "v2.1.5", false}, - {"gopkg.in/yaml.v1", "v3.0.0", false}, - - // For gopkg.in, .v1 means v1 only (not v0). - // But early versions of vgo still generated v0 pseudo-versions for it. - // Even though now we'd generate those as v1 pseudo-versions, - // we accept the old pseudo-versions to avoid breaking existing go.mod files. - // For example gopkg.in/yaml.v2@v2.2.1's go.mod requires check.v1 at a v0 pseudo-version. - {"gopkg.in/check.v1", "v0.0.0", false}, - {"gopkg.in/check.v1", "v0.0.0-20160102150405-abcdef123456", true}, - - {"gopkg.in/yaml.v2", "v1.0.0", false}, - {"gopkg.in/yaml.v2", "v2.0.0", true}, - {"gopkg.in/yaml.v2", "v2.1.5", true}, - {"gopkg.in/yaml.v2", "v3.0.0", false}, - - {"rsc.io/quote", "v17.0.0", false}, - {"rsc.io/quote", "v17.0.0+incompatible", true}, -} - -func TestCheck(t *testing.T) { - for _, tt := range checkTests { - err := Check(tt.path, tt.version) - if tt.ok && err != nil { - t.Errorf("Check(%q, %q) = %v, wanted nil error", tt.path, tt.version, err) - } else if !tt.ok && err == nil { - t.Errorf("Check(%q, %q) succeeded, wanted error", tt.path, tt.version) - } - } -} - -var checkPathTests = []struct { - path string - ok bool - importOK bool - fileOK bool -}{ - {"x.y/z", true, true, true}, - {"x.y", true, true, true}, - - {"", false, false, false}, - {"x.y/\xFFz", false, false, false}, - {"/x.y/z", false, false, false}, - {"x./z", false, false, false}, - {".x/z", false, false, true}, - {"-x/z", false, false, false}, - {"x..y/z", true, true, true}, - {"x.y/z/../../w", false, false, false}, - {"x.y//z", false, false, false}, - {"x.y/z//w", false, false, false}, - {"x.y/z/", false, false, false}, - - {"x.y/z/v0", false, true, true}, - {"x.y/z/v1", false, true, true}, - {"x.y/z/v2", true, true, true}, - {"x.y/z/v2.0", false, true, true}, - {"X.y/z", false, true, true}, - - {"!x.y/z", false, false, true}, - {"_x.y/z", false, true, true}, - {"x.y!/z", false, false, true}, - {"x.y\"/z", false, false, false}, - {"x.y#/z", false, false, true}, - {"x.y$/z", false, false, true}, - {"x.y%/z", false, false, true}, - {"x.y&/z", false, false, true}, - {"x.y'/z", false, false, false}, - {"x.y(/z", false, false, true}, - {"x.y)/z", false, false, true}, - {"x.y*/z", false, false, false}, - {"x.y+/z", false, true, true}, - {"x.y,/z", false, false, true}, - {"x.y-/z", true, true, true}, - {"x.y./zt", false, false, false}, - {"x.y:/z", false, false, false}, - {"x.y;/z", false, false, false}, - {"x.y</z", false, false, false}, - {"x.y=/z", false, false, true}, - {"x.y>/z", false, false, false}, - {"x.y?/z", false, false, false}, - {"x.y@/z", false, false, true}, - {"x.y[/z", false, false, true}, - {"x.y\\/z", false, false, false}, - {"x.y]/z", false, false, true}, - {"x.y^/z", false, false, true}, - {"x.y_/z", false, true, true}, - {"x.y`/z", false, false, false}, - {"x.y{/z", false, false, true}, - {"x.y}/z", false, false, true}, - {"x.y~/z", false, true, true}, - {"x.y/z!", false, false, true}, - {"x.y/z\"", false, false, false}, - {"x.y/z#", false, false, true}, - {"x.y/z$", false, false, true}, - {"x.y/z%", false, false, true}, - {"x.y/z&", false, false, true}, - {"x.y/z'", false, false, false}, - {"x.y/z(", false, false, true}, - {"x.y/z)", false, false, true}, - {"x.y/z*", false, false, false}, - {"x.y/z+", true, true, true}, - {"x.y/z,", false, false, true}, - {"x.y/z-", true, true, true}, - {"x.y/z.t", true, true, true}, - {"x.y/z/t", true, true, true}, - {"x.y/z:", false, false, false}, - {"x.y/z;", false, false, false}, - {"x.y/z<", false, false, false}, - {"x.y/z=", false, false, true}, - {"x.y/z>", false, false, false}, - {"x.y/z?", false, false, false}, - {"x.y/z@", false, false, true}, - {"x.y/z[", false, false, true}, - {"x.y/z\\", false, false, false}, - {"x.y/z]", false, false, true}, - {"x.y/z^", false, false, true}, - {"x.y/z_", true, true, true}, - {"x.y/z`", false, false, false}, - {"x.y/z{", false, false, true}, - {"x.y/z}", false, false, true}, - {"x.y/z~", true, true, true}, - {"x.y/x.foo", true, true, true}, - {"x.y/aux.foo", false, false, false}, - {"x.y/prn", false, false, false}, - {"x.y/prn2", true, true, true}, - {"x.y/com", true, true, true}, - {"x.y/com1", false, false, false}, - {"x.y/com1.txt", false, false, false}, - {"x.y/calm1", true, true, true}, - {"github.com/!123/logrus", false, false, true}, - - // TODO: CL 41822 allowed Unicode letters in old "go get" - // without due consideration of the implications, and only on github.com (!). - // For now, we disallow non-ASCII characters in module mode, - // in both module paths and general import paths, - // until we can get the implications right. - // When we do, we'll enable them everywhere, not just for GitHub. - {"github.com/user/unicode/испытание", false, false, true}, - - {".../x", false, false, false}, - {"../x", false, false, false}, - {"./y", false, false, false}, - {"x:y", false, false, false}, - {`\temp\foo`, false, false, false}, - {".gitignore", false, false, true}, - {".github/ISSUE_TEMPLATE", false, false, true}, - {"x☺y", false, false, false}, -} - -func TestCheckPath(t *testing.T) { - for _, tt := range checkPathTests { - err := CheckPath(tt.path) - if tt.ok && err != nil { - t.Errorf("CheckPath(%q) = %v, wanted nil error", tt.path, err) - } else if !tt.ok && err == nil { - t.Errorf("CheckPath(%q) succeeded, wanted error", tt.path) - } - - err = CheckImportPath(tt.path) - if tt.importOK && err != nil { - t.Errorf("CheckImportPath(%q) = %v, wanted nil error", tt.path, err) - } else if !tt.importOK && err == nil { - t.Errorf("CheckImportPath(%q) succeeded, wanted error", tt.path) - } - - err = CheckFilePath(tt.path) - if tt.fileOK && err != nil { - t.Errorf("CheckFilePath(%q) = %v, wanted nil error", tt.path, err) - } else if !tt.fileOK && err == nil { - t.Errorf("CheckFilePath(%q) succeeded, wanted error", tt.path) - } - } -} - -var splitPathVersionTests = []struct { - pathPrefix string - version string -}{ - {"x.y/z", ""}, - {"x.y/z", "/v2"}, - {"x.y/z", "/v3"}, - {"x.y/v", ""}, - {"gopkg.in/yaml", ".v0"}, - {"gopkg.in/yaml", ".v1"}, - {"gopkg.in/yaml", ".v2"}, - {"gopkg.in/yaml", ".v3"}, -} - -func TestSplitPathVersion(t *testing.T) { - for _, tt := range splitPathVersionTests { - pathPrefix, version, ok := SplitPathVersion(tt.pathPrefix + tt.version) - if pathPrefix != tt.pathPrefix || version != tt.version || !ok { - t.Errorf("SplitPathVersion(%q) = %q, %q, %v, want %q, %q, true", tt.pathPrefix+tt.version, pathPrefix, version, ok, tt.pathPrefix, tt.version) - } - } - - for _, tt := range checkPathTests { - pathPrefix, version, ok := SplitPathVersion(tt.path) - if pathPrefix+version != tt.path { - t.Errorf("SplitPathVersion(%q) = %q, %q, %v, doesn't add to input", tt.path, pathPrefix, version, ok) - } - } -} - -var escapeTests = []struct { - path string - esc string // empty means same as path -}{ - {path: "ascii.com/abcdefghijklmnopqrstuvwxyz.-+/~_0123456789"}, - {path: "github.com/GoogleCloudPlatform/omega", esc: "github.com/!google!cloud!platform/omega"}, -} - -func TestEscapePath(t *testing.T) { - // Check invalid paths. - for _, tt := range checkPathTests { - if !tt.ok { - _, err := EscapePath(tt.path) - if err == nil { - t.Errorf("EscapePath(%q): succeeded, want error (invalid path)", tt.path) - } - } - } - - // Check encodings. - for _, tt := range escapeTests { - esc, err := EscapePath(tt.path) - if err != nil { - t.Errorf("EscapePath(%q): unexpected error: %v", tt.path, err) - continue - } - want := tt.esc - if want == "" { - want = tt.path - } - if esc != want { - t.Errorf("EscapePath(%q) = %q, want %q", tt.path, esc, want) - } - } -} - -var badUnescape = []string{ - "github.com/GoogleCloudPlatform/omega", - "github.com/!google!cloud!platform!/omega", - "github.com/!0google!cloud!platform/omega", - "github.com/!_google!cloud!platform/omega", - "github.com/!!google!cloud!platform/omega", - "", -} - -func TestUnescapePath(t *testing.T) { - // Check invalid decodings. - for _, bad := range badUnescape { - _, err := UnescapePath(bad) - if err == nil { - t.Errorf("UnescapePath(%q): succeeded, want error (invalid decoding)", bad) - } - } - - // Check invalid paths (or maybe decodings). - for _, tt := range checkPathTests { - if !tt.ok { - path, err := UnescapePath(tt.path) - if err == nil { - t.Errorf("UnescapePath(%q) = %q, want error (invalid path)", tt.path, path) - } - } - } - - // Check encodings. - for _, tt := range escapeTests { - esc := tt.esc - if esc == "" { - esc = tt.path - } - path, err := UnescapePath(esc) - if err != nil { - t.Errorf("UnescapePath(%q): unexpected error: %v", esc, err) - continue - } - if path != tt.path { - t.Errorf("UnescapePath(%q) = %q, want %q", esc, path, tt.path) - } - } -} - -func TestMatchPathMajor(t *testing.T) { - for _, test := range []struct { - v, pathMajor string - want bool - }{ - {"v0.0.0", "", true}, - {"v0.0.0", "/v2", false}, - {"v0.0.0", ".v0", true}, - {"v0.0.0-20190510104115-cbcb75029529", ".v1", true}, - {"v1.0.0", "/v2", false}, - {"v1.0.0", ".v1", true}, - {"v1.0.0", ".v1-unstable", true}, - {"v2.0.0+incompatible", "", true}, - {"v2.0.0", "", false}, - {"v2.0.0", "/v2", true}, - {"v2.0.0", ".v2", true}, - } { - if got := MatchPathMajor(test.v, test.pathMajor); got != test.want { - t.Errorf("MatchPathMajor(%q, %q) = %v, want %v", test.v, test.pathMajor, got, test.want) - } - } -} diff --git a/src/cmd/go/internal/mvs/mvs.go b/src/cmd/go/internal/mvs/mvs.go index 8855d44f21..dd3b3ccb86 100644 --- a/src/cmd/go/internal/mvs/mvs.go +++ b/src/cmd/go/internal/mvs/mvs.go @@ -13,8 +13,9 @@ import ( "sync" "sync/atomic" - "cmd/go/internal/module" "cmd/go/internal/par" + + "golang.org/x/mod/module" ) // A Reqs is the requirement graph on which Minimal Version Selection (MVS) operates. diff --git a/src/cmd/go/internal/mvs/mvs_test.go b/src/cmd/go/internal/mvs/mvs_test.go index e195e857b8..9a30a8c3ac 100644 --- a/src/cmd/go/internal/mvs/mvs_test.go +++ b/src/cmd/go/internal/mvs/mvs_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "cmd/go/internal/module" + "golang.org/x/mod/module" ) var tests = ` diff --git a/src/cmd/go/internal/note/example_test.go b/src/cmd/go/internal/note/example_test.go deleted file mode 100644 index 53554b4c23..0000000000 --- a/src/cmd/go/internal/note/example_test.go +++ /dev/null @@ -1,128 +0,0 @@ -// Copyright 2019 The Go 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 note_test - -import ( - "fmt" - "io" - "os" - - "cmd/go/internal/note" -) - -func ExampleSign() { - skey := "PRIVATE+KEY+PeterNeumann+c74f20a3+AYEKFALVFGyNhPJEMzD1QIDr+Y7hfZx09iUvxdXHKDFz" - text := "If you think cryptography is the answer to your problem,\n" + - "then you don't know what your problem is.\n" - - signer, err := note.NewSigner(skey) - if err != nil { - fmt.Println(err) - return - } - - msg, err := note.Sign(¬e.Note{Text: text}, signer) - if err != nil { - fmt.Println(err) - return - } - os.Stdout.Write(msg) - - // Output: - // If you think cryptography is the answer to your problem, - // then you don't know what your problem is. - // - // — PeterNeumann x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM= -} - -func ExampleOpen() { - vkey := "PeterNeumann+c74f20a3+ARpc2QcUPDhMQegwxbzhKqiBfsVkmqq/LDE4izWy10TW" - msg := []byte("If you think cryptography is the answer to your problem,\n" + - "then you don't know what your problem is.\n" + - "\n" + - "— PeterNeumann x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM=\n") - - verifier, err := note.NewVerifier(vkey) - if err != nil { - fmt.Println(err) - return - } - verifiers := note.VerifierList(verifier) - - n, err := note.Open(msg, verifiers) - if err != nil { - fmt.Println(err) - return - } - fmt.Printf("%s (%08x):\n%s", n.Sigs[0].Name, n.Sigs[0].Hash, n.Text) - - // Output: - // PeterNeumann (c74f20a3): - // If you think cryptography is the answer to your problem, - // then you don't know what your problem is. -} - -var rand = struct { - Reader io.Reader -}{ - zeroReader{}, -} - -type zeroReader struct{} - -func (zeroReader) Read(buf []byte) (int, error) { - for i := range buf { - buf[i] = 0 - } - return len(buf), nil -} - -func ExampleSign_add_signatures() { - vkey := "PeterNeumann+c74f20a3+ARpc2QcUPDhMQegwxbzhKqiBfsVkmqq/LDE4izWy10TW" - msg := []byte("If you think cryptography is the answer to your problem,\n" + - "then you don't know what your problem is.\n" + - "\n" + - "— PeterNeumann x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM=\n") - - verifier, err := note.NewVerifier(vkey) - if err != nil { - fmt.Println(err) - return - } - verifiers := note.VerifierList(verifier) - - n, err := note.Open([]byte(msg), verifiers) - if err != nil { - fmt.Println(err) - return - } - - skey, vkey, err := note.GenerateKey(rand.Reader, "EnochRoot") - if err != nil { - fmt.Println(err) - return - } - _ = vkey // give to verifiers - - me, err := note.NewSigner(skey) - if err != nil { - fmt.Println(err) - return - } - - msg, err = note.Sign(n, me) - if err != nil { - fmt.Println(err) - return - } - os.Stdout.Write(msg) - - // Output: - // If you think cryptography is the answer to your problem, - // then you don't know what your problem is. - // - // — PeterNeumann x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM= - // — EnochRoot rwz+eBzmZa0SO3NbfRGzPCpDckykFXSdeX+MNtCOXm2/5n2tiOHp+vAF1aGrQ5ovTG01oOTGwnWLox33WWd1RvMc+QQ= -} diff --git a/src/cmd/go/internal/note/note_test.go b/src/cmd/go/internal/note/note_test.go deleted file mode 100644 index 729324647e..0000000000 --- a/src/cmd/go/internal/note/note_test.go +++ /dev/null @@ -1,472 +0,0 @@ -// Copyright 2019 The Go 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 note - -import ( - "crypto/ed25519" - "crypto/rand" - "errors" - "strings" - "testing" - "testing/iotest" -) - -func TestNewVerifier(t *testing.T) { - vkey := "PeterNeumann+c74f20a3+ARpc2QcUPDhMQegwxbzhKqiBfsVkmqq/LDE4izWy10TW" - _, err := NewVerifier(vkey) - if err != nil { - t.Fatal(err) - } - - // Check various manglings are not accepted. - badKey := func(k string) { - _, err := NewVerifier(k) - if err == nil { - t.Errorf("NewVerifier(%q) succeeded, should have failed", k) - } - } - - b := []byte(vkey) - for i := 0; i <= len(b); i++ { - for j := i + 1; j <= len(b); j++ { - if i != 0 || j != len(b) { - badKey(string(b[i:j])) - } - } - } - for i := 0; i < len(b); i++ { - b[i]++ - badKey(string(b)) - b[i]-- - } - - badKey("PeterNeumann+cc469956+ARpc2QcUPDhMQegwxbzhKqiBfsVkmqq/LDE4izWy10TWBADKEY==") // wrong length key, with adjusted key hash - badKey("PeterNeumann+173116ae+ZRpc2QcUPDhMQegwxbzhKqiBfsVkmqq/LDE4izWy10TW") // unknown algorithm, with adjusted key hash -} - -func TestNewSigner(t *testing.T) { - skey := "PRIVATE+KEY+PeterNeumann+c74f20a3+AYEKFALVFGyNhPJEMzD1QIDr+Y7hfZx09iUvxdXHKDFz" - _, err := NewSigner(skey) - if err != nil { - t.Fatal(err) - } - - // Check various manglings are not accepted. - b := []byte(skey) - for i := 0; i <= len(b); i++ { - for j := i + 1; j <= len(b); j++ { - if i == 0 && j == len(b) { - continue - } - _, err := NewSigner(string(b[i:j])) - if err == nil { - t.Errorf("NewSigner(%q) succeeded, should have failed", b[i:j]) - } - } - } - for i := 0; i < len(b); i++ { - b[i]++ - _, err := NewSigner(string(b)) - if err == nil { - t.Errorf("NewSigner(%q) succeeded, should have failed", b) - } - b[i]-- - } -} - -func testSignerAndVerifier(t *testing.T, Name string, signer Signer, verifier Verifier) { - if name := signer.Name(); name != Name { - t.Errorf("signer.Name() = %q, want %q", name, Name) - } - if name := verifier.Name(); name != Name { - t.Errorf("verifier.Name() = %q, want %q", name, Name) - } - shash := signer.KeyHash() - vhash := verifier.KeyHash() - if shash != vhash { - t.Errorf("signer.KeyHash() = %#08x != verifier.KeyHash() = %#08x", shash, vhash) - } - - msg := []byte("hi") - sig, err := signer.Sign(msg) - if err != nil { - t.Fatalf("signer.Sign: %v", err) - } - if !verifier.Verify(msg, sig) { - t.Fatalf("verifier.Verify failed on signature returned by signer.Sign") - } - sig[0]++ - if verifier.Verify(msg, sig) { - t.Fatalf("verifier.Verify succceeded on corrupt signature") - } - sig[0]-- - msg[0]++ - if verifier.Verify(msg, sig) { - t.Fatalf("verifier.Verify succceeded on corrupt message") - } -} - -func TestGenerateKey(t *testing.T) { - // Generate key pair, make sure it is all self-consistent. - const Name = "EnochRoot" - - skey, vkey, err := GenerateKey(rand.Reader, Name) - if err != nil { - t.Fatalf("GenerateKey: %v", err) - } - signer, err := NewSigner(skey) - if err != nil { - t.Fatalf("NewSigner: %v", err) - } - verifier, err := NewVerifier(vkey) - if err != nil { - t.Fatalf("NewVerifier: %v", err) - } - - testSignerAndVerifier(t, Name, signer, verifier) - - // Check that GenerateKey returns error from rand reader. - _, _, err = GenerateKey(iotest.TimeoutReader(iotest.OneByteReader(rand.Reader)), Name) - if err == nil { - t.Fatalf("GenerateKey succeeded with error-returning rand reader") - } -} - -func TestFromEd25519(t *testing.T) { - const Name = "EnochRoot" - - pub, priv, err := ed25519.GenerateKey(rand.Reader) - if err != nil { - t.Fatalf("GenerateKey: %v", err) - } - signer, err := newSignerFromEd25519Seed(Name, priv.Seed()) - if err != nil { - t.Fatalf("newSignerFromEd25519Seed: %v", err) - } - vkey, err := NewEd25519VerifierKey(Name, pub) - if err != nil { - t.Fatalf("NewEd25519VerifierKey: %v", err) - } - verifier, err := NewVerifier(vkey) - if err != nil { - t.Fatalf("NewVerifier: %v", err) - } - - testSignerAndVerifier(t, Name, signer, verifier) - - // Check that wrong key sizes return errors. - _, err = NewEd25519VerifierKey(Name, pub[:len(pub)-1]) - if err == nil { - t.Errorf("NewEd25519VerifierKey succeeded with a seed of the wrong size") - } -} - -// newSignerFromEd25519Seed constructs a new signer from a verifier name and a -// crypto/ed25519 private key seed. -func newSignerFromEd25519Seed(name string, seed []byte) (Signer, error) { - if len(seed) != ed25519.SeedSize { - return nil, errors.New("invalid seed size") - } - priv := ed25519.NewKeyFromSeed(seed) - pub := priv[32:] - - pubkey := append([]byte{algEd25519}, pub...) - hash := keyHash(name, pubkey) - - s := &signer{ - name: name, - hash: uint32(hash), - sign: func(msg []byte) ([]byte, error) { - return ed25519.Sign(priv, msg), nil - }, - } - return s, nil -} - -func TestSign(t *testing.T) { - skey := "PRIVATE+KEY+PeterNeumann+c74f20a3+AYEKFALVFGyNhPJEMzD1QIDr+Y7hfZx09iUvxdXHKDFz" - text := "If you think cryptography is the answer to your problem,\n" + - "then you don't know what your problem is.\n" - - signer, err := NewSigner(skey) - if err != nil { - t.Fatal(err) - } - - msg, err := Sign(&Note{Text: text}, signer) - if err != nil { - t.Fatal(err) - } - - want := `If you think cryptography is the answer to your problem, -then you don't know what your problem is. - -— PeterNeumann x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM= -` - if string(msg) != want { - t.Errorf("Sign: wrong output\nhave:\n%s\nwant:\n%s", msg, want) - } - - // Check that existing signature is replaced by new one. - msg, err = Sign(&Note{Text: text, Sigs: []Signature{{Name: "PeterNeumann", Hash: 0xc74f20a3, Base64: "BADSIGN="}}}, signer) - if err != nil { - t.Fatal(err) - } - if string(msg) != want { - t.Errorf("Sign replacing signature: wrong output\nhave:\n%s\nwant:\n%s", msg, want) - } - - // Check various bad inputs. - _, err = Sign(&Note{Text: "abc"}, signer) - if err == nil || err.Error() != "malformed note" { - t.Fatalf("Sign with short text: %v, want malformed note error", err) - } - - _, err = Sign(&Note{Text: text, Sigs: []Signature{{Name: "a+b", Base64: "ABCD"}}}) - if err == nil || err.Error() != "malformed note" { - t.Fatalf("Sign with bad name: %v, want malformed note error", err) - } - - _, err = Sign(&Note{Text: text, Sigs: []Signature{{Name: "PeterNeumann", Hash: 0xc74f20a3, Base64: "BADHASH="}}}) - if err == nil || err.Error() != "malformed note" { - t.Fatalf("Sign with bad pre-filled signature: %v, want malformed note error", err) - } - - _, err = Sign(&Note{Text: text}, &badSigner{signer}) - if err == nil || err.Error() != "invalid signer" { - t.Fatalf("Sign with bad signer: %v, want invalid signer error", err) - } - - _, err = Sign(&Note{Text: text}, &errSigner{signer}) - if err != errSurprise { - t.Fatalf("Sign with failing signer: %v, want errSurprise", err) - } -} - -func TestVerifierList(t *testing.T) { - peterKey := "PeterNeumann+c74f20a3+ARpc2QcUPDhMQegwxbzhKqiBfsVkmqq/LDE4izWy10TW" - peterVerifier, err := NewVerifier(peterKey) - if err != nil { - t.Fatal(err) - } - - enochKey := "EnochRoot+af0cfe78+ATtqJ7zOtqQtYqOo0CpvDXNlMhV3HeJDpjrASKGLWdop" - enochVerifier, err := NewVerifier(enochKey) - if err != nil { - t.Fatal(err) - } - - list := VerifierList(peterVerifier, enochVerifier, enochVerifier) - v, err := list.Verifier("PeterNeumann", 0xc74f20a3) - if v != peterVerifier || err != nil { - t.Fatalf("list.Verifier(peter) = %v, %v, want %v, nil", v, err, peterVerifier) - } - v, err = list.Verifier("PeterNeumann", 0xc74f20a4) - if v != nil || err == nil || err.Error() != "unknown key PeterNeumann+c74f20a4" { - t.Fatalf("list.Verifier(peter bad hash) = %v, %v, want nil, unknown key error", v, err) - } - - v, err = list.Verifier("PeterNeuman", 0xc74f20a3) - if v != nil || err == nil || err.Error() != "unknown key PeterNeuman+c74f20a3" { - t.Fatalf("list.Verifier(peter bad name) = %v, %v, want nil, unknown key error", v, err) - } - v, err = list.Verifier("EnochRoot", 0xaf0cfe78) - if v != nil || err == nil || err.Error() != "ambiguous key EnochRoot+af0cfe78" { - t.Fatalf("list.Verifier(enoch) = %v, %v, want nil, ambiguous key error", v, err) - } -} - -type badSigner struct { - Signer -} - -func (b *badSigner) Name() string { - return "bad name" -} - -var errSurprise = errors.New("surprise!") - -type errSigner struct { - Signer -} - -func (e *errSigner) Sign([]byte) ([]byte, error) { - return nil, errSurprise -} - -func TestOpen(t *testing.T) { - peterKey := "PeterNeumann+c74f20a3+ARpc2QcUPDhMQegwxbzhKqiBfsVkmqq/LDE4izWy10TW" - peterVerifier, err := NewVerifier(peterKey) - if err != nil { - t.Fatal(err) - } - - enochKey := "EnochRoot+af0cfe78+ATtqJ7zOtqQtYqOo0CpvDXNlMhV3HeJDpjrASKGLWdop" - enochVerifier, err := NewVerifier(enochKey) - if err != nil { - t.Fatal(err) - } - - text := `If you think cryptography is the answer to your problem, -then you don't know what your problem is. -` - peterSig := "— PeterNeumann x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM=\n" - enochSig := "— EnochRoot rwz+eBzmZa0SO3NbfRGzPCpDckykFXSdeX+MNtCOXm2/5n2tiOHp+vAF1aGrQ5ovTG01oOTGwnWLox33WWd1RvMc+QQ=\n" - - peter := Signature{"PeterNeumann", 0xc74f20a3, "x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM="} - enoch := Signature{"EnochRoot", 0xaf0cfe78, "rwz+eBzmZa0SO3NbfRGzPCpDckykFXSdeX+MNtCOXm2/5n2tiOHp+vAF1aGrQ5ovTG01oOTGwnWLox33WWd1RvMc+QQ="} - - // Check one signature verified, one not. - n, err := Open([]byte(text+"\n"+peterSig+enochSig), VerifierList(peterVerifier)) - if err != nil { - t.Fatal(err) - } - if n.Text != text { - t.Errorf("n.Text = %q, want %q", n.Text, text) - } - if len(n.Sigs) != 1 || n.Sigs[0] != peter { - t.Errorf("n.Sigs:\nhave %v\nwant %v", n.Sigs, []Signature{peter}) - } - if len(n.UnverifiedSigs) != 1 || n.UnverifiedSigs[0] != enoch { - t.Errorf("n.UnverifiedSigs:\nhave %v\nwant %v", n.Sigs, []Signature{peter}) - } - - // Check both verified. - n, err = Open([]byte(text+"\n"+peterSig+enochSig), VerifierList(peterVerifier, enochVerifier)) - if err != nil { - t.Fatal(err) - } - if len(n.Sigs) != 2 || n.Sigs[0] != peter || n.Sigs[1] != enoch { - t.Errorf("n.Sigs:\nhave %v\nwant %v", n.Sigs, []Signature{peter, enoch}) - } - if len(n.UnverifiedSigs) != 0 { - t.Errorf("n.UnverifiedSigs:\nhave %v\nwant %v", n.Sigs, []Signature{}) - } - - // Check both unverified. - n, err = Open([]byte(text+"\n"+peterSig+enochSig), VerifierList()) - if n != nil || err == nil { - t.Fatalf("Open unverified = %v, %v, want nil, error", n, err) - } - e, ok := err.(*UnverifiedNoteError) - if !ok { - t.Fatalf("Open unverified: err is %T, want *UnverifiedNoteError", err) - } - if err.Error() != "note has no verifiable signatures" { - t.Fatalf("Open unverified: err.Error() = %q, want %q", err.Error(), "note has no verifiable signatures") - } - - n = e.Note - if n == nil { - t.Fatalf("Open unverified: missing note in UnverifiedNoteError") - } - if len(n.Sigs) != 0 { - t.Errorf("n.Sigs:\nhave %v\nwant %v", n.Sigs, []Signature{}) - } - if len(n.UnverifiedSigs) != 2 || n.UnverifiedSigs[0] != peter || n.UnverifiedSigs[1] != enoch { - t.Errorf("n.UnverifiedSigs:\nhave %v\nwant %v", n.Sigs, []Signature{peter, enoch}) - } - - // Check duplicated verifier. - _, err = Open([]byte(text+"\n"+enochSig), VerifierList(enochVerifier, peterVerifier, enochVerifier)) - if err == nil || err.Error() != "ambiguous key EnochRoot+af0cfe78" { - t.Fatalf("Open with duplicated verifier: err=%v, want ambiguous key", err) - } - - // Check unused duplicated verifier. - _, err = Open([]byte(text+"\n"+peterSig), VerifierList(enochVerifier, peterVerifier, enochVerifier)) - if err != nil { - t.Fatal(err) - } - - // Check too many signatures. - n, err = Open([]byte(text+"\n"+strings.Repeat(peterSig, 101)), VerifierList(peterVerifier)) - if n != nil || err == nil || err.Error() != "malformed note" { - t.Fatalf("Open too many verified signatures = %v, %v, want nil, malformed note error", n, err) - } - n, err = Open([]byte(text+"\n"+strings.Repeat(peterSig, 101)), VerifierList()) - if n != nil || err == nil || err.Error() != "malformed note" { - t.Fatalf("Open too many verified signatures = %v, %v, want nil, malformed note error", n, err) - } - - // Invalid signature. - n, err = Open([]byte(text+"\n"+peterSig[:60]+"ABCD"+peterSig[60:]), VerifierList(peterVerifier)) - if n != nil || err == nil || err.Error() != "invalid signature for key PeterNeumann+c74f20a3" { - t.Fatalf("Open too many verified signatures = %v, %v, want nil, invalid signature error", n, err) - } - - // Duplicated verified and unverified signatures. - enochABCD := Signature{"EnochRoot", 0xaf0cfe78, "rwz+eBzmZa0SO3NbfRGzPCpDckykFXSdeX+MNtCOXm2/5n" + "ABCD" + "2tiOHp+vAF1aGrQ5ovTG01oOTGwnWLox33WWd1RvMc+QQ="} - n, err = Open([]byte(text+"\n"+peterSig+peterSig+enochSig+enochSig+enochSig[:60]+"ABCD"+enochSig[60:]), VerifierList(peterVerifier)) - if err != nil { - t.Fatal(err) - } - if len(n.Sigs) != 1 || n.Sigs[0] != peter { - t.Errorf("n.Sigs:\nhave %v\nwant %v", n.Sigs, []Signature{peter}) - } - if len(n.UnverifiedSigs) != 2 || n.UnverifiedSigs[0] != enoch || n.UnverifiedSigs[1] != enochABCD { - t.Errorf("n.UnverifiedSigs:\nhave %v\nwant %v", n.UnverifiedSigs, []Signature{enoch, enochABCD}) - } - - // Invalid encoded message syntax. - badMsgs := []string{ - text, - text + "\n", - text + "\n" + peterSig[:len(peterSig)-1], - "\x01" + text + "\n" + peterSig, - "\xff" + text + "\n" + peterSig, - text + "\n" + "— Bad Name x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM=", - text + "\n" + peterSig + "Unexpected line.\n", - } - for _, msg := range badMsgs { - n, err := Open([]byte(msg), VerifierList(peterVerifier)) - if n != nil || err == nil || err.Error() != "malformed note" { - t.Fatalf("Open bad msg = %v, %v, want nil, malformed note error\nmsg:\n%s", n, err, msg) - } - } -} - -func BenchmarkOpen(b *testing.B) { - vkey := "PeterNeumann+c74f20a3+ARpc2QcUPDhMQegwxbzhKqiBfsVkmqq/LDE4izWy10TW" - msg := []byte("If you think cryptography is the answer to your problem,\n" + - "then you don't know what your problem is.\n" + - "\n" + - "— PeterNeumann x08go/ZJkuBS9UG/SffcvIAQxVBtiFupLLr8pAcElZInNIuGUgYN1FFYC2pZSNXgKvqfqdngotpRZb6KE6RyyBwJnAM=\n") - - verifier, err := NewVerifier(vkey) - if err != nil { - b.Fatal(err) - } - verifiers := VerifierList(verifier) - verifiers0 := VerifierList() - - // Try with 0 signatures and 1 signature so we can tell how much each signature adds. - - b.Run("Sig0", func(b *testing.B) { - for i := 0; i < b.N; i++ { - _, err := Open(msg, verifiers0) - e, ok := err.(*UnverifiedNoteError) - if !ok { - b.Fatal("expected UnverifiedNoteError") - } - n := e.Note - if len(n.Sigs) != 0 || len(n.UnverifiedSigs) != 1 { - b.Fatal("wrong signature count") - } - } - }) - - b.Run("Sig1", func(b *testing.B) { - for i := 0; i < b.N; i++ { - n, err := Open(msg, verifiers) - if err != nil { - b.Fatal(err) - } - if len(n.Sigs) != 1 || len(n.UnverifiedSigs) != 0 { - b.Fatal("wrong signature count") - } - } - }) -} diff --git a/src/cmd/go/internal/semver/semver_test.go b/src/cmd/go/internal/semver/semver_test.go deleted file mode 100644 index 77025a44ab..0000000000 --- a/src/cmd/go/internal/semver/semver_test.go +++ /dev/null @@ -1,183 +0,0 @@ -// Copyright 2018 The Go 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 semver - -import ( - "strings" - "testing" -) - -var tests = []struct { - in string - out string -}{ - {"bad", ""}, - {"v1-alpha.beta.gamma", ""}, - {"v1-pre", ""}, - {"v1+meta", ""}, - {"v1-pre+meta", ""}, - {"v1.2-pre", ""}, - {"v1.2+meta", ""}, - {"v1.2-pre+meta", ""}, - {"v1.0.0-alpha", "v1.0.0-alpha"}, - {"v1.0.0-alpha.1", "v1.0.0-alpha.1"}, - {"v1.0.0-alpha.beta", "v1.0.0-alpha.beta"}, - {"v1.0.0-beta", "v1.0.0-beta"}, - {"v1.0.0-beta.2", "v1.0.0-beta.2"}, - {"v1.0.0-beta.11", "v1.0.0-beta.11"}, - {"v1.0.0-rc.1", "v1.0.0-rc.1"}, - {"v1", "v1.0.0"}, - {"v1.0", "v1.0.0"}, - {"v1.0.0", "v1.0.0"}, - {"v1.2", "v1.2.0"}, - {"v1.2.0", "v1.2.0"}, - {"v1.2.3-456", "v1.2.3-456"}, - {"v1.2.3-456.789", "v1.2.3-456.789"}, - {"v1.2.3-456-789", "v1.2.3-456-789"}, - {"v1.2.3-456a", "v1.2.3-456a"}, - {"v1.2.3-pre", "v1.2.3-pre"}, - {"v1.2.3-pre+meta", "v1.2.3-pre"}, - {"v1.2.3-pre.1", "v1.2.3-pre.1"}, - {"v1.2.3-zzz", "v1.2.3-zzz"}, - {"v1.2.3", "v1.2.3"}, - {"v1.2.3+meta", "v1.2.3"}, - {"v1.2.3+meta-pre", "v1.2.3"}, - {"v1.2.3+meta-pre.sha.256a", "v1.2.3"}, -} - -func TestIsValid(t *testing.T) { - for _, tt := range tests { - ok := IsValid(tt.in) - if ok != (tt.out != "") { - t.Errorf("IsValid(%q) = %v, want %v", tt.in, ok, !ok) - } - } -} - -func TestCanonical(t *testing.T) { - for _, tt := range tests { - out := Canonical(tt.in) - if out != tt.out { - t.Errorf("Canonical(%q) = %q, want %q", tt.in, out, tt.out) - } - } -} - -func TestMajor(t *testing.T) { - for _, tt := range tests { - out := Major(tt.in) - want := "" - if i := strings.Index(tt.out, "."); i >= 0 { - want = tt.out[:i] - } - if out != want { - t.Errorf("Major(%q) = %q, want %q", tt.in, out, want) - } - } -} - -func TestMajorMinor(t *testing.T) { - for _, tt := range tests { - out := MajorMinor(tt.in) - var want string - if tt.out != "" { - want = tt.in - if i := strings.Index(want, "+"); i >= 0 { - want = want[:i] - } - if i := strings.Index(want, "-"); i >= 0 { - want = want[:i] - } - switch strings.Count(want, ".") { - case 0: - want += ".0" - case 1: - // ok - case 2: - want = want[:strings.LastIndex(want, ".")] - } - } - if out != want { - t.Errorf("MajorMinor(%q) = %q, want %q", tt.in, out, want) - } - } -} - -func TestPrerelease(t *testing.T) { - for _, tt := range tests { - pre := Prerelease(tt.in) - var want string - if tt.out != "" { - if i := strings.Index(tt.out, "-"); i >= 0 { - want = tt.out[i:] - } - } - if pre != want { - t.Errorf("Prerelease(%q) = %q, want %q", tt.in, pre, want) - } - } -} - -func TestBuild(t *testing.T) { - for _, tt := range tests { - build := Build(tt.in) - var want string - if tt.out != "" { - if i := strings.Index(tt.in, "+"); i >= 0 { - want = tt.in[i:] - } - } - if build != want { - t.Errorf("Build(%q) = %q, want %q", tt.in, build, want) - } - } -} - -func TestCompare(t *testing.T) { - for i, ti := range tests { - for j, tj := range tests { - cmp := Compare(ti.in, tj.in) - var want int - if ti.out == tj.out { - want = 0 - } else if i < j { - want = -1 - } else { - want = +1 - } - if cmp != want { - t.Errorf("Compare(%q, %q) = %d, want %d", ti.in, tj.in, cmp, want) - } - } - } -} - -func TestMax(t *testing.T) { - for i, ti := range tests { - for j, tj := range tests { - max := Max(ti.in, tj.in) - want := Canonical(ti.in) - if i < j { - want = Canonical(tj.in) - } - if max != want { - t.Errorf("Max(%q, %q) = %q, want %q", ti.in, tj.in, max, want) - } - } - } -} - -var ( - v1 = "v1.0.0+metadata-dash" - v2 = "v1.0.0+metadata-dash1" -) - -func BenchmarkCompare(b *testing.B) { - for i := 0; i < b.N; i++ { - if Compare(v1, v2) != 0 { - b.Fatalf("bad compare") - } - } -} diff --git a/src/cmd/go/internal/sumdb/client_test.go b/src/cmd/go/internal/sumdb/client_test.go deleted file mode 100644 index d0e0a366be..0000000000 --- a/src/cmd/go/internal/sumdb/client_test.go +++ /dev/null @@ -1,460 +0,0 @@ -// Copyright 2019 The Go 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 sumdb - -import ( - "bytes" - "fmt" - "strings" - "sync" - "testing" - - "cmd/go/internal/note" - "cmd/go/internal/tlog" -) - -const ( - testName = "localhost.localdev/sumdb" - testVerifierKey = "localhost.localdev/sumdb+00000c67+AcTrnkbUA+TU4heY3hkjiSES/DSQniBqIeQ/YppAUtK6" - testSignerKey = "PRIVATE+KEY+localhost.localdev/sumdb+00000c67+AXu6+oaVaOYuQOFrf1V59JK1owcFlJcHwwXHDfDGxSPk" -) - -func TestClientLookup(t *testing.T) { - tc := newTestClient(t) - tc.mustHaveLatest(1) - - // Basic lookup. - tc.mustLookup("rsc.io/sampler", "v1.3.0", "rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=") - tc.mustHaveLatest(3) - - // Everything should now be cached, both for the original package and its /go.mod. - tc.getOK = false - tc.mustLookup("rsc.io/sampler", "v1.3.0", "rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=") - tc.mustLookup("rsc.io/sampler", "v1.3.0/go.mod", "rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=") - tc.mustHaveLatest(3) - tc.getOK = true - tc.getTileOK = false // the cache has what we need - - // Lookup with multiple returned lines. - tc.mustLookup("rsc.io/quote", "v1.5.2", "rsc.io/quote v1.5.2 h1:w5fcysjrx7yqtD/aO+QwRjYZOKnaM9Uh2b40tElTs3Y=\nrsc.io/quote v1.5.2 h2:xyzzy") - tc.mustHaveLatest(3) - - // Lookup with need for !-encoding. - // rsc.io/Quote is the only record written after rsc.io/samper, - // so it is the only one that should need more tiles. - tc.getTileOK = true - tc.mustLookup("rsc.io/Quote", "v1.5.2", "rsc.io/Quote v1.5.2 h1:uppercase!=") - tc.mustHaveLatest(4) -} - -func TestClientBadTiles(t *testing.T) { - tc := newTestClient(t) - - flipBits := func() { - for url, data := range tc.remote { - if strings.Contains(url, "/tile/") { - for i := range data { - data[i] ^= 0x80 - } - } - } - } - - // Bad tiles in initial download. - tc.mustHaveLatest(1) - flipBits() - _, err := tc.client.Lookup("rsc.io/sampler", "v1.3.0") - tc.mustError(err, "rsc.io/sampler@v1.3.0: initializing sumdb.Client: checking tree#1: downloaded inconsistent tile") - flipBits() - tc.newClient() - tc.mustLookup("rsc.io/sampler", "v1.3.0", "rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=") - - // Bad tiles after initial download. - flipBits() - _, err = tc.client.Lookup("rsc.io/Quote", "v1.5.2") - tc.mustError(err, "rsc.io/Quote@v1.5.2: checking tree#3 against tree#4: downloaded inconsistent tile") - flipBits() - tc.newClient() - tc.mustLookup("rsc.io/Quote", "v1.5.2", "rsc.io/Quote v1.5.2 h1:uppercase!=") - - // Bad starting tree hash looks like bad tiles. - tc.newClient() - text := tlog.FormatTree(tlog.Tree{N: 1, Hash: tlog.Hash{}}) - data, err := note.Sign(¬e.Note{Text: string(text)}, tc.signer) - if err != nil { - tc.t.Fatal(err) - } - tc.config[testName+"/latest"] = data - _, err = tc.client.Lookup("rsc.io/sampler", "v1.3.0") - tc.mustError(err, "rsc.io/sampler@v1.3.0: initializing sumdb.Client: checking tree#1: downloaded inconsistent tile") -} - -func TestClientFork(t *testing.T) { - tc := newTestClient(t) - tc2 := tc.fork() - - tc.addRecord("rsc.io/pkg1@v1.5.2", `rsc.io/pkg1 v1.5.2 h1:hash!= -`) - tc.addRecord("rsc.io/pkg1@v1.5.4", `rsc.io/pkg1 v1.5.4 h1:hash!= -`) - tc.mustLookup("rsc.io/pkg1", "v1.5.2", "rsc.io/pkg1 v1.5.2 h1:hash!=") - - tc2.addRecord("rsc.io/pkg1@v1.5.3", `rsc.io/pkg1 v1.5.3 h1:hash!= -`) - tc2.addRecord("rsc.io/pkg1@v1.5.4", `rsc.io/pkg1 v1.5.4 h1:hash!= -`) - tc2.mustLookup("rsc.io/pkg1", "v1.5.4", "rsc.io/pkg1 v1.5.4 h1:hash!=") - - key := "/lookup/rsc.io/pkg1@v1.5.2" - tc2.remote[key] = tc.remote[key] - _, err := tc2.client.Lookup("rsc.io/pkg1", "v1.5.2") - tc2.mustError(err, ErrSecurity.Error()) - - /* - SECURITY ERROR - go.sum database server misbehavior detected! - - old database: - go.sum database tree! - 5 - nWzN20+pwMt62p7jbv1/NlN95ePTlHijabv5zO/s36w= - - — localhost.localdev/sumdb AAAMZ5/2FVAdMH58kmnz/0h299pwyskEbzDzoa2/YaPdhvLya4YWDFQQxu2TQb5GpwAH4NdWnTwuhILafisyf3CNbgg= - - new database: - go.sum database tree - 6 - wc4SkQt52o5W2nQ8To2ARs+mWuUJjss+sdleoiqxMmM= - - — localhost.localdev/sumdb AAAMZ6oRNswlEZ6ZZhxrCvgl1MBy+nusq4JU+TG6Fe2NihWLqOzb+y2c2kzRLoCr4tvw9o36ucQEnhc20e4nA4Qc/wc= - - proof of misbehavior: - T7i+H/8ER4nXOiw4Bj0koZOkGjkxoNvlI34GpvhHhQg= - Nsuejv72de9hYNM5bqFv8rv3gm3zJQwv/DT/WNbLDLA= - mOmqqZ1aI/lzS94oq/JSbj7pD8Rv9S+xDyi12BtVSHo= - /7Aw5jVSMM9sFjQhaMg+iiDYPMk6decH7QLOGrL9Lx0= - */ - - wants := []string{ - "SECURITY ERROR", - "go.sum database server misbehavior detected!", - "old database:\n\tgo.sum database tree\n\t5\n", - "— localhost.localdev/sumdb AAAMZ5/2FVAd", - "new database:\n\tgo.sum database tree\n\t6\n", - "— localhost.localdev/sumdb AAAMZ6oRNswl", - "proof of misbehavior:\n\tT7i+H/8ER4nXOiw4Bj0k", - } - text := tc2.security.String() - for _, want := range wants { - if !strings.Contains(text, want) { - t.Fatalf("cannot find %q in security text:\n%s", want, text) - } - } -} - -func TestClientGONOSUMDB(t *testing.T) { - tc := newTestClient(t) - tc.client.SetGONOSUMDB("p,*/q") - tc.client.Lookup("rsc.io/sampler", "v1.3.0") // initialize before we turn off network - tc.getOK = false - - ok := []string{ - "abc", - "a/p", - "pq", - "q", - "n/o/p/q", - } - skip := []string{ - "p", - "p/x", - "x/q", - "x/q/z", - } - - for _, path := range ok { - _, err := tc.client.Lookup(path, "v1.0.0") - if err == ErrGONOSUMDB { - t.Errorf("Lookup(%q): ErrGONOSUMDB, wanted failed actual lookup", path) - } - } - for _, path := range skip { - _, err := tc.client.Lookup(path, "v1.0.0") - if err != ErrGONOSUMDB { - t.Errorf("Lookup(%q): %v, wanted ErrGONOSUMDB", path, err) - } - } -} - -// A testClient is a self-contained client-side testing environment. -type testClient struct { - t *testing.T // active test - client *Client // client being tested - tileHeight int // tile height to use (default 2) - getOK bool // should tc.GetURL succeed? - getTileOK bool // should tc.GetURL of tiles succeed? - treeSize int64 - hashes []tlog.Hash - remote map[string][]byte - signer note.Signer - - // mu protects config, cache, log, security - // during concurrent use of the exported methods - // by the client itself (testClient is the Client's ClientOps, - // and the Client methods can both read and write these fields). - // Unexported methods invoked directly by the test - // (for example, addRecord) need not hold the mutex: - // for proper test execution those methods should only - // be called when the Client is idle and not using its ClientOps. - // Not holding the mutex in those methods ensures - // that if a mistake is made, go test -race will report it. - // (Holding the mutex would eliminate the race report but - // not the underlying problem.) - // Similarly, the get map is not protected by the mutex, - // because the Client methods only read it. - mu sync.Mutex // prot - config map[string][]byte - cache map[string][]byte - security bytes.Buffer -} - -// newTestClient returns a new testClient that will call t.Fatal on error -// and has a few records already available on the remote server. -func newTestClient(t *testing.T) *testClient { - tc := &testClient{ - t: t, - tileHeight: 2, - getOK: true, - getTileOK: true, - config: make(map[string][]byte), - cache: make(map[string][]byte), - remote: make(map[string][]byte), - } - - tc.config["key"] = []byte(testVerifierKey + "\n") - var err error - tc.signer, err = note.NewSigner(testSignerKey) - if err != nil { - t.Fatal(err) - } - - tc.newClient() - - tc.addRecord("rsc.io/quote@v1.5.2", `rsc.io/quote v1.5.2 h1:w5fcysjrx7yqtD/aO+QwRjYZOKnaM9Uh2b40tElTs3Y= -rsc.io/quote v1.5.2/go.mod h1:LzX7hefJvL54yjefDEDHNONDjII0t9xZLPXsUe+TKr0= -rsc.io/quote v1.5.2 h2:xyzzy -`) - - tc.addRecord("golang.org/x/text@v0.0.0-20170915032832-14c0d48ead0c", `golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c h1:qgOY6WgZOaTkIIMiVjBQcw93ERBE4m30iBm00nkL0i8= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -`) - tc.addRecord("rsc.io/sampler@v1.3.0", `rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -`) - tc.config[testName+"/latest"] = tc.signTree(1) - - tc.addRecord("rsc.io/!quote@v1.5.2", `rsc.io/Quote v1.5.2 h1:uppercase!= -`) - return tc -} - -// newClient resets the Client associated with tc. -// This clears any in-memory cache from the Client -// but not tc's on-disk cache. -func (tc *testClient) newClient() { - tc.client = NewClient(tc) - tc.client.SetTileHeight(tc.tileHeight) -} - -// mustLookup does a lookup for path@vers and checks that the lines that come back match want. -func (tc *testClient) mustLookup(path, vers, want string) { - tc.t.Helper() - lines, err := tc.client.Lookup(path, vers) - if err != nil { - tc.t.Fatal(err) - } - if strings.Join(lines, "\n") != want { - tc.t.Fatalf("Lookup(%q, %q):\n\t%s\nwant:\n\t%s", path, vers, strings.Join(lines, "\n\t"), strings.Replace(want, "\n", "\n\t", -1)) - } -} - -// mustHaveLatest checks that the on-disk configuration -// for latest is a tree of size n. -func (tc *testClient) mustHaveLatest(n int64) { - tc.t.Helper() - - latest := tc.config[testName+"/latest"] - lines := strings.Split(string(latest), "\n") - if len(lines) < 2 || lines[1] != fmt.Sprint(n) { - tc.t.Fatalf("/latest should have tree %d, but has:\n%s", n, latest) - } -} - -// mustError checks that err's error string contains the text. -func (tc *testClient) mustError(err error, text string) { - tc.t.Helper() - if err == nil || !strings.Contains(err.Error(), text) { - tc.t.Fatalf("err = %v, want %q", err, text) - } -} - -// fork returns a copy of tc. -// Changes made to the new copy or to tc are not reflected in the other. -func (tc *testClient) fork() *testClient { - tc2 := &testClient{ - t: tc.t, - getOK: tc.getOK, - getTileOK: tc.getTileOK, - tileHeight: tc.tileHeight, - treeSize: tc.treeSize, - hashes: append([]tlog.Hash{}, tc.hashes...), - signer: tc.signer, - config: copyMap(tc.config), - cache: copyMap(tc.cache), - remote: copyMap(tc.remote), - } - tc2.newClient() - return tc2 -} - -func copyMap(m map[string][]byte) map[string][]byte { - m2 := make(map[string][]byte) - for k, v := range m { - m2[k] = v - } - return m2 -} - -// ReadHashes is tc's implementation of tlog.HashReader, for use with -// tlog.TreeHash and so on. -func (tc *testClient) ReadHashes(indexes []int64) ([]tlog.Hash, error) { - var list []tlog.Hash - for _, id := range indexes { - list = append(list, tc.hashes[id]) - } - return list, nil -} - -// addRecord adds a log record using the given (!-encoded) key and data. -func (tc *testClient) addRecord(key, data string) { - tc.t.Helper() - - // Create record, add hashes to log tree. - id := tc.treeSize - tc.treeSize++ - rec, err := tlog.FormatRecord(id, []byte(data)) - if err != nil { - tc.t.Fatal(err) - } - hashes, err := tlog.StoredHashesForRecordHash(id, tlog.RecordHash([]byte(data)), tc) - if err != nil { - tc.t.Fatal(err) - } - tc.hashes = append(tc.hashes, hashes...) - - // Create lookup result. - tc.remote["/lookup/"+key] = append(rec, tc.signTree(tc.treeSize)...) - - // Create new tiles. - tiles := tlog.NewTiles(tc.tileHeight, id, tc.treeSize) - for _, tile := range tiles { - data, err := tlog.ReadTileData(tile, tc) - if err != nil { - tc.t.Fatal(err) - } - tc.remote["/"+tile.Path()] = data - // TODO delete old partial tiles - } -} - -// signTree returns the signed head for the tree of the given size. -func (tc *testClient) signTree(size int64) []byte { - h, err := tlog.TreeHash(size, tc) - if err != nil { - tc.t.Fatal(err) - } - text := tlog.FormatTree(tlog.Tree{N: size, Hash: h}) - data, err := note.Sign(¬e.Note{Text: string(text)}, tc.signer) - if err != nil { - tc.t.Fatal(err) - } - return data -} - -// ReadRemote is for tc's implementation of Client. -func (tc *testClient) ReadRemote(path string) ([]byte, error) { - // No mutex here because only the Client should be running - // and the Client cannot change tc.get. - if !tc.getOK { - return nil, fmt.Errorf("disallowed remote read %s", path) - } - if strings.Contains(path, "/tile/") && !tc.getTileOK { - return nil, fmt.Errorf("disallowed remote tile read %s", path) - } - - data, ok := tc.remote[path] - if !ok { - return nil, fmt.Errorf("no remote path %s", path) - } - return data, nil -} - -// ReadConfig is for tc's implementation of Client. -func (tc *testClient) ReadConfig(file string) ([]byte, error) { - tc.mu.Lock() - defer tc.mu.Unlock() - - data, ok := tc.config[file] - if !ok { - return nil, fmt.Errorf("no config %s", file) - } - return data, nil -} - -// WriteConfig is for tc's implementation of Client. -func (tc *testClient) WriteConfig(file string, old, new []byte) error { - tc.mu.Lock() - defer tc.mu.Unlock() - - data := tc.config[file] - if !bytes.Equal(old, data) { - return ErrWriteConflict - } - tc.config[file] = new - return nil -} - -// ReadCache is for tc's implementation of Client. -func (tc *testClient) ReadCache(file string) ([]byte, error) { - tc.mu.Lock() - defer tc.mu.Unlock() - - data, ok := tc.cache[file] - if !ok { - return nil, fmt.Errorf("no cache %s", file) - } - return data, nil -} - -// WriteCache is for tc's implementation of Client. -func (tc *testClient) WriteCache(file string, data []byte) { - tc.mu.Lock() - defer tc.mu.Unlock() - - tc.cache[file] = data -} - -// Log is for tc's implementation of Client. -func (tc *testClient) Log(msg string) { - tc.t.Log(msg) -} - -// SecurityError is for tc's implementation of Client. -func (tc *testClient) SecurityError(msg string) { - tc.mu.Lock() - defer tc.mu.Unlock() - - fmt.Fprintf(&tc.security, "%s\n", strings.TrimRight(msg, "\n")) -} diff --git a/src/cmd/go/internal/tlog/ct_test.go b/src/cmd/go/internal/tlog/ct_test.go deleted file mode 100644 index c2d9aebe79..0000000000 --- a/src/cmd/go/internal/tlog/ct_test.go +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2019 The Go 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 tlog - -import ( - "encoding/json" - "fmt" - "io/ioutil" - "net/http" - "net/url" - "os" - "testing" -) - -func TestCertificateTransparency(t *testing.T) { - // Test that we can verify actual Certificate Transparency proofs. - // (The other tests check that we can verify our own proofs; - // this is a test that the two are compatible.) - - if testing.Short() { - t.Skip("skipping in -short mode") - } - - var root ctTree - httpGET(t, "http://ct.googleapis.com/logs/argon2020/ct/v1/get-sth", &root) - - var leaf ctEntries - httpGET(t, "http://ct.googleapis.com/logs/argon2020/ct/v1/get-entries?start=10000&end=10000", &leaf) - hash := RecordHash(leaf.Entries[0].Data) - - var rp ctRecordProof - httpGET(t, "http://ct.googleapis.com/logs/argon2020/ct/v1/get-proof-by-hash?tree_size="+fmt.Sprint(root.Size)+"&hash="+url.QueryEscape(hash.String()), &rp) - - err := CheckRecord(rp.Proof, root.Size, root.Hash, 10000, hash) - if err != nil { - t.Fatal(err) - } - - var tp ctTreeProof - httpGET(t, "http://ct.googleapis.com/logs/argon2020/ct/v1/get-sth-consistency?first=3654490&second="+fmt.Sprint(root.Size), &tp) - - oh, _ := ParseHash("AuIZ5V6sDUj1vn3Y1K85oOaQ7y+FJJKtyRTl1edIKBQ=") - err = CheckTree(tp.Proof, root.Size, root.Hash, 3654490, oh) - if err != nil { - t.Fatal(err) - } -} - -type ctTree struct { - Size int64 `json:"tree_size"` - Hash Hash `json:"sha256_root_hash"` -} - -type ctEntries struct { - Entries []*ctEntry -} - -type ctEntry struct { - Data []byte `json:"leaf_input"` -} - -type ctRecordProof struct { - Index int64 `json:"leaf_index"` - Proof RecordProof `json:"audit_path"` -} - -type ctTreeProof struct { - Proof TreeProof `json:"consistency"` -} - -func httpGET(t *testing.T, url string, targ interface{}) { - if testing.Verbose() { - println() - println(url) - } - resp, err := http.Get(url) - if err != nil { - t.Fatal(err) - } - defer resp.Body.Close() - data, err := ioutil.ReadAll(resp.Body) - if err != nil { - t.Fatal(err) - } - if testing.Verbose() { - os.Stdout.Write(data) - } - err = json.Unmarshal(data, targ) - if err != nil { - println(url) - os.Stdout.Write(data) - t.Fatal(err) - } -} diff --git a/src/cmd/go/internal/tlog/note_test.go b/src/cmd/go/internal/tlog/note_test.go deleted file mode 100644 index a32d6d2143..0000000000 --- a/src/cmd/go/internal/tlog/note_test.go +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright 2019 The Go 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 tlog - -import ( - "strings" - "testing" -) - -func TestFormatTree(t *testing.T) { - n := int64(123456789012) - h := RecordHash([]byte("hello world")) - golden := "go.sum database tree\n123456789012\nTszzRgjTG6xce+z2AG31kAXYKBgQVtCSCE40HmuwBb0=\n" - b := FormatTree(Tree{n, h}) - if string(b) != golden { - t.Errorf("FormatTree(...) = %q, want %q", b, golden) - } -} - -func TestParseTree(t *testing.T) { - in := "go.sum database tree\n123456789012\nTszzRgjTG6xce+z2AG31kAXYKBgQVtCSCE40HmuwBb0=\n" - goldH := RecordHash([]byte("hello world")) - goldN := int64(123456789012) - tree, err := ParseTree([]byte(in)) - if tree.N != goldN || tree.Hash != goldH || err != nil { - t.Fatalf("ParseTree(...) = Tree{%d, %v}, %v, want Tree{%d, %v}, nil", tree.N, tree.Hash, err, goldN, goldH) - } - - // Check invalid trees. - var badTrees = []string{ - "not-" + in, - "go.sum database tree\n0xabcdef\nTszzRgjTG6xce+z2AG31kAXYKBgQVtCSCE40HmuwBb0=\n", - "go.sum database tree\n123456789012\nTszzRgjTG6xce+z2AG31kAXYKBgQVtCSCE40HmuwBTOOBIG=\n", - } - for _, bad := range badTrees { - _, err := ParseTree([]byte(bad)) - if err == nil { - t.Fatalf("ParseTree(%q) succeeded, want failure", in) - } - } - - // Check junk on end is ignored. - var goodTrees = []string{ - in + "JOE", - in + "JOE\n", - in + strings.Repeat("JOE\n", 1000), - } - for _, good := range goodTrees { - _, err := ParseTree([]byte(good)) - if tree.N != goldN || tree.Hash != goldH || err != nil { - t.Fatalf("ParseTree(...+%q) = Tree{%d, %v}, %v, want Tree{%d, %v}, nil", good[len(in):], tree.N, tree.Hash, err, goldN, goldH) - } - } -} - -func TestFormatRecord(t *testing.T) { - id := int64(123456789012) - text := "hello, world\n" - golden := "123456789012\nhello, world\n\n" - msg, err := FormatRecord(id, []byte(text)) - if err != nil { - t.Fatalf("FormatRecord: %v", err) - } - if string(msg) != golden { - t.Fatalf("FormatRecord(...) = %q, want %q", msg, golden) - } - - var badTexts = []string{ - "", - "hello\nworld", - "hello\n\nworld\n", - "hello\x01world\n", - } - for _, bad := range badTexts { - msg, err := FormatRecord(id, []byte(bad)) - if err == nil { - t.Errorf("FormatRecord(id, %q) = %q, want error", bad, msg) - } - } -} - -func TestParseRecord(t *testing.T) { - in := "123456789012\nhello, world\n\njunk on end\x01\xff" - goldID := int64(123456789012) - goldText := "hello, world\n" - goldRest := "junk on end\x01\xff" - id, text, rest, err := ParseRecord([]byte(in)) - if id != goldID || string(text) != goldText || string(rest) != goldRest || err != nil { - t.Fatalf("ParseRecord(%q) = %d, %q, %q, %v, want %d, %q, %q, nil", in, id, text, rest, err, goldID, goldText, goldRest) - } - - in = "123456789012\nhello, world\n\n" - id, text, rest, err = ParseRecord([]byte(in)) - if id != goldID || string(text) != goldText || len(rest) != 0 || err != nil { - t.Fatalf("ParseRecord(%q) = %d, %q, %q, %v, want %d, %q, %q, nil", in, id, text, rest, err, goldID, goldText, "") - } - if rest == nil { - t.Fatalf("ParseRecord(%q): rest = []byte(nil), want []byte{}", in) - } - - // Check invalid records. - var badRecords = []string{ - "not-" + in, - "123\nhello\x01world\n\n", - "123\nhello\xffworld\n\n", - "123\nhello world\n", - "0x123\nhello world\n\n", - } - for _, bad := range badRecords { - id, text, rest, err := ParseRecord([]byte(bad)) - if err == nil { - t.Fatalf("ParseRecord(%q) = %d, %q, %q, nil, want error", in, id, text, rest) - } - } -} diff --git a/src/cmd/go/internal/tlog/tlog_test.go b/src/cmd/go/internal/tlog/tlog_test.go deleted file mode 100644 index 584e728c1b..0000000000 --- a/src/cmd/go/internal/tlog/tlog_test.go +++ /dev/null @@ -1,269 +0,0 @@ -// Copyright 2019 The Go 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 tlog - -import ( - "bytes" - "fmt" - "testing" -) - -type testHashStorage []Hash - -func (t testHashStorage) ReadHash(level int, n int64) (Hash, error) { - return t[StoredHashIndex(level, n)], nil -} - -func (t testHashStorage) ReadHashes(index []int64) ([]Hash, error) { - // It's not required by HashReader that indexes be in increasing order, - // but check that the functions we are testing only ever ask for - // indexes in increasing order. - for i := 1; i < len(index); i++ { - if index[i-1] >= index[i] { - panic("indexes out of order") - } - } - - out := make([]Hash, len(index)) - for i, x := range index { - out[i] = t[x] - } - return out, nil -} - -type testTilesStorage struct { - unsaved int - m map[Tile][]byte -} - -func (t testTilesStorage) Height() int { - return 2 -} - -func (t *testTilesStorage) SaveTiles(tiles []Tile, data [][]byte) { - t.unsaved -= len(tiles) -} - -func (t *testTilesStorage) ReadTiles(tiles []Tile) ([][]byte, error) { - out := make([][]byte, len(tiles)) - for i, tile := range tiles { - out[i] = t.m[tile] - } - t.unsaved += len(tiles) - return out, nil -} - -func TestTree(t *testing.T) { - var trees []Hash - var leafhashes []Hash - var storage testHashStorage - tiles := make(map[Tile][]byte) - const testH = 2 - for i := int64(0); i < 100; i++ { - data := []byte(fmt.Sprintf("leaf %d", i)) - hashes, err := StoredHashes(i, data, storage) - if err != nil { - t.Fatal(err) - } - leafhashes = append(leafhashes, RecordHash(data)) - oldStorage := len(storage) - storage = append(storage, hashes...) - if count := StoredHashCount(i + 1); count != int64(len(storage)) { - t.Errorf("StoredHashCount(%d) = %d, have %d StoredHashes", i+1, count, len(storage)) - } - th, err := TreeHash(i+1, storage) - if err != nil { - t.Fatal(err) - } - - for _, tile := range NewTiles(testH, i, i+1) { - data, err := ReadTileData(tile, storage) - if err != nil { - t.Fatal(err) - } - old := Tile{H: tile.H, L: tile.L, N: tile.N, W: tile.W - 1} - oldData := tiles[old] - if len(oldData) != len(data)-HashSize || !bytes.Equal(oldData, data[:len(oldData)]) { - t.Fatalf("tile %v not extending earlier tile %v", tile.Path(), old.Path()) - } - tiles[tile] = data - } - for _, tile := range NewTiles(testH, 0, i+1) { - data, err := ReadTileData(tile, storage) - if err != nil { - t.Fatal(err) - } - if !bytes.Equal(tiles[tile], data) { - t.Fatalf("mismatch at %+v", tile) - } - } - for _, tile := range NewTiles(testH, i/2, i+1) { - data, err := ReadTileData(tile, storage) - if err != nil { - t.Fatal(err) - } - if !bytes.Equal(tiles[tile], data) { - t.Fatalf("mismatch at %+v", tile) - } - } - - // Check that all the new hashes are readable from their tiles. - for j := oldStorage; j < len(storage); j++ { - tile := TileForIndex(testH, int64(j)) - data, ok := tiles[tile] - if !ok { - t.Log(NewTiles(testH, 0, i+1)) - t.Fatalf("TileForIndex(%d, %d) = %v, not yet stored (i=%d, stored %d)", testH, j, tile.Path(), i, len(storage)) - continue - } - h, err := HashFromTile(tile, data, int64(j)) - if err != nil { - t.Fatal(err) - } - if h != storage[j] { - t.Errorf("HashFromTile(%v, %d) = %v, want %v", tile.Path(), int64(j), h, storage[j]) - } - } - - trees = append(trees, th) - - // Check that leaf proofs work, for all trees and leaves so far. - for j := int64(0); j <= i; j++ { - p, err := ProveRecord(i+1, j, storage) - if err != nil { - t.Fatalf("ProveRecord(%d, %d): %v", i+1, j, err) - } - if err := CheckRecord(p, i+1, th, j, leafhashes[j]); err != nil { - t.Fatalf("CheckRecord(%d, %d): %v", i+1, j, err) - } - for k := range p { - p[k][0] ^= 1 - if err := CheckRecord(p, i+1, th, j, leafhashes[j]); err == nil { - t.Fatalf("CheckRecord(%d, %d) succeeded with corrupt proof hash #%d!", i+1, j, k) - } - p[k][0] ^= 1 - } - } - - // Check that leaf proofs work using TileReader. - // To prove a leaf that way, all you have to do is read and verify its hash. - storage := &testTilesStorage{m: tiles} - thr := TileHashReader(Tree{i + 1, th}, storage) - for j := int64(0); j <= i; j++ { - h, err := thr.ReadHashes([]int64{StoredHashIndex(0, j)}) - if err != nil { - t.Fatalf("TileHashReader(%d).ReadHashes(%d): %v", i+1, j, err) - } - if h[0] != leafhashes[j] { - t.Fatalf("TileHashReader(%d).ReadHashes(%d) returned wrong hash", i+1, j) - } - - // Even though reading the hash suffices, - // check we can generate the proof too. - p, err := ProveRecord(i+1, j, thr) - if err != nil { - t.Fatalf("ProveRecord(%d, %d, TileHashReader(%d)): %v", i+1, j, i+1, err) - } - if err := CheckRecord(p, i+1, th, j, leafhashes[j]); err != nil { - t.Fatalf("CheckRecord(%d, %d, TileHashReader(%d)): %v", i+1, j, i+1, err) - } - } - if storage.unsaved != 0 { - t.Fatalf("TileHashReader(%d) did not save %d tiles", i+1, storage.unsaved) - } - - // Check that ReadHashes will give an error if the index is not in the tree. - if _, err := thr.ReadHashes([]int64{(i + 1) * 2}); err == nil { - t.Fatalf("TileHashReader(%d).ReadHashes(%d) for index not in tree <nil>, want err", i, i+1) - } - if storage.unsaved != 0 { - t.Fatalf("TileHashReader(%d) did not save %d tiles", i+1, storage.unsaved) - } - - // Check that tree proofs work, for all trees so far, using TileReader. - // To prove a tree that way, all you have to do is compute and verify its hash. - for j := int64(0); j <= i; j++ { - h, err := TreeHash(j+1, thr) - if err != nil { - t.Fatalf("TreeHash(%d, TileHashReader(%d)): %v", j, i+1, err) - } - if h != trees[j] { - t.Fatalf("TreeHash(%d, TileHashReader(%d)) = %x, want %x (%v)", j, i+1, h[:], trees[j][:], trees[j]) - } - - // Even though computing the subtree hash suffices, - // check that we can generate the proof too. - p, err := ProveTree(i+1, j+1, thr) - if err != nil { - t.Fatalf("ProveTree(%d, %d): %v", i+1, j+1, err) - } - if err := CheckTree(p, i+1, th, j+1, trees[j]); err != nil { - t.Fatalf("CheckTree(%d, %d): %v [%v]", i+1, j+1, err, p) - } - for k := range p { - p[k][0] ^= 1 - if err := CheckTree(p, i+1, th, j+1, trees[j]); err == nil { - t.Fatalf("CheckTree(%d, %d) succeeded with corrupt proof hash #%d!", i+1, j+1, k) - } - p[k][0] ^= 1 - } - } - if storage.unsaved != 0 { - t.Fatalf("TileHashReader(%d) did not save %d tiles", i+1, storage.unsaved) - } - } -} - -func TestSplitStoredHashIndex(t *testing.T) { - for l := 0; l < 10; l++ { - for n := int64(0); n < 100; n++ { - x := StoredHashIndex(l, n) - l1, n1 := SplitStoredHashIndex(x) - if l1 != l || n1 != n { - t.Fatalf("StoredHashIndex(%d, %d) = %d, but SplitStoredHashIndex(%d) = %d, %d", l, n, x, x, l1, n1) - } - } - } -} - -// TODO(rsc): Test invalid paths too, like "tile/3/5/123/456/078". -var tilePaths = []struct { - path string - tile Tile -}{ - {"tile/4/0/001", Tile{4, 0, 1, 16}}, - {"tile/4/0/001.p/5", Tile{4, 0, 1, 5}}, - {"tile/3/5/x123/x456/078", Tile{3, 5, 123456078, 8}}, - {"tile/3/5/x123/x456/078.p/2", Tile{3, 5, 123456078, 2}}, - {"tile/1/0/x003/x057/500", Tile{1, 0, 3057500, 2}}, - {"tile/3/5/123/456/078", Tile{}}, - {"tile/3/-1/123/456/078", Tile{}}, - {"tile/1/data/x003/x057/500", Tile{1, -1, 3057500, 2}}, -} - -func TestTilePath(t *testing.T) { - for _, tt := range tilePaths { - if tt.tile.H > 0 { - p := tt.tile.Path() - if p != tt.path { - t.Errorf("%+v.Path() = %q, want %q", tt.tile, p, tt.path) - } - } - tile, err := ParseTilePath(tt.path) - if err != nil { - if tt.tile.H == 0 { - // Expected error. - continue - } - t.Errorf("ParseTilePath(%q): %v", tt.path, err) - } else if tile != tt.tile { - if tt.tile.H == 0 { - t.Errorf("ParseTilePath(%q): expected error, got %+v", tt.path, tt.tile) - continue - } - t.Errorf("ParseTilePath(%q) = %+v, want %+v", tt.path, tile, tt.tile) - } - } -} diff --git a/src/cmd/go/internal/work/buildid.go b/src/cmd/go/internal/work/buildid.go index 27bde8c615..7558a3091a 100644 --- a/src/cmd/go/internal/work/buildid.go +++ b/src/cmd/go/internal/work/buildid.go @@ -15,7 +15,6 @@ import ( "cmd/go/internal/base" "cmd/go/internal/cache" "cmd/go/internal/cfg" - "cmd/go/internal/load" "cmd/go/internal/str" "cmd/internal/buildid" ) @@ -421,7 +420,7 @@ func (b *Builder) fileHash(file string) string { // during a's work. The caller should defer b.flushOutput(a), to make sure // that flushOutput is eventually called regardless of whether the action // succeeds. The flushOutput call must happen after updateBuildID. -func (b *Builder) useCache(a *Action, p *load.Package, actionHash cache.ActionID, target string) bool { +func (b *Builder) useCache(a *Action, actionHash cache.ActionID, target string) bool { // The second half of the build ID here is a placeholder for the content hash. // It's important that the overall buildID be unlikely verging on impossible // to appear in the output by chance, but that should be taken care of by diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go index 0f25a5d19f..a50de513f5 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go @@ -395,7 +395,7 @@ func (b *Builder) build(a *Action) (err error) { bit(needCompiledGoFiles, b.NeedCompiledGoFiles) if !p.BinaryOnly { - if b.useCache(a, p, b.buildActionID(a), p.Target) { + if b.useCache(a, b.buildActionID(a), p.Target) { // We found the main output in the cache. // If we don't need any other outputs, we can stop. // Otherwise, we need to write files to a.Objdir (needVet, needCgoHdr). @@ -1171,7 +1171,7 @@ func (b *Builder) printLinkerConfig(h io.Writer, p *load.Package) { // link is the action for linking a single command. // Note that any new influence on this logic must be reported in b.linkActionID above as well. func (b *Builder) link(a *Action) (err error) { - if b.useCache(a, a.Package, b.linkActionID(a), a.Package.Target) || b.IsCmdList { + if b.useCache(a, b.linkActionID(a), a.Package.Target) || b.IsCmdList { return nil } defer b.flushOutput(a) @@ -1404,7 +1404,7 @@ func (b *Builder) linkSharedActionID(a *Action) cache.ActionID { } func (b *Builder) linkShared(a *Action) (err error) { - if b.useCache(a, nil, b.linkSharedActionID(a), a.Target) || b.IsCmdList { + if b.useCache(a, b.linkSharedActionID(a), a.Target) || b.IsCmdList { return nil } defer b.flushOutput(a) diff --git a/src/cmd/go/proxy_test.go b/src/cmd/go/proxy_test.go index 065b87a305..8214488a59 100644 --- a/src/cmd/go/proxy_test.go +++ b/src/cmd/go/proxy_test.go @@ -23,14 +23,15 @@ import ( "sync" "testing" - "cmd/go/internal/dirhash" "cmd/go/internal/modfetch" "cmd/go/internal/modfetch/codehost" - "cmd/go/internal/module" "cmd/go/internal/par" - "cmd/go/internal/semver" - "cmd/go/internal/sumdb" "cmd/go/internal/txtar" + + "golang.org/x/mod/module" + "golang.org/x/mod/semver" + "golang.org/x/mod/sumdb" + "golang.org/x/mod/sumdb/dirhash" ) var ( diff --git a/src/cmd/go/testdata/script/link_syso_issue33139.txt b/src/cmd/go/testdata/script/link_syso_issue33139.txt new file mode 100644 index 0000000000..c2ca27acbf --- /dev/null +++ b/src/cmd/go/testdata/script/link_syso_issue33139.txt @@ -0,0 +1,43 @@ +# Test that we can use the external linker with a host syso file that is +# embedded in a package, that is referenced by a Go assembly function. +# See issue 33139. +[!gc] skip +[!exec:cc] skip + +# External linking is not supported on linux/ppc64. +# See: https://github.com/golang/go/issues/8912 +[linux] [ppc64] skip + +# External linking is not supported on darwin/386 (10.14+). +# See: https://github.com/golang/go/issues/31751 +[darwin] [386] skip + +cc -c -o syso/objTestImpl.syso syso/src/objTestImpl.c +go build -ldflags='-linkmode=external' ./cmd/main.go + +-- syso/objTest.s -- +#include "textflag.h" + +TEXT ·ObjTest(SB), NOSPLIT, $0 + // We do not actually execute this function in the test above, thus + // there is no stack frame setup here. + // We only care about Go build and/or link errors when referencing + // the objTestImpl symbol in the syso file. + JMP objTestImpl(SB) + +-- syso/pkg.go -- +package syso + +func ObjTest() + +-- syso/src/objTestImpl.c -- +void objTestImpl() { /* Empty */ } + +-- cmd/main.go -- +package main + +import "syso" + +func main() { + syso.ObjTest() +} diff --git a/src/cmd/go/testdata/script/mod_get_svn.txt b/src/cmd/go/testdata/script/mod_get_svn.txt index 1a5376dec0..3817fce9b6 100644 --- a/src/cmd/go/testdata/script/mod_get_svn.txt +++ b/src/cmd/go/testdata/script/mod_get_svn.txt @@ -18,13 +18,10 @@ env GO111MODULE=on env GOPROXY=direct env GOSUMDB=off -# Attempting to get a module zip using svn should fail with a reasonable -# message instead of a panic. -# TODO(golang.org/issue/26092): Really, it shouldn't fail at all. -! go get -d vcs-test.golang.org/svn/hello.svn -stderr 'ReadZip not implemented for svn' -! go install . -stderr 'ReadZip not implemented for svn' +# Attempting to get a module zip using svn should succeed. +go get vcs-test.golang.org/svn/hello.svn@000000000001 +exists $GOPATH/pkg/mod/cache/download/vcs-test.golang.org/svn/hello.svn/@v/v0.0.0-20170922011245-000000000001.zip +exists $GOPATH/bin/hello.svn$GOEXE # Attempting to get a nonexistent module using svn should fail with a # reasonable message instead of a panic. @@ -34,7 +31,6 @@ stderr 'go get vcs-test.golang.org/svn/nonexistent.svn: no matching versions for -- go.mod -- module golang/go/issues/28943/main --- main.go -- -package main -import _ "vcs-test.golang.org/svn/hello.svn" -func main() {} +-- go.sum -- +vcs-test.golang.org/svn/hello.svn v0.0.0-20170922011245-000000000001 h1:rZjvboXMfQICKXdhx/QHqJ2Y/AQsJVrXnwGqwcTxQiw= +vcs-test.golang.org/svn/hello.svn v0.0.0-20170922011245-000000000001/go.mod h1:0memnh/BRLuxiK2zF4rvUgz6ts/fhhB28l3ULFWPusc= diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go index d7a77a9682..9e472b2d51 100644 --- a/src/cmd/gofmt/gofmt.go +++ b/src/cmd/gofmt/gofmt.go @@ -16,11 +16,12 @@ import ( "io" "io/ioutil" "os" - "os/exec" "path/filepath" "runtime" "runtime/pprof" "strings" + + "cmd/internal/diff" ) var ( @@ -141,7 +142,7 @@ func processFile(filename string, in io.Reader, out io.Writer, stdin bool) error } } if *doDiff { - data, err := diff(src, res, filename) + data, err := diffWithReplaceTempFile(src, res, filename) if err != nil { return fmt.Errorf("computing diff: %s", err) } @@ -227,47 +228,12 @@ func gofmtMain() { } } -func writeTempFile(dir, prefix string, data []byte) (string, error) { - file, err := ioutil.TempFile(dir, prefix) - if err != nil { - return "", err - } - _, err = file.Write(data) - if err1 := file.Close(); err == nil { - err = err1 - } - if err != nil { - os.Remove(file.Name()) - return "", err - } - return file.Name(), nil -} - -func diff(b1, b2 []byte, filename string) (data []byte, err error) { - f1, err := writeTempFile("", "gofmt", b1) - if err != nil { - return - } - defer os.Remove(f1) - - f2, err := writeTempFile("", "gofmt", b2) - if err != nil { - return - } - defer os.Remove(f2) - - cmd := "diff" - if runtime.GOOS == "plan9" { - cmd = "/bin/ape/diff" - } - - data, err = exec.Command(cmd, "-u", f1, f2).CombinedOutput() +func diffWithReplaceTempFile(b1, b2 []byte, filename string) ([]byte, error) { + data, err := diff.Diff("gofmt", b1, b2) if len(data) > 0 { - // diff exits with a non-zero status when the files don't match. - // Ignore that failure as long as we get output. return replaceTempFilename(data, filename) } - return + return data, err } // replaceTempFilename replaces temporary filenames in diff with actual one. diff --git a/src/cmd/gofmt/gofmt_test.go b/src/cmd/gofmt/gofmt_test.go index 3008365cd2..98d3eb7eb2 100644 --- a/src/cmd/gofmt/gofmt_test.go +++ b/src/cmd/gofmt/gofmt_test.go @@ -112,7 +112,7 @@ func runTest(t *testing.T, in, out string) { } t.Errorf("(gofmt %s) != %s (see %s.gofmt)", in, out, in) - d, err := diff(expected, got, in) + d, err := diffWithReplaceTempFile(expected, got, in) if err == nil { t.Errorf("%s", d) } @@ -194,7 +194,7 @@ func TestDiff(t *testing.T) { in := []byte("first\nsecond\n") out := []byte("first\nthird\n") filename := "difftest.txt" - b, err := diff(in, out, filename) + b, err := diffWithReplaceTempFile(in, out, filename) if err != nil { t.Fatal(err) } diff --git a/src/cmd/gofmt/testdata/import.golden b/src/cmd/gofmt/testdata/import.golden index 29bdc9baf4..1125b70cb7 100644 --- a/src/cmd/gofmt/testdata/import.golden +++ b/src/cmd/gofmt/testdata/import.golden @@ -1,3 +1,4 @@ +// package comment package main import ( @@ -10,11 +11,6 @@ import ( import ( "fmt" - "math" -) - -import ( - "fmt" "math" @@ -25,6 +21,10 @@ import ( "io" ) +// We reset the line numbering to test that +// the formatting works independent of line directives +//line :19 + import ( "errors" "fmt" @@ -129,3 +129,66 @@ import ( "dedup_by_group" ) + +import ( + "fmt" // for Printf + /* comment */ io1 "io" + /* comment */ io2 "io" + /* comment */ "log" +) + +import ( + "fmt" + /* comment */ io1 "io" + /* comment */ io2 "io" // hello + "math" /* right side */ + // end +) + +import ( + "errors" // for New + "fmt" + /* comment */ io1 "io" /* before */ // after + io2 "io" // another + // end +) + +import ( + "errors" // for New + /* left */ "fmt" /* right */ + "log" // for Fatal + /* left */ "math" /* right */ +) + +import /* why */ /* comment here? */ ( + /* comment */ "fmt" + "math" +) + +// Reset it again +//line :100 + +// Dedup with different import styles +import ( + "path" + . "path" + _ "path" + pathpkg "path" +) + +/* comment */ +import ( + "fmt" + "math" // for Abs + // This is a new run + "errors" + "fmt" +) + +// End an import declaration in the same line +// as the last import. See golang.org/issue/33538. +// Note: Must be the last (or 2nd last) line of the file. +import ( + "fmt" + "math" +) diff --git a/src/cmd/gofmt/testdata/import.input b/src/cmd/gofmt/testdata/import.input index 78ab4f6544..040b8722d4 100644 --- a/src/cmd/gofmt/testdata/import.input +++ b/src/cmd/gofmt/testdata/import.input @@ -1,3 +1,4 @@ +// package comment package main import ( @@ -8,9 +9,6 @@ import ( "io" ) -import("fmt" -"math") - import ( "fmt" @@ -23,6 +21,10 @@ import ( "io" ) +// We reset the line numbering to test that +// the formatting works independent of line directives +//line :19 + import ( "fmt" "math" @@ -132,3 +134,66 @@ import ( "dedup_by_group" ) + +import ( + /* comment */ io1 "io" + "fmt" // for Printf + /* comment */ "log" + /* comment */ io2 "io" +) + +import ( + /* comment */ io2 "io" // hello + /* comment */ io1 "io" + "math" /* right side */ + "fmt" + // end +) + +import ( + /* comment */ io1 "io" /* before */ // after + "fmt" + "errors" // for New + io2 "io" // another + // end +) + +import ( + /* left */ "fmt" /* right */ + "errors" // for New + /* left */ "math" /* right */ + "log" // for Fatal +) + +import /* why */ /* comment here? */ ( + /* comment */ "fmt" + "math" +) + +// Reset it again +//line :100 + +// Dedup with different import styles +import ( + "path" + . "path" + _ "path" + "path" + pathpkg "path" +) + +/* comment */ +import ( + "math" // for Abs + "fmt" + // This is a new run + "errors" + "fmt" + "errors" +) + +// End an import declaration in the same line +// as the last import. See golang.org/issue/33538. +// Note: Must be the last (or 2nd last) line of the file. +import("fmt" +"math")
\ No newline at end of file diff --git a/src/cmd/internal/diff/diff.go b/src/cmd/internal/diff/diff.go new file mode 100644 index 0000000000..e9d2c23780 --- /dev/null +++ b/src/cmd/internal/diff/diff.go @@ -0,0 +1,58 @@ +// Copyright 2019 The Go 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 diff implements a Diff function that compare two inputs +// using the 'diff' tool. +package diff + +import ( + "io/ioutil" + "os" + "os/exec" + "runtime" +) + +// Returns diff of two arrays of bytes in diff tool format. +func Diff(prefix string, b1, b2 []byte) ([]byte, error) { + f1, err := writeTempFile(prefix, b1) + if err != nil { + return nil, err + } + defer os.Remove(f1) + + f2, err := writeTempFile(prefix, b2) + if err != nil { + return nil, err + } + defer os.Remove(f2) + + cmd := "diff" + if runtime.GOOS == "plan9" { + cmd = "/bin/ape/diff" + } + + data, err := exec.Command(cmd, "-u", f1, f2).CombinedOutput() + if len(data) > 0 { + // diff exits with a non-zero status when the files don't match. + // Ignore that failure as long as we get output. + err = nil + } + return data, err +} + +func writeTempFile(prefix string, data []byte) (string, error) { + file, err := ioutil.TempFile("", prefix) + if err != nil { + return "", err + } + _, err = file.Write(data) + if err1 := file.Close(); err == nil { + err = err1 + } + if err != nil { + os.Remove(file.Name()) + return "", err + } + return file.Name(), nil +} diff --git a/src/cmd/internal/obj/mips/a.out.go b/src/cmd/internal/obj/mips/a.out.go index 026e8db76a..b0205ec11a 100644 --- a/src/cmd/internal/obj/mips/a.out.go +++ b/src/cmd/internal/obj/mips/a.out.go @@ -46,7 +46,7 @@ const ( ) const ( - REG_R0 = obj.RBaseMIPS + iota + REG_R0 = obj.RBaseMIPS + iota // must be a multiple of 32 REG_R1 REG_R2 REG_R3 @@ -79,7 +79,7 @@ const ( REG_R30 REG_R31 - REG_F0 + REG_F0 // must be a multiple of 32 REG_F1 REG_F2 REG_F3 @@ -112,11 +112,8 @@ const ( REG_F30 REG_F31 - REG_HI - REG_LO - // co-processor 0 control registers - REG_M0 + REG_M0 // must be a multiple of 32 REG_M1 REG_M2 REG_M3 @@ -150,7 +147,7 @@ const ( REG_M31 // FPU control registers - REG_FCR0 + REG_FCR0 // must be a multiple of 32 REG_FCR1 REG_FCR2 REG_FCR3 @@ -183,7 +180,10 @@ const ( REG_FCR30 REG_FCR31 - REG_LAST = REG_FCR31 // the last defined register + REG_HI + REG_LO + + REG_LAST = REG_LO // the last defined register REG_SPECIAL = REG_M0 @@ -412,3 +412,22 @@ const ( AJAL = obj.ACALL ARET = obj.ARET ) + +func init() { + // The asm encoder generally assumes that the lowest 5 bits of the + // REG_XX constants match the machine instruction encoding, i.e. + // the lowest 5 bits is the register number. + // Check this here. + if REG_R0%32 != 0 { + panic("REG_R0 is not a multiple of 32") + } + if REG_F0%32 != 0 { + panic("REG_F0 is not a multiple of 32") + } + if REG_M0%32 != 0 { + panic("REG_M0 is not a multiple of 32") + } + if REG_FCR0%32 != 0 { + panic("REG_FCR0 is not a multiple of 32") + } +} diff --git a/src/cmd/internal/obj/mips/asm0.go b/src/cmd/internal/obj/mips/asm0.go index 77aa24a4f6..76a3eec6bf 100644 --- a/src/cmd/internal/obj/mips/asm0.go +++ b/src/cmd/internal/obj/mips/asm0.go @@ -362,8 +362,8 @@ var optab = []Optab{ {AWORD, C_LCON, C_NONE, C_NONE, 40, 4, 0, 0}, - {AMOVW, C_REG, C_NONE, C_FCREG, 41, 8, 0, 0}, - {AMOVV, C_REG, C_NONE, C_FCREG, 41, 8, 0, sys.MIPS64}, + {AMOVW, C_REG, C_NONE, C_FCREG, 41, 4, 0, 0}, + {AMOVV, C_REG, C_NONE, C_FCREG, 41, 4, 0, sys.MIPS64}, {AMOVW, C_FCREG, C_NONE, C_REG, 42, 4, 0, 0}, {AMOVV, C_FCREG, C_NONE, C_REG, 42, 4, 0, sys.MIPS64}, @@ -1476,8 +1476,7 @@ func (c *ctxt0) asmout(p *obj.Prog, o *Optab, out []uint32) { o1 = uint32(c.regoff(&p.From)) case 41: /* movw f,fcr */ - o1 = OP_RRR(SP(2, 1)|(2<<21), uint32(REGZERO), uint32(0), uint32(p.To.Reg)) /* mfcc1 */ - o2 = OP_RRR(SP(2, 1)|(6<<21), uint32(p.From.Reg), uint32(0), uint32(p.To.Reg)) /* mtcc1 */ + o1 = OP_RRR(SP(2, 1)|(6<<21), uint32(p.From.Reg), uint32(0), uint32(p.To.Reg)) /* mtcc1 */ case 42: /* movw fcr,r */ o1 = OP_RRR(SP(2, 1)|(2<<21), uint32(p.To.Reg), uint32(0), uint32(p.From.Reg)) /* mfcc1 */ diff --git a/src/cmd/internal/obj/x86/asm6.go b/src/cmd/internal/obj/x86/asm6.go index 618e88212c..3a33bc3c3c 100644 --- a/src/cmd/internal/obj/x86/asm6.go +++ b/src/cmd/internal/obj/x86/asm6.go @@ -3468,7 +3468,7 @@ func (ab *AsmBuf) asmandsz(ctxt *obj.Link, cursym *obj.LSym, p *obj.Prog, a *obj } if REG_AX <= base && base <= REG_R15 { - if a.Index == REG_TLS && !ctxt.Flag_shared { + if a.Index == REG_TLS && !ctxt.Flag_shared && !isAndroid { rel = obj.Reloc{} rel.Type = objabi.R_TLS_LE rel.Siz = 4 diff --git a/src/cmd/internal/src/pos.go b/src/cmd/internal/src/pos.go index 8c0b6d277b..60c7c91cde 100644 --- a/src/cmd/internal/src/pos.go +++ b/src/cmd/internal/src/pos.go @@ -382,7 +382,7 @@ func makeLico(line, col uint) lico { } func (x lico) Line() uint { return uint(x) >> lineShift } -func (x lico) SameLine(y lico) bool { return 0 == (x^y)&^lico(1 << lineShift-1) } +func (x lico) SameLine(y lico) bool { return 0 == (x^y)&^lico(1<<lineShift-1) } func (x lico) Col() uint { return uint(x) >> colShift & colMax } func (x lico) IsStmt() uint { if x == 0 { diff --git a/src/cmd/internal/test2json/testdata/panic.json b/src/cmd/internal/test2json/testdata/panic.json new file mode 100644 index 0000000000..f99679c2e2 --- /dev/null +++ b/src/cmd/internal/test2json/testdata/panic.json @@ -0,0 +1,19 @@ +{"Action":"output","Test":"TestPanic","Output":"--- FAIL: TestPanic (0.00s)\n"} +{"Action":"output","Test":"TestPanic","Output":"panic: oops [recovered]\n"} +{"Action":"output","Test":"TestPanic","Output":"\tpanic: oops\n"} +{"Action":"output","Test":"TestPanic","Output":"\n"} +{"Action":"output","Test":"TestPanic","Output":"goroutine 7 [running]:\n"} +{"Action":"output","Test":"TestPanic","Output":"testing.tRunner.func1(0xc000092100)\n"} +{"Action":"output","Test":"TestPanic","Output":"\t/go/src/testing/testing.go:874 +0x3a3\n"} +{"Action":"output","Test":"TestPanic","Output":"panic(0x1110ea0, 0x116aea0)\n"} +{"Action":"output","Test":"TestPanic","Output":"\t/go/src/runtime/panic.go:679 +0x1b2\n"} +{"Action":"output","Test":"TestPanic","Output":"command-line-arguments.TestPanic(0xc000092100)\n"} +{"Action":"output","Test":"TestPanic","Output":"\ta_test.go:6 +0x39\n"} +{"Action":"output","Test":"TestPanic","Output":"testing.tRunner(0xc000092100, 0x114f500)\n"} +{"Action":"output","Test":"TestPanic","Output":"\tgo/src/testing/testing.go:909 +0xc9\n"} +{"Action":"output","Test":"TestPanic","Output":"created by testing.(*T).Run\n"} +{"Action":"output","Test":"TestPanic","Output":"\tgo/src/testing/testing.go:960 +0x350\n"} +{"Action":"output","Test":"TestPanic","Output":"FAIL\tcommand-line-arguments\t0.042s\n"} +{"Action":"fail","Test":"TestPanic"} +{"Action":"output","Output":"FAIL\n"} +{"Action":"fail"} diff --git a/src/cmd/internal/test2json/testdata/panic.test b/src/cmd/internal/test2json/testdata/panic.test new file mode 100644 index 0000000000..517ebafeb5 --- /dev/null +++ b/src/cmd/internal/test2json/testdata/panic.test @@ -0,0 +1,17 @@ +--- FAIL: TestPanic (0.00s) +panic: oops [recovered] + panic: oops + +goroutine 7 [running]: +testing.tRunner.func1(0xc000092100) + /go/src/testing/testing.go:874 +0x3a3 +panic(0x1110ea0, 0x116aea0) + /go/src/runtime/panic.go:679 +0x1b2 +command-line-arguments.TestPanic(0xc000092100) + a_test.go:6 +0x39 +testing.tRunner(0xc000092100, 0x114f500) + go/src/testing/testing.go:909 +0xc9 +created by testing.(*T).Run + go/src/testing/testing.go:960 +0x350 +FAIL command-line-arguments 0.042s +FAIL diff --git a/src/cmd/link/internal/amd64/asm.go b/src/cmd/link/internal/amd64/asm.go index 71e230e533..991f5523ed 100644 --- a/src/cmd/link/internal/amd64/asm.go +++ b/src/cmd/link/internal/amd64/asm.go @@ -659,14 +659,6 @@ func addgotsym(ctxt *ld.Link, s *sym.Symbol) { } func asmb(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f codeblk\n", ld.Cputime()) - } - if ctxt.IsELF { ld.Asmbelfsetup() } @@ -681,24 +673,14 @@ func asmb(ctxt *ld.Link) { } if ld.Segrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) } if ld.Segrelrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f datblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) @@ -740,9 +722,6 @@ func asmb2(ctxt *ld.Link) { ld.Lcsize = 0 symo := int64(0) if !*ld.FlagS { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f sym\n", ld.Cputime()) - } switch ctxt.HeadType { default: case objabi.Hplan9: @@ -775,10 +754,6 @@ func asmb2(ctxt *ld.Link) { ctxt.Out.Flush() ctxt.Out.Write(ld.Elfstrdat) - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) - } - if ctxt.LinkMode == ld.LinkExternal { ld.Elfemitreloc(ctxt) } @@ -796,9 +771,7 @@ func asmb2(ctxt *ld.Link) { } case objabi.Hwindows: - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) - } + // Do nothing case objabi.Hdarwin: if ctxt.LinkMode == ld.LinkExternal { @@ -807,9 +780,6 @@ func asmb2(ctxt *ld.Link) { } } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f headr\n", ld.Cputime()) - } ctxt.Out.SeekSet(0) switch ctxt.HeadType { default: diff --git a/src/cmd/link/internal/arm/asm.go b/src/cmd/link/internal/arm/asm.go index d8d01f6d27..f2fb6543d0 100644 --- a/src/cmd/link/internal/arm/asm.go +++ b/src/cmd/link/internal/arm/asm.go @@ -613,7 +613,7 @@ func archreloc(ctxt *ld.Link, r *sym.Reloc, s *sym.Symbol, val int64) (int64, bo rs = rs.Outer } - if rs.Type != sym.SHOSTOBJ && rs.Type != sym.SDYNIMPORT && rs.Sect == nil { + if rs.Type != sym.SHOSTOBJ && rs.Type != sym.SDYNIMPORT && rs.Type != sym.SUNDEFEXT && rs.Sect == nil { ld.Errorf(s, "missing section for %s", rs.Name) } r.Xsym = rs @@ -760,10 +760,6 @@ func addgotsym(ctxt *ld.Link, s *sym.Symbol) { } func asmb(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - if ctxt.IsELF { ld.Asmbelfsetup() } @@ -777,24 +773,14 @@ func asmb(ctxt *ld.Link) { } if ld.Segrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) } if ld.Segrelrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f datblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) @@ -815,9 +801,6 @@ func asmb2(ctxt *ld.Link) { symo := uint32(0) if !*ld.FlagS { // TODO: rationalize - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f sym\n", ld.Cputime()) - } switch ctxt.HeadType { default: if ctxt.IsELF { @@ -840,9 +823,6 @@ func asmb2(ctxt *ld.Link) { switch ctxt.HeadType { default: if ctxt.IsELF { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) - } ld.Asmelfsym(ctxt) ctxt.Out.Flush() ctxt.Out.Write(ld.Elfstrdat) @@ -864,9 +844,7 @@ func asmb2(ctxt *ld.Link) { } case objabi.Hwindows: - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) - } + // Do nothing case objabi.Hdarwin: if ctxt.LinkMode == ld.LinkExternal { @@ -875,9 +853,6 @@ func asmb2(ctxt *ld.Link) { } } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f header\n", ld.Cputime()) - } ctxt.Out.SeekSet(0) switch ctxt.HeadType { default: diff --git a/src/cmd/link/internal/arm64/asm.go b/src/cmd/link/internal/arm64/asm.go index e824627bf7..9fccf73a59 100644 --- a/src/cmd/link/internal/arm64/asm.go +++ b/src/cmd/link/internal/arm64/asm.go @@ -803,10 +803,6 @@ func addgotsym(ctxt *ld.Link, s *sym.Symbol) { } func asmb(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - if ctxt.IsELF { ld.Asmbelfsetup() } @@ -820,24 +816,14 @@ func asmb(ctxt *ld.Link) { } if ld.Segrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) } if ld.Segrelrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f datblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) @@ -858,9 +844,6 @@ func asmb2(ctxt *ld.Link) { symo := uint32(0) if !*ld.FlagS { // TODO: rationalize - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f sym\n", ld.Cputime()) - } switch ctxt.HeadType { default: if ctxt.IsELF { @@ -879,9 +862,6 @@ func asmb2(ctxt *ld.Link) { switch ctxt.HeadType { default: if ctxt.IsELF { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) - } ld.Asmelfsym(ctxt) ctxt.Out.Flush() ctxt.Out.Write(ld.Elfstrdat) @@ -909,9 +889,6 @@ func asmb2(ctxt *ld.Link) { } } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f header\n", ld.Cputime()) - } ctxt.Out.SeekSet(0) switch ctxt.HeadType { default: diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index dbc7a59a1e..ea238f7916 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -96,7 +96,7 @@ func trampoline(ctxt *Link, s *sym.Symbol) { if !r.Type.IsDirectJump() { continue } - if Symaddr(r.Sym) == 0 && r.Sym.Type != sym.SDYNIMPORT { + if Symaddr(r.Sym) == 0 && (r.Sym.Type != sym.SDYNIMPORT && r.Sym.Type != sym.SUNDEFEXT) { if r.Sym.File != s.File { if !isRuntimeDepPkg(s.File) || !isRuntimeDepPkg(r.Sym.File) { ctxt.ErrorUnresolved(s, r) @@ -298,7 +298,7 @@ func relocsym(ctxt *Link, s *sym.Symbol) { rs = rs.Outer } - if rs.Type != sym.SHOSTOBJ && rs.Type != sym.SDYNIMPORT && rs.Sect == nil { + if rs.Type != sym.SHOSTOBJ && rs.Type != sym.SDYNIMPORT && rs.Type != sym.SUNDEFEXT && rs.Sect == nil { Errorf(s, "missing section for relocation target %s", rs.Name) } r.Xsym = rs @@ -418,6 +418,17 @@ func relocsym(ctxt *Link, s *sym.Symbol) { } fallthrough case objabi.R_CALL, objabi.R_PCREL: + if ctxt.LinkMode == LinkExternal && r.Sym != nil && r.Sym.Type == sym.SUNDEFEXT { + // pass through to the external linker. + r.Done = false + r.Xadd = 0 + if ctxt.IsELF { + r.Xadd -= int64(r.Siz) + } + r.Xsym = r.Sym + o = 0 + break + } if ctxt.LinkMode == LinkExternal && r.Sym != nil && r.Sym.Type != sym.SCONST && (r.Sym.Sect != s.Sect || r.Type == objabi.R_GOTPCREL) { r.Done = false @@ -559,10 +570,6 @@ func relocsym(ctxt *Link, s *sym.Symbol) { } func (ctxt *Link) reloc() { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f reloc\n", Cputime()) - } - for _, s := range ctxt.Textp { relocsym(ctxt, s) } @@ -623,9 +630,6 @@ func (ctxt *Link) windynrelocsyms() { if !(ctxt.HeadType == objabi.Hwindows && iscgo && ctxt.LinkMode == LinkInternal) { return } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f windynrelocsyms\n", Cputime()) - } /* relocation table */ rel := ctxt.Syms.Lookup(".rel", 0) @@ -672,9 +676,6 @@ func dynreloc(ctxt *Link, data *[sym.SXREF][]*sym.Symbol) { if *FlagD { return } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dynreloc\n", Cputime()) - } for _, s := range ctxt.Textp { dynrelocsym(ctxt, s) @@ -1143,10 +1144,6 @@ func checkdatsize(ctxt *Link, datsize int64, symn sym.SymKind) { var datap []*sym.Symbol func (ctxt *Link) dodata() { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dodata\n", Cputime()) - } - if (ctxt.DynlinkingGo() && ctxt.HeadType == objabi.Hdarwin) || (ctxt.HeadType == objabi.Haix && ctxt.LinkMode == LinkExternal) { // The values in moduledata are filled out by relocations // pointing to the addresses of these special symbols. diff --git a/src/cmd/link/internal/ld/deadcode.go b/src/cmd/link/internal/ld/deadcode.go index 1ff34fec5f..e79207e2b8 100644 --- a/src/cmd/link/internal/ld/deadcode.go +++ b/src/cmd/link/internal/ld/deadcode.go @@ -47,7 +47,7 @@ import ( // Any unreached text symbols are removed from ctxt.Textp. func deadcode(ctxt *Link) { if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f deadcode\n", Cputime()) + ctxt.Logf("deadcode\n") } if *flagNewobj { diff --git a/src/cmd/link/internal/ld/dwarf.go b/src/cmd/link/internal/ld/dwarf.go index ebbfbb8ed2..f5af90b028 100644 --- a/src/cmd/link/internal/ld/dwarf.go +++ b/src/cmd/link/internal/ld/dwarf.go @@ -1798,10 +1798,6 @@ func dwarfGenerateDebugSyms(ctxt *Link) { return } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dwarf\n", Cputime()) - } - abbrev := writeabbrev(ctxt) syms := []*sym.Symbol{abbrev} diff --git a/src/cmd/link/internal/ld/go.go b/src/cmd/link/internal/ld/go.go index 6c61869ed8..3246747bb7 100644 --- a/src/cmd/link/internal/ld/go.go +++ b/src/cmd/link/internal/ld/go.go @@ -365,6 +365,24 @@ func fieldtrack(ctxt *Link) { } func (ctxt *Link) addexport() { + // Track undefined external symbols during external link. + if ctxt.LinkMode == LinkExternal { + for _, s := range ctxt.Syms.Allsym { + if !s.Attr.Reachable() || s.Attr.Special() || s.Attr.SubSymbol() { + continue + } + if s.Type != sym.STEXT { + continue + } + for i := range s.R { + r := &s.R[i] + if r.Sym != nil && r.Sym.Type == sym.Sxxx { + r.Sym.Type = sym.SUNDEFEXT + } + } + } + } + // TODO(aix) if ctxt.HeadType == objabi.Hdarwin || ctxt.HeadType == objabi.Haix { return diff --git a/src/cmd/link/internal/ld/ld.go b/src/cmd/link/internal/ld/ld.go index 9e5e2f9872..dae75a4c1a 100644 --- a/src/cmd/link/internal/ld/ld.go +++ b/src/cmd/link/internal/ld/ld.go @@ -148,7 +148,7 @@ func findlib(ctxt *Link, lib string) (string, bool) { } } } - pname = path.Clean(pname) + pname = filepath.Clean(pname) } return pname, isshlib @@ -165,7 +165,7 @@ func addlib(ctxt *Link, src string, obj string, lib string) *sym.Library { pname, isshlib := findlib(ctxt, lib) if ctxt.Debugvlog > 1 { - ctxt.Logf("%5.2f addlib: %s %s pulls in %s isshlib %v\n", elapsed(), obj, src, pname, isshlib) + ctxt.Logf("addlib: %s %s pulls in %s isshlib %v\n", obj, src, pname, isshlib) } if isshlib { @@ -188,7 +188,7 @@ func addlibpath(ctxt *Link, srcref string, objref string, file string, pkg strin } if ctxt.Debugvlog > 1 { - ctxt.Logf("%5.2f addlibpath: srcref: %s objref: %s file: %s pkg: %s shlib: %s\n", Cputime(), srcref, objref, file, pkg, shlib) + ctxt.Logf("addlibpath: srcref: %s objref: %s file: %s pkg: %s shlib: %s\n", srcref, objref, file, pkg, shlib) } l := &sym.Library{} diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go index 811dd0f9ef..a0f85b85c7 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go @@ -400,7 +400,7 @@ func (ctxt *Link) loadlib() { lib := ctxt.Library[i] if lib.Shlib == "" { if ctxt.Debugvlog > 1 { - ctxt.Logf("%5.2f autolib: %s (from %s)\n", Cputime(), lib.File, lib.Objref) + ctxt.Logf("autolib: %s (from %s)\n", lib.File, lib.Objref) } loadobjfile(ctxt, lib) } @@ -437,7 +437,7 @@ func (ctxt *Link) loadlib() { for _, lib := range ctxt.Library { if lib.Shlib != "" { if ctxt.Debugvlog > 1 { - ctxt.Logf("%5.2f autolib: %s (from %s)\n", Cputime(), lib.Shlib, lib.Objref) + ctxt.Logf("autolib: %s (from %s)\n", lib.Shlib, lib.Objref) } ldshlibsyms(ctxt, lib.Shlib) } @@ -832,7 +832,7 @@ func loadobjfile(ctxt *Link, lib *sym.Library) { pkg := objabi.PathToPrefix(lib.Pkg) if ctxt.Debugvlog > 1 { - ctxt.Logf("%5.2f ldobj: %s (%s)\n", Cputime(), lib.File, pkg) + ctxt.Logf("ldobj: %s (%s)\n", lib.File, pkg) } f, err := bio.Open(lib.File) if err != nil { @@ -1162,13 +1162,13 @@ func (ctxt *Link) hostlink() { switch ctxt.HeadType { case objabi.Hdarwin: - argv = append(argv, "-Wl,-headerpad,1144") + if !ctxt.Arch.InFamily(sys.ARM, sys.ARM64) { + // -headerpad is incompatible with -fembed-bitcode. + argv = append(argv, "-Wl,-headerpad,1144") + } if ctxt.DynlinkingGo() && !ctxt.Arch.InFamily(sys.ARM, sys.ARM64) { argv = append(argv, "-Wl,-flat_namespace") } - if ctxt.BuildMode == BuildModeExe && !ctxt.Arch.InFamily(sys.ARM64) { - argv = append(argv, "-Wl,-no_pie") - } case objabi.Hopenbsd: argv = append(argv, "-Wl,-nopie") case objabi.Hwindows: @@ -1181,6 +1181,9 @@ func (ctxt *Link) hostlink() { // ancient compatibility hacks. argv = append(argv, "-Wl,--tsaware") + // Enable DEP + argv = append(argv, "-Wl,--nxcompat") + argv = append(argv, fmt.Sprintf("-Wl,--major-os-version=%d", PeMinimumTargetMajorVersion)) argv = append(argv, fmt.Sprintf("-Wl,--minor-os-version=%d", PeMinimumTargetMinorVersion)) argv = append(argv, fmt.Sprintf("-Wl,--major-subsystem-version=%d", PeMinimumTargetMajorVersion)) @@ -1199,11 +1202,10 @@ func (ctxt *Link) hostlink() { switch ctxt.BuildMode { case BuildModeExe: if ctxt.HeadType == objabi.Hdarwin { - if ctxt.Arch.Family == sys.ARM64 { - // __PAGEZERO segment size determined empirically. - // XCode 9.0.1 successfully uploads an iOS app with this value. - argv = append(argv, "-Wl,-pagezero_size,100000000") - } else { + if ctxt.Arch.Family != sys.ARM64 { + argv = append(argv, "-Wl,-no_pie") + } + if !ctxt.Arch.InFamily(sys.ARM, sys.ARM64) { argv = append(argv, "-Wl,-pagezero_size,4000000") } } @@ -1284,6 +1286,19 @@ func (ctxt *Link) hostlink() { } } + if ctxt.Arch.Family == sys.ARM64 && objabi.GOOS == "freebsd" { + // Switch to ld.bfd on freebsd/arm64. + argv = append(argv, "-fuse-ld=bfd") + + // Provide a useful error if ld.bfd is missing. + cmd := exec.Command(*flagExtld, "-fuse-ld=bfd", "-Wl,--version") + if out, err := cmd.CombinedOutput(); err == nil { + if !bytes.Contains(out, []byte("GNU ld")) { + log.Fatalf("ARM64 external linker must be ld.bfd (issue #35197), please install devel/binutils") + } + } + } + if ctxt.IsELF && len(buildinfo) > 0 { argv = append(argv, fmt.Sprintf("-Wl,--build-id=0x%x", buildinfo)) } @@ -1432,7 +1447,7 @@ func (ctxt *Link) hostlink() { } if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f host link:", Cputime()) + ctxt.Logf("host link:") for _, v := range argv { ctxt.Logf(" %q", v) } @@ -1900,7 +1915,7 @@ func ldshlibsyms(ctxt *Link, shlib string) { } } if ctxt.Debugvlog > 1 { - ctxt.Logf("%5.2f ldshlibsyms: found library with name %s at %s\n", Cputime(), shlib, libpath) + ctxt.Logf("ldshlibsyms: found library with name %s at %s\n", shlib, libpath) } f, err := elf.Open(libpath) @@ -2396,6 +2411,11 @@ func genasmsym(ctxt *Link, put func(*Link, *sym.Symbol, string, SymbolType, int6 } put(ctxt, s, s.Name, BSSSym, Symaddr(s), s.Gotype) + case sym.SUNDEFEXT: + if ctxt.HeadType == objabi.Hwindows || ctxt.HeadType == objabi.Haix || ctxt.IsELF { + put(ctxt, s, s.Name, UndefinedSym, s.Value, nil) + } + case sym.SHOSTOBJ: if !s.Attr.Reachable() { continue @@ -2433,7 +2453,7 @@ func genasmsym(ctxt *Link, put func(*Link, *sym.Symbol, string, SymbolType, int6 } if ctxt.Debugvlog != 0 || *flagN { - ctxt.Logf("%5.2f symsize = %d\n", Cputime(), uint32(Symsize)) + ctxt.Logf("symsize = %d\n", uint32(Symsize)) } } diff --git a/src/cmd/link/internal/ld/macho.go b/src/cmd/link/internal/ld/macho.go index 7453f37c62..e9e48768c1 100644 --- a/src/cmd/link/internal/ld/macho.go +++ b/src/cmd/link/internal/ld/macho.go @@ -809,7 +809,7 @@ func machogenasmsym(ctxt *Link) { } } - if s.Type == sym.SDYNIMPORT || s.Type == sym.SHOSTOBJ { + if s.Type == sym.SDYNIMPORT || s.Type == sym.SHOSTOBJ || s.Type == sym.SUNDEFEXT { if s.Attr.Reachable() { addsym(ctxt, s, "", DataSym, 0, nil) } @@ -886,7 +886,7 @@ func machosymtab(ctxt *Link) { // replace "·" as ".", because DTrace cannot handle it. Addstring(symstr, strings.Replace(s.Extname(), "·", ".", -1)) - if s.Type == sym.SDYNIMPORT || s.Type == sym.SHOSTOBJ { + if s.Type == sym.SDYNIMPORT || s.Type == sym.SHOSTOBJ || s.Type == sym.SUNDEFEXT { symtab.AddUint8(0x01) // type N_EXT, external symbol symtab.AddUint8(0) // no section symtab.AddUint16(ctxt.Arch, 0) // desc diff --git a/src/cmd/link/internal/ld/main.go b/src/cmd/link/internal/ld/main.go index 3d8bc069af..10717f603d 100644 --- a/src/cmd/link/internal/ld/main.go +++ b/src/cmd/link/internal/ld/main.go @@ -280,7 +280,6 @@ func Main(arch *sys.Arch, theArch Arch) { ctxt.hostlink() ctxt.archive() if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f cpu time\n", Cputime()) ctxt.Logf("%d symbols\n", len(ctxt.Syms.Allsym)) ctxt.Logf("%d liveness data\n", liveness) } diff --git a/src/cmd/link/internal/ld/pcln.go b/src/cmd/link/internal/ld/pcln.go index 008adfbc97..818da34d6d 100644 --- a/src/cmd/link/internal/ld/pcln.go +++ b/src/cmd/link/internal/ld/pcln.go @@ -393,7 +393,7 @@ func (ctxt *Link) pclntab() { ftab.Size = int64(len(ftab.P)) if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f pclntab=%d bytes, funcdata total %d bytes\n", Cputime(), ftab.Size, funcdataBytes) + ctxt.Logf("pclntab=%d bytes, funcdata total %d bytes\n", ftab.Size, funcdataBytes) } } diff --git a/src/cmd/link/internal/ld/pe.go b/src/cmd/link/internal/ld/pe.go index 12363626ae..4ab346e733 100644 --- a/src/cmd/link/internal/ld/pe.go +++ b/src/cmd/link/internal/ld/pe.go @@ -685,7 +685,7 @@ func (f *peFile) writeSymbols(ctxt *Link) { // Only windows/386 requires underscore prefix on external symbols. if ctxt.Arch.Family == sys.I386 && ctxt.LinkMode == LinkExternal && - (s.Type == sym.SHOSTOBJ || s.Attr.CgoExport()) { + (s.Type == sym.SHOSTOBJ || s.Type == sym.SUNDEFEXT || s.Attr.CgoExport()) { s.Name = "_" + s.Name } @@ -861,14 +861,18 @@ func (f *peFile) writeOptionalHeader(ctxt *Link) { switch ctxt.Arch.Family { case sys.ARM: - oh64.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE | IMAGE_DLLCHARACTERISTICS_NX_COMPAT - oh.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE | IMAGE_DLLCHARACTERISTICS_NX_COMPAT + oh64.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE + oh.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE } // Mark as having awareness of terminal services, to avoid ancient compatibility hacks. oh64.DllCharacteristics |= IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE oh.DllCharacteristics |= IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE + // Enable DEP + oh64.DllCharacteristics |= IMAGE_DLLCHARACTERISTICS_NX_COMPAT + oh.DllCharacteristics |= IMAGE_DLLCHARACTERISTICS_NX_COMPAT + // Disable stack growth as we don't want Windows to // fiddle with the thread stack limits, which we set // ourselves to circumvent the stack checks in the diff --git a/src/cmd/link/internal/ld/symtab.go b/src/cmd/link/internal/ld/symtab.go index f36f6e9740..bba623eb48 100644 --- a/src/cmd/link/internal/ld/symtab.go +++ b/src/cmd/link/internal/ld/symtab.go @@ -110,7 +110,7 @@ func putelfsym(ctxt *Link, x *sym.Symbol, s string, t SymbolType, addr int64, go } var elfshnum int - if xo.Type == sym.SDYNIMPORT || xo.Type == sym.SHOSTOBJ { + if xo.Type == sym.SDYNIMPORT || xo.Type == sym.SHOSTOBJ || xo.Type == sym.SUNDEFEXT { elfshnum = SHN_UNDEF } else { if xo.Sect == nil { diff --git a/src/cmd/link/internal/ld/util.go b/src/cmd/link/internal/ld/util.go index 488386fec2..e42c8ce645 100644 --- a/src/cmd/link/internal/ld/util.go +++ b/src/cmd/link/internal/ld/util.go @@ -9,19 +9,8 @@ import ( "encoding/binary" "fmt" "os" - "time" ) -var startTime time.Time - -// TODO(josharian): delete. See issue 19865. -func Cputime() float64 { - if startTime.IsZero() { - startTime = time.Now() - } - return time.Since(startTime).Seconds() -} - var atExitFuncs []func() func AtExit(f func()) { @@ -84,12 +73,6 @@ func stringtouint32(x []uint32, s string) { } } -var start = time.Now() - -func elapsed() float64 { - return time.Since(start).Seconds() -} - // contains reports whether v is in s. func contains(s []string, v string) bool { for _, x := range s { diff --git a/src/cmd/link/internal/ld/xcoff.go b/src/cmd/link/internal/ld/xcoff.go index c64066acec..fe35578225 100644 --- a/src/cmd/link/internal/ld/xcoff.go +++ b/src/cmd/link/internal/ld/xcoff.go @@ -955,7 +955,7 @@ func putaixsym(ctxt *Link, x *sym.Symbol, str string, t SymbolType, addr int64, syms = append(syms, a4) case UndefinedSym: - if x.Type != sym.SDYNIMPORT && x.Type != sym.SHOSTOBJ { + if x.Type != sym.SDYNIMPORT && x.Type != sym.SHOSTOBJ && x.Type != sym.SUNDEFEXT { return } s := &XcoffSymEnt64{ diff --git a/src/cmd/link/internal/mips/asm.go b/src/cmd/link/internal/mips/asm.go index f05455e520..16c94c147a 100644 --- a/src/cmd/link/internal/mips/asm.go +++ b/src/cmd/link/internal/mips/asm.go @@ -163,10 +163,6 @@ func archrelocvariant(ctxt *ld.Link, r *sym.Reloc, s *sym.Symbol, t int64) int64 } func asmb(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - if ctxt.IsELF { ld.Asmbelfsetup() } @@ -180,18 +176,10 @@ func asmb(ctxt *ld.Link) { } if ld.Segrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f datblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) @@ -209,33 +197,19 @@ func asmb2(ctxt *ld.Link) { if !ctxt.IsELF { ld.Errorf(nil, "unsupported executable format") } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f sym\n", ld.Cputime()) - } symo = uint32(ld.Segdwarf.Fileoff + ld.Segdwarf.Filelen) symo = uint32(ld.Rnd(int64(symo), int64(*ld.FlagRound))) ctxt.Out.SeekSet(int64(symo)) - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) - } ld.Asmelfsym(ctxt) ctxt.Out.Flush() ctxt.Out.Write(ld.Elfstrdat) - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) - } - if ctxt.LinkMode == ld.LinkExternal { ld.Elfemitreloc(ctxt) } } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f header\n", ld.Cputime()) - } - ctxt.Out.SeekSet(0) switch ctxt.HeadType { default: diff --git a/src/cmd/link/internal/mips64/asm.go b/src/cmd/link/internal/mips64/asm.go index 9697ea511b..5c6fef9c5b 100644 --- a/src/cmd/link/internal/mips64/asm.go +++ b/src/cmd/link/internal/mips64/asm.go @@ -169,10 +169,6 @@ func archrelocvariant(ctxt *ld.Link, r *sym.Reloc, s *sym.Symbol, t int64) int64 } func asmb(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - if ctxt.IsELF { ld.Asmbelfsetup() } @@ -186,24 +182,14 @@ func asmb(ctxt *ld.Link) { } if ld.Segrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) } if ld.Segrelrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f datblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) @@ -219,9 +205,6 @@ func asmb2(ctxt *ld.Link) { symo := uint32(0) if !*ld.FlagS { // TODO: rationalize - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f sym\n", ld.Cputime()) - } switch ctxt.HeadType { default: if ctxt.IsELF { @@ -237,9 +220,6 @@ func asmb2(ctxt *ld.Link) { switch ctxt.HeadType { default: if ctxt.IsELF { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) - } ld.Asmelfsym(ctxt) ctxt.Out.Flush() ctxt.Out.Write(ld.Elfstrdat) @@ -262,9 +242,6 @@ func asmb2(ctxt *ld.Link) { } } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f header\n", ld.Cputime()) - } ctxt.Out.SeekSet(0) switch ctxt.HeadType { default: diff --git a/src/cmd/link/internal/ppc64/asm.go b/src/cmd/link/internal/ppc64/asm.go index cf6a2846de..9fbcff551a 100644 --- a/src/cmd/link/internal/ppc64/asm.go +++ b/src/cmd/link/internal/ppc64/asm.go @@ -801,7 +801,7 @@ func archreloc(ctxt *ld.Link, r *sym.Reloc, s *sym.Symbol, val int64) (int64, bo rs = rs.Outer } - if rs.Type != sym.SHOSTOBJ && rs.Type != sym.SDYNIMPORT && rs.Sect == nil { + if rs.Type != sym.SHOSTOBJ && rs.Type != sym.SDYNIMPORT && rs.Type != sym.SUNDEFEXT && rs.Sect == nil { ld.Errorf(s, "missing section for %s", rs.Name) } r.Xsym = rs @@ -1062,10 +1062,6 @@ func ensureglinkresolver(ctxt *ld.Link) *sym.Symbol { } func asmb(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - if ctxt.IsELF { ld.Asmbelfsetup() } @@ -1081,24 +1077,14 @@ func asmb(ctxt *ld.Link) { } if ld.Segrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) } if ld.Segrelrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f datblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) @@ -1114,9 +1100,6 @@ func asmb2(ctxt *ld.Link) { symo := uint32(0) if !*ld.FlagS { // TODO: rationalize - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f sym\n", ld.Cputime()) - } switch ctxt.HeadType { default: if ctxt.IsELF { @@ -1135,9 +1118,6 @@ func asmb2(ctxt *ld.Link) { switch ctxt.HeadType { default: if ctxt.IsELF { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) - } ld.Asmelfsym(ctxt) ctxt.Out.Flush() ctxt.Out.Write(ld.Elfstrdat) @@ -1164,9 +1144,6 @@ func asmb2(ctxt *ld.Link) { } } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f header\n", ld.Cputime()) - } ctxt.Out.SeekSet(0) switch ctxt.HeadType { default: diff --git a/src/cmd/link/internal/s390x/asm.go b/src/cmd/link/internal/s390x/asm.go index ebaf760edf..94a5a2f86c 100644 --- a/src/cmd/link/internal/s390x/asm.go +++ b/src/cmd/link/internal/s390x/asm.go @@ -503,10 +503,6 @@ func addgotsym(ctxt *ld.Link, s *sym.Symbol) { } func asmb(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - if ctxt.IsELF { ld.Asmbelfsetup() } @@ -520,24 +516,14 @@ func asmb(ctxt *ld.Link) { } if ld.Segrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) } if ld.Segrelrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f datblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) @@ -555,32 +541,19 @@ func asmb2(ctxt *ld.Link) { if !ctxt.IsELF { ld.Errorf(nil, "unsupported executable format") } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f sym\n", ld.Cputime()) - } symo = uint32(ld.Segdwarf.Fileoff + ld.Segdwarf.Filelen) symo = uint32(ld.Rnd(int64(symo), int64(*ld.FlagRound))) ctxt.Out.SeekSet(int64(symo)) - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) - } ld.Asmelfsym(ctxt) ctxt.Out.Flush() ctxt.Out.Write(ld.Elfstrdat) - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) - } - if ctxt.LinkMode == ld.LinkExternal { ld.Elfemitreloc(ctxt) } } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f header\n", ld.Cputime()) - } ctxt.Out.SeekSet(0) switch ctxt.HeadType { default: diff --git a/src/cmd/link/internal/sym/symkind.go b/src/cmd/link/internal/sym/symkind.go index a81070f253..97d8963978 100644 --- a/src/cmd/link/internal/sym/symkind.go +++ b/src/cmd/link/internal/sym/symkind.go @@ -104,6 +104,7 @@ const ( SCONST SDYNIMPORT SHOSTOBJ + SUNDEFEXT // Undefined symbol for resolution by external linker // Sections for debugging information SDWARFSECT diff --git a/src/cmd/link/internal/sym/symkind_string.go b/src/cmd/link/internal/sym/symkind_string.go index 2732ec7654..e48d90c511 100644 --- a/src/cmd/link/internal/sym/symkind_string.go +++ b/src/cmd/link/internal/sym/symkind_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type=SymKind"; DO NOT EDIT. +// Code generated by "stringer -type=SymKind symkind.go"; DO NOT EDIT. package sym @@ -54,17 +54,18 @@ func _() { _ = x[SCONST-43] _ = x[SDYNIMPORT-44] _ = x[SHOSTOBJ-45] - _ = x[SDWARFSECT-46] - _ = x[SDWARFINFO-47] - _ = x[SDWARFRANGE-48] - _ = x[SDWARFLOC-49] - _ = x[SDWARFLINES-50] - _ = x[SABIALIAS-51] + _ = x[SUNDEFEXT-46] + _ = x[SDWARFSECT-47] + _ = x[SDWARFINFO-48] + _ = x[SDWARFRANGE-49] + _ = x[SDWARFLOC-50] + _ = x[SDWARFLINES-51] + _ = x[SABIALIAS-52] } -const _SymKind_name = "SxxxSTEXTSELFRXSECTSTYPESSTRINGSGOSTRINGSGOFUNCSGCBITSSRODATASFUNCTABSELFROSECTSMACHOPLTSTYPERELROSSTRINGRELROSGOSTRINGRELROSGOFUNCRELROSGCBITSRELROSRODATARELROSFUNCTABRELROSTYPELINKSITABLINKSSYMTABSPCLNTABSFirstWritableSBUILDINFOSELFSECTSMACHOSMACHOGOTSWINDOWSSELFGOTSNOPTRDATASINITARRSDATASXCOFFTOCSBSSSNOPTRBSSSTLSBSSSXREFSMACHOSYMSTRSMACHOSYMTABSMACHOINDIRECTPLTSMACHOINDIRECTGOTSFILEPATHSCONSTSDYNIMPORTSHOSTOBJSDWARFSECTSDWARFINFOSDWARFRANGESDWARFLOCSDWARFLINESSABIALIAS" +const _SymKind_name = "SxxxSTEXTSELFRXSECTSTYPESSTRINGSGOSTRINGSGOFUNCSGCBITSSRODATASFUNCTABSELFROSECTSMACHOPLTSTYPERELROSSTRINGRELROSGOSTRINGRELROSGOFUNCRELROSGCBITSRELROSRODATARELROSFUNCTABRELROSTYPELINKSITABLINKSSYMTABSPCLNTABSFirstWritableSBUILDINFOSELFSECTSMACHOSMACHOGOTSWINDOWSSELFGOTSNOPTRDATASINITARRSDATASXCOFFTOCSBSSSNOPTRBSSSTLSBSSSXREFSMACHOSYMSTRSMACHOSYMTABSMACHOINDIRECTPLTSMACHOINDIRECTGOTSFILEPATHSCONSTSDYNIMPORTSHOSTOBJSUNDEFEXTSDWARFSECTSDWARFINFOSDWARFRANGESDWARFLOCSDWARFLINESSABIALIAS" -var _SymKind_index = [...]uint16{0, 4, 9, 19, 24, 31, 40, 47, 54, 61, 69, 79, 88, 98, 110, 124, 136, 148, 160, 173, 182, 191, 198, 206, 220, 230, 238, 244, 253, 261, 268, 278, 286, 291, 300, 304, 313, 320, 325, 337, 349, 366, 383, 392, 398, 408, 416, 426, 436, 447, 456, 467, 476} +var _SymKind_index = [...]uint16{0, 4, 9, 19, 24, 31, 40, 47, 54, 61, 69, 79, 88, 98, 110, 124, 136, 148, 160, 173, 182, 191, 198, 206, 220, 230, 238, 244, 253, 261, 268, 278, 286, 291, 300, 304, 313, 320, 325, 337, 349, 366, 383, 392, 398, 408, 416, 425, 435, 445, 456, 465, 476, 485} func (i SymKind) String() string { if i >= SymKind(len(_SymKind_index)-1) { diff --git a/src/cmd/link/internal/wasm/asm.go b/src/cmd/link/internal/wasm/asm.go index aaaa93f355..d70b0569a6 100644 --- a/src/cmd/link/internal/wasm/asm.go +++ b/src/cmd/link/internal/wasm/asm.go @@ -96,10 +96,6 @@ func asmb(ctxt *ld.Link) {} // dummy // asmb writes the final WebAssembly module binary. // Spec: https://webassembly.github.io/spec/core/binary/modules.html func asmb2(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - types := []*wasmFuncType{ // For normal Go functions, the single parameter is PC_B, // the return value is diff --git a/src/cmd/link/internal/x86/asm.go b/src/cmd/link/internal/x86/asm.go index aa4f99e9da..3fe36db64d 100644 --- a/src/cmd/link/internal/x86/asm.go +++ b/src/cmd/link/internal/x86/asm.go @@ -620,10 +620,6 @@ func addgotsym(ctxt *ld.Link, s *sym.Symbol) { } func asmb(ctxt *ld.Link) { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f asmb\n", ld.Cputime()) - } - if ctxt.IsELF { ld.Asmbelfsetup() } @@ -638,25 +634,14 @@ func asmb(ctxt *ld.Link) { } if ld.Segrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) } if ld.Segrelrodata.Filelen > 0 { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) - } ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f datblk\n", ld.Cputime()) - } - ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) @@ -676,9 +661,6 @@ func asmb2(ctxt *ld.Link) { symo := uint32(0) if !*ld.FlagS { // TODO: rationalize - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f sym\n", ld.Cputime()) - } switch ctxt.HeadType { default: if ctxt.IsELF { @@ -701,9 +683,6 @@ func asmb2(ctxt *ld.Link) { switch ctxt.HeadType { default: if ctxt.IsELF { - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) - } ld.Asmelfsym(ctxt) ctxt.Out.Flush() ctxt.Out.Write(ld.Elfstrdat) @@ -725,9 +704,7 @@ func asmb2(ctxt *ld.Link) { } case objabi.Hwindows: - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) - } + // Do nothing case objabi.Hdarwin: if ctxt.LinkMode == ld.LinkExternal { @@ -736,9 +713,6 @@ func asmb2(ctxt *ld.Link) { } } - if ctxt.Debugvlog != 0 { - ctxt.Logf("%5.2f headr\n", ld.Cputime()) - } ctxt.Out.SeekSet(0) switch ctxt.HeadType { default: diff --git a/src/cmd/link/link_test.go b/src/cmd/link/link_test.go index 29b98e9c32..155fd8bce3 100644 --- a/src/cmd/link/link_test.go +++ b/src/cmd/link/link_test.go @@ -1,6 +1,8 @@ package main import ( + "bufio" + "bytes" "debug/macho" "internal/testenv" "io/ioutil" @@ -315,3 +317,62 @@ func TestMacOSVersion(t *testing.T) { t.Errorf("no LC_VERSION_MIN_MACOSX load command found") } } + +const Issue34788src = ` + +package blah + +func Blah(i int) int { + a := [...]int{1, 2, 3, 4, 5, 6, 7, 8} + return a[i&7] +} +` + +func TestIssue34788Android386TLSSequence(t *testing.T) { + testenv.MustHaveGoBuild(t) + + // This is a cross-compilation test, so it doesn't make + // sense to run it on every GOOS/GOARCH combination. Limit + // the test to amd64 + darwin/linux. + if runtime.GOARCH != "amd64" || + (runtime.GOOS != "darwin" && runtime.GOOS != "linux") { + t.Skip("skipping on non-{linux,darwin}/amd64 platform") + } + + tmpdir, err := ioutil.TempDir("", "TestIssue34788Android386TLSSequence") + if err != nil { + t.Fatal(err) + } + defer os.RemoveAll(tmpdir) + + src := filepath.Join(tmpdir, "blah.go") + err = ioutil.WriteFile(src, []byte(Issue34788src), 0666) + if err != nil { + t.Fatal(err) + } + + obj := filepath.Join(tmpdir, "blah.o") + cmd := exec.Command(testenv.GoToolPath(t), "tool", "compile", "-o", obj, src) + cmd.Env = append(os.Environ(), "GOARCH=386", "GOOS=android") + if out, err := cmd.CombinedOutput(); err != nil { + if err != nil { + t.Fatalf("failed to compile blah.go: %v, output: %s\n", err, out) + } + } + + // Run objdump on the resulting object. + cmd = exec.Command(testenv.GoToolPath(t), "tool", "objdump", obj) + out, oerr := cmd.CombinedOutput() + if oerr != nil { + t.Fatalf("failed to objdump blah.o: %v, output: %s\n", oerr, out) + } + + // Sift through the output; we should not be seeing any R_TLS_LE relocs. + scanner := bufio.NewScanner(bytes.NewReader(out)) + for scanner.Scan() { + line := scanner.Text() + if strings.Contains(line, "R_TLS_LE") { + t.Errorf("objdump output contains unexpected R_TLS_LE reloc: %s", line) + } + } +} diff --git a/src/cmd/nm/nm_cgo_test.go b/src/cmd/nm/nm_cgo_test.go index 63001f85c6..dde24a0b72 100644 --- a/src/cmd/nm/nm_cgo_test.go +++ b/src/cmd/nm/nm_cgo_test.go @@ -17,6 +17,11 @@ func canInternalLink() bool { return false case "dragonfly": return false + case "freebsd": + switch runtime.GOARCH { + case "arm64": + return false + } case "linux": switch runtime.GOARCH { case "arm64", "mips64", "mips64le", "mips", "mipsle", "ppc64", "ppc64le": diff --git a/src/cmd/vendor/golang.org/x/crypto/ed25519/ed25519.go b/src/cmd/vendor/golang.org/x/crypto/ed25519/ed25519.go new file mode 100644 index 0000000000..c7f8c7e64e --- /dev/null +++ b/src/cmd/vendor/golang.org/x/crypto/ed25519/ed25519.go @@ -0,0 +1,222 @@ +// Copyright 2016 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// In Go 1.13, the ed25519 package was promoted to the standard library as +// crypto/ed25519, and this package became a wrapper for the standard library one. +// +// +build !go1.13 + +// Package ed25519 implements the Ed25519 signature algorithm. See +// https://ed25519.cr.yp.to/. +// +// These functions are also compatible with the “Ed25519” function defined in +// RFC 8032. However, unlike RFC 8032's formulation, this package's private key +// representation includes a public key suffix to make multiple signing +// operations with the same key more efficient. This package refers to the RFC +// 8032 private key as the “seed”. +package ed25519 + +// This code is a port of the public domain, “ref10” implementation of ed25519 +// from SUPERCOP. + +import ( + "bytes" + "crypto" + cryptorand "crypto/rand" + "crypto/sha512" + "errors" + "io" + "strconv" + + "golang.org/x/crypto/ed25519/internal/edwards25519" +) + +const ( + // PublicKeySize is the size, in bytes, of public keys as used in this package. + PublicKeySize = 32 + // PrivateKeySize is the size, in bytes, of private keys as used in this package. + PrivateKeySize = 64 + // SignatureSize is the size, in bytes, of signatures generated and verified by this package. + SignatureSize = 64 + // SeedSize is the size, in bytes, of private key seeds. These are the private key representations used by RFC 8032. + SeedSize = 32 +) + +// PublicKey is the type of Ed25519 public keys. +type PublicKey []byte + +// PrivateKey is the type of Ed25519 private keys. It implements crypto.Signer. +type PrivateKey []byte + +// Public returns the PublicKey corresponding to priv. +func (priv PrivateKey) Public() crypto.PublicKey { + publicKey := make([]byte, PublicKeySize) + copy(publicKey, priv[32:]) + return PublicKey(publicKey) +} + +// Seed returns the private key seed corresponding to priv. It is provided for +// interoperability with RFC 8032. RFC 8032's private keys correspond to seeds +// in this package. +func (priv PrivateKey) Seed() []byte { + seed := make([]byte, SeedSize) + copy(seed, priv[:32]) + return seed +} + +// Sign signs the given message with priv. +// Ed25519 performs two passes over messages to be signed and therefore cannot +// handle pre-hashed messages. Thus opts.HashFunc() must return zero to +// indicate the message hasn't been hashed. This can be achieved by passing +// crypto.Hash(0) as the value for opts. +func (priv PrivateKey) Sign(rand io.Reader, message []byte, opts crypto.SignerOpts) (signature []byte, err error) { + if opts.HashFunc() != crypto.Hash(0) { + return nil, errors.New("ed25519: cannot sign hashed message") + } + + return Sign(priv, message), nil +} + +// GenerateKey generates a public/private key pair using entropy from rand. +// If rand is nil, crypto/rand.Reader will be used. +func GenerateKey(rand io.Reader) (PublicKey, PrivateKey, error) { + if rand == nil { + rand = cryptorand.Reader + } + + seed := make([]byte, SeedSize) + if _, err := io.ReadFull(rand, seed); err != nil { + return nil, nil, err + } + + privateKey := NewKeyFromSeed(seed) + publicKey := make([]byte, PublicKeySize) + copy(publicKey, privateKey[32:]) + + return publicKey, privateKey, nil +} + +// NewKeyFromSeed calculates a private key from a seed. It will panic if +// len(seed) is not SeedSize. This function is provided for interoperability +// with RFC 8032. RFC 8032's private keys correspond to seeds in this +// package. +func NewKeyFromSeed(seed []byte) PrivateKey { + if l := len(seed); l != SeedSize { + panic("ed25519: bad seed length: " + strconv.Itoa(l)) + } + + digest := sha512.Sum512(seed) + digest[0] &= 248 + digest[31] &= 127 + digest[31] |= 64 + + var A edwards25519.ExtendedGroupElement + var hBytes [32]byte + copy(hBytes[:], digest[:]) + edwards25519.GeScalarMultBase(&A, &hBytes) + var publicKeyBytes [32]byte + A.ToBytes(&publicKeyBytes) + + privateKey := make([]byte, PrivateKeySize) + copy(privateKey, seed) + copy(privateKey[32:], publicKeyBytes[:]) + + return privateKey +} + +// Sign signs the message with privateKey and returns a signature. It will +// panic if len(privateKey) is not PrivateKeySize. +func Sign(privateKey PrivateKey, message []byte) []byte { + if l := len(privateKey); l != PrivateKeySize { + panic("ed25519: bad private key length: " + strconv.Itoa(l)) + } + + h := sha512.New() + h.Write(privateKey[:32]) + + var digest1, messageDigest, hramDigest [64]byte + var expandedSecretKey [32]byte + h.Sum(digest1[:0]) + copy(expandedSecretKey[:], digest1[:]) + expandedSecretKey[0] &= 248 + expandedSecretKey[31] &= 63 + expandedSecretKey[31] |= 64 + + h.Reset() + h.Write(digest1[32:]) + h.Write(message) + h.Sum(messageDigest[:0]) + + var messageDigestReduced [32]byte + edwards25519.ScReduce(&messageDigestReduced, &messageDigest) + var R edwards25519.ExtendedGroupElement + edwards25519.GeScalarMultBase(&R, &messageDigestReduced) + + var encodedR [32]byte + R.ToBytes(&encodedR) + + h.Reset() + h.Write(encodedR[:]) + h.Write(privateKey[32:]) + h.Write(message) + h.Sum(hramDigest[:0]) + var hramDigestReduced [32]byte + edwards25519.ScReduce(&hramDigestReduced, &hramDigest) + + var s [32]byte + edwards25519.ScMulAdd(&s, &hramDigestReduced, &expandedSecretKey, &messageDigestReduced) + + signature := make([]byte, SignatureSize) + copy(signature[:], encodedR[:]) + copy(signature[32:], s[:]) + + return signature +} + +// Verify reports whether sig is a valid signature of message by publicKey. It +// will panic if len(publicKey) is not PublicKeySize. +func Verify(publicKey PublicKey, message, sig []byte) bool { + if l := len(publicKey); l != PublicKeySize { + panic("ed25519: bad public key length: " + strconv.Itoa(l)) + } + + if len(sig) != SignatureSize || sig[63]&224 != 0 { + return false + } + + var A edwards25519.ExtendedGroupElement + var publicKeyBytes [32]byte + copy(publicKeyBytes[:], publicKey) + if !A.FromBytes(&publicKeyBytes) { + return false + } + edwards25519.FeNeg(&A.X, &A.X) + edwards25519.FeNeg(&A.T, &A.T) + + h := sha512.New() + h.Write(sig[:32]) + h.Write(publicKey[:]) + h.Write(message) + var digest [64]byte + h.Sum(digest[:0]) + + var hReduced [32]byte + edwards25519.ScReduce(&hReduced, &digest) + + var R edwards25519.ProjectiveGroupElement + var s [32]byte + copy(s[:], sig[32:]) + + // https://tools.ietf.org/html/rfc8032#section-5.1.7 requires that s be in + // the range [0, order) in order to prevent signature malleability. + if !edwards25519.ScMinimal(&s) { + return false + } + + edwards25519.GeDoubleScalarMultVartime(&R, &hReduced, &A, &s) + + var checkR [32]byte + R.ToBytes(&checkR) + return bytes.Equal(sig[:32], checkR[:]) +} diff --git a/src/cmd/vendor/golang.org/x/crypto/ed25519/ed25519_go113.go b/src/cmd/vendor/golang.org/x/crypto/ed25519/ed25519_go113.go new file mode 100644 index 0000000000..d1448d8d22 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/crypto/ed25519/ed25519_go113.go @@ -0,0 +1,73 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build go1.13 + +// Package ed25519 implements the Ed25519 signature algorithm. See +// https://ed25519.cr.yp.to/. +// +// These functions are also compatible with the “Ed25519” function defined in +// RFC 8032. However, unlike RFC 8032's formulation, this package's private key +// representation includes a public key suffix to make multiple signing +// operations with the same key more efficient. This package refers to the RFC +// 8032 private key as the “seed”. +// +// Beginning with Go 1.13, the functionality of this package was moved to the +// standard library as crypto/ed25519. This package only acts as a compatibility +// wrapper. +package ed25519 + +import ( + "crypto/ed25519" + "io" +) + +const ( + // PublicKeySize is the size, in bytes, of public keys as used in this package. + PublicKeySize = 32 + // PrivateKeySize is the size, in bytes, of private keys as used in this package. + PrivateKeySize = 64 + // SignatureSize is the size, in bytes, of signatures generated and verified by this package. + SignatureSize = 64 + // SeedSize is the size, in bytes, of private key seeds. These are the private key representations used by RFC 8032. + SeedSize = 32 +) + +// PublicKey is the type of Ed25519 public keys. +// +// This type is an alias for crypto/ed25519's PublicKey type. +// See the crypto/ed25519 package for the methods on this type. +type PublicKey = ed25519.PublicKey + +// PrivateKey is the type of Ed25519 private keys. It implements crypto.Signer. +// +// This type is an alias for crypto/ed25519's PrivateKey type. +// See the crypto/ed25519 package for the methods on this type. +type PrivateKey = ed25519.PrivateKey + +// GenerateKey generates a public/private key pair using entropy from rand. +// If rand is nil, crypto/rand.Reader will be used. +func GenerateKey(rand io.Reader) (PublicKey, PrivateKey, error) { + return ed25519.GenerateKey(rand) +} + +// NewKeyFromSeed calculates a private key from a seed. It will panic if +// len(seed) is not SeedSize. This function is provided for interoperability +// with RFC 8032. RFC 8032's private keys correspond to seeds in this +// package. +func NewKeyFromSeed(seed []byte) PrivateKey { + return ed25519.NewKeyFromSeed(seed) +} + +// Sign signs the message with privateKey and returns a signature. It will +// panic if len(privateKey) is not PrivateKeySize. +func Sign(privateKey PrivateKey, message []byte) []byte { + return ed25519.Sign(privateKey, message) +} + +// Verify reports whether sig is a valid signature of message by publicKey. It +// will panic if len(publicKey) is not PublicKeySize. +func Verify(publicKey PublicKey, message, sig []byte) bool { + return ed25519.Verify(publicKey, message, sig) +} diff --git a/src/cmd/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go b/src/cmd/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go new file mode 100644 index 0000000000..e39f086c1d --- /dev/null +++ b/src/cmd/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go @@ -0,0 +1,1422 @@ +// Copyright 2016 The Go 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 edwards25519 + +// These values are from the public domain, “ref10” implementation of ed25519 +// from SUPERCOP. + +// d is a constant in the Edwards curve equation. +var d = FieldElement{ + -10913610, 13857413, -15372611, 6949391, 114729, -8787816, -6275908, -3247719, -18696448, -12055116, +} + +// d2 is 2*d. +var d2 = FieldElement{ + -21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199, +} + +// SqrtM1 is the square-root of -1 in the field. +var SqrtM1 = FieldElement{ + -32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482, +} + +// A is a constant in the Montgomery-form of curve25519. +var A = FieldElement{ + 486662, 0, 0, 0, 0, 0, 0, 0, 0, 0, +} + +// bi contains precomputed multiples of the base-point. See the Ed25519 paper +// for a discussion about how these values are used. +var bi = [8]PreComputedGroupElement{ + { + FieldElement{25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605}, + FieldElement{-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378}, + FieldElement{-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546}, + }, + { + FieldElement{15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024}, + FieldElement{16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574}, + FieldElement{30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357}, + }, + { + FieldElement{10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380}, + FieldElement{4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306}, + FieldElement{19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942}, + }, + { + FieldElement{5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766}, + FieldElement{-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701}, + FieldElement{28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300}, + }, + { + FieldElement{-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877}, + FieldElement{-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951}, + FieldElement{4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784}, + }, + { + FieldElement{-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436}, + FieldElement{25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918}, + FieldElement{23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877}, + }, + { + FieldElement{-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800}, + FieldElement{-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305}, + FieldElement{-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300}, + }, + { + FieldElement{-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876}, + FieldElement{-24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619}, + FieldElement{-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683}, + }, +} + +// base contains precomputed multiples of the base-point. See the Ed25519 paper +// for a discussion about how these values are used. +var base = [32][8]PreComputedGroupElement{ + { + { + FieldElement{25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605}, + FieldElement{-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378}, + FieldElement{-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546}, + }, + { + FieldElement{-12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303}, + FieldElement{-21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081}, + FieldElement{26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697}, + }, + { + FieldElement{15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024}, + FieldElement{16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574}, + FieldElement{30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357}, + }, + { + FieldElement{-17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540}, + FieldElement{23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397}, + FieldElement{7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325}, + }, + { + FieldElement{10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380}, + FieldElement{4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306}, + FieldElement{19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942}, + }, + { + FieldElement{-15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777}, + FieldElement{-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737}, + FieldElement{-18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652}, + }, + { + FieldElement{5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766}, + FieldElement{-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701}, + FieldElement{28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300}, + }, + { + FieldElement{14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726}, + FieldElement{-7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955}, + FieldElement{27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425}, + }, + }, + { + { + FieldElement{-13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171}, + FieldElement{27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510}, + FieldElement{17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660}, + }, + { + FieldElement{-10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639}, + FieldElement{29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963}, + FieldElement{5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950}, + }, + { + FieldElement{-27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568}, + FieldElement{12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335}, + FieldElement{25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628}, + }, + { + FieldElement{-26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007}, + FieldElement{-2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772}, + FieldElement{-22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653}, + }, + { + FieldElement{2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567}, + FieldElement{13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686}, + FieldElement{21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372}, + }, + { + FieldElement{-13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887}, + FieldElement{-23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954}, + FieldElement{-29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953}, + }, + { + FieldElement{24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833}, + FieldElement{-16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532}, + FieldElement{-22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876}, + }, + { + FieldElement{2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268}, + FieldElement{33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214}, + FieldElement{1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038}, + }, + }, + { + { + FieldElement{6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800}, + FieldElement{4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645}, + FieldElement{-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664}, + }, + { + FieldElement{1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933}, + FieldElement{-25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182}, + FieldElement{-17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222}, + }, + { + FieldElement{-18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991}, + FieldElement{20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880}, + FieldElement{9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092}, + }, + { + FieldElement{-16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295}, + FieldElement{19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788}, + FieldElement{8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553}, + }, + { + FieldElement{-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026}, + FieldElement{11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347}, + FieldElement{-18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033}, + }, + { + FieldElement{-23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395}, + FieldElement{-27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278}, + FieldElement{1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890}, + }, + { + FieldElement{32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995}, + FieldElement{-30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596}, + FieldElement{-11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891}, + }, + { + FieldElement{31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060}, + FieldElement{11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608}, + FieldElement{-20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606}, + }, + }, + { + { + FieldElement{7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389}, + FieldElement{-19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016}, + FieldElement{-11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341}, + }, + { + FieldElement{-22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505}, + FieldElement{14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553}, + FieldElement{-28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655}, + }, + { + FieldElement{15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220}, + FieldElement{12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631}, + FieldElement{-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099}, + }, + { + FieldElement{26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556}, + FieldElement{14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749}, + FieldElement{236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930}, + }, + { + FieldElement{1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391}, + FieldElement{5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253}, + FieldElement{20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066}, + }, + { + FieldElement{24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958}, + FieldElement{-11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082}, + FieldElement{-28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383}, + }, + { + FieldElement{-30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521}, + FieldElement{-11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807}, + FieldElement{23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948}, + }, + { + FieldElement{9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134}, + FieldElement{-32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455}, + FieldElement{27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629}, + }, + }, + { + { + FieldElement{-8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069}, + FieldElement{-32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746}, + FieldElement{24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919}, + }, + { + FieldElement{11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837}, + FieldElement{8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906}, + FieldElement{-28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771}, + }, + { + FieldElement{-25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817}, + FieldElement{10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098}, + FieldElement{10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409}, + }, + { + FieldElement{-12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504}, + FieldElement{-26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727}, + FieldElement{28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420}, + }, + { + FieldElement{-32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003}, + FieldElement{-1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605}, + FieldElement{-30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384}, + }, + { + FieldElement{-26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701}, + FieldElement{-23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683}, + FieldElement{29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708}, + }, + { + FieldElement{-3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563}, + FieldElement{-19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260}, + FieldElement{-5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387}, + }, + { + FieldElement{-19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672}, + FieldElement{23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686}, + FieldElement{-24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665}, + }, + }, + { + { + FieldElement{11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182}, + FieldElement{-31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277}, + FieldElement{14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628}, + }, + { + FieldElement{-4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474}, + FieldElement{-26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539}, + FieldElement{-25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822}, + }, + { + FieldElement{-10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970}, + FieldElement{19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756}, + FieldElement{-24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508}, + }, + { + FieldElement{-26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683}, + FieldElement{-10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655}, + FieldElement{-20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158}, + }, + { + FieldElement{-4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125}, + FieldElement{-15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839}, + FieldElement{-20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664}, + }, + { + FieldElement{27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294}, + FieldElement{-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899}, + FieldElement{-11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070}, + }, + { + FieldElement{3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294}, + FieldElement{-15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949}, + FieldElement{-21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083}, + }, + { + FieldElement{31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420}, + FieldElement{-5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940}, + FieldElement{29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396}, + }, + }, + { + { + FieldElement{-12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567}, + FieldElement{20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127}, + FieldElement{-16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294}, + }, + { + FieldElement{-12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887}, + FieldElement{22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964}, + FieldElement{16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195}, + }, + { + FieldElement{9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244}, + FieldElement{24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999}, + FieldElement{-1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762}, + }, + { + FieldElement{-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274}, + FieldElement{-33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236}, + FieldElement{-16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605}, + }, + { + FieldElement{-13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761}, + FieldElement{-22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884}, + FieldElement{-6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482}, + }, + { + FieldElement{-24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638}, + FieldElement{-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490}, + FieldElement{-32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170}, + }, + { + FieldElement{5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736}, + FieldElement{10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124}, + FieldElement{-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392}, + }, + { + FieldElement{8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029}, + FieldElement{6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048}, + FieldElement{28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958}, + }, + }, + { + { + FieldElement{24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593}, + FieldElement{26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071}, + FieldElement{-11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692}, + }, + { + FieldElement{11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687}, + FieldElement{-160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441}, + FieldElement{-20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001}, + }, + { + FieldElement{-938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460}, + FieldElement{-19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007}, + FieldElement{-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762}, + }, + { + FieldElement{15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005}, + FieldElement{-9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674}, + FieldElement{4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035}, + }, + { + FieldElement{7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590}, + FieldElement{-2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957}, + FieldElement{-30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812}, + }, + { + FieldElement{33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740}, + FieldElement{-18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122}, + FieldElement{-27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158}, + }, + { + FieldElement{8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885}, + FieldElement{26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140}, + FieldElement{19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857}, + }, + { + FieldElement{801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155}, + FieldElement{19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260}, + FieldElement{19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483}, + }, + }, + { + { + FieldElement{-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677}, + FieldElement{32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815}, + FieldElement{22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751}, + }, + { + FieldElement{-16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203}, + FieldElement{-11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208}, + FieldElement{1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230}, + }, + { + FieldElement{16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850}, + FieldElement{-21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389}, + FieldElement{-9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968}, + }, + { + FieldElement{-11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689}, + FieldElement{14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880}, + FieldElement{5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304}, + }, + { + FieldElement{30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632}, + FieldElement{-3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412}, + FieldElement{20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566}, + }, + { + FieldElement{-20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038}, + FieldElement{-26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232}, + FieldElement{-1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943}, + }, + { + FieldElement{17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856}, + FieldElement{23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738}, + FieldElement{15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971}, + }, + { + FieldElement{-27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718}, + FieldElement{-13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697}, + FieldElement{-11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883}, + }, + }, + { + { + FieldElement{5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912}, + FieldElement{-26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358}, + FieldElement{3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849}, + }, + { + FieldElement{29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307}, + FieldElement{-14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977}, + FieldElement{-6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335}, + }, + { + FieldElement{-29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644}, + FieldElement{-22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616}, + FieldElement{-27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735}, + }, + { + FieldElement{-21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099}, + FieldElement{29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341}, + FieldElement{-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336}, + }, + { + FieldElement{-23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646}, + FieldElement{31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425}, + FieldElement{-17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388}, + }, + { + FieldElement{-31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743}, + FieldElement{-16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822}, + FieldElement{-8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462}, + }, + { + FieldElement{18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985}, + FieldElement{9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702}, + FieldElement{-22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797}, + }, + { + FieldElement{21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293}, + FieldElement{27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100}, + FieldElement{19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688}, + }, + }, + { + { + FieldElement{12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186}, + FieldElement{2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610}, + FieldElement{-2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707}, + }, + { + FieldElement{7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220}, + FieldElement{915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025}, + FieldElement{32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044}, + }, + { + FieldElement{32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992}, + FieldElement{-4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027}, + FieldElement{21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197}, + }, + { + FieldElement{8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901}, + FieldElement{31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952}, + FieldElement{19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878}, + }, + { + FieldElement{-28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390}, + FieldElement{32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730}, + FieldElement{2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730}, + }, + { + FieldElement{-19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180}, + FieldElement{-30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272}, + FieldElement{-15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715}, + }, + { + FieldElement{-22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970}, + FieldElement{-31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772}, + FieldElement{-17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865}, + }, + { + FieldElement{15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750}, + FieldElement{20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373}, + FieldElement{32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348}, + }, + }, + { + { + FieldElement{9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144}, + FieldElement{-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195}, + FieldElement{5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086}, + }, + { + FieldElement{-13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684}, + FieldElement{-8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518}, + FieldElement{-2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233}, + }, + { + FieldElement{-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793}, + FieldElement{-2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794}, + FieldElement{580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435}, + }, + { + FieldElement{23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921}, + FieldElement{13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518}, + FieldElement{2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563}, + }, + { + FieldElement{14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278}, + FieldElement{-27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024}, + FieldElement{4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030}, + }, + { + FieldElement{10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783}, + FieldElement{27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717}, + FieldElement{6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844}, + }, + { + FieldElement{14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333}, + FieldElement{16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048}, + FieldElement{22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760}, + }, + { + FieldElement{-4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760}, + FieldElement{-15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757}, + FieldElement{-2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112}, + }, + }, + { + { + FieldElement{-19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468}, + FieldElement{3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184}, + FieldElement{10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289}, + }, + { + FieldElement{15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066}, + FieldElement{24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882}, + FieldElement{13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226}, + }, + { + FieldElement{16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101}, + FieldElement{29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279}, + FieldElement{-6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811}, + }, + { + FieldElement{27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709}, + FieldElement{20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714}, + FieldElement{-2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121}, + }, + { + FieldElement{9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464}, + FieldElement{12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847}, + FieldElement{13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400}, + }, + { + FieldElement{4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414}, + FieldElement{-15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158}, + FieldElement{17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045}, + }, + { + FieldElement{-461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415}, + FieldElement{-5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459}, + FieldElement{-31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079}, + }, + { + FieldElement{21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412}, + FieldElement{-20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743}, + FieldElement{-14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836}, + }, + }, + { + { + FieldElement{12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022}, + FieldElement{18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429}, + FieldElement{-6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065}, + }, + { + FieldElement{30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861}, + FieldElement{10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000}, + FieldElement{-33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101}, + }, + { + FieldElement{32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815}, + FieldElement{29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642}, + FieldElement{10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966}, + }, + { + FieldElement{25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574}, + FieldElement{-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742}, + FieldElement{-18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689}, + }, + { + FieldElement{12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020}, + FieldElement{-10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772}, + FieldElement{3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982}, + }, + { + FieldElement{-14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953}, + FieldElement{-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218}, + FieldElement{-17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265}, + }, + { + FieldElement{29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073}, + FieldElement{-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325}, + FieldElement{-11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798}, + }, + { + FieldElement{-4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870}, + FieldElement{-7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863}, + FieldElement{-13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927}, + }, + }, + { + { + FieldElement{-2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267}, + FieldElement{-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663}, + FieldElement{22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862}, + }, + { + FieldElement{-25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673}, + FieldElement{15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943}, + FieldElement{15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020}, + }, + { + FieldElement{-4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238}, + FieldElement{11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064}, + FieldElement{14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795}, + }, + { + FieldElement{15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052}, + FieldElement{-10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904}, + FieldElement{29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531}, + }, + { + FieldElement{-13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979}, + FieldElement{-5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841}, + FieldElement{10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431}, + }, + { + FieldElement{10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324}, + FieldElement{-31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940}, + FieldElement{10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320}, + }, + { + FieldElement{-15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184}, + FieldElement{14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114}, + FieldElement{30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878}, + }, + { + FieldElement{12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784}, + FieldElement{-2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091}, + FieldElement{-16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585}, + }, + }, + { + { + FieldElement{-8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208}, + FieldElement{10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864}, + FieldElement{17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661}, + }, + { + FieldElement{7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233}, + FieldElement{26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212}, + FieldElement{-12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525}, + }, + { + FieldElement{-24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068}, + FieldElement{9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397}, + FieldElement{-8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988}, + }, + { + FieldElement{5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889}, + FieldElement{32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038}, + FieldElement{14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697}, + }, + { + FieldElement{20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875}, + FieldElement{-25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905}, + FieldElement{-25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656}, + }, + { + FieldElement{11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818}, + FieldElement{27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714}, + FieldElement{10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203}, + }, + { + FieldElement{20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931}, + FieldElement{-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024}, + FieldElement{-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084}, + }, + { + FieldElement{-1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204}, + FieldElement{20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817}, + FieldElement{27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667}, + }, + }, + { + { + FieldElement{11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504}, + FieldElement{-12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768}, + FieldElement{-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255}, + }, + { + FieldElement{6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790}, + FieldElement{1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438}, + FieldElement{-22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333}, + }, + { + FieldElement{17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971}, + FieldElement{31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905}, + FieldElement{29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409}, + }, + { + FieldElement{12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409}, + FieldElement{6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499}, + FieldElement{-8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363}, + }, + { + FieldElement{28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664}, + FieldElement{-11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324}, + FieldElement{-21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940}, + }, + { + FieldElement{13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990}, + FieldElement{-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914}, + FieldElement{-25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290}, + }, + { + FieldElement{24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257}, + FieldElement{-6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433}, + FieldElement{-16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236}, + }, + { + FieldElement{-12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045}, + FieldElement{11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093}, + FieldElement{-1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347}, + }, + }, + { + { + FieldElement{-28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191}, + FieldElement{-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507}, + FieldElement{-12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906}, + }, + { + FieldElement{3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018}, + FieldElement{-16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109}, + FieldElement{-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926}, + }, + { + FieldElement{-24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528}, + FieldElement{8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625}, + FieldElement{-32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286}, + }, + { + FieldElement{2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033}, + FieldElement{27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866}, + FieldElement{21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896}, + }, + { + FieldElement{30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075}, + FieldElement{26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347}, + FieldElement{-22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437}, + }, + { + FieldElement{-5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165}, + FieldElement{-18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588}, + FieldElement{-32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193}, + }, + { + FieldElement{-19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017}, + FieldElement{-28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883}, + FieldElement{21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961}, + }, + { + FieldElement{8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043}, + FieldElement{29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663}, + FieldElement{-20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362}, + }, + }, + { + { + FieldElement{-33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860}, + FieldElement{2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466}, + FieldElement{-24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063}, + }, + { + FieldElement{-26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997}, + FieldElement{-1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295}, + FieldElement{-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369}, + }, + { + FieldElement{9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385}, + FieldElement{18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109}, + FieldElement{2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906}, + }, + { + FieldElement{4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424}, + FieldElement{-19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185}, + FieldElement{7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962}, + }, + { + FieldElement{-7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325}, + FieldElement{10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593}, + FieldElement{696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404}, + }, + { + FieldElement{-11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644}, + FieldElement{17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801}, + FieldElement{26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804}, + }, + { + FieldElement{-31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884}, + FieldElement{-586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577}, + FieldElement{-9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849}, + }, + { + FieldElement{32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473}, + FieldElement{-8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644}, + FieldElement{-2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319}, + }, + }, + { + { + FieldElement{-11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599}, + FieldElement{-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768}, + FieldElement{-27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084}, + }, + { + FieldElement{-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328}, + FieldElement{-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369}, + FieldElement{20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920}, + }, + { + FieldElement{12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815}, + FieldElement{-32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025}, + FieldElement{-21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397}, + }, + { + FieldElement{-20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448}, + FieldElement{6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981}, + FieldElement{30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165}, + }, + { + FieldElement{32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501}, + FieldElement{17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073}, + FieldElement{-1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861}, + }, + { + FieldElement{14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845}, + FieldElement{-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211}, + FieldElement{18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870}, + }, + { + FieldElement{10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096}, + FieldElement{33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803}, + FieldElement{-32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168}, + }, + { + FieldElement{30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965}, + FieldElement{-14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505}, + FieldElement{18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598}, + }, + }, + { + { + FieldElement{5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782}, + FieldElement{5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900}, + FieldElement{-31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479}, + }, + { + FieldElement{-12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208}, + FieldElement{8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232}, + FieldElement{17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719}, + }, + { + FieldElement{16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271}, + FieldElement{-4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326}, + FieldElement{-8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132}, + }, + { + FieldElement{14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300}, + FieldElement{8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570}, + FieldElement{15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670}, + }, + { + FieldElement{-2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994}, + FieldElement{-12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913}, + FieldElement{31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317}, + }, + { + FieldElement{-25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730}, + FieldElement{842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096}, + FieldElement{-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078}, + }, + { + FieldElement{-15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411}, + FieldElement{-19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905}, + FieldElement{-9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654}, + }, + { + FieldElement{-28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870}, + FieldElement{-23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498}, + FieldElement{12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579}, + }, + }, + { + { + FieldElement{14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677}, + FieldElement{10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647}, + FieldElement{-2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743}, + }, + { + FieldElement{-25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468}, + FieldElement{21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375}, + FieldElement{-25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155}, + }, + { + FieldElement{6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725}, + FieldElement{-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612}, + FieldElement{-10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943}, + }, + { + FieldElement{-30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944}, + FieldElement{30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928}, + FieldElement{9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406}, + }, + { + FieldElement{22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139}, + FieldElement{-8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963}, + FieldElement{-31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693}, + }, + { + FieldElement{1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734}, + FieldElement{-448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680}, + FieldElement{-24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410}, + }, + { + FieldElement{-9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931}, + FieldElement{-16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654}, + FieldElement{22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710}, + }, + { + FieldElement{29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180}, + FieldElement{-26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684}, + FieldElement{-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895}, + }, + }, + { + { + FieldElement{22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501}, + FieldElement{-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413}, + FieldElement{6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880}, + }, + { + FieldElement{-8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874}, + FieldElement{22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962}, + FieldElement{-7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899}, + }, + { + FieldElement{21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152}, + FieldElement{9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063}, + FieldElement{7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080}, + }, + { + FieldElement{-9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146}, + FieldElement{-17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183}, + FieldElement{-19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133}, + }, + { + FieldElement{-32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421}, + FieldElement{-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622}, + FieldElement{-4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197}, + }, + { + FieldElement{2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663}, + FieldElement{31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753}, + FieldElement{4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755}, + }, + { + FieldElement{-9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862}, + FieldElement{-26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118}, + FieldElement{26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171}, + }, + { + FieldElement{15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380}, + FieldElement{16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824}, + FieldElement{28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270}, + }, + }, + { + { + FieldElement{-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438}, + FieldElement{-31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584}, + FieldElement{-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562}, + }, + { + FieldElement{30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471}, + FieldElement{18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610}, + FieldElement{19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269}, + }, + { + FieldElement{-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650}, + FieldElement{14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369}, + FieldElement{19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461}, + }, + { + FieldElement{30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462}, + FieldElement{-5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793}, + FieldElement{-2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218}, + }, + { + FieldElement{-24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226}, + FieldElement{18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019}, + FieldElement{-15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037}, + }, + { + FieldElement{31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171}, + FieldElement{-17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132}, + FieldElement{-28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841}, + }, + { + FieldElement{21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181}, + FieldElement{-33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210}, + FieldElement{-1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040}, + }, + { + FieldElement{3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935}, + FieldElement{24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105}, + FieldElement{-28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814}, + }, + }, + { + { + FieldElement{793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852}, + FieldElement{5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581}, + FieldElement{-4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646}, + }, + { + FieldElement{10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844}, + FieldElement{10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025}, + FieldElement{27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453}, + }, + { + FieldElement{-23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068}, + FieldElement{4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192}, + FieldElement{-17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921}, + }, + { + FieldElement{-9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259}, + FieldElement{-12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426}, + FieldElement{-5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072}, + }, + { + FieldElement{-17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305}, + FieldElement{13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832}, + FieldElement{28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943}, + }, + { + FieldElement{-16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011}, + FieldElement{24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447}, + FieldElement{17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494}, + }, + { + FieldElement{-28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245}, + FieldElement{-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859}, + FieldElement{28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915}, + }, + { + FieldElement{16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707}, + FieldElement{10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848}, + FieldElement{-11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224}, + }, + }, + { + { + FieldElement{-25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391}, + FieldElement{15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215}, + FieldElement{-23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101}, + }, + { + FieldElement{23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713}, + FieldElement{21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849}, + FieldElement{-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930}, + }, + { + FieldElement{-29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940}, + FieldElement{-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031}, + FieldElement{-17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404}, + }, + { + FieldElement{-25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243}, + FieldElement{-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116}, + FieldElement{-24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525}, + }, + { + FieldElement{-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509}, + FieldElement{-10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883}, + FieldElement{15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865}, + }, + { + FieldElement{-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660}, + FieldElement{4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273}, + FieldElement{-28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138}, + }, + { + FieldElement{-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560}, + FieldElement{-10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135}, + FieldElement{2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941}, + }, + { + FieldElement{-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739}, + FieldElement{18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756}, + FieldElement{-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819}, + }, + }, + { + { + FieldElement{-6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347}, + FieldElement{-27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028}, + FieldElement{21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075}, + }, + { + FieldElement{16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799}, + FieldElement{-2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609}, + FieldElement{-25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817}, + }, + { + FieldElement{-23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989}, + FieldElement{-30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523}, + FieldElement{4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278}, + }, + { + FieldElement{31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045}, + FieldElement{19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377}, + FieldElement{24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480}, + }, + { + FieldElement{17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016}, + FieldElement{510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426}, + FieldElement{18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525}, + }, + { + FieldElement{13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396}, + FieldElement{9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080}, + FieldElement{12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892}, + }, + { + FieldElement{15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275}, + FieldElement{11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074}, + FieldElement{20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140}, + }, + { + FieldElement{-16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717}, + FieldElement{-1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101}, + FieldElement{24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127}, + }, + }, + { + { + FieldElement{-12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632}, + FieldElement{-26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415}, + FieldElement{-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160}, + }, + { + FieldElement{31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876}, + FieldElement{22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625}, + FieldElement{-15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478}, + }, + { + FieldElement{27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164}, + FieldElement{26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595}, + FieldElement{-7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248}, + }, + { + FieldElement{-16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858}, + FieldElement{15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193}, + FieldElement{8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184}, + }, + { + FieldElement{-18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942}, + FieldElement{-1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635}, + FieldElement{21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948}, + }, + { + FieldElement{11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935}, + FieldElement{-25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415}, + FieldElement{-15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416}, + }, + { + FieldElement{-7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018}, + FieldElement{4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778}, + FieldElement{366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659}, + }, + { + FieldElement{-24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385}, + FieldElement{18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503}, + FieldElement{476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329}, + }, + }, + { + { + FieldElement{20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056}, + FieldElement{-13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838}, + FieldElement{24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948}, + }, + { + FieldElement{-3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691}, + FieldElement{-15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118}, + FieldElement{-23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517}, + }, + { + FieldElement{-20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269}, + FieldElement{-6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904}, + FieldElement{-23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589}, + }, + { + FieldElement{-28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193}, + FieldElement{-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910}, + FieldElement{-30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930}, + }, + { + FieldElement{-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667}, + FieldElement{25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481}, + FieldElement{-9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876}, + }, + { + FieldElement{22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640}, + FieldElement{-8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278}, + FieldElement{-21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112}, + }, + { + FieldElement{26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272}, + FieldElement{17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012}, + FieldElement{-10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221}, + }, + { + FieldElement{30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046}, + FieldElement{13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345}, + FieldElement{-19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310}, + }, + }, + { + { + FieldElement{19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937}, + FieldElement{31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636}, + FieldElement{-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008}, + }, + { + FieldElement{-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429}, + FieldElement{-15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576}, + FieldElement{31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066}, + }, + { + FieldElement{-9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490}, + FieldElement{-12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104}, + FieldElement{33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053}, + }, + { + FieldElement{31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275}, + FieldElement{-20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511}, + FieldElement{22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095}, + }, + { + FieldElement{-28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439}, + FieldElement{23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939}, + FieldElement{-23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424}, + }, + { + FieldElement{2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310}, + FieldElement{3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608}, + FieldElement{-32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079}, + }, + { + FieldElement{-23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101}, + FieldElement{21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418}, + FieldElement{18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576}, + }, + { + FieldElement{30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356}, + FieldElement{9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996}, + FieldElement{-26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099}, + }, + }, + { + { + FieldElement{-26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728}, + FieldElement{-13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658}, + FieldElement{-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242}, + }, + { + FieldElement{-21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001}, + FieldElement{-4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766}, + FieldElement{18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373}, + }, + { + FieldElement{26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458}, + FieldElement{-17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628}, + FieldElement{-13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657}, + }, + { + FieldElement{-23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062}, + FieldElement{25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616}, + FieldElement{31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014}, + }, + { + FieldElement{24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383}, + FieldElement{-25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814}, + FieldElement{-20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718}, + }, + { + FieldElement{30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417}, + FieldElement{2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222}, + FieldElement{33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444}, + }, + { + FieldElement{-20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597}, + FieldElement{23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970}, + FieldElement{1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799}, + }, + { + FieldElement{-5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647}, + FieldElement{13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511}, + FieldElement{-29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032}, + }, + }, + { + { + FieldElement{9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834}, + FieldElement{-23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461}, + FieldElement{29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062}, + }, + { + FieldElement{-25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516}, + FieldElement{-20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547}, + FieldElement{-24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240}, + }, + { + FieldElement{-17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038}, + FieldElement{-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741}, + FieldElement{16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103}, + }, + { + FieldElement{-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747}, + FieldElement{-1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323}, + FieldElement{31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016}, + }, + { + FieldElement{-14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373}, + FieldElement{15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228}, + FieldElement{-2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141}, + }, + { + FieldElement{16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399}, + FieldElement{11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831}, + FieldElement{-185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376}, + }, + { + FieldElement{-32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313}, + FieldElement{-18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958}, + FieldElement{-6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577}, + }, + { + FieldElement{-22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743}, + FieldElement{29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684}, + FieldElement{-20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476}, + }, + }, +} diff --git a/src/cmd/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go b/src/cmd/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go new file mode 100644 index 0000000000..fd03c252af --- /dev/null +++ b/src/cmd/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go @@ -0,0 +1,1793 @@ +// Copyright 2016 The Go 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 edwards25519 + +import "encoding/binary" + +// This code is a port of the public domain, “ref10” implementation of ed25519 +// from SUPERCOP. + +// FieldElement represents an element of the field GF(2^255 - 19). An element +// t, entries t[0]...t[9], represents the integer t[0]+2^26 t[1]+2^51 t[2]+2^77 +// t[3]+2^102 t[4]+...+2^230 t[9]. Bounds on each t[i] vary depending on +// context. +type FieldElement [10]int32 + +var zero FieldElement + +func FeZero(fe *FieldElement) { + copy(fe[:], zero[:]) +} + +func FeOne(fe *FieldElement) { + FeZero(fe) + fe[0] = 1 +} + +func FeAdd(dst, a, b *FieldElement) { + dst[0] = a[0] + b[0] + dst[1] = a[1] + b[1] + dst[2] = a[2] + b[2] + dst[3] = a[3] + b[3] + dst[4] = a[4] + b[4] + dst[5] = a[5] + b[5] + dst[6] = a[6] + b[6] + dst[7] = a[7] + b[7] + dst[8] = a[8] + b[8] + dst[9] = a[9] + b[9] +} + +func FeSub(dst, a, b *FieldElement) { + dst[0] = a[0] - b[0] + dst[1] = a[1] - b[1] + dst[2] = a[2] - b[2] + dst[3] = a[3] - b[3] + dst[4] = a[4] - b[4] + dst[5] = a[5] - b[5] + dst[6] = a[6] - b[6] + dst[7] = a[7] - b[7] + dst[8] = a[8] - b[8] + dst[9] = a[9] - b[9] +} + +func FeCopy(dst, src *FieldElement) { + copy(dst[:], src[:]) +} + +// Replace (f,g) with (g,g) if b == 1; +// replace (f,g) with (f,g) if b == 0. +// +// Preconditions: b in {0,1}. +func FeCMove(f, g *FieldElement, b int32) { + b = -b + f[0] ^= b & (f[0] ^ g[0]) + f[1] ^= b & (f[1] ^ g[1]) + f[2] ^= b & (f[2] ^ g[2]) + f[3] ^= b & (f[3] ^ g[3]) + f[4] ^= b & (f[4] ^ g[4]) + f[5] ^= b & (f[5] ^ g[5]) + f[6] ^= b & (f[6] ^ g[6]) + f[7] ^= b & (f[7] ^ g[7]) + f[8] ^= b & (f[8] ^ g[8]) + f[9] ^= b & (f[9] ^ g[9]) +} + +func load3(in []byte) int64 { + var r int64 + r = int64(in[0]) + r |= int64(in[1]) << 8 + r |= int64(in[2]) << 16 + return r +} + +func load4(in []byte) int64 { + var r int64 + r = int64(in[0]) + r |= int64(in[1]) << 8 + r |= int64(in[2]) << 16 + r |= int64(in[3]) << 24 + return r +} + +func FeFromBytes(dst *FieldElement, src *[32]byte) { + h0 := load4(src[:]) + h1 := load3(src[4:]) << 6 + h2 := load3(src[7:]) << 5 + h3 := load3(src[10:]) << 3 + h4 := load3(src[13:]) << 2 + h5 := load4(src[16:]) + h6 := load3(src[20:]) << 7 + h7 := load3(src[23:]) << 5 + h8 := load3(src[26:]) << 4 + h9 := (load3(src[29:]) & 8388607) << 2 + + FeCombine(dst, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9) +} + +// FeToBytes marshals h to s. +// Preconditions: +// |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +// +// Write p=2^255-19; q=floor(h/p). +// Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))). +// +// Proof: +// Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4. +// Also have |h-2^230 h9|<2^230 so |19 2^(-255)(h-2^230 h9)|<1/4. +// +// Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9). +// Then 0<y<1. +// +// Write r=h-pq. +// Have 0<=r<=p-1=2^255-20. +// Thus 0<=r+19(2^-255)r<r+19(2^-255)2^255<=2^255-1. +// +// Write x=r+19(2^-255)r+y. +// Then 0<x<2^255 so floor(2^(-255)x) = 0 so floor(q+2^(-255)x) = q. +// +// Have q+2^(-255)x = 2^(-255)(h + 19 2^(-25) h9 + 2^(-1)) +// so floor(2^(-255)(h + 19 2^(-25) h9 + 2^(-1))) = q. +func FeToBytes(s *[32]byte, h *FieldElement) { + var carry [10]int32 + + q := (19*h[9] + (1 << 24)) >> 25 + q = (h[0] + q) >> 26 + q = (h[1] + q) >> 25 + q = (h[2] + q) >> 26 + q = (h[3] + q) >> 25 + q = (h[4] + q) >> 26 + q = (h[5] + q) >> 25 + q = (h[6] + q) >> 26 + q = (h[7] + q) >> 25 + q = (h[8] + q) >> 26 + q = (h[9] + q) >> 25 + + // Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20. + h[0] += 19 * q + // Goal: Output h-2^255 q, which is between 0 and 2^255-20. + + carry[0] = h[0] >> 26 + h[1] += carry[0] + h[0] -= carry[0] << 26 + carry[1] = h[1] >> 25 + h[2] += carry[1] + h[1] -= carry[1] << 25 + carry[2] = h[2] >> 26 + h[3] += carry[2] + h[2] -= carry[2] << 26 + carry[3] = h[3] >> 25 + h[4] += carry[3] + h[3] -= carry[3] << 25 + carry[4] = h[4] >> 26 + h[5] += carry[4] + h[4] -= carry[4] << 26 + carry[5] = h[5] >> 25 + h[6] += carry[5] + h[5] -= carry[5] << 25 + carry[6] = h[6] >> 26 + h[7] += carry[6] + h[6] -= carry[6] << 26 + carry[7] = h[7] >> 25 + h[8] += carry[7] + h[7] -= carry[7] << 25 + carry[8] = h[8] >> 26 + h[9] += carry[8] + h[8] -= carry[8] << 26 + carry[9] = h[9] >> 25 + h[9] -= carry[9] << 25 + // h10 = carry9 + + // Goal: Output h[0]+...+2^255 h10-2^255 q, which is between 0 and 2^255-20. + // Have h[0]+...+2^230 h[9] between 0 and 2^255-1; + // evidently 2^255 h10-2^255 q = 0. + // Goal: Output h[0]+...+2^230 h[9]. + + s[0] = byte(h[0] >> 0) + s[1] = byte(h[0] >> 8) + s[2] = byte(h[0] >> 16) + s[3] = byte((h[0] >> 24) | (h[1] << 2)) + s[4] = byte(h[1] >> 6) + s[5] = byte(h[1] >> 14) + s[6] = byte((h[1] >> 22) | (h[2] << 3)) + s[7] = byte(h[2] >> 5) + s[8] = byte(h[2] >> 13) + s[9] = byte((h[2] >> 21) | (h[3] << 5)) + s[10] = byte(h[3] >> 3) + s[11] = byte(h[3] >> 11) + s[12] = byte((h[3] >> 19) | (h[4] << 6)) + s[13] = byte(h[4] >> 2) + s[14] = byte(h[4] >> 10) + s[15] = byte(h[4] >> 18) + s[16] = byte(h[5] >> 0) + s[17] = byte(h[5] >> 8) + s[18] = byte(h[5] >> 16) + s[19] = byte((h[5] >> 24) | (h[6] << 1)) + s[20] = byte(h[6] >> 7) + s[21] = byte(h[6] >> 15) + s[22] = byte((h[6] >> 23) | (h[7] << 3)) + s[23] = byte(h[7] >> 5) + s[24] = byte(h[7] >> 13) + s[25] = byte((h[7] >> 21) | (h[8] << 4)) + s[26] = byte(h[8] >> 4) + s[27] = byte(h[8] >> 12) + s[28] = byte((h[8] >> 20) | (h[9] << 6)) + s[29] = byte(h[9] >> 2) + s[30] = byte(h[9] >> 10) + s[31] = byte(h[9] >> 18) +} + +func FeIsNegative(f *FieldElement) byte { + var s [32]byte + FeToBytes(&s, f) + return s[0] & 1 +} + +func FeIsNonZero(f *FieldElement) int32 { + var s [32]byte + FeToBytes(&s, f) + var x uint8 + for _, b := range s { + x |= b + } + x |= x >> 4 + x |= x >> 2 + x |= x >> 1 + return int32(x & 1) +} + +// FeNeg sets h = -f +// +// Preconditions: +// |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +// +// Postconditions: +// |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +func FeNeg(h, f *FieldElement) { + h[0] = -f[0] + h[1] = -f[1] + h[2] = -f[2] + h[3] = -f[3] + h[4] = -f[4] + h[5] = -f[5] + h[6] = -f[6] + h[7] = -f[7] + h[8] = -f[8] + h[9] = -f[9] +} + +func FeCombine(h *FieldElement, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 int64) { + var c0, c1, c2, c3, c4, c5, c6, c7, c8, c9 int64 + + /* + |h0| <= (1.1*1.1*2^52*(1+19+19+19+19)+1.1*1.1*2^50*(38+38+38+38+38)) + i.e. |h0| <= 1.2*2^59; narrower ranges for h2, h4, h6, h8 + |h1| <= (1.1*1.1*2^51*(1+1+19+19+19+19+19+19+19+19)) + i.e. |h1| <= 1.5*2^58; narrower ranges for h3, h5, h7, h9 + */ + + c0 = (h0 + (1 << 25)) >> 26 + h1 += c0 + h0 -= c0 << 26 + c4 = (h4 + (1 << 25)) >> 26 + h5 += c4 + h4 -= c4 << 26 + /* |h0| <= 2^25 */ + /* |h4| <= 2^25 */ + /* |h1| <= 1.51*2^58 */ + /* |h5| <= 1.51*2^58 */ + + c1 = (h1 + (1 << 24)) >> 25 + h2 += c1 + h1 -= c1 << 25 + c5 = (h5 + (1 << 24)) >> 25 + h6 += c5 + h5 -= c5 << 25 + /* |h1| <= 2^24; from now on fits into int32 */ + /* |h5| <= 2^24; from now on fits into int32 */ + /* |h2| <= 1.21*2^59 */ + /* |h6| <= 1.21*2^59 */ + + c2 = (h2 + (1 << 25)) >> 26 + h3 += c2 + h2 -= c2 << 26 + c6 = (h6 + (1 << 25)) >> 26 + h7 += c6 + h6 -= c6 << 26 + /* |h2| <= 2^25; from now on fits into int32 unchanged */ + /* |h6| <= 2^25; from now on fits into int32 unchanged */ + /* |h3| <= 1.51*2^58 */ + /* |h7| <= 1.51*2^58 */ + + c3 = (h3 + (1 << 24)) >> 25 + h4 += c3 + h3 -= c3 << 25 + c7 = (h7 + (1 << 24)) >> 25 + h8 += c7 + h7 -= c7 << 25 + /* |h3| <= 2^24; from now on fits into int32 unchanged */ + /* |h7| <= 2^24; from now on fits into int32 unchanged */ + /* |h4| <= 1.52*2^33 */ + /* |h8| <= 1.52*2^33 */ + + c4 = (h4 + (1 << 25)) >> 26 + h5 += c4 + h4 -= c4 << 26 + c8 = (h8 + (1 << 25)) >> 26 + h9 += c8 + h8 -= c8 << 26 + /* |h4| <= 2^25; from now on fits into int32 unchanged */ + /* |h8| <= 2^25; from now on fits into int32 unchanged */ + /* |h5| <= 1.01*2^24 */ + /* |h9| <= 1.51*2^58 */ + + c9 = (h9 + (1 << 24)) >> 25 + h0 += c9 * 19 + h9 -= c9 << 25 + /* |h9| <= 2^24; from now on fits into int32 unchanged */ + /* |h0| <= 1.8*2^37 */ + + c0 = (h0 + (1 << 25)) >> 26 + h1 += c0 + h0 -= c0 << 26 + /* |h0| <= 2^25; from now on fits into int32 unchanged */ + /* |h1| <= 1.01*2^24 */ + + h[0] = int32(h0) + h[1] = int32(h1) + h[2] = int32(h2) + h[3] = int32(h3) + h[4] = int32(h4) + h[5] = int32(h5) + h[6] = int32(h6) + h[7] = int32(h7) + h[8] = int32(h8) + h[9] = int32(h9) +} + +// FeMul calculates h = f * g +// Can overlap h with f or g. +// +// Preconditions: +// |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +// |g| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +// +// Postconditions: +// |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +// +// Notes on implementation strategy: +// +// Using schoolbook multiplication. +// Karatsuba would save a little in some cost models. +// +// Most multiplications by 2 and 19 are 32-bit precomputations; +// cheaper than 64-bit postcomputations. +// +// There is one remaining multiplication by 19 in the carry chain; +// one *19 precomputation can be merged into this, +// but the resulting data flow is considerably less clean. +// +// There are 12 carries below. +// 10 of them are 2-way parallelizable and vectorizable. +// Can get away with 11 carries, but then data flow is much deeper. +// +// With tighter constraints on inputs, can squeeze carries into int32. +func FeMul(h, f, g *FieldElement) { + f0 := int64(f[0]) + f1 := int64(f[1]) + f2 := int64(f[2]) + f3 := int64(f[3]) + f4 := int64(f[4]) + f5 := int64(f[5]) + f6 := int64(f[6]) + f7 := int64(f[7]) + f8 := int64(f[8]) + f9 := int64(f[9]) + + f1_2 := int64(2 * f[1]) + f3_2 := int64(2 * f[3]) + f5_2 := int64(2 * f[5]) + f7_2 := int64(2 * f[7]) + f9_2 := int64(2 * f[9]) + + g0 := int64(g[0]) + g1 := int64(g[1]) + g2 := int64(g[2]) + g3 := int64(g[3]) + g4 := int64(g[4]) + g5 := int64(g[5]) + g6 := int64(g[6]) + g7 := int64(g[7]) + g8 := int64(g[8]) + g9 := int64(g[9]) + + g1_19 := int64(19 * g[1]) /* 1.4*2^29 */ + g2_19 := int64(19 * g[2]) /* 1.4*2^30; still ok */ + g3_19 := int64(19 * g[3]) + g4_19 := int64(19 * g[4]) + g5_19 := int64(19 * g[5]) + g6_19 := int64(19 * g[6]) + g7_19 := int64(19 * g[7]) + g8_19 := int64(19 * g[8]) + g9_19 := int64(19 * g[9]) + + h0 := f0*g0 + f1_2*g9_19 + f2*g8_19 + f3_2*g7_19 + f4*g6_19 + f5_2*g5_19 + f6*g4_19 + f7_2*g3_19 + f8*g2_19 + f9_2*g1_19 + h1 := f0*g1 + f1*g0 + f2*g9_19 + f3*g8_19 + f4*g7_19 + f5*g6_19 + f6*g5_19 + f7*g4_19 + f8*g3_19 + f9*g2_19 + h2 := f0*g2 + f1_2*g1 + f2*g0 + f3_2*g9_19 + f4*g8_19 + f5_2*g7_19 + f6*g6_19 + f7_2*g5_19 + f8*g4_19 + f9_2*g3_19 + h3 := f0*g3 + f1*g2 + f2*g1 + f3*g0 + f4*g9_19 + f5*g8_19 + f6*g7_19 + f7*g6_19 + f8*g5_19 + f9*g4_19 + h4 := f0*g4 + f1_2*g3 + f2*g2 + f3_2*g1 + f4*g0 + f5_2*g9_19 + f6*g8_19 + f7_2*g7_19 + f8*g6_19 + f9_2*g5_19 + h5 := f0*g5 + f1*g4 + f2*g3 + f3*g2 + f4*g1 + f5*g0 + f6*g9_19 + f7*g8_19 + f8*g7_19 + f9*g6_19 + h6 := f0*g6 + f1_2*g5 + f2*g4 + f3_2*g3 + f4*g2 + f5_2*g1 + f6*g0 + f7_2*g9_19 + f8*g8_19 + f9_2*g7_19 + h7 := f0*g7 + f1*g6 + f2*g5 + f3*g4 + f4*g3 + f5*g2 + f6*g1 + f7*g0 + f8*g9_19 + f9*g8_19 + h8 := f0*g8 + f1_2*g7 + f2*g6 + f3_2*g5 + f4*g4 + f5_2*g3 + f6*g2 + f7_2*g1 + f8*g0 + f9_2*g9_19 + h9 := f0*g9 + f1*g8 + f2*g7 + f3*g6 + f4*g5 + f5*g4 + f6*g3 + f7*g2 + f8*g1 + f9*g0 + + FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9) +} + +func feSquare(f *FieldElement) (h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 int64) { + f0 := int64(f[0]) + f1 := int64(f[1]) + f2 := int64(f[2]) + f3 := int64(f[3]) + f4 := int64(f[4]) + f5 := int64(f[5]) + f6 := int64(f[6]) + f7 := int64(f[7]) + f8 := int64(f[8]) + f9 := int64(f[9]) + f0_2 := int64(2 * f[0]) + f1_2 := int64(2 * f[1]) + f2_2 := int64(2 * f[2]) + f3_2 := int64(2 * f[3]) + f4_2 := int64(2 * f[4]) + f5_2 := int64(2 * f[5]) + f6_2 := int64(2 * f[6]) + f7_2 := int64(2 * f[7]) + f5_38 := 38 * f5 // 1.31*2^30 + f6_19 := 19 * f6 // 1.31*2^30 + f7_38 := 38 * f7 // 1.31*2^30 + f8_19 := 19 * f8 // 1.31*2^30 + f9_38 := 38 * f9 // 1.31*2^30 + + h0 = f0*f0 + f1_2*f9_38 + f2_2*f8_19 + f3_2*f7_38 + f4_2*f6_19 + f5*f5_38 + h1 = f0_2*f1 + f2*f9_38 + f3_2*f8_19 + f4*f7_38 + f5_2*f6_19 + h2 = f0_2*f2 + f1_2*f1 + f3_2*f9_38 + f4_2*f8_19 + f5_2*f7_38 + f6*f6_19 + h3 = f0_2*f3 + f1_2*f2 + f4*f9_38 + f5_2*f8_19 + f6*f7_38 + h4 = f0_2*f4 + f1_2*f3_2 + f2*f2 + f5_2*f9_38 + f6_2*f8_19 + f7*f7_38 + h5 = f0_2*f5 + f1_2*f4 + f2_2*f3 + f6*f9_38 + f7_2*f8_19 + h6 = f0_2*f6 + f1_2*f5_2 + f2_2*f4 + f3_2*f3 + f7_2*f9_38 + f8*f8_19 + h7 = f0_2*f7 + f1_2*f6 + f2_2*f5 + f3_2*f4 + f8*f9_38 + h8 = f0_2*f8 + f1_2*f7_2 + f2_2*f6 + f3_2*f5_2 + f4*f4 + f9*f9_38 + h9 = f0_2*f9 + f1_2*f8 + f2_2*f7 + f3_2*f6 + f4_2*f5 + + return +} + +// FeSquare calculates h = f*f. Can overlap h with f. +// +// Preconditions: +// |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. +// +// Postconditions: +// |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. +func FeSquare(h, f *FieldElement) { + h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 := feSquare(f) + FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9) +} + +// FeSquare2 sets h = 2 * f * f +// +// Can overlap h with f. +// +// Preconditions: +// |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc. +// +// Postconditions: +// |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc. +// See fe_mul.c for discussion of implementation strategy. +func FeSquare2(h, f *FieldElement) { + h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 := feSquare(f) + + h0 += h0 + h1 += h1 + h2 += h2 + h3 += h3 + h4 += h4 + h5 += h5 + h6 += h6 + h7 += h7 + h8 += h8 + h9 += h9 + + FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9) +} + +func FeInvert(out, z *FieldElement) { + var t0, t1, t2, t3 FieldElement + var i int + + FeSquare(&t0, z) // 2^1 + FeSquare(&t1, &t0) // 2^2 + for i = 1; i < 2; i++ { // 2^3 + FeSquare(&t1, &t1) + } + FeMul(&t1, z, &t1) // 2^3 + 2^0 + FeMul(&t0, &t0, &t1) // 2^3 + 2^1 + 2^0 + FeSquare(&t2, &t0) // 2^4 + 2^2 + 2^1 + FeMul(&t1, &t1, &t2) // 2^4 + 2^3 + 2^2 + 2^1 + 2^0 + FeSquare(&t2, &t1) // 5,4,3,2,1 + for i = 1; i < 5; i++ { // 9,8,7,6,5 + FeSquare(&t2, &t2) + } + FeMul(&t1, &t2, &t1) // 9,8,7,6,5,4,3,2,1,0 + FeSquare(&t2, &t1) // 10..1 + for i = 1; i < 10; i++ { // 19..10 + FeSquare(&t2, &t2) + } + FeMul(&t2, &t2, &t1) // 19..0 + FeSquare(&t3, &t2) // 20..1 + for i = 1; i < 20; i++ { // 39..20 + FeSquare(&t3, &t3) + } + FeMul(&t2, &t3, &t2) // 39..0 + FeSquare(&t2, &t2) // 40..1 + for i = 1; i < 10; i++ { // 49..10 + FeSquare(&t2, &t2) + } + FeMul(&t1, &t2, &t1) // 49..0 + FeSquare(&t2, &t1) // 50..1 + for i = 1; i < 50; i++ { // 99..50 + FeSquare(&t2, &t2) + } + FeMul(&t2, &t2, &t1) // 99..0 + FeSquare(&t3, &t2) // 100..1 + for i = 1; i < 100; i++ { // 199..100 + FeSquare(&t3, &t3) + } + FeMul(&t2, &t3, &t2) // 199..0 + FeSquare(&t2, &t2) // 200..1 + for i = 1; i < 50; i++ { // 249..50 + FeSquare(&t2, &t2) + } + FeMul(&t1, &t2, &t1) // 249..0 + FeSquare(&t1, &t1) // 250..1 + for i = 1; i < 5; i++ { // 254..5 + FeSquare(&t1, &t1) + } + FeMul(out, &t1, &t0) // 254..5,3,1,0 +} + +func fePow22523(out, z *FieldElement) { + var t0, t1, t2 FieldElement + var i int + + FeSquare(&t0, z) + for i = 1; i < 1; i++ { + FeSquare(&t0, &t0) + } + FeSquare(&t1, &t0) + for i = 1; i < 2; i++ { + FeSquare(&t1, &t1) + } + FeMul(&t1, z, &t1) + FeMul(&t0, &t0, &t1) + FeSquare(&t0, &t0) + for i = 1; i < 1; i++ { + FeSquare(&t0, &t0) + } + FeMul(&t0, &t1, &t0) + FeSquare(&t1, &t0) + for i = 1; i < 5; i++ { + FeSquare(&t1, &t1) + } + FeMul(&t0, &t1, &t0) + FeSquare(&t1, &t0) + for i = 1; i < 10; i++ { + FeSquare(&t1, &t1) + } + FeMul(&t1, &t1, &t0) + FeSquare(&t2, &t1) + for i = 1; i < 20; i++ { + FeSquare(&t2, &t2) + } + FeMul(&t1, &t2, &t1) + FeSquare(&t1, &t1) + for i = 1; i < 10; i++ { + FeSquare(&t1, &t1) + } + FeMul(&t0, &t1, &t0) + FeSquare(&t1, &t0) + for i = 1; i < 50; i++ { + FeSquare(&t1, &t1) + } + FeMul(&t1, &t1, &t0) + FeSquare(&t2, &t1) + for i = 1; i < 100; i++ { + FeSquare(&t2, &t2) + } + FeMul(&t1, &t2, &t1) + FeSquare(&t1, &t1) + for i = 1; i < 50; i++ { + FeSquare(&t1, &t1) + } + FeMul(&t0, &t1, &t0) + FeSquare(&t0, &t0) + for i = 1; i < 2; i++ { + FeSquare(&t0, &t0) + } + FeMul(out, &t0, z) +} + +// Group elements are members of the elliptic curve -x^2 + y^2 = 1 + d * x^2 * +// y^2 where d = -121665/121666. +// +// Several representations are used: +// ProjectiveGroupElement: (X:Y:Z) satisfying x=X/Z, y=Y/Z +// ExtendedGroupElement: (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT +// CompletedGroupElement: ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T +// PreComputedGroupElement: (y+x,y-x,2dxy) + +type ProjectiveGroupElement struct { + X, Y, Z FieldElement +} + +type ExtendedGroupElement struct { + X, Y, Z, T FieldElement +} + +type CompletedGroupElement struct { + X, Y, Z, T FieldElement +} + +type PreComputedGroupElement struct { + yPlusX, yMinusX, xy2d FieldElement +} + +type CachedGroupElement struct { + yPlusX, yMinusX, Z, T2d FieldElement +} + +func (p *ProjectiveGroupElement) Zero() { + FeZero(&p.X) + FeOne(&p.Y) + FeOne(&p.Z) +} + +func (p *ProjectiveGroupElement) Double(r *CompletedGroupElement) { + var t0 FieldElement + + FeSquare(&r.X, &p.X) + FeSquare(&r.Z, &p.Y) + FeSquare2(&r.T, &p.Z) + FeAdd(&r.Y, &p.X, &p.Y) + FeSquare(&t0, &r.Y) + FeAdd(&r.Y, &r.Z, &r.X) + FeSub(&r.Z, &r.Z, &r.X) + FeSub(&r.X, &t0, &r.Y) + FeSub(&r.T, &r.T, &r.Z) +} + +func (p *ProjectiveGroupElement) ToBytes(s *[32]byte) { + var recip, x, y FieldElement + + FeInvert(&recip, &p.Z) + FeMul(&x, &p.X, &recip) + FeMul(&y, &p.Y, &recip) + FeToBytes(s, &y) + s[31] ^= FeIsNegative(&x) << 7 +} + +func (p *ExtendedGroupElement) Zero() { + FeZero(&p.X) + FeOne(&p.Y) + FeOne(&p.Z) + FeZero(&p.T) +} + +func (p *ExtendedGroupElement) Double(r *CompletedGroupElement) { + var q ProjectiveGroupElement + p.ToProjective(&q) + q.Double(r) +} + +func (p *ExtendedGroupElement) ToCached(r *CachedGroupElement) { + FeAdd(&r.yPlusX, &p.Y, &p.X) + FeSub(&r.yMinusX, &p.Y, &p.X) + FeCopy(&r.Z, &p.Z) + FeMul(&r.T2d, &p.T, &d2) +} + +func (p *ExtendedGroupElement) ToProjective(r *ProjectiveGroupElement) { + FeCopy(&r.X, &p.X) + FeCopy(&r.Y, &p.Y) + FeCopy(&r.Z, &p.Z) +} + +func (p *ExtendedGroupElement) ToBytes(s *[32]byte) { + var recip, x, y FieldElement + + FeInvert(&recip, &p.Z) + FeMul(&x, &p.X, &recip) + FeMul(&y, &p.Y, &recip) + FeToBytes(s, &y) + s[31] ^= FeIsNegative(&x) << 7 +} + +func (p *ExtendedGroupElement) FromBytes(s *[32]byte) bool { + var u, v, v3, vxx, check FieldElement + + FeFromBytes(&p.Y, s) + FeOne(&p.Z) + FeSquare(&u, &p.Y) + FeMul(&v, &u, &d) + FeSub(&u, &u, &p.Z) // y = y^2-1 + FeAdd(&v, &v, &p.Z) // v = dy^2+1 + + FeSquare(&v3, &v) + FeMul(&v3, &v3, &v) // v3 = v^3 + FeSquare(&p.X, &v3) + FeMul(&p.X, &p.X, &v) + FeMul(&p.X, &p.X, &u) // x = uv^7 + + fePow22523(&p.X, &p.X) // x = (uv^7)^((q-5)/8) + FeMul(&p.X, &p.X, &v3) + FeMul(&p.X, &p.X, &u) // x = uv^3(uv^7)^((q-5)/8) + + var tmpX, tmp2 [32]byte + + FeSquare(&vxx, &p.X) + FeMul(&vxx, &vxx, &v) + FeSub(&check, &vxx, &u) // vx^2-u + if FeIsNonZero(&check) == 1 { + FeAdd(&check, &vxx, &u) // vx^2+u + if FeIsNonZero(&check) == 1 { + return false + } + FeMul(&p.X, &p.X, &SqrtM1) + + FeToBytes(&tmpX, &p.X) + for i, v := range tmpX { + tmp2[31-i] = v + } + } + + if FeIsNegative(&p.X) != (s[31] >> 7) { + FeNeg(&p.X, &p.X) + } + + FeMul(&p.T, &p.X, &p.Y) + return true +} + +func (p *CompletedGroupElement) ToProjective(r *ProjectiveGroupElement) { + FeMul(&r.X, &p.X, &p.T) + FeMul(&r.Y, &p.Y, &p.Z) + FeMul(&r.Z, &p.Z, &p.T) +} + +func (p *CompletedGroupElement) ToExtended(r *ExtendedGroupElement) { + FeMul(&r.X, &p.X, &p.T) + FeMul(&r.Y, &p.Y, &p.Z) + FeMul(&r.Z, &p.Z, &p.T) + FeMul(&r.T, &p.X, &p.Y) +} + +func (p *PreComputedGroupElement) Zero() { + FeOne(&p.yPlusX) + FeOne(&p.yMinusX) + FeZero(&p.xy2d) +} + +func geAdd(r *CompletedGroupElement, p *ExtendedGroupElement, q *CachedGroupElement) { + var t0 FieldElement + + FeAdd(&r.X, &p.Y, &p.X) + FeSub(&r.Y, &p.Y, &p.X) + FeMul(&r.Z, &r.X, &q.yPlusX) + FeMul(&r.Y, &r.Y, &q.yMinusX) + FeMul(&r.T, &q.T2d, &p.T) + FeMul(&r.X, &p.Z, &q.Z) + FeAdd(&t0, &r.X, &r.X) + FeSub(&r.X, &r.Z, &r.Y) + FeAdd(&r.Y, &r.Z, &r.Y) + FeAdd(&r.Z, &t0, &r.T) + FeSub(&r.T, &t0, &r.T) +} + +func geSub(r *CompletedGroupElement, p *ExtendedGroupElement, q *CachedGroupElement) { + var t0 FieldElement + + FeAdd(&r.X, &p.Y, &p.X) + FeSub(&r.Y, &p.Y, &p.X) + FeMul(&r.Z, &r.X, &q.yMinusX) + FeMul(&r.Y, &r.Y, &q.yPlusX) + FeMul(&r.T, &q.T2d, &p.T) + FeMul(&r.X, &p.Z, &q.Z) + FeAdd(&t0, &r.X, &r.X) + FeSub(&r.X, &r.Z, &r.Y) + FeAdd(&r.Y, &r.Z, &r.Y) + FeSub(&r.Z, &t0, &r.T) + FeAdd(&r.T, &t0, &r.T) +} + +func geMixedAdd(r *CompletedGroupElement, p *ExtendedGroupElement, q *PreComputedGroupElement) { + var t0 FieldElement + + FeAdd(&r.X, &p.Y, &p.X) + FeSub(&r.Y, &p.Y, &p.X) + FeMul(&r.Z, &r.X, &q.yPlusX) + FeMul(&r.Y, &r.Y, &q.yMinusX) + FeMul(&r.T, &q.xy2d, &p.T) + FeAdd(&t0, &p.Z, &p.Z) + FeSub(&r.X, &r.Z, &r.Y) + FeAdd(&r.Y, &r.Z, &r.Y) + FeAdd(&r.Z, &t0, &r.T) + FeSub(&r.T, &t0, &r.T) +} + +func geMixedSub(r *CompletedGroupElement, p *ExtendedGroupElement, q *PreComputedGroupElement) { + var t0 FieldElement + + FeAdd(&r.X, &p.Y, &p.X) + FeSub(&r.Y, &p.Y, &p.X) + FeMul(&r.Z, &r.X, &q.yMinusX) + FeMul(&r.Y, &r.Y, &q.yPlusX) + FeMul(&r.T, &q.xy2d, &p.T) + FeAdd(&t0, &p.Z, &p.Z) + FeSub(&r.X, &r.Z, &r.Y) + FeAdd(&r.Y, &r.Z, &r.Y) + FeSub(&r.Z, &t0, &r.T) + FeAdd(&r.T, &t0, &r.T) +} + +func slide(r *[256]int8, a *[32]byte) { + for i := range r { + r[i] = int8(1 & (a[i>>3] >> uint(i&7))) + } + + for i := range r { + if r[i] != 0 { + for b := 1; b <= 6 && i+b < 256; b++ { + if r[i+b] != 0 { + if r[i]+(r[i+b]<<uint(b)) <= 15 { + r[i] += r[i+b] << uint(b) + r[i+b] = 0 + } else if r[i]-(r[i+b]<<uint(b)) >= -15 { + r[i] -= r[i+b] << uint(b) + for k := i + b; k < 256; k++ { + if r[k] == 0 { + r[k] = 1 + break + } + r[k] = 0 + } + } else { + break + } + } + } + } + } +} + +// GeDoubleScalarMultVartime sets r = a*A + b*B +// where a = a[0]+256*a[1]+...+256^31 a[31]. +// and b = b[0]+256*b[1]+...+256^31 b[31]. +// B is the Ed25519 base point (x,4/5) with x positive. +func GeDoubleScalarMultVartime(r *ProjectiveGroupElement, a *[32]byte, A *ExtendedGroupElement, b *[32]byte) { + var aSlide, bSlide [256]int8 + var Ai [8]CachedGroupElement // A,3A,5A,7A,9A,11A,13A,15A + var t CompletedGroupElement + var u, A2 ExtendedGroupElement + var i int + + slide(&aSlide, a) + slide(&bSlide, b) + + A.ToCached(&Ai[0]) + A.Double(&t) + t.ToExtended(&A2) + + for i := 0; i < 7; i++ { + geAdd(&t, &A2, &Ai[i]) + t.ToExtended(&u) + u.ToCached(&Ai[i+1]) + } + + r.Zero() + + for i = 255; i >= 0; i-- { + if aSlide[i] != 0 || bSlide[i] != 0 { + break + } + } + + for ; i >= 0; i-- { + r.Double(&t) + + if aSlide[i] > 0 { + t.ToExtended(&u) + geAdd(&t, &u, &Ai[aSlide[i]/2]) + } else if aSlide[i] < 0 { + t.ToExtended(&u) + geSub(&t, &u, &Ai[(-aSlide[i])/2]) + } + + if bSlide[i] > 0 { + t.ToExtended(&u) + geMixedAdd(&t, &u, &bi[bSlide[i]/2]) + } else if bSlide[i] < 0 { + t.ToExtended(&u) + geMixedSub(&t, &u, &bi[(-bSlide[i])/2]) + } + + t.ToProjective(r) + } +} + +// equal returns 1 if b == c and 0 otherwise, assuming that b and c are +// non-negative. +func equal(b, c int32) int32 { + x := uint32(b ^ c) + x-- + return int32(x >> 31) +} + +// negative returns 1 if b < 0 and 0 otherwise. +func negative(b int32) int32 { + return (b >> 31) & 1 +} + +func PreComputedGroupElementCMove(t, u *PreComputedGroupElement, b int32) { + FeCMove(&t.yPlusX, &u.yPlusX, b) + FeCMove(&t.yMinusX, &u.yMinusX, b) + FeCMove(&t.xy2d, &u.xy2d, b) +} + +func selectPoint(t *PreComputedGroupElement, pos int32, b int32) { + var minusT PreComputedGroupElement + bNegative := negative(b) + bAbs := b - (((-bNegative) & b) << 1) + + t.Zero() + for i := int32(0); i < 8; i++ { + PreComputedGroupElementCMove(t, &base[pos][i], equal(bAbs, i+1)) + } + FeCopy(&minusT.yPlusX, &t.yMinusX) + FeCopy(&minusT.yMinusX, &t.yPlusX) + FeNeg(&minusT.xy2d, &t.xy2d) + PreComputedGroupElementCMove(t, &minusT, bNegative) +} + +// GeScalarMultBase computes h = a*B, where +// a = a[0]+256*a[1]+...+256^31 a[31] +// B is the Ed25519 base point (x,4/5) with x positive. +// +// Preconditions: +// a[31] <= 127 +func GeScalarMultBase(h *ExtendedGroupElement, a *[32]byte) { + var e [64]int8 + + for i, v := range a { + e[2*i] = int8(v & 15) + e[2*i+1] = int8((v >> 4) & 15) + } + + // each e[i] is between 0 and 15 and e[63] is between 0 and 7. + + carry := int8(0) + for i := 0; i < 63; i++ { + e[i] += carry + carry = (e[i] + 8) >> 4 + e[i] -= carry << 4 + } + e[63] += carry + // each e[i] is between -8 and 8. + + h.Zero() + var t PreComputedGroupElement + var r CompletedGroupElement + for i := int32(1); i < 64; i += 2 { + selectPoint(&t, i/2, int32(e[i])) + geMixedAdd(&r, h, &t) + r.ToExtended(h) + } + + var s ProjectiveGroupElement + + h.Double(&r) + r.ToProjective(&s) + s.Double(&r) + r.ToProjective(&s) + s.Double(&r) + r.ToProjective(&s) + s.Double(&r) + r.ToExtended(h) + + for i := int32(0); i < 64; i += 2 { + selectPoint(&t, i/2, int32(e[i])) + geMixedAdd(&r, h, &t) + r.ToExtended(h) + } +} + +// The scalars are GF(2^252 + 27742317777372353535851937790883648493). + +// Input: +// a[0]+256*a[1]+...+256^31*a[31] = a +// b[0]+256*b[1]+...+256^31*b[31] = b +// c[0]+256*c[1]+...+256^31*c[31] = c +// +// Output: +// s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l +// where l = 2^252 + 27742317777372353535851937790883648493. +func ScMulAdd(s, a, b, c *[32]byte) { + a0 := 2097151 & load3(a[:]) + a1 := 2097151 & (load4(a[2:]) >> 5) + a2 := 2097151 & (load3(a[5:]) >> 2) + a3 := 2097151 & (load4(a[7:]) >> 7) + a4 := 2097151 & (load4(a[10:]) >> 4) + a5 := 2097151 & (load3(a[13:]) >> 1) + a6 := 2097151 & (load4(a[15:]) >> 6) + a7 := 2097151 & (load3(a[18:]) >> 3) + a8 := 2097151 & load3(a[21:]) + a9 := 2097151 & (load4(a[23:]) >> 5) + a10 := 2097151 & (load3(a[26:]) >> 2) + a11 := (load4(a[28:]) >> 7) + b0 := 2097151 & load3(b[:]) + b1 := 2097151 & (load4(b[2:]) >> 5) + b2 := 2097151 & (load3(b[5:]) >> 2) + b3 := 2097151 & (load4(b[7:]) >> 7) + b4 := 2097151 & (load4(b[10:]) >> 4) + b5 := 2097151 & (load3(b[13:]) >> 1) + b6 := 2097151 & (load4(b[15:]) >> 6) + b7 := 2097151 & (load3(b[18:]) >> 3) + b8 := 2097151 & load3(b[21:]) + b9 := 2097151 & (load4(b[23:]) >> 5) + b10 := 2097151 & (load3(b[26:]) >> 2) + b11 := (load4(b[28:]) >> 7) + c0 := 2097151 & load3(c[:]) + c1 := 2097151 & (load4(c[2:]) >> 5) + c2 := 2097151 & (load3(c[5:]) >> 2) + c3 := 2097151 & (load4(c[7:]) >> 7) + c4 := 2097151 & (load4(c[10:]) >> 4) + c5 := 2097151 & (load3(c[13:]) >> 1) + c6 := 2097151 & (load4(c[15:]) >> 6) + c7 := 2097151 & (load3(c[18:]) >> 3) + c8 := 2097151 & load3(c[21:]) + c9 := 2097151 & (load4(c[23:]) >> 5) + c10 := 2097151 & (load3(c[26:]) >> 2) + c11 := (load4(c[28:]) >> 7) + var carry [23]int64 + + s0 := c0 + a0*b0 + s1 := c1 + a0*b1 + a1*b0 + s2 := c2 + a0*b2 + a1*b1 + a2*b0 + s3 := c3 + a0*b3 + a1*b2 + a2*b1 + a3*b0 + s4 := c4 + a0*b4 + a1*b3 + a2*b2 + a3*b1 + a4*b0 + s5 := c5 + a0*b5 + a1*b4 + a2*b3 + a3*b2 + a4*b1 + a5*b0 + s6 := c6 + a0*b6 + a1*b5 + a2*b4 + a3*b3 + a4*b2 + a5*b1 + a6*b0 + s7 := c7 + a0*b7 + a1*b6 + a2*b5 + a3*b4 + a4*b3 + a5*b2 + a6*b1 + a7*b0 + s8 := c8 + a0*b8 + a1*b7 + a2*b6 + a3*b5 + a4*b4 + a5*b3 + a6*b2 + a7*b1 + a8*b0 + s9 := c9 + a0*b9 + a1*b8 + a2*b7 + a3*b6 + a4*b5 + a5*b4 + a6*b3 + a7*b2 + a8*b1 + a9*b0 + s10 := c10 + a0*b10 + a1*b9 + a2*b8 + a3*b7 + a4*b6 + a5*b5 + a6*b4 + a7*b3 + a8*b2 + a9*b1 + a10*b0 + s11 := c11 + a0*b11 + a1*b10 + a2*b9 + a3*b8 + a4*b7 + a5*b6 + a6*b5 + a7*b4 + a8*b3 + a9*b2 + a10*b1 + a11*b0 + s12 := a1*b11 + a2*b10 + a3*b9 + a4*b8 + a5*b7 + a6*b6 + a7*b5 + a8*b4 + a9*b3 + a10*b2 + a11*b1 + s13 := a2*b11 + a3*b10 + a4*b9 + a5*b8 + a6*b7 + a7*b6 + a8*b5 + a9*b4 + a10*b3 + a11*b2 + s14 := a3*b11 + a4*b10 + a5*b9 + a6*b8 + a7*b7 + a8*b6 + a9*b5 + a10*b4 + a11*b3 + s15 := a4*b11 + a5*b10 + a6*b9 + a7*b8 + a8*b7 + a9*b6 + a10*b5 + a11*b4 + s16 := a5*b11 + a6*b10 + a7*b9 + a8*b8 + a9*b7 + a10*b6 + a11*b5 + s17 := a6*b11 + a7*b10 + a8*b9 + a9*b8 + a10*b7 + a11*b6 + s18 := a7*b11 + a8*b10 + a9*b9 + a10*b8 + a11*b7 + s19 := a8*b11 + a9*b10 + a10*b9 + a11*b8 + s20 := a9*b11 + a10*b10 + a11*b9 + s21 := a10*b11 + a11*b10 + s22 := a11 * b11 + s23 := int64(0) + + carry[0] = (s0 + (1 << 20)) >> 21 + s1 += carry[0] + s0 -= carry[0] << 21 + carry[2] = (s2 + (1 << 20)) >> 21 + s3 += carry[2] + s2 -= carry[2] << 21 + carry[4] = (s4 + (1 << 20)) >> 21 + s5 += carry[4] + s4 -= carry[4] << 21 + carry[6] = (s6 + (1 << 20)) >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[8] = (s8 + (1 << 20)) >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[10] = (s10 + (1 << 20)) >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + carry[12] = (s12 + (1 << 20)) >> 21 + s13 += carry[12] + s12 -= carry[12] << 21 + carry[14] = (s14 + (1 << 20)) >> 21 + s15 += carry[14] + s14 -= carry[14] << 21 + carry[16] = (s16 + (1 << 20)) >> 21 + s17 += carry[16] + s16 -= carry[16] << 21 + carry[18] = (s18 + (1 << 20)) >> 21 + s19 += carry[18] + s18 -= carry[18] << 21 + carry[20] = (s20 + (1 << 20)) >> 21 + s21 += carry[20] + s20 -= carry[20] << 21 + carry[22] = (s22 + (1 << 20)) >> 21 + s23 += carry[22] + s22 -= carry[22] << 21 + + carry[1] = (s1 + (1 << 20)) >> 21 + s2 += carry[1] + s1 -= carry[1] << 21 + carry[3] = (s3 + (1 << 20)) >> 21 + s4 += carry[3] + s3 -= carry[3] << 21 + carry[5] = (s5 + (1 << 20)) >> 21 + s6 += carry[5] + s5 -= carry[5] << 21 + carry[7] = (s7 + (1 << 20)) >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[9] = (s9 + (1 << 20)) >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[11] = (s11 + (1 << 20)) >> 21 + s12 += carry[11] + s11 -= carry[11] << 21 + carry[13] = (s13 + (1 << 20)) >> 21 + s14 += carry[13] + s13 -= carry[13] << 21 + carry[15] = (s15 + (1 << 20)) >> 21 + s16 += carry[15] + s15 -= carry[15] << 21 + carry[17] = (s17 + (1 << 20)) >> 21 + s18 += carry[17] + s17 -= carry[17] << 21 + carry[19] = (s19 + (1 << 20)) >> 21 + s20 += carry[19] + s19 -= carry[19] << 21 + carry[21] = (s21 + (1 << 20)) >> 21 + s22 += carry[21] + s21 -= carry[21] << 21 + + s11 += s23 * 666643 + s12 += s23 * 470296 + s13 += s23 * 654183 + s14 -= s23 * 997805 + s15 += s23 * 136657 + s16 -= s23 * 683901 + s23 = 0 + + s10 += s22 * 666643 + s11 += s22 * 470296 + s12 += s22 * 654183 + s13 -= s22 * 997805 + s14 += s22 * 136657 + s15 -= s22 * 683901 + s22 = 0 + + s9 += s21 * 666643 + s10 += s21 * 470296 + s11 += s21 * 654183 + s12 -= s21 * 997805 + s13 += s21 * 136657 + s14 -= s21 * 683901 + s21 = 0 + + s8 += s20 * 666643 + s9 += s20 * 470296 + s10 += s20 * 654183 + s11 -= s20 * 997805 + s12 += s20 * 136657 + s13 -= s20 * 683901 + s20 = 0 + + s7 += s19 * 666643 + s8 += s19 * 470296 + s9 += s19 * 654183 + s10 -= s19 * 997805 + s11 += s19 * 136657 + s12 -= s19 * 683901 + s19 = 0 + + s6 += s18 * 666643 + s7 += s18 * 470296 + s8 += s18 * 654183 + s9 -= s18 * 997805 + s10 += s18 * 136657 + s11 -= s18 * 683901 + s18 = 0 + + carry[6] = (s6 + (1 << 20)) >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[8] = (s8 + (1 << 20)) >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[10] = (s10 + (1 << 20)) >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + carry[12] = (s12 + (1 << 20)) >> 21 + s13 += carry[12] + s12 -= carry[12] << 21 + carry[14] = (s14 + (1 << 20)) >> 21 + s15 += carry[14] + s14 -= carry[14] << 21 + carry[16] = (s16 + (1 << 20)) >> 21 + s17 += carry[16] + s16 -= carry[16] << 21 + + carry[7] = (s7 + (1 << 20)) >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[9] = (s9 + (1 << 20)) >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[11] = (s11 + (1 << 20)) >> 21 + s12 += carry[11] + s11 -= carry[11] << 21 + carry[13] = (s13 + (1 << 20)) >> 21 + s14 += carry[13] + s13 -= carry[13] << 21 + carry[15] = (s15 + (1 << 20)) >> 21 + s16 += carry[15] + s15 -= carry[15] << 21 + + s5 += s17 * 666643 + s6 += s17 * 470296 + s7 += s17 * 654183 + s8 -= s17 * 997805 + s9 += s17 * 136657 + s10 -= s17 * 683901 + s17 = 0 + + s4 += s16 * 666643 + s5 += s16 * 470296 + s6 += s16 * 654183 + s7 -= s16 * 997805 + s8 += s16 * 136657 + s9 -= s16 * 683901 + s16 = 0 + + s3 += s15 * 666643 + s4 += s15 * 470296 + s5 += s15 * 654183 + s6 -= s15 * 997805 + s7 += s15 * 136657 + s8 -= s15 * 683901 + s15 = 0 + + s2 += s14 * 666643 + s3 += s14 * 470296 + s4 += s14 * 654183 + s5 -= s14 * 997805 + s6 += s14 * 136657 + s7 -= s14 * 683901 + s14 = 0 + + s1 += s13 * 666643 + s2 += s13 * 470296 + s3 += s13 * 654183 + s4 -= s13 * 997805 + s5 += s13 * 136657 + s6 -= s13 * 683901 + s13 = 0 + + s0 += s12 * 666643 + s1 += s12 * 470296 + s2 += s12 * 654183 + s3 -= s12 * 997805 + s4 += s12 * 136657 + s5 -= s12 * 683901 + s12 = 0 + + carry[0] = (s0 + (1 << 20)) >> 21 + s1 += carry[0] + s0 -= carry[0] << 21 + carry[2] = (s2 + (1 << 20)) >> 21 + s3 += carry[2] + s2 -= carry[2] << 21 + carry[4] = (s4 + (1 << 20)) >> 21 + s5 += carry[4] + s4 -= carry[4] << 21 + carry[6] = (s6 + (1 << 20)) >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[8] = (s8 + (1 << 20)) >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[10] = (s10 + (1 << 20)) >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + + carry[1] = (s1 + (1 << 20)) >> 21 + s2 += carry[1] + s1 -= carry[1] << 21 + carry[3] = (s3 + (1 << 20)) >> 21 + s4 += carry[3] + s3 -= carry[3] << 21 + carry[5] = (s5 + (1 << 20)) >> 21 + s6 += carry[5] + s5 -= carry[5] << 21 + carry[7] = (s7 + (1 << 20)) >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[9] = (s9 + (1 << 20)) >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[11] = (s11 + (1 << 20)) >> 21 + s12 += carry[11] + s11 -= carry[11] << 21 + + s0 += s12 * 666643 + s1 += s12 * 470296 + s2 += s12 * 654183 + s3 -= s12 * 997805 + s4 += s12 * 136657 + s5 -= s12 * 683901 + s12 = 0 + + carry[0] = s0 >> 21 + s1 += carry[0] + s0 -= carry[0] << 21 + carry[1] = s1 >> 21 + s2 += carry[1] + s1 -= carry[1] << 21 + carry[2] = s2 >> 21 + s3 += carry[2] + s2 -= carry[2] << 21 + carry[3] = s3 >> 21 + s4 += carry[3] + s3 -= carry[3] << 21 + carry[4] = s4 >> 21 + s5 += carry[4] + s4 -= carry[4] << 21 + carry[5] = s5 >> 21 + s6 += carry[5] + s5 -= carry[5] << 21 + carry[6] = s6 >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[7] = s7 >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[8] = s8 >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[9] = s9 >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[10] = s10 >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + carry[11] = s11 >> 21 + s12 += carry[11] + s11 -= carry[11] << 21 + + s0 += s12 * 666643 + s1 += s12 * 470296 + s2 += s12 * 654183 + s3 -= s12 * 997805 + s4 += s12 * 136657 + s5 -= s12 * 683901 + s12 = 0 + + carry[0] = s0 >> 21 + s1 += carry[0] + s0 -= carry[0] << 21 + carry[1] = s1 >> 21 + s2 += carry[1] + s1 -= carry[1] << 21 + carry[2] = s2 >> 21 + s3 += carry[2] + s2 -= carry[2] << 21 + carry[3] = s3 >> 21 + s4 += carry[3] + s3 -= carry[3] << 21 + carry[4] = s4 >> 21 + s5 += carry[4] + s4 -= carry[4] << 21 + carry[5] = s5 >> 21 + s6 += carry[5] + s5 -= carry[5] << 21 + carry[6] = s6 >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[7] = s7 >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[8] = s8 >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[9] = s9 >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[10] = s10 >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + + s[0] = byte(s0 >> 0) + s[1] = byte(s0 >> 8) + s[2] = byte((s0 >> 16) | (s1 << 5)) + s[3] = byte(s1 >> 3) + s[4] = byte(s1 >> 11) + s[5] = byte((s1 >> 19) | (s2 << 2)) + s[6] = byte(s2 >> 6) + s[7] = byte((s2 >> 14) | (s3 << 7)) + s[8] = byte(s3 >> 1) + s[9] = byte(s3 >> 9) + s[10] = byte((s3 >> 17) | (s4 << 4)) + s[11] = byte(s4 >> 4) + s[12] = byte(s4 >> 12) + s[13] = byte((s4 >> 20) | (s5 << 1)) + s[14] = byte(s5 >> 7) + s[15] = byte((s5 >> 15) | (s6 << 6)) + s[16] = byte(s6 >> 2) + s[17] = byte(s6 >> 10) + s[18] = byte((s6 >> 18) | (s7 << 3)) + s[19] = byte(s7 >> 5) + s[20] = byte(s7 >> 13) + s[21] = byte(s8 >> 0) + s[22] = byte(s8 >> 8) + s[23] = byte((s8 >> 16) | (s9 << 5)) + s[24] = byte(s9 >> 3) + s[25] = byte(s9 >> 11) + s[26] = byte((s9 >> 19) | (s10 << 2)) + s[27] = byte(s10 >> 6) + s[28] = byte((s10 >> 14) | (s11 << 7)) + s[29] = byte(s11 >> 1) + s[30] = byte(s11 >> 9) + s[31] = byte(s11 >> 17) +} + +// Input: +// s[0]+256*s[1]+...+256^63*s[63] = s +// +// Output: +// s[0]+256*s[1]+...+256^31*s[31] = s mod l +// where l = 2^252 + 27742317777372353535851937790883648493. +func ScReduce(out *[32]byte, s *[64]byte) { + s0 := 2097151 & load3(s[:]) + s1 := 2097151 & (load4(s[2:]) >> 5) + s2 := 2097151 & (load3(s[5:]) >> 2) + s3 := 2097151 & (load4(s[7:]) >> 7) + s4 := 2097151 & (load4(s[10:]) >> 4) + s5 := 2097151 & (load3(s[13:]) >> 1) + s6 := 2097151 & (load4(s[15:]) >> 6) + s7 := 2097151 & (load3(s[18:]) >> 3) + s8 := 2097151 & load3(s[21:]) + s9 := 2097151 & (load4(s[23:]) >> 5) + s10 := 2097151 & (load3(s[26:]) >> 2) + s11 := 2097151 & (load4(s[28:]) >> 7) + s12 := 2097151 & (load4(s[31:]) >> 4) + s13 := 2097151 & (load3(s[34:]) >> 1) + s14 := 2097151 & (load4(s[36:]) >> 6) + s15 := 2097151 & (load3(s[39:]) >> 3) + s16 := 2097151 & load3(s[42:]) + s17 := 2097151 & (load4(s[44:]) >> 5) + s18 := 2097151 & (load3(s[47:]) >> 2) + s19 := 2097151 & (load4(s[49:]) >> 7) + s20 := 2097151 & (load4(s[52:]) >> 4) + s21 := 2097151 & (load3(s[55:]) >> 1) + s22 := 2097151 & (load4(s[57:]) >> 6) + s23 := (load4(s[60:]) >> 3) + + s11 += s23 * 666643 + s12 += s23 * 470296 + s13 += s23 * 654183 + s14 -= s23 * 997805 + s15 += s23 * 136657 + s16 -= s23 * 683901 + s23 = 0 + + s10 += s22 * 666643 + s11 += s22 * 470296 + s12 += s22 * 654183 + s13 -= s22 * 997805 + s14 += s22 * 136657 + s15 -= s22 * 683901 + s22 = 0 + + s9 += s21 * 666643 + s10 += s21 * 470296 + s11 += s21 * 654183 + s12 -= s21 * 997805 + s13 += s21 * 136657 + s14 -= s21 * 683901 + s21 = 0 + + s8 += s20 * 666643 + s9 += s20 * 470296 + s10 += s20 * 654183 + s11 -= s20 * 997805 + s12 += s20 * 136657 + s13 -= s20 * 683901 + s20 = 0 + + s7 += s19 * 666643 + s8 += s19 * 470296 + s9 += s19 * 654183 + s10 -= s19 * 997805 + s11 += s19 * 136657 + s12 -= s19 * 683901 + s19 = 0 + + s6 += s18 * 666643 + s7 += s18 * 470296 + s8 += s18 * 654183 + s9 -= s18 * 997805 + s10 += s18 * 136657 + s11 -= s18 * 683901 + s18 = 0 + + var carry [17]int64 + + carry[6] = (s6 + (1 << 20)) >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[8] = (s8 + (1 << 20)) >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[10] = (s10 + (1 << 20)) >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + carry[12] = (s12 + (1 << 20)) >> 21 + s13 += carry[12] + s12 -= carry[12] << 21 + carry[14] = (s14 + (1 << 20)) >> 21 + s15 += carry[14] + s14 -= carry[14] << 21 + carry[16] = (s16 + (1 << 20)) >> 21 + s17 += carry[16] + s16 -= carry[16] << 21 + + carry[7] = (s7 + (1 << 20)) >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[9] = (s9 + (1 << 20)) >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[11] = (s11 + (1 << 20)) >> 21 + s12 += carry[11] + s11 -= carry[11] << 21 + carry[13] = (s13 + (1 << 20)) >> 21 + s14 += carry[13] + s13 -= carry[13] << 21 + carry[15] = (s15 + (1 << 20)) >> 21 + s16 += carry[15] + s15 -= carry[15] << 21 + + s5 += s17 * 666643 + s6 += s17 * 470296 + s7 += s17 * 654183 + s8 -= s17 * 997805 + s9 += s17 * 136657 + s10 -= s17 * 683901 + s17 = 0 + + s4 += s16 * 666643 + s5 += s16 * 470296 + s6 += s16 * 654183 + s7 -= s16 * 997805 + s8 += s16 * 136657 + s9 -= s16 * 683901 + s16 = 0 + + s3 += s15 * 666643 + s4 += s15 * 470296 + s5 += s15 * 654183 + s6 -= s15 * 997805 + s7 += s15 * 136657 + s8 -= s15 * 683901 + s15 = 0 + + s2 += s14 * 666643 + s3 += s14 * 470296 + s4 += s14 * 654183 + s5 -= s14 * 997805 + s6 += s14 * 136657 + s7 -= s14 * 683901 + s14 = 0 + + s1 += s13 * 666643 + s2 += s13 * 470296 + s3 += s13 * 654183 + s4 -= s13 * 997805 + s5 += s13 * 136657 + s6 -= s13 * 683901 + s13 = 0 + + s0 += s12 * 666643 + s1 += s12 * 470296 + s2 += s12 * 654183 + s3 -= s12 * 997805 + s4 += s12 * 136657 + s5 -= s12 * 683901 + s12 = 0 + + carry[0] = (s0 + (1 << 20)) >> 21 + s1 += carry[0] + s0 -= carry[0] << 21 + carry[2] = (s2 + (1 << 20)) >> 21 + s3 += carry[2] + s2 -= carry[2] << 21 + carry[4] = (s4 + (1 << 20)) >> 21 + s5 += carry[4] + s4 -= carry[4] << 21 + carry[6] = (s6 + (1 << 20)) >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[8] = (s8 + (1 << 20)) >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[10] = (s10 + (1 << 20)) >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + + carry[1] = (s1 + (1 << 20)) >> 21 + s2 += carry[1] + s1 -= carry[1] << 21 + carry[3] = (s3 + (1 << 20)) >> 21 + s4 += carry[3] + s3 -= carry[3] << 21 + carry[5] = (s5 + (1 << 20)) >> 21 + s6 += carry[5] + s5 -= carry[5] << 21 + carry[7] = (s7 + (1 << 20)) >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[9] = (s9 + (1 << 20)) >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[11] = (s11 + (1 << 20)) >> 21 + s12 += carry[11] + s11 -= carry[11] << 21 + + s0 += s12 * 666643 + s1 += s12 * 470296 + s2 += s12 * 654183 + s3 -= s12 * 997805 + s4 += s12 * 136657 + s5 -= s12 * 683901 + s12 = 0 + + carry[0] = s0 >> 21 + s1 += carry[0] + s0 -= carry[0] << 21 + carry[1] = s1 >> 21 + s2 += carry[1] + s1 -= carry[1] << 21 + carry[2] = s2 >> 21 + s3 += carry[2] + s2 -= carry[2] << 21 + carry[3] = s3 >> 21 + s4 += carry[3] + s3 -= carry[3] << 21 + carry[4] = s4 >> 21 + s5 += carry[4] + s4 -= carry[4] << 21 + carry[5] = s5 >> 21 + s6 += carry[5] + s5 -= carry[5] << 21 + carry[6] = s6 >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[7] = s7 >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[8] = s8 >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[9] = s9 >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[10] = s10 >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + carry[11] = s11 >> 21 + s12 += carry[11] + s11 -= carry[11] << 21 + + s0 += s12 * 666643 + s1 += s12 * 470296 + s2 += s12 * 654183 + s3 -= s12 * 997805 + s4 += s12 * 136657 + s5 -= s12 * 683901 + s12 = 0 + + carry[0] = s0 >> 21 + s1 += carry[0] + s0 -= carry[0] << 21 + carry[1] = s1 >> 21 + s2 += carry[1] + s1 -= carry[1] << 21 + carry[2] = s2 >> 21 + s3 += carry[2] + s2 -= carry[2] << 21 + carry[3] = s3 >> 21 + s4 += carry[3] + s3 -= carry[3] << 21 + carry[4] = s4 >> 21 + s5 += carry[4] + s4 -= carry[4] << 21 + carry[5] = s5 >> 21 + s6 += carry[5] + s5 -= carry[5] << 21 + carry[6] = s6 >> 21 + s7 += carry[6] + s6 -= carry[6] << 21 + carry[7] = s7 >> 21 + s8 += carry[7] + s7 -= carry[7] << 21 + carry[8] = s8 >> 21 + s9 += carry[8] + s8 -= carry[8] << 21 + carry[9] = s9 >> 21 + s10 += carry[9] + s9 -= carry[9] << 21 + carry[10] = s10 >> 21 + s11 += carry[10] + s10 -= carry[10] << 21 + + out[0] = byte(s0 >> 0) + out[1] = byte(s0 >> 8) + out[2] = byte((s0 >> 16) | (s1 << 5)) + out[3] = byte(s1 >> 3) + out[4] = byte(s1 >> 11) + out[5] = byte((s1 >> 19) | (s2 << 2)) + out[6] = byte(s2 >> 6) + out[7] = byte((s2 >> 14) | (s3 << 7)) + out[8] = byte(s3 >> 1) + out[9] = byte(s3 >> 9) + out[10] = byte((s3 >> 17) | (s4 << 4)) + out[11] = byte(s4 >> 4) + out[12] = byte(s4 >> 12) + out[13] = byte((s4 >> 20) | (s5 << 1)) + out[14] = byte(s5 >> 7) + out[15] = byte((s5 >> 15) | (s6 << 6)) + out[16] = byte(s6 >> 2) + out[17] = byte(s6 >> 10) + out[18] = byte((s6 >> 18) | (s7 << 3)) + out[19] = byte(s7 >> 5) + out[20] = byte(s7 >> 13) + out[21] = byte(s8 >> 0) + out[22] = byte(s8 >> 8) + out[23] = byte((s8 >> 16) | (s9 << 5)) + out[24] = byte(s9 >> 3) + out[25] = byte(s9 >> 11) + out[26] = byte((s9 >> 19) | (s10 << 2)) + out[27] = byte(s10 >> 6) + out[28] = byte((s10 >> 14) | (s11 << 7)) + out[29] = byte(s11 >> 1) + out[30] = byte(s11 >> 9) + out[31] = byte(s11 >> 17) +} + +// order is the order of Curve25519 in little-endian form. +var order = [4]uint64{0x5812631a5cf5d3ed, 0x14def9dea2f79cd6, 0, 0x1000000000000000} + +// ScMinimal returns true if the given scalar is less than the order of the +// curve. +func ScMinimal(scalar *[32]byte) bool { + for i := 3; ; i-- { + v := binary.LittleEndian.Uint64(scalar[i*8:]) + if v > order[i] { + return false + } else if v < order[i] { + break + } else if i == 0 { + return false + } + } + + return true +} diff --git a/src/cmd/vendor/golang.org/x/mod/LICENSE b/src/cmd/vendor/golang.org/x/mod/LICENSE new file mode 100644 index 0000000000..6a66aea5ea --- /dev/null +++ b/src/cmd/vendor/golang.org/x/mod/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/cmd/vendor/golang.org/x/mod/PATENTS b/src/cmd/vendor/golang.org/x/mod/PATENTS new file mode 100644 index 0000000000..733099041f --- /dev/null +++ b/src/cmd/vendor/golang.org/x/mod/PATENTS @@ -0,0 +1,22 @@ +Additional IP Rights Grant (Patents) + +"This implementation" means the copyrightable works distributed by +Google as part of the Go project. + +Google hereby grants to You a perpetual, worldwide, non-exclusive, +no-charge, royalty-free, irrevocable (except as stated in this section) +patent license to make, have made, use, offer to sell, sell, import, +transfer and otherwise run, modify and propagate the contents of this +implementation of Go, where such license applies only to those patent +claims, both currently owned or controlled by Google and acquired in +the future, licensable by Google that are necessarily infringed by this +implementation of Go. This grant does not include claims that would be +infringed only as a consequence of further modification of this +implementation. If you or your agent or exclusive licensee institute or +order or agree to the institution of patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging +that this implementation of Go or any code incorporated within this +implementation of Go constitutes direct or contributory patent +infringement, or inducement of patent infringement, then any patent +rights granted to you under this License for this implementation of Go +shall terminate as of the date such litigation is filed. diff --git a/src/cmd/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go b/src/cmd/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go new file mode 100644 index 0000000000..2681af35af --- /dev/null +++ b/src/cmd/vendor/golang.org/x/mod/internal/lazyregexp/lazyre.go @@ -0,0 +1,78 @@ +// Copyright 2018 The Go 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 lazyregexp is a thin wrapper over regexp, allowing the use of global +// regexp variables without forcing them to be compiled at init. +package lazyregexp + +import ( + "os" + "regexp" + "strings" + "sync" +) + +// Regexp is a wrapper around regexp.Regexp, where the underlying regexp will be +// compiled the first time it is needed. +type Regexp struct { + str string + once sync.Once + rx *regexp.Regexp +} + +func (r *Regexp) re() *regexp.Regexp { + r.once.Do(r.build) + return r.rx +} + +func (r *Regexp) build() { + r.rx = regexp.MustCompile(r.str) + r.str = "" +} + +func (r *Regexp) FindSubmatch(s []byte) [][]byte { + return r.re().FindSubmatch(s) +} + +func (r *Regexp) FindStringSubmatch(s string) []string { + return r.re().FindStringSubmatch(s) +} + +func (r *Regexp) FindStringSubmatchIndex(s string) []int { + return r.re().FindStringSubmatchIndex(s) +} + +func (r *Regexp) ReplaceAllString(src, repl string) string { + return r.re().ReplaceAllString(src, repl) +} + +func (r *Regexp) FindString(s string) string { + return r.re().FindString(s) +} + +func (r *Regexp) FindAllString(s string, n int) []string { + return r.re().FindAllString(s, n) +} + +func (r *Regexp) MatchString(s string) bool { + return r.re().MatchString(s) +} + +func (r *Regexp) SubexpNames() []string { + return r.re().SubexpNames() +} + +var inTest = len(os.Args) > 0 && strings.HasSuffix(strings.TrimSuffix(os.Args[0], ".exe"), ".test") + +// New creates a new lazy regexp, delaying the compiling work until it is first +// needed. If the code is being run as part of tests, the regexp compiling will +// happen immediately. +func New(str string) *Regexp { + lr := &Regexp{str: str} + if inTest { + // In tests, always compile the regexps early. + lr.re() + } + return lr +} diff --git a/src/cmd/go/internal/modfile/print.go b/src/cmd/vendor/golang.org/x/mod/modfile/print.go index 3bbea38529..3bbea38529 100644 --- a/src/cmd/go/internal/modfile/print.go +++ b/src/cmd/vendor/golang.org/x/mod/modfile/print.go diff --git a/src/cmd/go/internal/modfile/read.go b/src/cmd/vendor/golang.org/x/mod/modfile/read.go index bfa90a5a64..bfa90a5a64 100644 --- a/src/cmd/go/internal/modfile/read.go +++ b/src/cmd/vendor/golang.org/x/mod/modfile/read.go diff --git a/src/cmd/go/internal/modfile/rule.go b/src/cmd/vendor/golang.org/x/mod/modfile/rule.go index 17135fb009..95fefecb6a 100644 --- a/src/cmd/go/internal/modfile/rule.go +++ b/src/cmd/vendor/golang.org/x/mod/modfile/rule.go @@ -8,14 +8,14 @@ import ( "bytes" "errors" "fmt" - "internal/lazyregexp" "path/filepath" "sort" "strconv" "strings" "unicode" - "cmd/go/internal/module" + "golang.org/x/mod/internal/lazyregexp" + "golang.org/x/mod/module" ) // A File is the parsed, interpreted form of a go.mod file. diff --git a/src/cmd/go/internal/module/module.go b/src/cmd/vendor/golang.org/x/mod/module/module.go index 8d24c693f3..21f123957d 100644 --- a/src/cmd/go/internal/module/module.go +++ b/src/cmd/vendor/golang.org/x/mod/module/module.go @@ -96,14 +96,14 @@ package module // Changes to the semantics in this file require approval from rsc. import ( - "errors" "fmt" "sort" "strings" "unicode" "unicode/utf8" - "cmd/go/internal/semver" + "golang.org/x/mod/semver" + errors "golang.org/x/xerrors" ) // A Version (for clients, a module.Version) is defined by a module path and version pair. diff --git a/src/cmd/go/internal/semver/semver.go b/src/cmd/vendor/golang.org/x/mod/semver/semver.go index 2988e3cf9c..2988e3cf9c 100644 --- a/src/cmd/go/internal/semver/semver.go +++ b/src/cmd/vendor/golang.org/x/mod/semver/semver.go diff --git a/src/cmd/go/internal/sumdb/cache.go b/src/cmd/vendor/golang.org/x/mod/sumdb/cache.go index 629e591f42..629e591f42 100644 --- a/src/cmd/go/internal/sumdb/cache.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/cache.go diff --git a/src/cmd/go/internal/sumdb/client.go b/src/cmd/vendor/golang.org/x/mod/sumdb/client.go index e6976c25cb..70dd56f103 100644 --- a/src/cmd/go/internal/sumdb/client.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/client.go @@ -13,9 +13,9 @@ import ( "sync" "sync/atomic" - "cmd/go/internal/module" - "cmd/go/internal/note" - "cmd/go/internal/tlog" + "golang.org/x/mod/module" + "golang.org/x/mod/sumdb/note" + "golang.org/x/mod/sumdb/tlog" ) // A ClientOps provides the external operations diff --git a/src/cmd/go/internal/dirhash/hash.go b/src/cmd/vendor/golang.org/x/mod/sumdb/dirhash/hash.go index ef5df6f5b5..ef5df6f5b5 100644 --- a/src/cmd/go/internal/dirhash/hash.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/dirhash/hash.go diff --git a/src/cmd/go/internal/note/note.go b/src/cmd/vendor/golang.org/x/mod/sumdb/note/note.go index c0067a588e..3c8e67bc3d 100644 --- a/src/cmd/go/internal/note/note.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/note/note.go @@ -183,7 +183,6 @@ package note import ( "bytes" - "crypto/ed25519" "crypto/sha256" "encoding/base64" "encoding/binary" @@ -194,6 +193,8 @@ import ( "strings" "unicode" "unicode/utf8" + + "golang.org/x/crypto/ed25519" ) // A Verifier verifies messages signed with a specific key. diff --git a/src/cmd/go/internal/sumdb/server.go b/src/cmd/vendor/golang.org/x/mod/sumdb/server.go index 6370cf5fd5..28866f18f8 100644 --- a/src/cmd/go/internal/sumdb/server.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/server.go @@ -7,13 +7,13 @@ package sumdb import ( "context" - "internal/lazyregexp" "net/http" "os" "strings" - "cmd/go/internal/module" - "cmd/go/internal/tlog" + "golang.org/x/mod/internal/lazyregexp" + "golang.org/x/mod/module" + "golang.org/x/mod/sumdb/tlog" ) // A ServerOps provides the external operations @@ -80,17 +80,17 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { escPath, escVers := mod[:i], mod[i+1:] path, err := module.UnescapePath(escPath) if err != nil { - reportError(w, r, err) + reportError(w, err) return } vers, err := module.UnescapeVersion(escVers) if err != nil { - reportError(w, r, err) + reportError(w, err) return } id, err := s.ops.Lookup(ctx, module.Version{Path: path, Version: vers}) if err != nil { - reportError(w, r, err) + reportError(w, err) return } records, err := s.ops.ReadRecords(ctx, id, 1) @@ -137,7 +137,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { start := t.N << uint(t.H) records, err := s.ops.ReadRecords(ctx, start, int64(t.W)) if err != nil { - reportError(w, r, err) + reportError(w, err) return } if len(records) != t.W { @@ -159,7 +159,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { data, err := s.ops.ReadTileData(ctx, t) if err != nil { - reportError(w, r, err) + reportError(w, err) return } w.Header().Set("Content-Type", "application/octet-stream") @@ -172,7 +172,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Otherwise it is an internal server error. // The caller must only call reportError in contexts where // a not-found err should be reported as 404. -func reportError(w http.ResponseWriter, r *http.Request, err error) { +func reportError(w http.ResponseWriter, err error) { if os.IsNotExist(err) { http.Error(w, err.Error(), http.StatusNotFound) return diff --git a/src/cmd/go/internal/sumdb/test.go b/src/cmd/vendor/golang.org/x/mod/sumdb/test.go index 9100470697..e4c166d87e 100644 --- a/src/cmd/go/internal/sumdb/test.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/test.go @@ -9,9 +9,9 @@ import ( "fmt" "sync" - "cmd/go/internal/module" - "cmd/go/internal/note" - "cmd/go/internal/tlog" + "golang.org/x/mod/module" + "golang.org/x/mod/sumdb/note" + "golang.org/x/mod/sumdb/tlog" ) // NewTestServer constructs a new TestServer diff --git a/src/cmd/go/internal/tlog/note.go b/src/cmd/vendor/golang.org/x/mod/sumdb/tlog/note.go index ce5353e0fe..ce5353e0fe 100644 --- a/src/cmd/go/internal/tlog/note.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/tlog/note.go diff --git a/src/cmd/go/internal/tlog/tile.go b/src/cmd/vendor/golang.org/x/mod/sumdb/tlog/tile.go index e4aeb14eff..e4aeb14eff 100644 --- a/src/cmd/go/internal/tlog/tile.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/tlog/tile.go diff --git a/src/cmd/go/internal/tlog/tlog.go b/src/cmd/vendor/golang.org/x/mod/sumdb/tlog/tlog.go index 01d06c4e26..01d06c4e26 100644 --- a/src/cmd/go/internal/tlog/tlog.go +++ b/src/cmd/vendor/golang.org/x/mod/sumdb/tlog/tlog.go diff --git a/src/cmd/vendor/golang.org/x/xerrors/LICENSE b/src/cmd/vendor/golang.org/x/xerrors/LICENSE new file mode 100644 index 0000000000..e4a47e17f1 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2019 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/cmd/vendor/golang.org/x/xerrors/PATENTS b/src/cmd/vendor/golang.org/x/xerrors/PATENTS new file mode 100644 index 0000000000..733099041f --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/PATENTS @@ -0,0 +1,22 @@ +Additional IP Rights Grant (Patents) + +"This implementation" means the copyrightable works distributed by +Google as part of the Go project. + +Google hereby grants to You a perpetual, worldwide, non-exclusive, +no-charge, royalty-free, irrevocable (except as stated in this section) +patent license to make, have made, use, offer to sell, sell, import, +transfer and otherwise run, modify and propagate the contents of this +implementation of Go, where such license applies only to those patent +claims, both currently owned or controlled by Google and acquired in +the future, licensable by Google that are necessarily infringed by this +implementation of Go. This grant does not include claims that would be +infringed only as a consequence of further modification of this +implementation. If you or your agent or exclusive licensee institute or +order or agree to the institution of patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging +that this implementation of Go or any code incorporated within this +implementation of Go constitutes direct or contributory patent +infringement, or inducement of patent infringement, then any patent +rights granted to you under this License for this implementation of Go +shall terminate as of the date such litigation is filed. diff --git a/src/cmd/vendor/golang.org/x/xerrors/README b/src/cmd/vendor/golang.org/x/xerrors/README new file mode 100644 index 0000000000..aac7867a56 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/README @@ -0,0 +1,2 @@ +This repository holds the transition packages for the new Go 1.13 error values. +See golang.org/design/29934-error-values. diff --git a/src/cmd/vendor/golang.org/x/xerrors/adaptor.go b/src/cmd/vendor/golang.org/x/xerrors/adaptor.go new file mode 100644 index 0000000000..4317f24833 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/adaptor.go @@ -0,0 +1,193 @@ +// Copyright 2018 The Go 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 xerrors + +import ( + "bytes" + "fmt" + "io" + "reflect" + "strconv" +) + +// FormatError calls the FormatError method of f with an errors.Printer +// configured according to s and verb, and writes the result to s. +func FormatError(f Formatter, s fmt.State, verb rune) { + // Assuming this function is only called from the Format method, and given + // that FormatError takes precedence over Format, it cannot be called from + // any package that supports errors.Formatter. It is therefore safe to + // disregard that State may be a specific printer implementation and use one + // of our choice instead. + + // limitations: does not support printing error as Go struct. + + var ( + sep = " " // separator before next error + p = &state{State: s} + direct = true + ) + + var err error = f + + switch verb { + // Note that this switch must match the preference order + // for ordinary string printing (%#v before %+v, and so on). + + case 'v': + if s.Flag('#') { + if stringer, ok := err.(fmt.GoStringer); ok { + io.WriteString(&p.buf, stringer.GoString()) + goto exit + } + // proceed as if it were %v + } else if s.Flag('+') { + p.printDetail = true + sep = "\n - " + } + case 's': + case 'q', 'x', 'X': + // Use an intermediate buffer in the rare cases that precision, + // truncation, or one of the alternative verbs (q, x, and X) are + // specified. + direct = false + + default: + p.buf.WriteString("%!") + p.buf.WriteRune(verb) + p.buf.WriteByte('(') + switch { + case err != nil: + p.buf.WriteString(reflect.TypeOf(f).String()) + default: + p.buf.WriteString("<nil>") + } + p.buf.WriteByte(')') + io.Copy(s, &p.buf) + return + } + +loop: + for { + switch v := err.(type) { + case Formatter: + err = v.FormatError((*printer)(p)) + case fmt.Formatter: + v.Format(p, 'v') + break loop + default: + io.WriteString(&p.buf, v.Error()) + break loop + } + if err == nil { + break + } + if p.needColon || !p.printDetail { + p.buf.WriteByte(':') + p.needColon = false + } + p.buf.WriteString(sep) + p.inDetail = false + p.needNewline = false + } + +exit: + width, okW := s.Width() + prec, okP := s.Precision() + + if !direct || (okW && width > 0) || okP { + // Construct format string from State s. + format := []byte{'%'} + if s.Flag('-') { + format = append(format, '-') + } + if s.Flag('+') { + format = append(format, '+') + } + if s.Flag(' ') { + format = append(format, ' ') + } + if okW { + format = strconv.AppendInt(format, int64(width), 10) + } + if okP { + format = append(format, '.') + format = strconv.AppendInt(format, int64(prec), 10) + } + format = append(format, string(verb)...) + fmt.Fprintf(s, string(format), p.buf.String()) + } else { + io.Copy(s, &p.buf) + } +} + +var detailSep = []byte("\n ") + +// state tracks error printing state. It implements fmt.State. +type state struct { + fmt.State + buf bytes.Buffer + + printDetail bool + inDetail bool + needColon bool + needNewline bool +} + +func (s *state) Write(b []byte) (n int, err error) { + if s.printDetail { + if len(b) == 0 { + return 0, nil + } + if s.inDetail && s.needColon { + s.needNewline = true + if b[0] == '\n' { + b = b[1:] + } + } + k := 0 + for i, c := range b { + if s.needNewline { + if s.inDetail && s.needColon { + s.buf.WriteByte(':') + s.needColon = false + } + s.buf.Write(detailSep) + s.needNewline = false + } + if c == '\n' { + s.buf.Write(b[k:i]) + k = i + 1 + s.needNewline = true + } + } + s.buf.Write(b[k:]) + if !s.inDetail { + s.needColon = true + } + } else if !s.inDetail { + s.buf.Write(b) + } + return len(b), nil +} + +// printer wraps a state to implement an xerrors.Printer. +type printer state + +func (s *printer) Print(args ...interface{}) { + if !s.inDetail || s.printDetail { + fmt.Fprint((*state)(s), args...) + } +} + +func (s *printer) Printf(format string, args ...interface{}) { + if !s.inDetail || s.printDetail { + fmt.Fprintf((*state)(s), format, args...) + } +} + +func (s *printer) Detail() bool { + s.inDetail = true + return s.printDetail +} diff --git a/src/cmd/vendor/golang.org/x/xerrors/codereview.cfg b/src/cmd/vendor/golang.org/x/xerrors/codereview.cfg new file mode 100644 index 0000000000..3f8b14b64e --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/codereview.cfg @@ -0,0 +1 @@ +issuerepo: golang/go diff --git a/src/cmd/vendor/golang.org/x/xerrors/doc.go b/src/cmd/vendor/golang.org/x/xerrors/doc.go new file mode 100644 index 0000000000..eef99d9d54 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/doc.go @@ -0,0 +1,22 @@ +// Copyright 2019 The Go 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 xerrors implements functions to manipulate errors. +// +// This package is based on the Go 2 proposal for error values: +// https://golang.org/design/29934-error-values +// +// These functions were incorporated into the standard library's errors package +// in Go 1.13: +// - Is +// - As +// - Unwrap +// +// Also, Errorf's %w verb was incorporated into fmt.Errorf. +// +// Use this package to get equivalent behavior in all supported Go versions. +// +// No other features of this package were included in Go 1.13, and at present +// there are no plans to include any of them. +package xerrors // import "golang.org/x/xerrors" diff --git a/src/cmd/vendor/golang.org/x/xerrors/errors.go b/src/cmd/vendor/golang.org/x/xerrors/errors.go new file mode 100644 index 0000000000..e88d3772d8 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/errors.go @@ -0,0 +1,33 @@ +// Copyright 2011 The Go 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 xerrors + +import "fmt" + +// errorString is a trivial implementation of error. +type errorString struct { + s string + frame Frame +} + +// New returns an error that formats as the given text. +// +// The returned error contains a Frame set to the caller's location and +// implements Formatter to show this information when printed with details. +func New(text string) error { + return &errorString{text, Caller(1)} +} + +func (e *errorString) Error() string { + return e.s +} + +func (e *errorString) Format(s fmt.State, v rune) { FormatError(e, s, v) } + +func (e *errorString) FormatError(p Printer) (next error) { + p.Print(e.s) + e.frame.Format(p) + return nil +} diff --git a/src/cmd/vendor/golang.org/x/xerrors/fmt.go b/src/cmd/vendor/golang.org/x/xerrors/fmt.go new file mode 100644 index 0000000000..74c1c93ec9 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/fmt.go @@ -0,0 +1,109 @@ +// Copyright 2018 The Go 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 xerrors + +import ( + "fmt" + "strings" + + "golang.org/x/xerrors/internal" +) + +// Errorf formats according to a format specifier and returns the string as a +// value that satisfies error. +// +// The returned error includes the file and line number of the caller when +// formatted with additional detail enabled. If the last argument is an error +// the returned error's Format method will return it if the format string ends +// with ": %s", ": %v", or ": %w". If the last argument is an error and the +// format string ends with ": %w", the returned error implements Wrapper +// with an Unwrap method returning it. +func Errorf(format string, a ...interface{}) error { + err, wrap := lastError(format, a) + format = formatPlusW(format) + if err == nil { + return &noWrapError{fmt.Sprintf(format, a...), nil, Caller(1)} + } + + // TODO: this is not entirely correct. The error value could be + // printed elsewhere in format if it mixes numbered with unnumbered + // substitutions. With relatively small changes to doPrintf we can + // have it optionally ignore extra arguments and pass the argument + // list in its entirety. + msg := fmt.Sprintf(format[:len(format)-len(": %s")], a[:len(a)-1]...) + frame := Frame{} + if internal.EnableTrace { + frame = Caller(1) + } + if wrap { + return &wrapError{msg, err, frame} + } + return &noWrapError{msg, err, frame} +} + +// formatPlusW is used to avoid the vet check that will barf at %w. +func formatPlusW(s string) string { + return s +} + +func lastError(format string, a []interface{}) (err error, wrap bool) { + wrap = strings.HasSuffix(format, ": %w") + if !wrap && + !strings.HasSuffix(format, ": %s") && + !strings.HasSuffix(format, ": %v") { + return nil, false + } + + if len(a) == 0 { + return nil, false + } + + err, ok := a[len(a)-1].(error) + if !ok { + return nil, false + } + + return err, wrap +} + +type noWrapError struct { + msg string + err error + frame Frame +} + +func (e *noWrapError) Error() string { + return fmt.Sprint(e) +} + +func (e *noWrapError) Format(s fmt.State, v rune) { FormatError(e, s, v) } + +func (e *noWrapError) FormatError(p Printer) (next error) { + p.Print(e.msg) + e.frame.Format(p) + return e.err +} + +type wrapError struct { + msg string + err error + frame Frame +} + +func (e *wrapError) Error() string { + return fmt.Sprint(e) +} + +func (e *wrapError) Format(s fmt.State, v rune) { FormatError(e, s, v) } + +func (e *wrapError) FormatError(p Printer) (next error) { + p.Print(e.msg) + e.frame.Format(p) + return e.err +} + +func (e *wrapError) Unwrap() error { + return e.err +} diff --git a/src/cmd/vendor/golang.org/x/xerrors/format.go b/src/cmd/vendor/golang.org/x/xerrors/format.go new file mode 100644 index 0000000000..1bc9c26b97 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/format.go @@ -0,0 +1,34 @@ +// Copyright 2018 The Go 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 xerrors + +// A Formatter formats error messages. +type Formatter interface { + error + + // FormatError prints the receiver's first error and returns the next error in + // the error chain, if any. + FormatError(p Printer) (next error) +} + +// A Printer formats error messages. +// +// The most common implementation of Printer is the one provided by package fmt +// during Printf (as of Go 1.13). Localization packages such as golang.org/x/text/message +// typically provide their own implementations. +type Printer interface { + // Print appends args to the message output. + Print(args ...interface{}) + + // Printf writes a formatted string. + Printf(format string, args ...interface{}) + + // Detail reports whether error detail is requested. + // After the first call to Detail, all text written to the Printer + // is formatted as additional detail, or ignored when + // detail has not been requested. + // If Detail returns false, the caller can avoid printing the detail at all. + Detail() bool +} diff --git a/src/cmd/vendor/golang.org/x/xerrors/frame.go b/src/cmd/vendor/golang.org/x/xerrors/frame.go new file mode 100644 index 0000000000..0de628ec50 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/frame.go @@ -0,0 +1,56 @@ +// Copyright 2018 The Go 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 xerrors + +import ( + "runtime" +) + +// A Frame contains part of a call stack. +type Frame struct { + // Make room for three PCs: the one we were asked for, what it called, + // and possibly a PC for skipPleaseUseCallersFrames. See: + // https://go.googlesource.com/go/+/032678e0fb/src/runtime/extern.go#169 + frames [3]uintptr +} + +// Caller returns a Frame that describes a frame on the caller's stack. +// The argument skip is the number of frames to skip over. +// Caller(0) returns the frame for the caller of Caller. +func Caller(skip int) Frame { + var s Frame + runtime.Callers(skip+1, s.frames[:]) + return s +} + +// location reports the file, line, and function of a frame. +// +// The returned function may be "" even if file and line are not. +func (f Frame) location() (function, file string, line int) { + frames := runtime.CallersFrames(f.frames[:]) + if _, ok := frames.Next(); !ok { + return "", "", 0 + } + fr, ok := frames.Next() + if !ok { + return "", "", 0 + } + return fr.Function, fr.File, fr.Line +} + +// Format prints the stack as error detail. +// It should be called from an error's Format implementation +// after printing any other error detail. +func (f Frame) Format(p Printer) { + if p.Detail() { + function, file, line := f.location() + if function != "" { + p.Printf("%s\n ", function) + } + if file != "" { + p.Printf("%s:%d\n", file, line) + } + } +} diff --git a/src/cmd/vendor/golang.org/x/xerrors/go.mod b/src/cmd/vendor/golang.org/x/xerrors/go.mod new file mode 100644 index 0000000000..870d4f612d --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/go.mod @@ -0,0 +1,3 @@ +module golang.org/x/xerrors + +go 1.11 diff --git a/src/cmd/vendor/golang.org/x/xerrors/internal/internal.go b/src/cmd/vendor/golang.org/x/xerrors/internal/internal.go new file mode 100644 index 0000000000..89f4eca5df --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/internal/internal.go @@ -0,0 +1,8 @@ +// Copyright 2018 The Go 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 internal + +// EnableTrace indicates whether stack information should be recorded in errors. +var EnableTrace = true diff --git a/src/cmd/vendor/golang.org/x/xerrors/wrap.go b/src/cmd/vendor/golang.org/x/xerrors/wrap.go new file mode 100644 index 0000000000..9a3b510374 --- /dev/null +++ b/src/cmd/vendor/golang.org/x/xerrors/wrap.go @@ -0,0 +1,106 @@ +// Copyright 2018 The Go 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 xerrors + +import ( + "reflect" +) + +// A Wrapper provides context around another error. +type Wrapper interface { + // Unwrap returns the next error in the error chain. + // If there is no next error, Unwrap returns nil. + Unwrap() error +} + +// Opaque returns an error with the same error formatting as err +// but that does not match err and cannot be unwrapped. +func Opaque(err error) error { + return noWrapper{err} +} + +type noWrapper struct { + error +} + +func (e noWrapper) FormatError(p Printer) (next error) { + if f, ok := e.error.(Formatter); ok { + return f.FormatError(p) + } + p.Print(e.error) + return nil +} + +// Unwrap returns the result of calling the Unwrap method on err, if err implements +// Unwrap. Otherwise, Unwrap returns nil. +func Unwrap(err error) error { + u, ok := err.(Wrapper) + if !ok { + return nil + } + return u.Unwrap() +} + +// Is reports whether any error in err's chain matches target. +// +// An error is considered to match a target if it is equal to that target or if +// it implements a method Is(error) bool such that Is(target) returns true. +func Is(err, target error) bool { + if target == nil { + return err == target + } + + isComparable := reflect.TypeOf(target).Comparable() + for { + if isComparable && err == target { + return true + } + if x, ok := err.(interface{ Is(error) bool }); ok && x.Is(target) { + return true + } + // TODO: consider supporing target.Is(err). This would allow + // user-definable predicates, but also may allow for coping with sloppy + // APIs, thereby making it easier to get away with them. + if err = Unwrap(err); err == nil { + return false + } + } +} + +// As finds the first error in err's chain that matches the type to which target +// points, and if so, sets the target to its value and returns true. An error +// matches a type if it is assignable to the target type, or if it has a method +// As(interface{}) bool such that As(target) returns true. As will panic if target +// is not a non-nil pointer to a type which implements error or is of interface type. +// +// The As method should set the target to its value and return true if err +// matches the type to which target points. +func As(err error, target interface{}) bool { + if target == nil { + panic("errors: target cannot be nil") + } + val := reflect.ValueOf(target) + typ := val.Type() + if typ.Kind() != reflect.Ptr || val.IsNil() { + panic("errors: target must be a non-nil pointer") + } + if e := typ.Elem(); e.Kind() != reflect.Interface && !e.Implements(errorType) { + panic("errors: *target must be interface or implement error") + } + targetType := typ.Elem() + for err != nil { + if reflect.TypeOf(err).AssignableTo(targetType) { + val.Elem().Set(reflect.ValueOf(err)) + return true + } + if x, ok := err.(interface{ As(interface{}) bool }); ok && x.As(target) { + return true + } + err = Unwrap(err) + } + return false +} + +var errorType = reflect.TypeOf((*error)(nil)).Elem() diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt index 12f8740f4d..6cc6ed87fa 100644 --- a/src/cmd/vendor/modules.txt +++ b/src/cmd/vendor/modules.txt @@ -24,9 +24,21 @@ golang.org/x/arch/arm/armasm golang.org/x/arch/arm64/arm64asm golang.org/x/arch/ppc64/ppc64asm golang.org/x/arch/x86/x86asm -# golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c +# golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 ## explicit +golang.org/x/crypto/ed25519 +golang.org/x/crypto/ed25519/internal/edwards25519 golang.org/x/crypto/ssh/terminal +# golang.org/x/mod v0.1.1-0.20191029194233-18c3998b6452 +## explicit +golang.org/x/mod/internal/lazyregexp +golang.org/x/mod/modfile +golang.org/x/mod/module +golang.org/x/mod/semver +golang.org/x/mod/sumdb +golang.org/x/mod/sumdb/dirhash +golang.org/x/mod/sumdb/note +golang.org/x/mod/sumdb/tlog # golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82 ## explicit golang.org/x/sys/unix @@ -67,3 +79,6 @@ golang.org/x/tools/go/ast/inspector golang.org/x/tools/go/cfg golang.org/x/tools/go/types/objectpath golang.org/x/tools/go/types/typeutil +# golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 +golang.org/x/xerrors +golang.org/x/xerrors/internal |