From 595426c0d903a3686bdfe6d0e8ef268a60c19896 Mon Sep 17 00:00:00 2001 From: David Chase Date: Fri, 10 Jun 2016 11:51:46 -0400 Subject: [PATCH] cmd/compile: fix OASWB rewriting in racewalk Special case for rewriting OAS inits omitted OASWB, added that and OAS2FUNC. The special case cannot be default case, that causes racewalk to fail in horrible ways. Fixes #16008. Change-Id: Ie0d2f5735fe9d8255a109597b36d196d4f86703a Reviewed-on: https://go-review.googlesource.com/23954 Reviewed-by: Keith Randall Reviewed-by: Dmitry Vyukov Run-TryBot: David Chase TryBot-Result: Gobot Gobot --- src/cmd/compile/internal/gc/racewalk.go | 2 +- test/fixedbugs/issue16008.go | 52 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 test/fixedbugs/issue16008.go diff --git a/src/cmd/compile/internal/gc/racewalk.go b/src/cmd/compile/internal/gc/racewalk.go index 4a658b1976..ad2bba9714 100644 --- a/src/cmd/compile/internal/gc/racewalk.go +++ b/src/cmd/compile/internal/gc/racewalk.go @@ -164,7 +164,7 @@ func instrumentnode(np **Node, init *Nodes, wr int, skip int) { var outn Nodes outn.Set(out) instrumentnode(&ls[i], &outn, 0, 0) - if ls[i].Op != OAS || ls[i].Ninit.Len() == 0 { + if ls[i].Op != OAS && ls[i].Op != OASWB && ls[i].Op != OAS2FUNC || ls[i].Ninit.Len() == 0 { out = append(outn.Slice(), ls[i]) } else { // Splice outn onto end of ls[i].Ninit diff --git a/test/fixedbugs/issue16008.go b/test/fixedbugs/issue16008.go new file mode 100644 index 0000000000..1b516fbabe --- /dev/null +++ b/test/fixedbugs/issue16008.go @@ -0,0 +1,52 @@ +// errorcheck -0 -race + +package foo + +const benchmarkNumNodes = 10000 + +func BenchmarkUpdateNodeTransaction(b B) { + s, nodeIDs := setupNodes(benchmarkNumNodes) + b.ResetTimer() + for i := 0; i < b.N(); i++ { + _ = s.Update(func(tx1 Tx) error { + _ = UpdateNode(tx1, &Node{ + ID: nodeIDs[i%benchmarkNumNodes], + }) + return nil + }) + } +} + +type B interface { + ResetTimer() + N() int +} + +type Tx interface { +} + +type Node struct { + ID string +} + +type MemoryStore struct { +} + +// go:noinline +func setupNodes(n int) (s *MemoryStore, nodeIDs []string) { + return +} + +//go:noinline +func (s *MemoryStore) Update(cb func(Tx) error) error { + return nil +} + +var sink interface{} + +//go:noinline +func UpdateNode(tx Tx, n *Node) error { + sink = tx + sink = n + return nil +} -- 2.50.0