From 5be5a95818791046f2bf5a84fd80a73853591000 Mon Sep 17 00:00:00 2001 From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:27:53 -0600 Subject: [PATCH] Revert "core/vm: performance tweak of `OpCode.String()` (#28453)" This reverts commit 0622724082df83e3857f3a32a226d7c6c12f7fb4. --- core/vm/opcodes.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go index c7a3a163be..a11cf05a15 100644 --- a/core/vm/opcodes.go +++ b/core/vm/opcodes.go @@ -224,7 +224,8 @@ const ( SELFDESTRUCT OpCode = 0xff ) -var opCodeToString = [256]string{ +// Since the opcodes aren't all in order we can't use a regular slice. +var opCodeToString = map[OpCode]string{ // 0x0 range - arithmetic ops. STOP: "STOP", ADD: "ADD", @@ -398,10 +399,12 @@ var opCodeToString = [256]string{ } func (op OpCode) String() string { - if s := opCodeToString[op]; s != "" { - return s + str := opCodeToString[op] + if len(str) == 0 { + return fmt.Sprintf("opcode %#x not defined", int(op)) } - return fmt.Sprintf("opcode %#x not defined", int(op)) + + return str } var stringToOp = map[string]OpCode{