fix

Author: rekyyang

core/vm/evm.go

@@ -222,18 +222,16 @@ func (evm *EVM) Call(caller ContractRef, addr common.Address, input []byte, gas
 		shortcutResult = &shortcut.Result{
 			Ready: make(chan bool),
 		}
-		if evm.Config.EnableInline {
-			go func() {
-				defer close(shortcutResult.Ready)
-
-				inliner := shortcut.GetShortcut(addr)
-				if inliner != nil {
-					shortcutResult.Pc, shortcutResult.GasUsed,
-						shortcutResult.Stack, shortcutResult.Mem, shortcutResult.LastGasCost,
-						shortcutResult.Expected, shortcutResult.Err = inliner.Shortcut(input, evm.Origin, caller.Address(), value)
-				}
-			}()
-		}
+		go func() {
+			defer close(shortcutResult.Ready)
+
+			inliner := shortcut.GetShortcut(addr)
+			if inliner != nil {
+				shortcutResult.Pc, shortcutResult.GasUsed,
+					shortcutResult.Stack, shortcutResult.Mem, shortcutResult.LastGasCost,
+					shortcutResult.Expected, shortcutResult.Err = inliner.Shortcut(input, evm.Origin, caller.Address(), value)
+			}
+		}()
 	}
 
 	// Capture the tracer start/end events in debug mode
@@ -343,22 +341,21 @@ func (evm *EVM) Call(caller ContractRef, addr common.Address, input []byte, gas
 // CallCode differs from Call in the sense that it executes the given address'
 // code with the caller as context.
 func (evm *EVM) CallCode(caller ContractRef, addr common.Address, input []byte, gas uint64, value *uint256.Int) (ret []byte, leftOverGas uint64, err error) {
-	shortcutResult := &shortcut.Result{
-		Ready: make(chan bool),
-	}
+	var shortcutResult *shortcut.Result
 	if evm.Config.EnableInline {
-		if evm.Config.EnableInline {
-			go func() {
-				defer close(shortcutResult.Ready)
-
-				inliner := shortcut.GetShortcut(addr)
-				if inliner != nil {
-					shortcutResult.Pc, shortcutResult.GasUsed,
-						shortcutResult.Stack, shortcutResult.Mem, shortcutResult.LastGasCost,
-						shortcutResult.Expected, shortcutResult.Err = inliner.Shortcut(input, evm.Origin, caller.Address(), value)
-				}
-			}()
+		shortcutResult = &shortcut.Result{
+			Ready: make(chan bool),
 		}
+		go func() {
+			defer close(shortcutResult.Ready)
+
+			inliner := shortcut.GetShortcut(addr)
+			if inliner != nil {
+				shortcutResult.Pc, shortcutResult.GasUsed,
+					shortcutResult.Stack, shortcutResult.Mem, shortcutResult.LastGasCost,
+					shortcutResult.Expected, shortcutResult.Err = inliner.Shortcut(input, evm.Origin, caller.Address(), value)
+			}
+		}()
 	}
 
 	// Invoke tracer hooks that signal entering/exiting a call frame
@@ -439,22 +436,21 @@ func (evm *EVM) CallCode(caller ContractRef, addr common.Address, input []byte,
 // DelegateCall differs from CallCode in the sense that it executes the given address'
 // code with the caller as context and the caller is set to the caller of the caller.
 func (evm *EVM) DelegateCall(caller ContractRef, addr common.Address, input []byte, gas uint64) (ret []byte, leftOverGas uint64, err error) {
-	shortcutResult := &shortcut.Result{
-		Ready: make(chan bool),
-	}
+	var shortcutResult *shortcut.Result
 	if evm.Config.EnableInline {
-		if evm.Config.EnableInline {
-			go func() {
-				defer close(shortcutResult.Ready)
-
-				inliner := shortcut.GetShortcut(addr)
-				if inliner != nil {
-					shortcutResult.Pc, shortcutResult.GasUsed,
-						shortcutResult.Stack, shortcutResult.Mem, shortcutResult.LastGasCost,
-						shortcutResult.Expected, shortcutResult.Err = inliner.Shortcut(input, evm.Origin, caller.Address(), uint256.NewInt(0))
-				}
-			}()
+		shortcutResult = &shortcut.Result{
+			Ready: make(chan bool),
 		}
+		go func() {
+			defer close(shortcutResult.Ready)
+
+			inliner := shortcut.GetShortcut(addr)
+			if inliner != nil {
+				shortcutResult.Pc, shortcutResult.GasUsed,
+					shortcutResult.Stack, shortcutResult.Mem, shortcutResult.LastGasCost,
+					shortcutResult.Expected, shortcutResult.Err = inliner.Shortcut(input, evm.Origin, caller.Address(), uint256.NewInt(0))
+			}
+		}()
 	}
 
 	// Invoke tracer hooks that signal entering/exiting a call frame
@@ -525,22 +521,21 @@ func (evm *EVM) DelegateCall(caller ContractRef, addr common.Address, input []by
 // Opcodes that attempt to perform such modifications will result in exceptions
 // instead of performing the modifications.
 func (evm *EVM) StaticCall(caller ContractRef, addr common.Address, input []byte, gas uint64) (ret []byte, leftOverGas uint64, err error) {
-	shortcutResult := &shortcut.Result{
-		Ready: make(chan bool),
-	}
+	var shortcutResult *shortcut.Result
 	if evm.Config.EnableInline {
-		if evm.Config.EnableInline {
-			go func() {
-				defer close(shortcutResult.Ready)
-
-				inliner := shortcut.GetShortcut(addr)
-				if inliner != nil {
-					shortcutResult.Pc, shortcutResult.GasUsed,
-						shortcutResult.Stack, shortcutResult.Mem, shortcutResult.LastGasCost,
-						shortcutResult.Expected, shortcutResult.Err = inliner.Shortcut(input, evm.Origin, caller.Address(), uint256.NewInt(0))
-				}
-			}()
+		shortcutResult = &shortcut.Result{
+			Ready: make(chan bool),
 		}
+		go func() {
+			defer close(shortcutResult.Ready)
+
+			inliner := shortcut.GetShortcut(addr)
+			if inliner != nil {
+				shortcutResult.Pc, shortcutResult.GasUsed,
+					shortcutResult.Stack, shortcutResult.Mem, shortcutResult.LastGasCost,
+					shortcutResult.Expected, shortcutResult.Err = inliner.Shortcut(input, evm.Origin, caller.Address(), uint256.NewInt(0))
+			}
+		}()
 	}
 
 	// Invoke tracer hooks that signal entering/exiting a call frame