llvm-hs-pretty 0.6.0.0 → 0.6.1.0

raw patch · 9 files changed

+34/−24 lines, 9 filesdep ~llvm-hsdep ~llvm-hs-pure

Dependency ranges changed: llvm-hs, llvm-hs-pure

Files

• llvm-hs-pretty.cabal +4/−4
• src/LLVM/Pretty.hs +15/−5
• tests/Main.hs +1/−1
• tests/input/debug_metadata_enum.ll +1/−1
• tests/input/debug_metadata_global.ll +1/−1
• tests/input/debug_metadata_namespace.ll +8/−8
• tests/input/debug_metadata_qualifiers.ll +1/−1
• tests/input/debug_metadata_tu_composite.ll +2/−2
• tests/input/debug_metadata_union.ll +1/−1

@@ -1,5 +1,5 @@ name:                llvm-hs-pretty-version:             0.6.0.0+version:             0.6.1.0 license:             MIT synopsis:            A pretty printer for LLVM IR.  description:         A pretty printer for the LLVM AST types provided by llvm-hs.@@ -29,7 +29,7 @@     array                >= 0.5,     base                 >= 4.6   && < 5.0,     bytestring           >= 0.10,-    llvm-hs-pure         >= 6.2,+    llvm-hs-pure         >= 7.0,     text                 >= 0.1,     prettyprinter        >= 1.2 @@ -50,5 +50,5 @@     tasty-hunit          -any,     tasty-golden         >= 1.1,     llvm-hs-pretty       -any,-    llvm-hs              >= 6.2,-    llvm-hs-pure         >= 6.2+    llvm-hs              >= 7.0,+    llvm-hs-pure         >= 7.0

