Remove YulString

clonker · clonker · commit f57374d51df4 · 2025-04-02T14:41:13.000+02:00
diff --git a/libsolc/libsolc.cpp b/libsolc/libsolc.cpp
@@ -153,7 +153,6 @@ extern void solidity_reset() noexcept
 {
 	// This is called right before each compilation, but not at the end, so additional memory
 	// can be freed here.
-	yul::YulStringRepository::reset();
 	solidityAllocations.clear();
 }
 }
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
@@ -1794,8 +1794,6 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 
 Json StandardCompiler::compile(Json const& _input) noexcept
 {
-	YulStringRepository::reset();
-
 	try
 	{
 		auto parsed = parseInput(_input);
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
@@ -45,7 +45,6 @@ add_library(yul
 	YulControlFlowGraphExporter.h
 	YulControlFlowGraphExporter.cpp
 	YulName.h
-	YulString.h
 	backends/evm/AbstractAssembly.h
 	backends/evm/AsmCodeGen.cpp
 	backends/evm/AsmCodeGen.h
diff --git a/libyul/Dialect.h b/libyul/Dialect.h
@@ -25,7 +25,6 @@
 #include <libyul/ControlFlowSideEffects.h>
 #include <libyul/Exceptions.h>
 #include <libyul/SideEffects.h>
-#include <libyul/YulString.h>
 
 #include <optional>
 #include <string>
diff --git a/libyul/YulString.h b/libyul/YulString.h
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
@@ -546,7 +546,6 @@ bool EVMDialect::reservedIdentifier(std::string_view _name) const
 EVMDialect const& EVMDialect::strictAssemblyForEVM(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion)
 {
 	static std::map<std::pair<langutil::EVMVersion, std::optional<uint8_t>>, std::unique_ptr<EVMDialect const>> dialects;
-	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
 	if (!dialects[{_evmVersion, _eofVersion}])
 		dialects[{_evmVersion, _eofVersion}] = std::make_unique<EVMDialect>(_evmVersion, _eofVersion, false);
 	return *dialects[{_evmVersion, _eofVersion}];
@@ -555,7 +554,6 @@ EVMDialect const& EVMDialect::strictAssemblyForEVM(langutil::EVMVersion _evmVers
 EVMDialect const& EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion)
 {
 	static std::map<std::pair<langutil::EVMVersion, std::optional<uint8_t>>, std::unique_ptr<EVMDialect const>> dialects;
-	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
 	if (!dialects[{_evmVersion, _eofVersion}])
 		dialects[{_evmVersion, _eofVersion}] = std::make_unique<EVMDialect>(_evmVersion, _eofVersion, true);
 	return *dialects[{_evmVersion, _eofVersion}];
diff --git a/libyul/optimiser/UnusedStoreBase.h b/libyul/optimiser/UnusedStoreBase.h
@@ -100,6 +100,5 @@ class UnusedStoreBase: public ASTWalker
 };
 
 enum class UnusedStoreEliminatorKey { Memory, Storage };
-extern template class UnusedStoreBase<YulString>;
 extern template class UnusedStoreBase<UnusedStoreEliminatorKey>;
 }
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -91,8 +91,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		of.write(yul_source.data(), static_cast<std::streamsize>(yul_source.size()));
 	}
 
-	YulStringRepository::reset();
-
 	solidity::frontend::OptimiserSettings settings = solidity::frontend::OptimiserSettings::full();
 	settings.runYulOptimiser = false;
 	settings.optimizeStackAllocation = false;
diff --git a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
@@ -33,8 +33,6 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	if (_size > 600)
 		return 0;
 
-	YulStringRepository::reset();
-
 	std::string input(reinterpret_cast<char const*>(_data), _size);
 	YulStack stack(
 		langutil::EVMVersion(),
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -58,8 +58,6 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	}))
 		return 0;
 
-	YulStringRepository::reset();
-
 	YulStack stack(
 		langutil::EVMVersion(),
 		std::nullopt,
diff --git a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
@@ -34,8 +34,6 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	if (_size > 600)
 		return 0;
 
-	YulStringRepository::reset();
-
 	std::string input(reinterpret_cast<char const*>(_data), _size);
 	YulStack stack(
 		langutil::EVMVersion(),
diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp
@@ -58,8 +58,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	if (yul_source.size() > 1200)
 		return;
 
-	YulStringRepository::reset();
-
 	// YulStack entry point
 	YulStack stack(
 		version,
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -58,8 +58,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		of.write(yul_source.data(), static_cast<std::streamsize>(yul_source.size()));
 	}
 
-	YulStringRepository::reset();
-
 	// YulStack entry point
 	YulStack stack(
 		version,
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -38,7 +38,6 @@ enum class Instruction: uint8_t;
 
 namespace solidity::yul
 {
-class YulString;
 struct BuiltinFunctionForEVM;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ extern void solidity_reset() noexcept`
`153`	`153`	`{`
`154`	`154`	`// This is called right before each compilation, but not at the end, so additional memory`
`155`	`155`	`// can be freed here.`
`156`		`- yul::YulStringRepository::reset();`
`157`	`156`	`solidityAllocations.clear();`
`158`	`157`	`}`
`159`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1794,8 +1794,6 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)`
`1794`	`1794`
`1795`	`1795`	`Json StandardCompiler::compile(Json const& _input) noexcept`
`1796`	`1796`	`{`
`1797`		`- YulStringRepository::reset();`
`1798`		`-`
`1799`	`1797`	`try`
`1800`	`1798`	`{`
`1801`	`1799`	`auto parsed = parseInput(_input);`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,5 @@ class UnusedStoreBase: public ASTWalker`
`100`	`100`	`};`
`101`	`101`
`102`	`102`	`enum class UnusedStoreEliminatorKey { Memory, Storage };`
`103`		`-extern template class UnusedStoreBase<YulString>;`
`104`	`103`	`extern template class UnusedStoreBase<UnusedStoreEliminatorKey>;`
`105`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)`
`91`	`91`	`of.write(yul_source.data(), static_cast<std::streamsize>(yul_source.size()));`
`92`	`92`	`}`
`93`	`93`
`94`		`- YulStringRepository::reset();`
`95`		`-`
`96`	`94`	`solidity::frontend::OptimiserSettings settings = solidity::frontend::OptimiserSettings::full();`
`97`	`95`	`settings.runYulOptimiser = false;`
`98`	`96`	`settings.optimizeStackAllocation = false;`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)`
`58`	`58`	`of.write(yul_source.data(), static_cast<std::streamsize>(yul_source.size()));`
`59`	`59`	`}`
`60`	`60`
`61`		`- YulStringRepository::reset();`
`62`		`-`
`63`	`61`	`// YulStack entry point`
`64`	`62`	`YulStack stack(`
`65`	`63`	`version,`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ enum class Instruction: uint8_t;`
`38`	`38`
`39`	`39`	`namespace solidity::yul`
`40`	`40`	`{`
`41`		`-class YulString;`
`42`	`41`	`struct BuiltinFunctionForEVM;`
`43`	`42`	`}`
`44`	`43`