debug code

decompiler/pipeline/controlflowanalysis/restructuring.py

@@ -18,6 +18,7 @@
 from decompiler.structures.graphs.restructuring_graph.transition_cfg import TransitionBlock, TransitionCFG
 from decompiler.structures.pseudo import Assignment, Constant, Integer, Variable
 from decompiler.task import DecompilerTask
+from decompiler.util.decoration import DecoratedAST, DecoratedCFG, DecoratedGraph
 
 
 class PatternIndependentRestructuring(PipelineStage):
@@ -47,6 +48,8 @@ def run(self, task: DecompilerTask):
  self.asforest = AbstractSyntaxForest.generate_from_code_nodes([node.ast for node in self.t_cfg], self.t_cfg.condition_handler)
  self.options = RestructuringOptions.generate(task.options)
 
+ # DecoratedCFG.from_cfg(task.graph).export_plot("restructuring.png")
+
  self.restructure_cfg()
 
  assert len(self.t_cfg) == 1, f"The Transition Graph can only have one node after the restructuring."

decompiler/pipeline/controlflowanalysis/restructuring_commons/condition_based_refinement.py

@@ -74,7 +74,7 @@ def _refine_code_nodes_with_complementary_conditions(self) -> None:
  sibling_reachability.merge_siblings_to(condition_node, [ast_node_i, ast_node_j])
  processed_to_branch.update([ast_node_i, ast_node_j])
 
- sequence_node._sorted_children = sibling_reachability.sorted_nodes()
+ sequence_node._sorted_children = sibling_reachability.sorted_nodes() # set private property to None, expect tupe... TODO DBG
 
  @staticmethod
  def _get_possible_complementary_nodes(sequence_node: SeqNode):
@@ -92,6 +92,10 @@ def _structure_sequence_node(self, sequence_node: SeqNode) -> Set[SeqNode]:
  newly_created_sequence_nodes: Set[SeqNode] = set()
  sibling_reachability: SiblingReachability = self.asforest.get_sibling_reachability_of_children_of(sequence_node)
 
+ print("SEQUENCE NODE", sequence_node)
+ print("SEQUENCE NODE _SORTED_CHILDREN", sequence_node._sorted_children)
+ print("SEQUENCE NODE CHILDREN", sequence_node.children)
+
  for child in list(sequence_node.children):
  if child in visited:
  continue

decompiler/structures/ast/ast_nodes.py

@@ -261,7 +261,7 @@ class SeqNode(AbstractSyntaxTreeNode):
  def __init__(self, reaching_condition: LogicCondition, ast: Optional[AbstractSyntaxInterface] = None):
  """Init a new SequenceNode with a reaching condition and the ast it is contained in."""
  super().__init__(reaching_condition, ast)
- self._sorted_children: Tuple[AbstractSyntaxTreeNode, ...] = tuple()
+ self.__sorted_children: Tuple[AbstractSyntaxTreeNode, ...] = tuple()
 
  def __str__(self) -> str:
  """Return a string representation of a SeqNode."""
@@ -275,6 +275,16 @@ def copy(self) -> SeqNode:
  """Return a copy of the ast node."""
  return SeqNode(self.reaching_condition)
 
+ @property
+ def _sorted_children(self):
+ return self.__sorted_children
+
+ @_sorted_children.setter
+ def _sorted_children(self, value):
+ if value is None:
+ raise ValueError("_sorted_children cannot be set to None")
+ self.__sorted_children = value
+
  @property
  def children(self) -> Tuple[AbstractSyntaxTreeNode, ...]:
  """Return a tuple of all successors in execution order."""