Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

compiler/basicTypes/Literal.lhs

@@ -84,7 +84,7 @@ data Literal
         -- First the primitive guys
     MachChar    Char            -- ^ @Char#@ - at least 31 bits. Create with 'mkMachChar'
 
-  | MachStr     FastString      -- ^ A string-literal: stored and emitted
+  | MachStr     FastBytes       -- ^ A string-literal: stored and emitted
                                 -- UTF-8 encoded, we'll arrange to decode it
                                 -- at runtime.  Also emitted with a @'\0'@
                                 -- terminator. Create with 'mkMachString'
@@ -248,7 +248,8 @@ mkMachChar = MachChar
 -- | Creates a 'Literal' of type @Addr#@, which is appropriate for passing to
 -- e.g. some of the \"error\" functions in GHC.Err such as @GHC.Err.runtimeError@
 mkMachString :: String -> Literal
-mkMachString s = MachStr (mkFastString s) -- stored UTF-8 encoded
+-- stored UTF-8 encoded
+mkMachString s = MachStr (fastStringToFastBytes $ mkFastString s)
 
 mkLitInteger :: Integer -> Type -> Literal
 mkLitInteger = LitInteger
@@ -436,7 +437,7 @@ pprLiteral :: (SDoc -> SDoc) -> Literal -> SDoc
 -- to wrap parens around literals that occur in
 -- a context requiring an atomic thing
 pprLiteral _       (MachChar ch)    = pprHsChar ch
-pprLiteral _       (MachStr s)      = pprHsString s
+pprLiteral _       (MachStr s)      = pprHsBytes s
 pprLiteral _       (MachInt i)      = pprIntVal i
 pprLiteral _       (MachDouble d)   = double (fromRat d)
 pprLiteral _       (MachNullAddr)   = ptext (sLit "__NULL")
@@ -469,7 +470,7 @@ Hash values should be zero or a positive integer.  No negatives please.
 \begin{code}
 hashLiteral :: Literal -> Int
 hashLiteral (MachChar c)        = ord c + 1000  -- Keep it out of range of common ints
-hashLiteral (MachStr s)         = hashFS s
+hashLiteral (MachStr s)         = hashFB s
 hashLiteral (MachNullAddr)      = 0
 hashLiteral (MachInt i)         = hashInteger i
 hashLiteral (MachInt64 i)       = hashInteger i

compiler/basicTypes/Module.lhs

@@ -191,7 +191,7 @@ pprModuleName :: ModuleName -> SDoc
 pprModuleName (ModuleName nm) =
     getPprStyle $ \ sty ->
     if codeStyle sty
-        then ftext (zEncodeFS nm)
+        then ztext (zEncodeFS nm)
         else ftext nm
 
 moduleNameFS :: ModuleName -> FastString
@@ -271,7 +271,7 @@ pprPackagePrefix p mod = getPprStyle doc
        | codeStyle sty =
           if p == mainPackageId
                 then empty -- never qualify the main package in code
-                else ftext (zEncodeFS (packageIdFS p)) <> char '_'
+                else ztext (zEncodeFS (packageIdFS p)) <> char '_'
        | qualModule sty mod = ftext (packageIdFS (modulePackageId mod)) <> char ':'
                 -- the PrintUnqualified tells us which modules have to
                 -- be qualified with package names

compiler/basicTypes/Name.lhs

@@ -514,7 +514,7 @@ ppr_occ_name occ = ftext (occNameFS occ)
 -- In code style, we Z-encode the strings.  The results of Z-encoding each FastString are
 -- cached behind the scenes in the FastString implementation.
 ppr_z_occ_name :: OccName -> SDoc
-ppr_z_occ_name occ = ftext (zEncodeFS (occNameFS occ))
+ppr_z_occ_name occ = ztext (zEncodeFS (occNameFS occ))
 
 -- Prints (if mod information is available) "Defined at <loc>" or 
 --  "Defined in <mod>" information for a Name.

compiler/basicTypes/OccName.lhs

@@ -265,7 +265,7 @@ pprOccName :: OccName -> SDoc
 pprOccName (OccName sp occ) 
   = getPprStyle $ \ sty ->
     if codeStyle sty 
-    then ftext (zEncodeFS occ)
+    then ztext (zEncodeFS occ)
     else pp_occ <> pp_debug sty
   where
     pp_debug sty | debugStyle sty = braces (pprNameSpaceBrief sp)

