From f63bc730c7ea42ca6882f8078eb86be8bf1cc6ad Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Tue, 19 Sep 2017 14:35:36 -0400 Subject: compiler: introduce custom "GhcPrelude" Prelude This switches the compiler/ component to get compiled with -XNoImplicitPrelude and a `import GhcPrelude` is inserted in all modules. This is motivated by the upcoming "Prelude" re-export of `Semigroup((<>))` which would cause lots of name clashes in every modulewhich imports also `Outputable` Reviewers: austin, goldfire, bgamari, alanz, simonmar Reviewed By: bgamari Subscribers: goldfire, rwbarton, thomie, mpickering, bgamari Differential Revision: https://phabricator.haskell.org/D3989 --- compiler/cmm/CmmNode.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/cmm/CmmNode.hs') diff --git a/compiler/cmm/CmmNode.hs b/compiler/cmm/CmmNode.hs index f452b0b3f5..286b1e306c 100644 --- a/compiler/cmm/CmmNode.hs +++ b/compiler/cmm/CmmNode.hs @@ -22,6 +22,8 @@ module CmmNode ( CmmTickScope(..), isTickSubScope, combineTickScopes, ) where +import GhcPrelude hiding (succ) + import CodeGen.Platform import CmmExpr import CmmSwitch @@ -38,7 +40,6 @@ import Hoopl.Graph import Hoopl.Label import Data.Maybe import Data.List (tails,sortBy) -import Prelude hiding (succ) import Unique (nonDetCmpUnique) import Util -- cgit v1.2.1