Merge pull request #16228 from argotorg/generalize_opt_tests

testing: run yul optimizer tests on all code subobjects

Author: clonker

test/libyul/YulOptimizerTestCommon.cpp

@@ -66,6 +66,8 @@
 
 #include <libsolidity/interface/OptimiserSettings.h>
 
+#include <range/v3/view/enumerate.hpp>
+
 #include <random>
 
 using namespace solidity;
@@ -81,15 +83,6 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(std::shared_ptr<Object const> _ob
 {
 	soltestAssert(m_object && m_optimizedObject);
 
-	if (
-		std::any_of(
-			m_object->subObjects.begin(),
-			m_object->subObjects.end(),
-			[](auto const& subObject) { return dynamic_cast<Data*>(subObject.get()) == nullptr;}
-		)
-	)
-		solUnimplemented("The current implementation of YulOptimizerTests ignores subobjects that are not Data.");
-
 	m_namedSteps = {
 		{"disambiguator", [&]() { return disambiguate(); }},
 		{"nameDisplacer", [&]() {
@@ -496,8 +489,19 @@ void YulOptimizerTestCommon::setStep(std::string const& _optimizerStep)
 
 bool YulOptimizerTestCommon::runStep()
 {
-	if (m_namedSteps.count(m_optimizerStep))
+	if (m_namedSteps.contains(m_optimizerStep))
 	{
+		for (auto const& [ix, subNode]: m_object->subObjects | ranges::views::enumerate)
+			if (auto const subObject = std::dynamic_pointer_cast<Object const>(subNode))
+			{
+				YulOptimizerTestCommon subTest(subObject);
+				subTest.setStep(m_optimizerStep);
+				subTest.run();
+				auto const optimizedSubObject = std::dynamic_pointer_cast<Object>(m_optimizedObject->subObjects[ix]);
+				yulAssert(optimizedSubObject);
+				optimizedSubObject->setCode(subTest.m_optimizedObject->code());
+			}
+
 		auto block = m_namedSteps[m_optimizerStep]();
 		m_optimizedObject->setCode(std::make_shared<AST>(*m_object->dialect(), std::move(block)));
 	}

test/libyul/yulOptimizerTests/fullSuite/sub_objects.yul

@@ -0,0 +1,39 @@
+// nested object to show that optimizations are applied at all levels
+object "A" {
+    code
+    {
+        mstore(43, 33)  // removed by optimizer as it's transient and otherwise unused
+    }
+
+    object "B"
+    {
+        code
+        {
+            let y := 42
+            sstore(y, y)  // persists
+            mstore(y, y)  // removed
+        }
+
+        object "C"
+        {
+            code
+            {
+                let x := 55
+                sstore(x, x)  // persists
+                mstore(x, x)  // removed
+            }
+        }
+    }
+}
+// ----
+// step: fullSuite
+//
+// object "A" {
+//     code { { } }
+//     object "B" {
+//         code { { sstore(42, 42) } }
+//         object "C" {
+//             code { { sstore(55, 55) } }
+//         }
+//     }
+// }