do not remove struct fields omg

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
vsoch · Jun 15, 2022 · 2a0d8a8 · 2a0d8a8
1 parent 807dfbf
commit 2a0d8a8
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/cle/backends/elf/corpus.py b/cle/backends/elf/corpus.py
@@ -454,7 +454,7 @@ def parse_structure_type(self, die, flags=None):
                 continue
 
             field = self.parse_member(child)
-
+            print(field)
             # Our default is import but Matt wants struct param fields to be exports
             if "direction" not in field or field["direction"] != "both":
                 field["direction"] = "export"

diff --git a/cle/backends/elf/parser/AMD64/classifier.py b/cle/backends/elf/parser/AMD64/classifier.py
@@ -1,6 +1,7 @@
 from .register_class import RegisterClass
 from .allocators import RegisterAllocator
 from ...types import ClassType
+import copy
 
 
 class Classification:
@@ -268,7 +269,7 @@ def classify_aggregate(
     ebs = []
     cur = Eightbyte()
     added = False
-    fields = typ.get("fields", [])
+    fields = copy.deepcopy(typ.get("fields", []))
     while fields:
         f = fields.pop(0)
         field = types.get(f.get("type"))
@@ -277,7 +278,7 @@ def classify_aggregate(
 
         # If we have another aggregate (I'm not sure this is correct)
         if field.get("class") in ["Union", "Struct", "Class"]:
-            fields = field.get("fields", []) + fields
+            fields = copy.deepcopy(field.get("fields", [])) + fields
             continue
 
         added = False

diff --git a/examples/array/facts.json b/examples/array/facts.json
@@ -57,7 +57,18 @@
             "name": "Foo",
             "size": 36,
             "class": "Struct",
-            "fields": []
+            "fields": [
+                {
+                    "name": "x",
+                    "type": "1fd8c01bdca094933f920b41375cfed0",
+                    "direction": "export"
+                },
+                {
+                    "name": "c",
+                    "type": "a577ccf4dfcba55c299a5e6b401951d1",
+                    "direction": "export"
+                }
+            ]
         }
     }
 }
diff --git a/examples/class-inheritance/facts.json b/examples/class-inheritance/facts.json
@@ -96,6 +96,11 @@
             "size": 16,
             "class": "Struct",
             "fields": [
+                {
+                    "name": "unknown",
+                    "type": "308e7c0c4ed84449b2850937c1b6329e",
+                    "direction": "export"
+                },
                 {
                     "name": "unknown",
                     "type": "3b92f99410a6dae32be62e61c114908a",

diff --git a/examples/function-as-parameter/facts.json b/examples/function-as-parameter/facts.json
@@ -3439,7 +3439,12 @@
             "name": "exception_ptr",
             "size": 8,
             "class": "Class",
-            "fields": []
+            "fields": [
+                {
+                    "name": "_M_exception_object",
+                    "type": "bd0f95a6606dcd8b66497841cf8daa03"
+                }
+            ]
         },
         "f35c8460d65ceaaadef5f007642685f2": {
             "class": "Pointer",

diff --git a/test.py b/test.py
@@ -11,6 +11,7 @@
 
 # TODO we will want to look at lib name if they auto load and not add to corpus
 # OR we will want to generate separate corpora
+# TODO debug why struct fields removed from array...
 import cle
 
 # TODOs slow to build: omega-h, strumpack (openblas) fortrilinos