diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-08-19 11:53:24 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-08-21 09:36:38 -0400 |
| commit | 659eb31b7a40f0aa2ba43c3454b5d9006fde837d (patch) | |
| tree | 3c4cf4092cd6f7b753971c9fce73ca78b8bc3fae /compiler/GHC/CmmToLlvm | |
| parent | 50eb4460cd8412387e0c3755a9e0bafaced12bb2 (diff) | |
| download | haskell-659eb31b7a40f0aa2ba43c3454b5d9006fde837d.tar.gz | |
NCG: Dwarf configuration
* remove references to DynFlags in GHC.CmmToAsm.Dwarf
* add specific Dwarf options in NCGConfig instead of directly querying
the debug level
Diffstat (limited to 'compiler/GHC/CmmToLlvm')
| -rw-r--r-- | compiler/GHC/CmmToLlvm/Base.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/CmmToLlvm/CodeGen.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/GHC/CmmToLlvm/Base.hs b/compiler/GHC/CmmToLlvm/Base.hs index bdadaf49de..d7667bb073 100644 --- a/compiler/GHC/CmmToLlvm/Base.hs +++ b/compiler/GHC/CmmToLlvm/Base.hs @@ -498,7 +498,7 @@ strCLabel_llvm lbl = do dflags <- getDynFlags platform <- getPlatform let sdoc = pprCLabel_LLVM platform lbl - str = Outp.renderWithStyle + str = Outp.renderWithContext (initSDocContext dflags (Outp.mkCodeStyle Outp.CStyle)) sdoc return (fsLit str) diff --git a/compiler/GHC/CmmToLlvm/CodeGen.hs b/compiler/GHC/CmmToLlvm/CodeGen.hs index 916931eefa..34d0353681 100644 --- a/compiler/GHC/CmmToLlvm/CodeGen.hs +++ b/compiler/GHC/CmmToLlvm/CodeGen.hs @@ -1566,7 +1566,7 @@ genMachOp_slow opt op [x, y] = case op of -- Error. Continue anyway so we can debug the generated ll file. dflags <- getDynFlags let style = mkCodeStyle CStyle - toString doc = renderWithStyle (initSDocContext dflags style) doc + toString doc = renderWithContext (initSDocContext dflags style) doc cmmToStr = (lines . toString . PprCmm.pprExpr platform) statement $ Comment $ map fsLit $ cmmToStr x statement $ Comment $ map fsLit $ cmmToStr y |