Yul: Implement CLZ exception in EVMDialect with hasCLZ function

clonker · clonker · commit 92429395bcf6 · 2025-10-16T11:49:58.000+02:00
also resolve a whitespace issue in one test
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
@@ -136,7 +136,7 @@ std::set<std::string, std::less<>> createReservedIdentifiers(langutil::EVMVersio
 	// clz for VMs before osaka.
 	auto clzException = [&](evmasm::Instruction _instr) -> bool
 	{
-		return _instr == evmasm::Instruction::CLZ && _evmVersion < langutil::EVMVersion::osaka();
+		return _instr == evmasm::Instruction::CLZ && !_evmVersion.hasCLZ();
 	};
 
 	auto eofIdentifiersException = [&](evmasm::Instruction _instr) -> bool
diff --git a/test/libyul/yulSyntaxTests/clz_pre_osaka.yul b/test/libyul/yulSyntaxTests/clz_pre_osaka.yul
@@ -11,4 +11,4 @@
 
 // ====
 // EVMVersion: <osaka
-// ----
+// ----

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ std::set<std::string, std::less<>> createReservedIdentifiers(langutil::EVMVersio`
`136`	`136`	`// clz for VMs before osaka.`
`137`	`137`	`auto clzException = [&](evmasm::Instruction _instr) -> bool`
`138`	`138`	`{`
`139`		`- return _instr == evmasm::Instruction::CLZ && _evmVersion < langutil::EVMVersion::osaka();`
	`139`	`+ return _instr == evmasm::Instruction::CLZ && !_evmVersion.hasCLZ();`
`140`	`140`	`};`
`141`	`141`
`142`	`142`	`auto eofIdentifiersException = [&](evmasm::Instruction _instr) -> bool`
-Original file line number
+Diff line change
 // ====
 // EVMVersion: <osaka
 -// ----
 +// ----