rebase

Author: clonker

libyul/backends/evm/SSACFGEVMCodeTransform.cpp

@@ -72,7 +72,7 @@ std::vector<StackTooDeepError> SSACFGEVMCodeTransform::run(
 		std::cout << "--------------------\n";
 		std::cout << "Running SSACFGEVMCodeTransform" << std::endl;
 		std::cout << "--------------------\n";
-		fmt::print("{}\n", _liveness.toDot(nullptr)); // &mainCodeTransform.m_stackLayout
+		fmt::print("{}\n", _liveness.toDot());
 		std::fflush(nullptr);
 	}
 

libyul/backends/evm/SSACFGStack.cpp

@@ -30,7 +30,7 @@ std::string ssa::slotToString(StackSlot const& _slot)
 {
 	return std::visit(util::GenericVisitor{
 		[&](SSACFG::ValueId const _value) {
-			return "v" + std::to_string(_value.value);
+			return "v" + std::to_string(_value.value());
 		},
 		[](AbstractAssembly::LabelID const _label) {
 			return "LABEL[" + std::to_string(_label) + "]";

libyul/backends/evm/SSACFGStack.h

@@ -69,7 +69,7 @@ struct SlotCanBeFreelyGenerated
 	bool operator()(Slot const& _slot) const
 	{
 		if (std::holds_alternative<SSACFG::ValueId>(_slot))
-			return m_cfg->isLiteralValue(std::get<SSACFG::ValueId>(_slot));
+			return std::get<SSACFG::ValueId>(_slot).isLiteral();
 		return std::holds_alternative<JunkSlot>(_slot) || std::holds_alternative<FunctionReturnLabel>(_slot);
 	}
 

libyul/backends/evm/ssa/ControlFlow.cpp

@@ -27,7 +27,7 @@ ControlFlowLiveness::ControlFlowLiveness(ControlFlow const& _controlFlow):
 	cfgLiveness(_controlFlow.functionGraphs | ranges::views::transform([](auto const& _cfg) { return std::make_unique<LivenessAnalysis>(*_cfg); }) | ranges::to<std::vector>)
 { }
 
-std::string ControlFlowLiveness::toDot(SSACFGStackLayout const* _stackLayout) const
+std::string ControlFlowLiveness::toDot() const
 {
-	return controlFlow.get().toDot(this, _stackLayout);
+	return controlFlow.get().toDot(this);
 }

libyul/backends/evm/ssa/OperationForwardShuffler.h

@@ -56,7 +56,7 @@ class OperationForwardShuffler
 				else
 					++histogramArgs[slot];
 				if (_stack.size() - i - 1 < ReachableStackDepth)
-					++histogramReachable[slot]++;
+					++histogramReachable[slot];
 			}
 		}
 

libyul/backends/evm/ssa/SSACFG.h

@@ -279,8 +279,6 @@ class SSACFG
 		return *idx;
 	}
 
-	std::string valueDescription(ValueId const& _valueId) const;
-
 	std::string toDot(
 		bool _includeDiGraphDefinition=true,
 		std::optional<size_t> _functionIndex=std::nullopt,

libyul/backends/evm/ssa/Stack.cpp

@@ -44,12 +44,12 @@ std::string slotToString(StackSlot const& _slot)
 std::string slotToString(StackSlot const& _slot, SSACFG const& _cfg)
 {
 	if (_slot.kind() == StackSlot::Kind::ValueID)
-		return _cfg.valueDescription(_slot.valueID());
+		return _slot.valueID().str(_cfg);
 
 	return slotToString(_slot);
 }
 
-std::string stackToString(Stack<>::Data const& _stackData)
+std::string stackToString(StackData const& _stackData)
 {
 	auto const numJunk = junkTailSize(_stackData);
 	if (numJunk > 0)
@@ -65,7 +65,7 @@ std::string stackToString(Stack<>::Data const& _stackData)
 	);
 }
 
-std::string stackToString(Stack<>::Data const& _stackData, SSACFG const& _cfg)
+std::string stackToString(StackData const& _stackData, SSACFG const& _cfg)
 {
 	auto const numJunk = junkTailSize(_stackData);
 	if (numJunk > 0)

test/libyul/Misctest.cpp

@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(yo)
 				<< fmt::format("{{ {} }} + ", fmt::join(r, ", "))
 				<< fmt::format("[ {} ]\n", fmt::join(args | t2, ", "));
 		}
-		ssa::OperationForwardShuffler<TestStack>::shuffle(*stack, args, liveness, true);
+		ssa::OperationForwardShuffler<PrintCallback>::shuffle(*stack, args, liveness, true, stack->size());
 		std::cout << "--- fin ---" << std::endl;
 		std::cout << ssa::stackToString(stack->data(), *cfg) << std::endl;
 		final = stack->data();