compiler/basicTypes/Unique.lhs

@@ -18,50 +18,43 @@ Haskell).
 \begin{code}
 {-# LANGUAGE BangPatterns #-}
 
-{-# OPTIONS -fno-warn-tabs #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and
--- detab the module (please do the detabbing in a separate patch). See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
--- for details
-
 module Unique (
         -- * Main data types
-	Unique, Uniquable(..), 
-	
-	-- ** Constructors, desctructors and operations on 'Unique's
-	hasKey,
+        Unique, Uniquable(..),
+
+        -- ** Constructors, desctructors and operations on 'Unique's
+        hasKey,
 
-	pprUnique, 
+        pprUnique,
 
-	mkUniqueGrimily,		-- Used in UniqSupply only!
-        getKey, getKeyFastInt,		-- Used in Var, UniqFM, Name only!
+        mkUniqueGrimily,                -- Used in UniqSupply only!
+        getKey, getKeyFastInt,          -- Used in Var, UniqFM, Name only!
         mkUnique, unpkUnique,           -- Used in BinIface only
 
-	incrUnique,			-- Used for renumbering
-	deriveUnique,			-- Ditto
-	newTagUnique,			-- Used in CgCase
-	initTyVarUnique,
+        incrUnique,                     -- Used for renumbering
+        deriveUnique,                   -- Ditto
+        newTagUnique,                   -- Used in CgCase
+        initTyVarUnique,
 
-	-- ** Making built-in uniques
+        -- ** Making built-in uniques
 
-	-- now all the built-in Uniques (and functions to make them)
-	-- [the Oh-So-Wonderful Haskell module system wins again...]
-	mkAlphaTyVarUnique,
-	mkPrimOpIdUnique,
-	mkTupleTyConUnique, mkTupleDataConUnique,
-	mkPreludeMiscIdUnique, mkPreludeDataConUnique,
-	mkPreludeTyConUnique, mkPreludeClassUnique,
-	mkPArrDataConUnique,
+        -- now all the built-in Uniques (and functions to make them)
+        -- [the Oh-So-Wonderful Haskell module system wins again...]
+        mkAlphaTyVarUnique,
+        mkPrimOpIdUnique,
+        mkTupleTyConUnique, mkTupleDataConUnique,
+        mkPreludeMiscIdUnique, mkPreludeDataConUnique,
+        mkPreludeTyConUnique, mkPreludeClassUnique,
+        mkPArrDataConUnique,
 
     mkVarOccUnique, mkDataOccUnique, mkTvOccUnique, mkTcOccUnique,
         mkRegSingleUnique, mkRegPairUnique, mkRegClassUnique, mkRegSubUnique,
         mkCostCentreUnique,
 
-	mkBuiltinUnique,
+        mkBuiltinUnique,
         mkPseudoUniqueD,
-	mkPseudoUniqueE,
-	mkPseudoUniqueH
+        mkPseudoUniqueE,
+        mkPseudoUniqueH
     ) where
 
 #include "HsVersions.h"
@@ -79,13 +72,13 @@ import GHC.Exts (indexCharOffAddr#, Char(..))
 #else
 import Data.Array
 #endif
-import Data.Char	( chr, ord )
+import Data.Char        ( chr, ord )
 \end{code}
 
 %************************************************************************
-%*									*
+%*                                                                      *
 \subsection[Unique-type]{@Unique@ type and operations}
-%*									*
+%*                                                                      *
 %************************************************************************
 
 The @Chars@ are ``tag letters'' that identify the @UniqueSupply@.
@@ -104,15 +97,15 @@ Now come the functions which construct uniques from their pieces, and vice versa
 The stuff about unique *supplies* is handled further down this module.
 
 \begin{code}
-unpkUnique	:: Unique -> (Char, Int)	-- The reverse
+unpkUnique      :: Unique -> (Char, Int)        -- The reverse
 
-mkUniqueGrimily :: Int -> Unique		-- A trap-door for UniqSupply
-getKey		:: Unique -> Int		-- for Var
-getKeyFastInt	:: Unique -> FastInt		-- for Var
+mkUniqueGrimily :: Int -> Unique                -- A trap-door for UniqSupply
+getKey          :: Unique -> Int                -- for Var
+getKeyFastInt   :: Unique -> FastInt            -- for Var
 
-incrUnique	:: Unique -> Unique
-deriveUnique	:: Unique -> Int -> Unique
-newTagUnique	:: Unique -> Char -> Unique
+incrUnique      :: Unique -> Unique
+deriveUnique    :: Unique -> Int -> Unique
+newTagUnique    :: Unique -> Char -> Unique
 \end{code}
 
 
@@ -139,8 +132,8 @@ newTagUnique u c = mkUnique c i where (_,i) = unpkUnique u
 
 -- and as long as the Char fits in 8 bits, which we assume anyway!
 
-mkUnique :: Char -> Int -> Unique	-- Builds a unique from pieces
--- NOT EXPORTED, so that we can see all the Chars that 
+mkUnique :: Char -> Int -> Unique       -- Builds a unique from pieces
+-- NOT EXPORTED, so that we can see all the Chars that
 --               are used in this one module
 mkUnique c i
   = MkUnique (tag `bitOrFastInt` bits)
@@ -150,10 +143,10 @@ mkUnique c i
 
 unpkUnique (MkUnique u)
   = let
-	-- as long as the Char may have its eighth bit set, we
-	-- really do need the logical right-shift here!
-	tag = cBox (fastChr (u `shiftRLFastInt` _ILIT(24)))
-	i   = iBox (u `bitAndFastInt` _ILIT(16777215){-``0x00ffffff''-})
+        -- as long as the Char may have its eighth bit set, we
+        -- really do need the logical right-shift here!
+        tag = cBox (fastChr (u `shiftRLFastInt` _ILIT(24)))
+        i   = iBox (u `bitAndFastInt` _ILIT(16777215){-``0x00ffffff''-})
     in
     (tag, i)
 \end{code}
@@ -161,9 +154,9 @@ unpkUnique (MkUnique u)
 
 
 %************************************************************************
-%*									*
+%*                                                                      *
 \subsection[Uniquable-class]{The @Uniquable@ class}
-%*									*
+%*                                                                      *
 %************************************************************************
 
 \begin{code}
@@ -171,8 +164,8 @@ unpkUnique (MkUnique u)
 class Uniquable a where
     getUnique :: a -> Unique
 
-hasKey		:: Uniquable a => a -> Unique -> Bool
-x `hasKey` k	= getUnique x == k
+hasKey          :: Uniquable a => a -> Unique -> Bool
+x `hasKey` k    = getUnique x == k
 
 instance Uniquable FastString where
  getUnique fs = mkUniqueGrimily (iBox (uniqueOfFS fs))
@@ -183,9 +176,9 @@ instance Uniquable Int where
 
 
 %************************************************************************
-%*									*
+%*                                                                      *
 \subsection[Unique-instances]{Instance declarations for @Unique@}
-%*									*
+%*                                                                      *
 %************************************************************************
 
 And the whole point (besides uniqueness) is fast equality.  We don't
@@ -243,9 +236,9 @@ instance Show Unique where
 \end{code}
 
 %************************************************************************
-%*									*
+%*                                                                      *
 \subsection[Utils-base62]{Base-62 numbers}
-%*									*
+%*                                                                      *
 %************************************************************************
 
 A character-stingy way to read/write numbers (notably Uniques).
@@ -258,12 +251,12 @@ iToBase62 n_
   = ASSERT(n_ >= 0) go (iUnbox n_) ""
   where
     go n cs | n <# _ILIT(62)
-	     = case chooseChar62 n of { c -> c `seq` (c : cs) }
-	     | otherwise
-	     =	case (quotRem (iBox n) 62) of { (q_, r_) ->
+             = case chooseChar62 n of { c -> c `seq` (c : cs) }
+             | otherwise
+             =  case (quotRem (iBox n) 62) of { (q_, r_) ->
                 case iUnbox q_ of { q -> case iUnbox r_ of { r ->
-		case (chooseChar62 r) of { c -> c `seq`
-		(go q (c : cs)) }}}}
+                case (chooseChar62 r) of { c -> c `seq`
+                (go q (c : cs)) }}}}
 
     chooseChar62 :: FastInt -> Char
     {-# INLINE chooseChar62 #-}
@@ -279,29 +272,29 @@ iToBase62 n_
 \end{code}
 
 %************************************************************************
-%*									*
+%*                                                                      *
 \subsection[Uniques-prelude]{@Uniques@ for wired-in Prelude things}
-%*									*
+%*                                                                      *
 %************************************************************************
 
 Allocation of unique supply characters:
-	v,t,u : for renumbering value-, type- and usage- vars.
-	B:   builtin
-	C-E: pseudo uniques	(used in native-code generator)
-	X:   uniques derived by deriveUnique
-	_:   unifiable tyvars   (above)
-	0-9: prelude things below
-	     (no numbers left any more..)
-	::   (prelude) parallel array data constructors
-
-	other a-z: lower case chars for unique supplies.  Used so far:
-
-	d	desugarer
-	f	AbsC flattener
-	g	SimplStg
-	n	Native codegen
-	r	Hsc name cache
-	s	simplifier
+        v,t,u : for renumbering value-, type- and usage- vars.
+        B:   builtin
+        C-E: pseudo uniques     (used in native-code generator)
+        X:   uniques derived by deriveUnique
+        _:   unifiable tyvars   (above)
+        0-9: prelude things below
+             (no numbers left any more..)
+        ::   (prelude) parallel array data constructors
+
+        other a-z: lower case chars for unique supplies.  Used so far:
+
+        d       desugarer
+        f       AbsC flattener
+        g       SimplStg
+        n       Native codegen
+        r       Hsc name cache
+        s       simplifier
 
 \begin{code}
 mkAlphaTyVarUnique     :: Int -> Unique
@@ -322,10 +315,10 @@ mkPreludeClassUnique i          = mkUnique '2' i
 -- The first is for the tycon itself; the latter two
 -- are for the generic to/from Ids.  See TysWiredIn.mk_tc_gen_info.
 
-mkPreludeTyConUnique i		= mkUnique '3' (3*i)
-mkTupleTyConUnique BoxedTuple   a	= mkUnique '4' (3*a)
-mkTupleTyConUnique UnboxedTuple a	= mkUnique '5' (3*a)
-mkTupleTyConUnique ConstraintTuple a	= mkUnique 'k' (3*a)
+mkPreludeTyConUnique i          = mkUnique '3' (3*i)
+mkTupleTyConUnique BoxedTuple   a       = mkUnique '4' (3*a)
+mkTupleTyConUnique UnboxedTuple a       = mkUnique '5' (3*a)
+mkTupleTyConUnique ConstraintTuple a    = mkUnique 'k' (3*a)
 
 -- Data constructor keys occupy *two* slots.  The first is used for the
 -- data constructor itself and its wrapper function (the function that
@@ -333,16 +326,16 @@ mkTupleTyConUnique ConstraintTuple a	= mkUnique 'k' (3*a)
 -- used for the worker function (the function that builds the constructor
 -- representation).
 
-mkPreludeDataConUnique i	= mkUnique '6' (2*i)	-- Must be alphabetic
-mkTupleDataConUnique BoxedTuple   a = mkUnique '7' (2*a)	-- ditto (*may* be used in C labels)
+mkPreludeDataConUnique i        = mkUnique '6' (2*i)    -- Must be alphabetic
+mkTupleDataConUnique BoxedTuple   a = mkUnique '7' (2*a)        -- ditto (*may* be used in C labels)
 mkTupleDataConUnique UnboxedTuple    a = mkUnique '8' (2*a)
 mkTupleDataConUnique ConstraintTuple a = mkUnique 'h' (2*a)
 
 mkPrimOpIdUnique op         = mkUnique '9' op
 mkPreludeMiscIdUnique  i    = mkUnique '0' i
 
--- No numbers left anymore, so I pick something different for the character tag 
-mkPArrDataConUnique a	        = mkUnique ':' (2*a)
+-- No numbers left anymore, so I pick something different for the character tag
+mkPArrDataConUnique a           = mkUnique ':' (2*a)
 
 -- The "tyvar uniques" print specially nicely: a, b, c, etc.
 -- See pprUnique for details
@@ -371,7 +364,7 @@ mkVarOccUnique, mkDataOccUnique, mkTvOccUnique, mkTcOccUnique :: FastString -> U
 -- See Note [The Unique of an OccName] in OccName
 mkVarOccUnique  fs = mkUnique 'i' (iBox (uniqueOfFS fs))
 mkDataOccUnique fs = mkUnique 'd' (iBox (uniqueOfFS fs))
-mkTvOccUnique 	fs = mkUnique 'v' (iBox (uniqueOfFS fs))
-mkTcOccUnique 	fs = mkUnique 'c' (iBox (uniqueOfFS fs))
+mkTvOccUnique   fs = mkUnique 'v' (iBox (uniqueOfFS fs))
+mkTcOccUnique   fs = mkUnique 'c' (iBox (uniqueOfFS fs))
 \end{code}
 

compiler/cmm/BlockId.hs

 {- BlockId module should probably go away completely, being superseded by Label -}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module BlockId
   ( BlockId, mkBlockId -- ToDo: BlockId should be abstract, but it isn't yet
   , BlockSet, BlockEnv

compiler/cmm/Cmm.hs

 -- Cmm representations using Hoopl's Graph CmmNode e x.
 {-# LANGUAGE GADTs #-}
 {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#if __GLASGOW_HASKELL__ >= 703
--- GHC 7.0.1 improved incomplete pattern warnings with GADTs
-{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
-#endif
 
 module Cmm (
      -- * Cmm top-level datatypes

compiler/cmm/CmmBuildInfoTables.hs

@@ -48,11 +48,7 @@ import qualified Data.Set as Set
 import Control.Monad
 
 foldSet :: (a -> b -> b) -> b -> Set a -> b
-#if __GLASGOW_HASKELL__ < 704
-foldSet = Set.fold
-#else
 foldSet = Set.foldr
-#endif
 
 ----------------------------------------------------------------
 -- Building InfoTables

compiler/cmm/CmmLayoutStack.hs

 {-# LANGUAGE RecordWildCards, GADTs #-}
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#endif
 module CmmLayoutStack (
        cmmLayoutStack, setInfoTableStackMap
   ) where

compiler/cmm/CmmLint.hs

@@ -6,9 +6,6 @@
 --
 -----------------------------------------------------------------------------
 {-# LANGUAGE GADTs #-}
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#endif
 module CmmLint (
     cmmLint, cmmLintGraph
   ) where

compiler/cmm/CmmNode.hs

@@ -8,12 +8,6 @@
 --     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
 -- for details
 
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#if __GLASGOW_HASKELL__ >= 703
--- GHC 7.0.1 improved incomplete pattern warnings with GADTs
-{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
-#endif
-
 module CmmNode (
      CmmNode(..), ForeignHint(..), CmmFormal, CmmActual,
      UpdFrameOffset, Convention(..), ForeignConvention(..), ForeignTarget(..),

compiler/cmm/CmmProcPoint.hs

 {-# LANGUAGE GADTs, DisambiguateRecordFields #-}
 {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#endif
 
 module CmmProcPoint
     ( ProcPointSet, Status(..)

compiler/cmm/CmmUtils.hs

@@ -8,11 +8,6 @@
 
 {-# OPTIONS_GHC -fno-warn-deprecations #-}
 -- Warnings from deprecated blockToNodeList
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#if __GLASGOW_HASKELL__ >= 703
--- GHC 7.0.1 improved incomplete pattern warnings with GADTs
-{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
-#endif
 
 
 -----------------------------------------------------------------------------

compiler/cmm/Hoopl.hs

-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-duplicate-exports #-}
-#endif
 module Hoopl (
     module Compiler.Hoopl,
     module Hoopl.Dataflow,

compiler/cmm/Hoopl/Dataflow.hs

@@ -10,15 +10,8 @@
 --
 
 {-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, MultiParamTypeClasses #-}
-#if __GLASGOW_HASKELL__ >= 703
 {-# OPTIONS_GHC -fprof-auto-top #-}
-#endif
-#if __GLASGOW_HASKELL__ >= 701
 {-# LANGUAGE Trustworthy #-}
-#endif
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#endif
 
 module Hoopl.Dataflow
   ( DataflowLattice(..), OldFact(..), NewFact(..), Fact, mkFactBase

compiler/cmm/OldPprCmm.hs

@@ -32,6 +32,7 @@
 -- A useful example pass over Cmm is in nativeGen/MachCodeGen.hs
 --
 
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module OldPprCmm (
         pprStmt,
         module PprCmmDecl,

compiler/cmm/PprCmm.hs

@@ -30,6 +30,7 @@
 --
 -- A useful example pass over Cmm is in nativeGen/MachCodeGen.hs
 
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE GADTs, TypeFamilies, FlexibleContexts #-}
 module PprCmm
   ( module PprCmmDecl

compiler/cmm/PprCmmDecl.hs

@@ -32,6 +32,7 @@
 -- A useful example pass over Cmm is in nativeGen/MachCodeGen.hs
 --
 
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module PprCmmDecl
     ( writeCmms, pprCmms, pprCmmGroup, pprSection, pprStatic
     )

compiler/cmm/PprCmmExpr.hs

@@ -32,6 +32,7 @@
 -- A useful example pass over Cmm is in nativeGen/MachCodeGen.hs
 --
 
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module PprCmmExpr
     ( pprExpr, pprLit
     , pprExpr9 {-only to import in OldPprCmm. When it dies, remove the export -}

compiler/codeGen/CgCon.lhs

@@ -119,9 +119,10 @@ buildDynCon :: Id                 -- Name of the thing to which this constr will
             -> FCode CgIdInfo     -- Return details about how to find it
 buildDynCon binder ccs con args
     = do dflags <- getDynFlags
-         buildDynCon' (targetPlatform dflags) binder ccs con args
+         buildDynCon' dflags (targetPlatform dflags) binder ccs con args
 
-buildDynCon' :: Platform
+buildDynCon' :: DynFlags
+             -> Platform
              -> Id
              -> CostCentreStack
              -> DataCon
@@ -148,7 +149,7 @@ which have exclusively size-zero (VoidRep) args, we generate no code
 at all.
 
 \begin{code}
-buildDynCon' _ binder _ con []
+buildDynCon' _ _ binder _ con []
   = returnFC (taggedStableIdInfo binder
                            (mkLblExpr (mkClosureLabel (dataConName con)
                                       (idCafInfo binder)))
@@ -183,9 +184,9 @@ because they don't support cross package data references well.
 \begin{code}
 
 
-buildDynCon' platform binder _ con [arg_amode]
+buildDynCon' dflags platform binder _ con [arg_amode]
   | maybeIntLikeCon con
-  , platformOS platform /= OSMinGW32 || not opt_PIC
+  , platformOS platform /= OSMinGW32 || not (dopt Opt_PIC dflags)
   , (_, CmmLit (CmmInt val _)) <- arg_amode
   , let val_int = (fromIntegral val) :: Int
   , val_int <= mAX_INTLIKE && val_int >= mIN_INTLIKE
@@ -195,9 +196,9 @@ buildDynCon' platform binder _ con [arg_amode]
               intlike_amode = CmmLit (cmmLabelOffW intlike_lbl offsetW)
         ; returnFC (taggedStableIdInfo binder intlike_amode (mkConLFInfo con) con) }
 
-buildDynCon' platform binder _ con [arg_amode]
+buildDynCon' dflags platform binder _ con [arg_amode]
   | maybeCharLikeCon con
-  , platformOS platform /= OSMinGW32 || not opt_PIC
+  , platformOS platform /= OSMinGW32 || not (dopt Opt_PIC dflags)
   , (_, CmmLit (CmmInt val _)) <- arg_amode
   , let val_int = (fromIntegral val) :: Int
   , val_int <= mAX_CHARLIKE && val_int >= mIN_CHARLIKE
@@ -212,7 +213,7 @@ buildDynCon' platform binder _ con [arg_amode]
 Now the general case.
 
 \begin{code}
-buildDynCon' _ binder ccs con args
+buildDynCon' _ _ binder ccs con args
   = do  {
         ; let
             (closure_info, amodes_w_offsets) = layOutDynConstr con args

compiler/codeGen/CgUtils.hs

@@ -92,8 +92,7 @@ addIdReps ids = [(idCgRep id, id) | id <- ids]
 -------------------------------------------------------------------------
 
 cgLit :: Literal -> FCode CmmLit
-cgLit (MachStr s) = newByteStringCLit (bytesFS s)
- -- not unpackFS; we want the UTF-8 byte stream.
+cgLit (MachStr s) = newByteStringCLit (bytesFB s)
 cgLit other_lit   = return (mkSimpleLit other_lit)
 
 mkSimpleLit :: Literal -> CmmLit

compiler/codeGen/StgCmmCon.hs

@@ -40,7 +40,6 @@ import Literal
 import PrelInfo
 import Outputable
 import Platform
-import StaticFlags
 import Util