Replace InvalidOpcode exception with AssemblyImportException and asserts

- The only case where it needs to be an exception is assembly import. In other situations we don't catch it so it's effectively an assert.

libevmasm/Assembly.cpp

@@ -281,7 +281,7 @@ AssemblyItem Assembly::createAssemblyItemFromJSON(Json const& _json, std::vector
 			result = item;
 		}
 		else
-			solThrow(InvalidOpcode, "Invalid opcode: " + name);
+			solThrow(AssemblyImportException, "Invalid opcode (" + name + ")");
 	}
 	result.setLocation(location);
 	result.m_modifierDepth = modifierDepth;
@@ -1236,7 +1236,7 @@ LinkerObject const& Assembly::assembleLegacy() const
 			ret.bytecode += assembleTag(item, ret.bytecode.size(), true);
 			break;
 		default:
-			assertThrow(false, InvalidOpcode, "Unexpected opcode while assembling.");
+			solAssert(false, "Unexpected opcode while assembling.");
 		}
 	}
 
@@ -1469,7 +1469,7 @@ LinkerObject const& Assembly::assembleEOF() const
 				break;
 			}
 			default:
-				solThrow(InvalidOpcode, "Unexpected opcode while assembling.");
+				solAssert(false, "Unexpected opcode while assembling.");
 			}
 		}
 

libevmasm/Exceptions.h

@@ -33,6 +33,4 @@ struct OptimizerException: virtual AssemblyException {};
 struct StackTooDeepException: virtual OptimizerException {};
 struct ItemNotAvailableException: virtual OptimizerException {};
 
-DEV_SIMPLE_EXCEPTION(InvalidOpcode);
-
 }

libevmasm/Instruction.h

@@ -26,6 +26,7 @@
 #include <libsolutil/Common.h>
 #include <libsolutil/Assertions.h>
 #include <liblangutil/EVMVersion.h>
+#include <liblangutil/Exceptions.h>
 
 namespace solidity::evmasm
 {
@@ -267,28 +268,28 @@ inline unsigned getLogNumber(Instruction _inst)
 /// @returns the PUSH<_number> instruction
 inline Instruction pushInstruction(unsigned _number)
 {
-	assertThrow(_number <= 32, InvalidOpcode, std::string("Invalid PUSH instruction requested (") + std::to_string(_number) + ").");
+	solAssert(_number <= 32);
 	return Instruction(unsigned(Instruction::PUSH0) + _number);
 }
 
 /// @returns the DUP<_number> instruction
 inline Instruction dupInstruction(unsigned _number)
 {
-	assertThrow(1 <= _number && _number <= 16, InvalidOpcode, std::string("Invalid DUP instruction requested (") + std::to_string(_number) + ").");
+	solAssert(1 <= _number && _number <= 16);
 	return Instruction(unsigned(Instruction::DUP1) + _number - 1);
 }
 
 /// @returns the SWAP<_number> instruction
 inline Instruction swapInstruction(unsigned _number)
 {
-	assertThrow(1 <= _number && _number <= 16, InvalidOpcode, std::string("Invalid SWAP instruction requested (") + std::to_string(_number) + ").");
+	solAssert(1 <= _number && _number <= 16);
 	return Instruction(unsigned(Instruction::SWAP1) + _number - 1);
 }
 
 /// @returns the LOG<_number> instruction
 inline Instruction logInstruction(unsigned _number)
 {
-	assertThrow(_number <= 4, InvalidOpcode, std::string("Invalid LOG instruction requested (") + std::to_string(_number) + ").");
+	solAssert(_number <= 4);
 	return Instruction(unsigned(Instruction::LOG0) + _number);
 }
 

libsolidity/interface/StandardCompiler.cpp

@@ -1220,10 +1220,6 @@ Json StandardCompiler::importEVMAssembly(StandardCompiler::InputsAndSettings _in
 	{
 		return formatFatalError(Error::Type::Exception, "Assembly import error: " + std::string(e.what()));
 	}
-	catch (evmasm::InvalidOpcode const& e)
-	{
-		return formatFatalError(Error::Type::Exception, "Assembly import error: " + std::string(e.what()));
-	}
 	catch (...)
 	{
 		return formatError(

test/cmdlineTests/standard_import_asm_json_invalid_opcode/output.json

@@ -2,8 +2,8 @@
     "errors": [
         {
             "component": "general",
-            "formattedMessage": "Assembly import error: InvalidOpcode",
-            "message": "Assembly import error: InvalidOpcode",
+            "formattedMessage": "Assembly import error: Invalid opcode (INVALID_OPCODE)",
+            "message": "Assembly import error: Invalid opcode (INVALID_OPCODE)",
             "severity": "error",
             "type": "Exception"
         }