core/vm: rework reversion to work on a higher level

core/vm/interpreter.go

@@ -209,24 +209,22 @@ func (in *Interpreter) Run(snapshot int, contract *Contract, input []byte) (ret
 		if verifyPool {
 			verifyIntegerPool(in.intPool)
 		}
-		// checks whether the operation should revert state.
-		if operation.reverts {
-			in.evm.StateDB.RevertToSnapshot(snapshot)
-		}
-
-		switch {
-		case err != nil:
-			return nil, err
-		case operation.halts:
-			return res, nil
-		case !operation.jumps:
-			pc++
-		}
 		// if the operation clears the return data (e.g. it has returning data)
 		// set the last return to the result of the operation.
 		if operation.returns {
 			in.returnData = res
 		}
+
+		switch {
+		case err != nil:
+			return nil, err
+		case operation.reverts:
+			return res, errExecutionReverted
+		case operation.halts:
+			return res, nil
+		case !operation.jumps:
+			pc++
+		}
 	}
 	return nil, nil
 }