From 1d03d8bef962e6789db44e8b6f2cfd9e34f3f5ad Mon Sep 17 00:00:00 2001
From: Sylvain Henry <sylvain@haskus.fr>
Date: Thu, 11 Mar 2021 17:41:51 +0100
Subject: Replace (ptext .. sLit) with `text`

1. `text` is as efficient as `ptext . sLit` thanks to the rewrite rules

2. `text` is visually nicer than `ptext . sLit`

3. `ptext . sLit` encourages using one `ptext` for several `sLit` as in:

    ptext $ case xy of
      ... -> sLit ...
      ... -> sLit ...

  which may allocate SDoc's TextBeside constructors at runtime instead
  of sharing them into CAFs.
---
 compiler/GHC/CmmToC.hs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'compiler/GHC/CmmToC.hs')

diff --git a/compiler/GHC/CmmToC.hs b/compiler/GHC/CmmToC.hs
index 5f6c0486bc..9b8832ff80 100644
--- a/compiler/GHC/CmmToC.hs
+++ b/compiler/GHC/CmmToC.hs
@@ -46,7 +46,6 @@ import GHC.Cmm.Switch
 import GHC.CmmToAsm.CPrim
 import GHC.Driver.Session
 import GHC.Driver.Ppr
-import GHC.Data.FastString
 import GHC.Utils.Outputable
 import GHC.Utils.Panic
 import GHC.Platform
@@ -207,7 +206,7 @@ pprStmt :: Platform -> CmmNode e x -> SDoc
 pprStmt platform stmt =
     case stmt of
     CmmEntry{}   -> empty
-    CmmComment _ -> empty -- (hang (text "/*") 3 (ftext s)) $$ ptext (sLit "*/")
+    CmmComment _ -> empty -- (hang (text "/*") 3 (ftext s)) $$ text "*/"
                           -- XXX if the string contains "*/", we need to fix it
                           -- XXX we probably want to emit these comments when
                           -- some debugging option is on.  They can get quite
@@ -221,7 +220,7 @@ pprStmt platform stmt =
     CmmStore  dest src
         | typeWidth rep == W64 && wordWidth platform /= W64
         -> (if isFloatType rep then text "ASSIGN_DBL"
-                               else ptext (sLit ("ASSIGN_Word64"))) <>
+                               else text "ASSIGN_Word64") <>
            parens (mkP_ <> pprExpr1 platform dest <> comma <> pprExpr platform src) <> semi
 
         | otherwise
@@ -828,19 +827,20 @@ pprCallishMachOp_for_C mop
         MO_Memset _     -> text "memset"
         MO_Memmove _    -> text "memmove"
         MO_Memcmp _     -> text "memcmp"
-        (MO_BSwap w)    -> ptext (sLit $ bSwapLabel w)
-        (MO_BRev w)     -> ptext (sLit $ bRevLabel w)
-        (MO_PopCnt w)   -> ptext (sLit $ popCntLabel w)
-        (MO_Pext w)     -> ptext (sLit $ pextLabel w)
-        (MO_Pdep w)     -> ptext (sLit $ pdepLabel w)
-        (MO_Clz w)      -> ptext (sLit $ clzLabel w)
-        (MO_Ctz w)      -> ptext (sLit $ ctzLabel w)
-        (MO_AtomicRMW w amop) -> ptext (sLit $ atomicRMWLabel w amop)
-        (MO_Cmpxchg w)  -> ptext (sLit $ cmpxchgLabel w)
-        (MO_Xchg w)     -> ptext (sLit $ xchgLabel w)
-        (MO_AtomicRead w)  -> ptext (sLit $ atomicReadLabel w)
-        (MO_AtomicWrite w) -> ptext (sLit $ atomicWriteLabel w)
-        (MO_UF_Conv w)  -> ptext (sLit $ word2FloatLabel w)
+
+        MO_BSwap w          -> ftext (bSwapLabel w)
+        MO_BRev w           -> ftext (bRevLabel w)
+        MO_PopCnt w         -> ftext (popCntLabel w)
+        MO_Pext w           -> ftext (pextLabel w)
+        MO_Pdep w           -> ftext (pdepLabel w)
+        MO_Clz w            -> ftext (clzLabel w)
+        MO_Ctz w            -> ftext (ctzLabel w)
+        MO_AtomicRMW w amop -> ftext (atomicRMWLabel w amop)
+        MO_Cmpxchg w        -> ftext (cmpxchgLabel w)
+        MO_Xchg w           -> ftext (xchgLabel w)
+        MO_AtomicRead w     -> ftext (atomicReadLabel w)
+        MO_AtomicWrite w    -> ftext (atomicWriteLabel w)
+        MO_UF_Conv w        -> ftext (word2FloatLabel w)
 
         MO_S_Mul2     {} -> unsupported
         MO_S_QuotRem  {} -> unsupported
-- 
cgit v1.2.1