Avoid pop unused function returns

ethereum · Jul 9, 2024 · cf8b262 · cf8b262
1 parent 080673b
commit cf8b262
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/libyul/YulControlFlowGraphExporter.cpp b/libyul/YulControlFlowGraphExporter.cpp
@@ -40,12 +40,12 @@ namespace
  void validateStackSlot(StackSlot const& _slot)
  {
  std::visit(util::GenericVisitor{
- [](FunctionCallReturnLabelSlot const&) { solAssert(false); },
- [](FunctionReturnLabelSlot const&) { solAssert(false); },
+ [](FunctionCallReturnLabelSlot const&) { solAssert(false, "RET[] slot found"); },
+ [](FunctionReturnLabelSlot const&) { solAssert(false, "RET slot found"); },
  [](VariableSlot const&) {},
  [](LiteralSlot const&) {},
- [](TemporarySlot const&) { solAssert(false); },
- [](JunkSlot const&) { solAssert(false); },
+ [](TemporarySlot const&) { solAssert(false, "TMP slot found"); },
+ [](JunkSlot const&) { solAssert(false, "JUNK slot found"); },
  }, _slot);
  }
 }

diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
@@ -105,12 +105,13 @@ void UnusedPruner::operator()(Block& _block)
  subtractReferences(ReferencesCounter::countReferences(*varDecl.value));
  statement = Block{std::move(varDecl.debugData), {}};
  }
- else if (varDecl.variables.size() == 1 && m_dialect.discardFunction(varDecl.variables.front().type))
- statement = ExpressionStatement{varDecl.debugData, FunctionCall{
- varDecl.debugData,
- {varDecl.debugData, m_dialect.discardFunction(varDecl.variables.front().type)->name},
- {*std::move(varDecl.value)}
- }};
+ // TODO: hack to avoid creating TMP slots for unused variables in discard functions
+ ///else if (varDecl.variables.size() == 1 && m_dialect.discardFunction(varDecl.variables.front().type))
+ /// statement = ExpressionStatement{varDecl.debugData, FunctionCall{
+ /// varDecl.debugData,
+ /// {varDecl.debugData, m_dialect.discardFunction(varDecl.variables.front().type)->name},
+ /// {*std::move(varDecl.value)}
+ /// }};
  }
  }
  else if (std::holds_alternative<ExpressionStatement>(statement))