Require with custom error for legacy pipeline

nikola-matic · nikola-matic · commit d32b0eb0bb98 · 2024-06-02T20:45:27.000+02:00
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1263,7 +1263,30 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				// as require with custom errors is not supported in legacy codegen.
 				auto const* magicType = dynamic_cast<MagicType const*>(arguments[1]->annotation().type);
 				if (magicType && magicType->kind() == MagicType::Kind::Error)
-					solUnimplemented("Require with a custom error is only available using the via-ir pipeline.");
+				{
+					m_context << Instruction::ISZERO << Instruction::ISZERO;
+					auto success = m_context.appendConditionalJump();
+
+					auto const& errorConstructorCall = dynamic_cast<FunctionCall const&>(*arguments[1]);
+					errorConstructorCall.expression().accept(*this);
+					std::vector<Type const*> argumentTypes;
+					for (ASTPointer<Expression const> const& arg: errorConstructorCall.sortedArguments())
+					{
+						arg->accept(*this);
+						argumentTypes.push_back(arg->annotation().type);
+					}
+
+					auto const* errorDefinition = dynamic_cast<ErrorDefinition const*>(ASTNode::referencedDeclaration(errorConstructorCall.expression()));
+					solAssert(errorDefinition);
+
+					utils().revertWithError(
+						errorDefinition->functionType(true)->externalSignature(),
+						errorDefinition->functionType(true)->parameterTypes(),
+						argumentTypes
+					);
+					m_context << success;
+					break;
+				}
 
 				if (m_context.revertStrings() == RevertStrings::Strip)
 				{
diff --git a/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol b/test/libsolidity/semanticTests/errors/require_different_errors_same_parameters.sol
@@ -14,8 +14,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"f55fefe3", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"
 // g() -> FAILURE, hex"44a06798", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000006", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"6669766500000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol b/test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol
@@ -14,7 +14,5 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"271b1dfa", hex"c06afe3a8444fc0004668591e8306bfb9968e79ef37cdc8e0000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol b/test/libsolidity/semanticTests/errors/require_error_multiple_arguments.sol
@@ -13,8 +13,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"
 // g() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000006", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"6669766500000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_string_literal.sol b/test/libsolidity/semanticTests/errors/require_error_string_literal.sol
@@ -13,8 +13,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000b", hex"6572726f72526561736f6e000000000000000000000000000000000000000000"
 // g() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000d", hex"616e6f74686572526561736f6e00000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_string_memory.sol b/test/libsolidity/semanticTests/errors/require_error_string_memory.sol
@@ -15,8 +15,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000b", hex"6572726f72526561736f6e000000000000000000000000000000000000000000"
 // g() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000d", hex"616e6f74686572526561736f6e00000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/require_error_uint256.sol b/test/libsolidity/semanticTests/errors/require_error_uint256.sol
@@ -13,8 +13,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"110b3655", hex"0000000000000000000000000000000000000000000000000000000000000001"
 // g() -> FAILURE, hex"110b3655", hex"0000000000000000000000000000000000000000000000000000000000000002"
diff --git a/test/libsolidity/semanticTests/errors/require_evaluation_order.sol b/test/libsolidity/semanticTests/errors/require_evaluation_order.sol
@@ -21,8 +21,6 @@ contract C
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> 7
 // g() -> 7
diff --git a/test/libsolidity/semanticTests/errors/require_inherited_error.sol b/test/libsolidity/semanticTests/errors/require_inherited_error.sol
@@ -11,7 +11,5 @@ contract C is Base
     }
 }
 
-// ====
-// compileViaYul: true
 // ----
 // f() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ contract C`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-// ====`
`18`		`-// compileViaYul: true`
`19`	`17`	`// ----`
`20`	`18`	`// f() -> FAILURE, hex"f55fefe3", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"`
`21`	`19`	`// g() -> FAILURE, hex"44a06798", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000006", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"6669766500000000000000000000000000000000000000000000000000000000"`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,5 @@ contract C`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-// ====`
`18`		`-// compileViaYul: true`
`19`	`17`	`// ----`
`20`	`18`	`// f() -> FAILURE, hex"271b1dfa", hex"c06afe3a8444fc0004668591e8306bfb9968e79ef37cdc8e0000000000000000"`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ contract C`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-// ====`
`17`		`-// compileViaYul: true`
`18`	`16`	`// ----`
`19`	`17`	`// f() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"`
`20`	`18`	`// g() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000006", hex"0000000000000000000000000000000000000000000000000000000000000004", hex"6669766500000000000000000000000000000000000000000000000000000000"`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ contract C`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`-// ====`
`19`		`-// compileViaYul: true`
`20`	`18`	`// ----`
`21`	`19`	`// f() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000b", hex"6572726f72526561736f6e000000000000000000000000000000000000000000"`
`22`	`20`	`// g() -> FAILURE, hex"8d6ea8be", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000d", hex"616e6f74686572526561736f6e00000000000000000000000000000000000000"`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ contract C`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-// ====`
`25`		`-// compileViaYul: true`
`26`	`24`	`// ----`
`27`	`25`	`// f() -> 7`
`28`	`26`	`// g() -> 7`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,5 @@ contract C is Base`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`14`		`-// ====`
`15`		`-// compileViaYul: true`
`16`	`14`	`// ----`
`17`	`15`	`// f() -> FAILURE, hex"11a1077e", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"74776f0000000000000000000000000000000000000000000000000000000000"`