@@ -690,7 +690,11 @@   pretty (DISubprogram p) = pretty p  instance Pretty DIEnumerator where-  pretty (Enumerator val name) = ppDINode "DIEnumerator" [("name", ppSbs name), ("value", Just (pretty val))]+  pretty (Enumerator val unsigned name) =+    ppDINode "DIEnumerator"+      [ ("name", ppSbs name)+      , ("isUnsigned", if unsigned then Just "true" else Nothing)+      , ("value", Just (pretty val))]  instance Pretty DIImportedEntity where   pretty ImportedEntity {..} = ppDINode "DIImportedEntity"@@ -728,6 +732,10 @@ instance Pretty DISubrange where   pretty Subrange {..} = ppDINode "DISubrange" [("count", Just (pretty count)), ("lowerBound", Just (pretty lowerBound))] +instance Pretty DICount where+  pretty (DICountConstant c) = pretty c+  pretty (DICountVariable v) = pretty v+ instance Pretty DITemplateParameter where   pretty DITemplateTypeParameter {..} = ppDINode "DITemplateTypeParameter"     [ ("name", ppSbs name), ("type", Just (pretty type')) ]@@ -777,10 +785,13 @@   pretty (File {..}) = ppDINode "DIFile" $     [ ("filename", Just (dquotes (pretty filename)))     , ("directory", Just (dquotes (pretty directory)))-    , ("checksum", ppSbs checksum)-    , ("checksumkind", Just (pretty checksumKind))     ]+    <> ppDIChecksum checksum +ppDIChecksum :: Maybe ChecksumInfo -> [([Char], Maybe (Doc ann))]+ppDIChecksum Nothing = []+ppDIChecksum (Just (ChecksumInfo kind val)) = [("checksumkind", Just (pretty kind)), ("checksum", ppSbs val)]+ instance Pretty DIModule where   pretty O.Module {..} = ppDINode "DIModule"     [ ("scope", Just (maybe "null" pretty scope))@@ -839,7 +850,7 @@    , ("unit", fmap pretty unit)    , ("templateParams", ppDIArray (map pretty templateParams))    , ("declaration", fmap pretty declaration)-   , ("variables", ppDIArray (map pretty variables))+   , ("retainedNodes", ppDIArray (map pretty retainedNodes))    , ("thrownTypes", ppDIArray (map pretty thrownTypes))    ] @@ -849,7 +860,6 @@ ppVirtuality PureVirtual = Just "DW_VIRTUALITY_pure_virtual"  instance Pretty ChecksumKind where-  pretty None = "CSK_None"   pretty MD5 = "CSK_MD5"   pretty SHA1 = "CSK_SHA1" 

@@ -38,7 +38,7 @@     return True  makeTest :: FilePath -> TestTree-makeTest fname = testCase fname $ assert  (llvmFile fname)+makeTest fname = testCase fname $ assertBool "" =<< llvmFile fname  testPath :: FilePath testPath = "tests/input/"

@@ -37,7 +37,7 @@ !14 = !{!0} !15 = !{i32 2, !"Dwarf Version", i32 3} !16 = !{i32 1, !"Debug Info Version", i32 3}-!17 = distinct !DISubprogram(name: "func", linkageName: "_Z4funcv", scope: !2, file: !2, line: 3, type: !18, isLocal: false, isDefinition: true, scopeLine: 3, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !8, variables: !13)+!17 = distinct !DISubprogram(name: "func", linkageName: "_Z4funcv", scope: !2, file: !2, line: 3, type: !18, isLocal: false, isDefinition: true, scopeLine: 3, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !8, retainedNodes: !13) !18 = !DISubroutineType(types: !19) !19 = !{null} !20 = !DILocalVariable(name: "b", scope: !17, file: !2, line: 4, type: !21)

@@ -20,7 +20,7 @@ !6 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !7 = !{i32 2, !"Dwarf Version", i32 3} !8 = !{i32 1, !"Debug Info Version", i32 3}-!9 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 2, type: !10, isLocal: false, isDefinition: true, scopeLine: 2, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, unit: !0, variables: !2)+!9 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 2, type: !10, isLocal: false, isDefinition: true, scopeLine: 2, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, unit: !0, retainedNodes: !2) !10 = !DISubroutineType(types: !11) !11 = !{!6} !12 = !DILocation(line: 4, scope: !9)

@@ -94,24 +94,24 @@ !6 = !DINamespace(name: "B", scope: !7) !7 = !DINamespace(name: "A", scope: null) !8 = !DICompositeType(tag: DW_TAG_structure_type, name: "bar", line: 6, size: 8, align: 8, file: !5, scope: !6, elements: !2, identifier: "_ZTSN1A1B3barE")-!10 = distinct !DISubprogram(name: "f1", linkageName: "_ZN1A1B2f1Ev", line: 3, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 3, file: !5, scope: !6, type: !11, variables: !2)+!10 = distinct !DISubprogram(name: "f1", linkageName: "_ZN1A1B2f1Ev", line: 3, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 3, file: !5, scope: !6, type: !11, retainedNodes: !2) !11 = !DISubroutineType(types: !12) !12 = !{!13} !13 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed)-!14 = distinct !DISubprogram(name: "f1", linkageName: "_ZN1A1B2f1Ei", line: 4, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 4, file: !5, scope: !6, type: !15, variables: !2)+!14 = distinct !DISubprogram(name: "f1", linkageName: "_ZN1A1B2f1Ei", line: 4, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 4, file: !5, scope: !6, type: !15, retainedNodes: !2) !15 = !DISubroutineType(types: !16) !16 = !{null, !13}-!17 = distinct !DISubprogram(name: "__cxx_global_var_init", line: 20, isLocal: true, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 20, file: !5, scope: !18, type: !19, variables: !2)+!17 = distinct !DISubprogram(name: "__cxx_global_var_init", line: 20, isLocal: true, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 20, file: !5, scope: !18, type: !19, retainedNodes: !2) !18 = !DIFile(filename: "foo.cpp", directory: "/tmp") !19 = !DISubroutineType(types: !20) !20 = !{null}-!21 = distinct !DISubprogram(name: "func", linkageName: "_Z4funcb", line: 21, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 21, file: !5, scope: !18, type: !22, variables: !2)+!21 = distinct !DISubprogram(name: "func", linkageName: "_Z4funcb", line: 21, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 21, file: !5, scope: !18, type: !22, retainedNodes: !2) !22 = !DISubroutineType(types: !23) !23 = !{!13, !24} !24 = !DIBasicType(tag: DW_TAG_base_type, name: "bool", size: 8, align: 8, encoding: DW_ATE_boolean)-!25 = distinct !DISubprogram(name: "__cxx_global_var_init1", line: 44, isLocal: true, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 44, file: !5, scope: !18, type: !19, variables: !2)-!26 = distinct !DISubprogram(name: "func_fwd", linkageName: "_ZN1A1B8func_fwdEv", line: 47, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 47, file: !5, scope: !6, type: !19, variables: !2)-!27 = distinct !DISubprogram(name: "", linkageName: "_GLOBAL__sub_I_debug_info_namespace.cpp", isLocal: true, isDefinition: true, flags: DIFlagArtificial, isOptimized: false, unit: !0, file: !1, scope: !28, type: !29, variables: !2)+!25 = distinct !DISubprogram(name: "__cxx_global_var_init1", line: 44, isLocal: true, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 44, file: !5, scope: !18, type: !19, retainedNodes: !2)+!26 = distinct !DISubprogram(name: "func_fwd", linkageName: "_ZN1A1B8func_fwdEv", line: 47, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 47, file: !5, scope: !6, type: !19, retainedNodes: !2)+!27 = distinct !DISubprogram(name: "", linkageName: "_GLOBAL__sub_I_debug_info_namespace.cpp", isLocal: true, isDefinition: true, flags: DIFlagArtificial, isOptimized: false, unit: !0, file: !1, scope: !28, type: !29, retainedNodes: !2) !28 = !DIFile(filename: "debug-info-namespace.cpp", directory: "/tmp") !29 = !DISubroutineType(types: !2) !30 = !{!131, !132}@@ -136,7 +136,7 @@ !49 = !DIImportedEntity(tag: DW_TAG_imported_declaration, file: !5, line: 34, scope: !21, entity: !50) !50 = !DIGlobalVariable(name: "var_decl", linkageName: "_ZN1A1B8var_declE", line: 8, isLocal: false, isDefinition: false, scope: !6, file: !18, type: !13) !51 = !DIImportedEntity(tag: DW_TAG_imported_declaration, file: !5, line: 35, scope: !21, entity: !52)-!52 = !DISubprogram(name: "func_decl", linkageName: "_ZN1A1B9func_declEv", line: 9, isLocal: false, isDefinition: false, flags: DIFlagPrototyped, isOptimized: false, file: !5, scope: !6, type: !19, variables: !53)+!52 = !DISubprogram(name: "func_decl", linkageName: "_ZN1A1B9func_declEv", line: 9, isLocal: false, isDefinition: false, flags: DIFlagPrototyped, isOptimized: false, file: !5, scope: !6, type: !19, retainedNodes: !53) !53 = !{} ; previously: invalid DW_TAG_base_type !54 = !DIImportedEntity(tag: DW_TAG_imported_declaration, file: !5, line: 36, scope: !21, entity: !32) !55 = !DIImportedEntity(tag: DW_TAG_imported_declaration, file: !5, line: 37, scope: !21, entity: !26)

