remove libfuzzerInitializeCounters and fix counter incrementing code

golang · Mar 17, 2022 · a039aba · a039aba
1 parent 3e0442f
commit a039aba
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/src/cmd/compile/internal/typecheck/builtin.go b/src/cmd/compile/internal/typecheck/builtin.go
diff --git a/src/cmd/compile/internal/typecheck/builtin/runtime.go b/src/cmd/compile/internal/typecheck/builtin/runtime.go
@@ -266,9 +266,6 @@ func libfuzzerTraceConstCmp2(uint16, uint16)
 func libfuzzerTraceConstCmp4(uint32, uint32)
 func libfuzzerTraceConstCmp8(uint64, uint64)
 
-// This function should be called by the fuzz target on start to register the 8bit counters with libfuzzer
-func libfuzzerInitializeCounters()
-
 // architecture variants
 var x86HasPOPCNT bool
 var x86HasSSE41 bool

diff --git a/src/cmd/compile/internal/walk/order.go b/src/cmd/compile/internal/walk/order.go
@@ -464,8 +464,8 @@ func (o *orderState) edge() {
 	// Saturated Counters, however, decreases the overall performance.
 	o.append(ir.NewIfStmt(base.Pos,
 		ir.NewBinaryExpr(base.Pos, ir.OEQ, counter, ir.NewInt(0xff)),
-		[]ir.Node{ir.NewAssignOpStmt(base.Pos, ir.OADD, counter, ir.NewInt(1))},
-		[]ir.Node{ir.NewAssignStmt(base.Pos, counter, ir.NewInt(1))}))
+		[]ir.Node{ir.NewAssignStmt(base.Pos, counter, ir.NewInt(1))},
+		[]ir.Node{ir.NewAssignOpStmt(base.Pos, ir.OADD, counter, ir.NewInt(1))}))
 }
 
 // orderBlock orders the block of statements in n into a new slice,

diff --git a/src/cmd/internal/goobj/builtinlist.go b/src/cmd/internal/goobj/builtinlist.go