Merge StructConstant with Constant

Author: rihi

decompiler/backend/variabledeclarations.py

@@ -12,7 +12,7 @@
 from decompiler.structures.ast.syntaxtree import AbstractSyntaxTree
 from decompiler.structures.pseudo import GlobalVariable, Integer, Variable
 from decompiler.structures.pseudo.complextypes import Struct
-from decompiler.structures.pseudo.expressions import StructConstant
+from decompiler.structures.pseudo.expressions import Constant
 from decompiler.structures.pseudo.typing import ArrayType, CustomType, Pointer
 from decompiler.structures.visitors.ast_dataflowobjectvisitor import BaseAstDataflowObjectVisitor
 from decompiler.task import DecompilerTask
@@ -105,6 +105,6 @@ def visit_global_variable(self, expr: GlobalVariable):
             self._global_vars.add(expr.copy(ssa_label=0, ssa_name=None))
         if not expr.is_constant or expr.type == Pointer(CustomType.void()):
             self._global_vars.add(expr.copy(ssa_label=0, ssa_name=None))
-        if isinstance(expr.initial_value, StructConstant):
+        if isinstance(expr.initial_value, Constant) and isinstance(expr.initial_value.value, dict):
             for member_value in expr.initial_value.value.values():
                 self.visit(member_value)

decompiler/frontend/binaryninja/handlers/globals.py

@@ -30,7 +30,6 @@
     Integer,
     OperationType,
     Pointer,
-    StructConstant,
     Symbol,
     UnaryOperation,
 )
@@ -288,7 +287,7 @@ def _lift_struct_helper(self, variable, parent, struct_type):
             lift = self._lifter.lift(dv, view=self._view)
             values[member_type.offset] = lift.initial_value
         return self._build_global_variable(
-            variable.name, s_type, variable.address, StructConstant(values, s_type), parent.ssa_memory_version if parent else 0
+            variable.name, s_type, variable.address, Constant(values, s_type), parent.ssa_memory_version if parent else 0
         )
 
     def _lift_enum_type(self, variable: DataVariable, parent: Optional[MediumLevelILInstruction] = None, **_):

decompiler/structures/pseudo/__init__.py

@@ -10,7 +10,6 @@
     IntrinsicSymbol,
     NotUseableConstant,
     RegisterPair,
-    StructConstant,
     Symbol,
     Tag,
     UnknownExpression,

decompiler/structures/pseudo/expressions.py

@@ -35,7 +35,7 @@
 from typing import TYPE_CHECKING, Generic, Iterator, List, Optional, Tuple, TypeVar, Union, final
 
 from ...util.insertion_ordered_set import InsertionOrderedSet
-from .complextypes import Enum, Struct
+from .complextypes import Enum
 from .typing import CustomType, Type, UnknownType
 
 T = TypeVar("T")
@@ -165,8 +165,7 @@ def accept(self, visitor: DataflowObjectVisitorInterface[T]) -> T:
 class Constant(Expression[DecompiledType]):
     """Represents a constant expression type."""
 
-    # python 3.12 allows writing: type ValueType = int | float | str | bytes | dict[str, ValueType]
-    ValueType = int | float | str | bytes | list["ValueType"] | dict[str, "ValueType"]
+    ValueType = int | float | str | bytes | Expression | list["ValueType"] | dict[int, "ValueType"]
 
     def __init__(
         self,
@@ -566,34 +565,3 @@ def copy(self) -> RegisterPair:
     def accept(self, visitor: DataflowObjectVisitorInterface[T]) -> T:
         """Invoke the appropriate visitor for this Expression."""
         return visitor.visit_register_pair(self)
-
-
-class StructConstant(Constant):
-    """This class represents constant structs.
-    The value is a dictionary mapping offsets to the corresponding fields' value.
-    The vartype is a 'Struct' (a special ComplexType), which provides a mapping from offsets to field names."""
-
-    def __init__(self, value: dict[int, Expression], vartype: Struct, tags: Optional[Tuple[Tag, ...]] = None):
-        super().__init__(
-            value,
-            vartype=vartype,
-            tags=tags,
-        )
-
-    def __eq__(self, __value):
-        return isinstance(__value, StructConstant) and super().__eq__(__value)
-
-    def __hash__(self):
-        return hash(tuple(sorted(self.value.items())))
-
-    def __str__(self) -> str:
-        """Return a string representation of the struct"""
-
-        return str(self.value)
-
-    def __iter__(self) -> Iterator[Expression]:
-        yield from self.value.values()
-
-    def copy(self) -> StructConstant:
-        """Generate a copy of the UnknownExpression with the same message."""
-        return StructConstant(self.value, self._type)