@@ -41,7 +41,7 @@ !11 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !4) !13 = !DISubprogram(name: "r", linkageName: "_ZNKO1A1rEv", line: 7, isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagObjectPointer | DIFlagRValueReference, isOptimized: false, scopeLine: 7, file: !5, scope: !4, type: !14) !14 = !DISubroutineType(flags: DIFlagRValueReference, types: !9)-!17 = distinct !DISubprogram(name: "g", linkageName: "_Z1gv", line: 10, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 10, file: !5, scope: !18, type: !19, variables: !2)+!17 = distinct !DISubprogram(name: "g", linkageName: "_Z1gv", line: 10, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 10, file: !5, scope: !18, type: !19, retainedNodes: !2) !18 = !DIFile(filename: "debug-info-qualifiers.cpp", directory: "") !19 = !DISubroutineType(types: !20) !20 = !{null}

@@ -75,8 +75,8 @@ !27 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !18) !28 = !{!29} !29 = !DITemplateTypeParameter(name: "T", type: !18)-!31 = distinct !DISubprogram(name: "foo", linkageName: "_ZN1C3fooEv", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 4, file: !1, scope: null, type: !14, declaration: !13, variables: !2)-!32 = distinct !DISubprogram(name: "test", linkageName: "_Z4testv", line: 20, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 20, file: !1, scope: !7, type: !33, variables: !2)+!31 = distinct !DISubprogram(name: "foo", linkageName: "_ZN1C3fooEv", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 4, file: !1, scope: null, type: !14, declaration: !13, retainedNodes: !2)+!32 = distinct !DISubprogram(name: "test", linkageName: "_Z4testv", line: 20, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 20, file: !1, scope: !7, type: !33, retainedNodes: !2) !33 = !DISubroutineType(types: !34) !34 = !{null} !35 = !{i32 2, !"Dwarf Version", i32 2}

@@ -28,7 +28,7 @@ !0 = distinct !DICompileUnit(language: DW_LANG_C99, producer: "clang version 3.7.0 (trunk 226915) (llvm/trunk 226905)", isOptimized: true, emissionKind: FullDebug, file: !1, enums: !2, retainedTypes: !2, globals: !2, imports: !2) !1 = !DIFile(filename: "union.c", directory: "") !2 = !{}-!4 = distinct !DISubprogram(name: "mfi_aen_setup", line: 5, isLocal: false, isDefinition: true, isOptimized: true, unit: !0, scopeLine: 5, file: !1, scope: !5, type: !6, variables: !15)+!4 = distinct !DISubprogram(name: "mfi_aen_setup", line: 5, isLocal: false, isDefinition: true, isOptimized: true, unit: !0, scopeLine: 5, file: !1, scope: !5, type: !6, retainedNodes: !15) !5 = !DIFile(filename: "union.c", directory: "") !6 = !DISubroutineType(types: !7) !7 = !{!8}