From da5a3146ec903cdcb779d501be4ff88fd775820e Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 8 May 2023 23:18:38 -0400 Subject: cmd/compile: use more of internal/bisect in HashDebug Using more of internal/bisect gives us more that will be deleted from base/hashdebug.go when we have updated the tools that need the old protocol. It is also cheaper: there is no allocation to make a decision about whether to enable, and no locking unless printing is needed. Change-Id: I43ec398461205a1a9e988512a134ed6b3a3b1587 Reviewed-on: https://go-review.googlesource.com/c/go/+/493736 Run-TryBot: Russ Cox TryBot-Result: Gopher Robot Reviewed-by: David Chase --- src/cmd/compile/internal/loopvar/loopvar.go | 4 ++-- src/cmd/compile/internal/loopvar/loopvar_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cmd/compile/internal/loopvar') diff --git a/src/cmd/compile/internal/loopvar/loopvar.go b/src/cmd/compile/internal/loopvar/loopvar.go index 0d8a6d2d6e..7752cac535 100644 --- a/src/cmd/compile/internal/loopvar/loopvar.go +++ b/src/cmd/compile/internal/loopvar/loopvar.go @@ -91,7 +91,7 @@ func ForCapture(fn *ir.Func) []VarAndLoop { // subject to hash-variable debugging. maybeReplaceVar := func(k ir.Node, x *ir.RangeStmt) ir.Node { if n, ok := k.(*ir.Name); ok && possiblyLeaked[n] { - if base.LoopVarHash.DebugHashMatchPos(n.Pos()) { + if base.LoopVarHash.MatchPos(n.Pos()) { // Rename the loop key, prefix body with assignment from loop key transformed = append(transformed, VarAndLoop{n, x, lastPos}) tk := typecheck.Temp(n.Type()) @@ -199,7 +199,7 @@ func ForCapture(fn *ir.Func) []VarAndLoop { forAllDefInInit(x, func(z ir.Node) { if n, ok := z.(*ir.Name); ok && possiblyLeaked[n] { // Hash on n.Pos() for most precise failure location. - if base.LoopVarHash.DebugHashMatchPos(n.Pos()) { + if base.LoopVarHash.MatchPos(n.Pos()) { leaked = append(leaked, n) } } diff --git a/src/cmd/compile/internal/loopvar/loopvar_test.go b/src/cmd/compile/internal/loopvar/loopvar_test.go index 1a13f0e30c..5c7e11ac69 100644 --- a/src/cmd/compile/internal/loopvar/loopvar_test.go +++ b/src/cmd/compile/internal/loopvar/loopvar_test.go @@ -190,7 +190,7 @@ func TestLoopVarHashes(t *testing.T) { return string(b) } - m := f("000100000010011111101100") + m := f("011011011110011110111101") t.Logf(m) mCount := strings.Count(m, "loopvarhash triggered main.go:27:6") -- cgit v1.3-5-g9baa