parse subroutine type declaration formal parameters (#382)

* parse subroutine type declaration formal parameters This is useful for Reopt as we want to get more accurate type information for library functions.
GaloisInc · May 22, 2024 · 77a6c62 · 77a6c62
1 parent 4b2f7df
commit 77a6c62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/base/ChangeLog.md b/base/ChangeLog.md
@@ -32,3 +32,6 @@
 - The `Hashable` and `HashableF` instances for `App f` now require
   `TestEquality f` constraints. (This is needed to support `hashable-1.4.*`,
   which adds `Eq` as a superclass to `Hashable`.)
+
+- `SubroutineTypeDecl` now contains a parsed `Variable` (rather than an unparsed `DIE`) for its
+  formals.
diff --git a/base/src/Data/Macaw/Dwarf.hs b/base/src/Data/Macaw/Dwarf.hs
@@ -630,7 +630,7 @@ data EnumDecl = EnumDecl
 
 data SubroutineTypeDecl = SubroutineTypeDecl
   { fntypePrototyped :: !(Maybe Bool),
-    fntypeFormals :: ![DIE],
+    fntypeFormals :: ![Variable],
     fntypeType :: !(Maybe TypeRef)
   }
   deriving (Show)
@@ -837,9 +837,9 @@ parseEnumerationType fileVec = do
 
 -- | Parse a subroutine type.
 parseSubroutineType :: TypeParser
-parseSubroutineType _ = do
+parseSubroutineType fileVec = do
   proto <- getMaybeAttribute DW_AT_prototyped attributeAsBool
-  formals <- parseChildrenList DW_TAG_formal_parameter pure
+  formals <- parseParameters fileVec
 
   tp <- getMaybeAttribute DW_AT_type attributeAsTypeRef