Merge pull request GaloisInc#62 from siddharthist/metadata-namespace

Allow null names for DINameSpace
Ptival · Jan 17, 2019 · 41d3850 · 41d3850
2 parents 4690fa1 + 4bfa3ac
commit 41d3850
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Text/LLVM/AST.hs b/src/Text/LLVM/AST.hs
@@ -1108,7 +1108,7 @@ data DITemplateValueParameter' lab = DITemplateValueParameter
 
 type DINameSpace = DINameSpace' BlockLabel
 data DINameSpace' lab = DINameSpace
-    { dinsName  :: String
+    { dinsName  :: Maybe String
     , dinsScope :: ValMd' lab
     , dinsFile  :: ValMd' lab
     , dinsLine  :: Word32

diff --git a/src/Text/LLVM/PP.hs b/src/Text/LLVM/PP.hs
@@ -869,11 +869,11 @@ ppDIImportedEntity = ppDIImportedEntity' ppLabel
 
 ppDINameSpace' :: LLVM => (i -> Doc) -> DINameSpace' i -> Doc
 ppDINameSpace' pp ns = "!DINameSpace"
-  <> parens (commas [ "name:"   <+> text (dinsName ns)
-                    , "scope:"  <+> ppValMd' pp (dinsScope ns)
-                    , "file:"   <+> ppValMd' pp (dinsFile ns)
-                    , "line:"   <+> integral (dinsLine ns)
-                    ])
+  <> parens (mcommas [ ("name:"   <+>) . text <$> (dinsName ns)
+                     , pure ("scope:"  <+> ppValMd' pp (dinsScope ns))
+                     , pure ("file:"   <+> ppValMd' pp (dinsFile ns))
+                     , pure ("line:"   <+> integral (dinsLine ns))
+                     ])
 
 ppDINameSpace :: LLVM => DINameSpace -> Doc
 ppDINameSpace = ppDINameSpace' ppLabel