Fix issue #113 and #114 #121
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RyanGlScott
approved these changes
Aug 7, 2023
src/Text/LLVM/PP.hs
Outdated
Comment on lines
1047
to
1054
| ++ if llvmVer < 11 then [] else | ||
| [ pure ("rangesBaseAddress:" <+> ppBool (dicuRangesBaseAddress cu)) | ||
| , (("sysroot:" <+>) . doubleQuotes . text) | ||
| <$> (dicuSysRoot cu) | ||
| , (("sdk:" <+>) . doubleQuotes . text) | ||
| <$> (dicuSDK cu) | ||
| ]) | ||
| ] | ||
| ) |
There was a problem hiding this comment.
I'd prefer llvmVer >= 11. Something like this, perhaps:
[ pure ("rangesBaseAddress:" <+> ppBool (dicuRangesBaseAddress cu))
, (("sysroot:" <+>) . doubleQuotes . text)
<$> (dicuSysRoot cu)
, (("sdk:" <+>) . doubleQuotes . text)
<$> (dicuSDK cu)
| llvmVer >= 11
]
src/Text/LLVM/PP.hs
Outdated
| @@ -1046,12 +1043,15 @@ ppDICompileUnit' pp cu = "!DICompileUnit" | |||
| , pure ("splitDebugInlining:" <+> ppBool (dicuSplitDebugInlining cu)) | |||
| , pure ("debugInfoForProfiling:" <+> ppBool (dicuDebugInfoForProf cu)) | |||
| , pure ("nameTableKind:" <+> integral (dicuNameTableKind cu)) | |||
| , pure ("rangesBaseAddress:" <+> ppBool (dicuRangesBaseAddress cu)) | |||
| ] | |||
| ++ if llvmVer < 11 then [] else | |||
There was a problem hiding this comment.
Perhaps worth adding a Haddock comment to dicuRangesBaseAddress (here) that it is only pretty-printed with LLVM 11 or later, the version that it was added.
src/Text/LLVM/PP.hs
Outdated
| @@ -971,7 +968,7 @@ ppDIImportedEntity = ppDIImportedEntity' ppLabel | |||
| ppDILabel' :: Fmt i -> Fmt (DILabel' i) | |||
| ppDILabel' pp ie = "!DILabel" | |||
| <> parens (mcommas [ (("scope:" <+>) . ppValMd' pp) <$> dilScope ie | |||
| , pure ("name:" <+> text (dilName ie)) | |||
| , pure ("name:" <+> doubleQuotes (text (dilName ie))) | |||
There was a problem hiding this comment.
I think this would be preferable:
Suggested change
| , pure ("name:" <+> doubleQuotes (text (dilName ie))) | |
| , pure ("name:" <+> ppStringLiteral (dilName ie)) |
As ppStringLiteral performs escaping of certain characters.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contains a fix for the quoting of the
DILabelnamefield bug identified in Issue #114 .Contains a fix for the
DICompileUnitrangesBaseAddress(and subsequent) fields which was added in LLVM 11 as noted in Issue #113. The fix does not switch the field type as proposed in the issue, but does update the pretty-printing.