diff options
author | Michael Sloan <mgsloan@gmail.com> | 2019-03-14 16:01:44 -0700 |
---|---|---|
committer | Ben Gamari <ben@well-typed.com> | 2019-06-03 23:42:46 -0400 |
commit | 3be420327adda2236d5c4f5c3a8cec8c572ed93c (patch) | |
tree | d8a9d853e7d4d9fe94732281fd27d7c3717faf30 | |
parent | 7258f41bdf8c6a981cb64452d83ac9bdd9b9e38e (diff) | |
download | haskell-3be420327adda2236d5c4f5c3a8cec8c572ed93c.tar.gz |
Remove unnecessary uses of UnboxedTuples pragma (see #13101 / #15454)
Also removes a couple unnecessary MagicHash pragmas
(cherry picked from commit 061276ea5d265eb3c23a3698f0a10f6a764ff4b4)
-rw-r--r-- | compiler/codeGen/StgCmmMonad.hs | 2 | ||||
-rw-r--r-- | compiler/ghci/ByteCodeLink.hs | 1 | ||||
-rw-r--r-- | compiler/ghci/RtClosureInspect.hs | 2 | ||||
-rw-r--r-- | compiler/main/InteractiveEval.hs | 2 | ||||
-rw-r--r-- | compiler/utils/Binary.hs | 2 | ||||
-rw-r--r-- | ghc/GHCi/UI/Monad.hs | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs index 9ddd8a3985..e856cd12f3 100644 --- a/compiler/codeGen/StgCmmMonad.hs +++ b/compiler/codeGen/StgCmmMonad.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE GADTs, UnboxedTuples #-} +{-# LANGUAGE GADTs #-} ----------------------------------------------------------------------------- -- diff --git a/compiler/ghci/ByteCodeLink.hs b/compiler/ghci/ByteCodeLink.hs index 9a5fb39e6d..f2a368ba5c 100644 --- a/compiler/ghci/ByteCodeLink.hs +++ b/compiler/ghci/ByteCodeLink.hs @@ -3,7 +3,6 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MagicHash #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE UnboxedTuples #-} {-# OPTIONS_GHC -optc-DNON_POSIX_SOURCE #-} -- -- (c) The University of Glasgow 2002-2006 diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs index 4a119a991b..b11b3efd0d 100644 --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE BangPatterns, CPP, ScopedTypeVariables, MagicHash, UnboxedTuples #-} +{-# LANGUAGE BangPatterns, CPP, ScopedTypeVariables, MagicHash #-} ----------------------------------------------------------------------------- -- diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs index 79e64b3ad9..325a06c49b 100644 --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, MagicHash, NondecreasingIndentation, UnboxedTuples, +{-# LANGUAGE CPP, MagicHash, NondecreasingIndentation, RecordWildCards, BangPatterns #-} -- ----------------------------------------------------------------------------- diff --git a/compiler/utils/Binary.hs b/compiler/utils/Binary.hs index ad1970797b..294eaf06a7 100644 --- a/compiler/utils/Binary.hs +++ b/compiler/utils/Binary.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, MagicHash, UnboxedTuples #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE ScopedTypeVariables #-} diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs index 8f60dfbb7e..69d317f47c 100644 --- a/ghc/GHCi/UI/Monad.hs +++ b/ghc/GHCi/UI/Monad.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, FlexibleInstances, UnboxedTuples, MagicHash #-} +{-# LANGUAGE CPP, FlexibleInstances #-} {-# OPTIONS_GHC -fno-cse -fno-warn-orphans #-} -- -fno-cse is needed for GLOBAL_VAR's to behave properly |