diff options
Diffstat (limited to 'testsuite')
121 files changed, 206 insertions, 276 deletions
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index e20a8329d7..13e22d5329 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -139,6 +139,9 @@ class TestConfig: # Is readelf available? self.have_readelf = False + # Do we use a fast backend for bignum (e.g. GMP) + self.have_fast_bignum = True + # Are we testing an in-tree compiler? self.in_tree_compiler = True diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 95b0983ba0..bce6c1be0f 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -563,11 +563,11 @@ def have_gdb( ) -> bool: def have_readelf( ) -> bool: return config.have_readelf -def integer_gmp( ) -> bool: - return have_library("integer-gmp") +def have_fast_bignum( ) -> bool: + return config.have_fast_bignum -def integer_simple( ) -> bool: - return have_library("integer-simple") +def have_slow_bignum( ) -> bool: + return not(have_fast_bignum()) def llvm_build ( ) -> bool: return config.ghc_built_by_llvm @@ -2143,11 +2143,11 @@ def normalise_errmsg(s: str) -> str: # collisions, so we need to normalise that to just "ghc" s = re.sub('ghc-stage[123]', 'ghc', s) - # Error messages sometimes contain integer implementation package - s = re.sub('integer-(gmp|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', s) + # Error messages sometimes contain ghc-bignum implementation package + s = re.sub('ghc-bignum-[0-9.]+', 'ghc-bignum-<VERSION>', s) # Error messages sometimes contain this blurb which can vary - # spuriously depending upon build configuration (e.g. based on integer + # spuriously depending upon build configuration (e.g. based on bignum # backend) s = re.sub('...plus ([a-z]+|[0-9]+) instances involving out-of-scope types', '...plus N instances involving out-of-scope types', s) diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 6e6def19ab..cb4b3747f5 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -100,6 +100,10 @@ HAVE_PROFILING := $(shell if [ -f $(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrap HAVE_GDB := $(shell if gdb --version > /dev/null 2> /dev/null; then echo YES; else echo NO; fi) HAVE_READELF := $(shell if readelf --version > /dev/null 2> /dev/null; then echo YES; else echo NO; fi) +# we need a better way to find which backend is selected and if --check flag is +# used +BIGNUM_GMP := $(shell "$(GHC_PKG)" field ghc-bignum exposed-modules | grep GMP) + ifeq "$(HAVE_VANILLA)" "YES" RUNTEST_OPTS += -e config.have_vanilla=True else @@ -156,6 +160,12 @@ else RUNTEST_OPTS += -e config.have_readelf=False endif +ifeq "$(BIGNUM_GMP)" "" +RUNTEST_OPTS += -e config.have_fast_bignum=False +else +RUNTEST_OPTS += -e config.have_fast_bignum=True +endif + ifeq "$(GhcDynamicByDefault)" "YES" RUNTEST_OPTS += -e config.ghc_dynamic_by_default=True CABAL_MINIMAL_BUILD = --enable-shared --disable-library-vanilla diff --git a/testsuite/tests/ado/T13242a.stderr b/testsuite/tests/ado/T13242a.stderr index 5e6bc9899d..eb2bf062ca 100644 --- a/testsuite/tests/ado/T13242a.stderr +++ b/testsuite/tests/ado/T13242a.stderr @@ -27,11 +27,10 @@ T13242a.hs:13:13: error: Probable fix: use a type annotation to specify what ‘a0’ should be. These potential instances exist: instance Eq Ordering -- Defined in ‘GHC.Classes’ - instance Eq Integer - -- Defined in ‘integer-gmp-1.0.3.0:GHC.Integer.Type’ + instance Eq Integer -- Defined in ‘GHC.Num.Integer’ instance Eq () -- Defined in ‘GHC.Classes’ ...plus 21 others - ...plus six instances involving out-of-scope types + ...plus five instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of a 'do' block: return (x == x) In the expression: diff --git a/testsuite/tests/ado/ado004.stderr b/testsuite/tests/ado/ado004.stderr index 2ac9b26388..459c9cf359 100644 --- a/testsuite/tests/ado/ado004.stderr +++ b/testsuite/tests/ado/ado004.stderr @@ -42,5 +42,4 @@ TYPE SIGNATURES (Monad m, Num (m a)) => (m a -> m (m a)) -> p -> m a Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/ado/all.T b/testsuite/tests/ado/all.T index f564f365eb..8c07539965 100644 --- a/testsuite/tests/ado/all.T +++ b/testsuite/tests/ado/all.T @@ -1,7 +1,7 @@ test('ado001', normal, compile_and_run, ['']) test('ado002', normal, compile_fail, ['']) test('ado003', normal, compile_fail, ['']) -test('ado004', normalise_version('base','ghc-prim','integer-gmp'), compile, ['']) +test('ado004', normalise_version('base','ghc-prim','ghc-bignum'), compile, ['']) test('ado005', normal, compile_fail, ['']) test('ado006', normal, compile, ['']) test('ado007', normal, compile, ['']) diff --git a/testsuite/tests/annotations/should_fail/annfail10.stderr b/testsuite/tests/annotations/should_fail/annfail10.stderr index d29a861566..66394e52d3 100644 --- a/testsuite/tests/annotations/should_fail/annfail10.stderr +++ b/testsuite/tests/annotations/should_fail/annfail10.stderr @@ -8,7 +8,8 @@ annfail10.hs:9:1: error: Data.Data.Data (Either a b) -- Defined in ‘Data.Data’ instance Data.Data.Data Ordering -- Defined in ‘Data.Data’ - instance Data.Data.Data Integer -- Defined in ‘Data.Data’ + instance Data.Data.Data a => Data.Data.Data (Maybe a) + -- Defined in ‘Data.Data’ ...plus 15 others ...plus 47 instances involving out-of-scope types (use -fprint-potential-instances to see them all) diff --git a/testsuite/tests/callarity/unittest/CallArity1.hs b/testsuite/tests/callarity/unittest/CallArity1.hs index 55427ff4b7..843d3d16c5 100644 --- a/testsuite/tests/callarity/unittest/CallArity1.hs +++ b/testsuite/tests/callarity/unittest/CallArity1.hs @@ -204,7 +204,7 @@ mkRFun :: Id -> [Id] -> CoreExpr -> CoreExpr -> CoreExpr mkRFun v xs rhs body = mkRLet v (mkLams xs rhs) body mkLit :: Integer -> CoreExpr -mkLit i = Lit (mkLitInteger i intTy) +mkLit i = mkUncheckedIntExpr i -- Collects all let-bound IDs allBoundIds :: CoreExpr -> VarSet diff --git a/testsuite/tests/dependent/should_compile/T14729.stderr b/testsuite/tests/dependent/should_compile/T14729.stderr index 4c31287941..2a14dd8b9c 100644 --- a/testsuite/tests/dependent/should_compile/T14729.stderr +++ b/testsuite/tests/dependent/should_compile/T14729.stderr @@ -11,5 +11,4 @@ COERCION AXIOMS FAMILY INSTANCES type instance F Int = Bool -- Defined at T14729.hs:10:15 Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/dependent/should_compile/T15743.stderr b/testsuite/tests/dependent/should_compile/T15743.stderr index acdb531ba8..54d691c409 100644 --- a/testsuite/tests/dependent/should_compile/T15743.stderr +++ b/testsuite/tests/dependent/should_compile/T15743.stderr @@ -3,5 +3,4 @@ TYPE CONSTRUCTORS forall {k1} k2 (k3 :: k2). Proxy k3 -> k1 -> k2 -> * roles nominal nominal nominal phantom phantom phantom Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/dependent/should_compile/T15743e.stderr b/testsuite/tests/dependent/should_compile/T15743e.stderr index 524b4831ef..23bab0712d 100644 --- a/testsuite/tests/dependent/should_compile/T15743e.stderr +++ b/testsuite/tests/dependent/should_compile/T15743e.stderr @@ -52,5 +52,4 @@ DATA CONSTRUCTORS (d :: Proxy k5) (e :: Proxy k7). f c -> T k8 a b f c d e Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/determinism/determ021/determ021.stdout b/testsuite/tests/determinism/determ021/determ021.stdout index cf171149db..1146157101 100644 --- a/testsuite/tests/determinism/determ021/determ021.stdout +++ b/testsuite/tests/determinism/determ021/determ021.stdout @@ -5,8 +5,7 @@ TYPE SIGNATURES (Applicative f, Num t, Num b) => (t -> f b) -> f b Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] [1 of 1] Compiling A ( A.hs, A.o ) TYPE SIGNATURES test2 :: @@ -14,5 +13,4 @@ TYPE SIGNATURES (Applicative f, Num t, Num b) => (t -> f b) -> f b Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/driver/json2.stderr b/testsuite/tests/driver/json2.stderr index 544cb6338f..129a4b8a92 100644 --- a/testsuite/tests/driver/json2.stderr +++ b/testsuite/tests/driver/json2.stderr @@ -1 +1 @@ -{"span": null,"doc": "TYPE SIGNATURES\n foo :: forall a. a -> a\nDependent modules: []\nDependent packages: [base-4.13.0.0, ghc-prim-0.6.1,\n integer-gmp-1.0.2.0]","severity": "SevOutput","reason": null} +{"span": null,"doc": "TYPE SIGNATURES\n foo :: forall a. a -> a\nDependent modules: []\nDependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1]","severity": "SevOutput","reason": null} diff --git a/testsuite/tests/ghci.debugger/scripts/all.T b/testsuite/tests/ghci.debugger/scripts/all.T index 12fe420363..aa998adef2 100644 --- a/testsuite/tests/ghci.debugger/scripts/all.T +++ b/testsuite/tests/ghci.debugger/scripts/all.T @@ -45,7 +45,7 @@ test('print033', normal, ghci_script, ['print033.script']) test('print034', extra_files(['../GADT.hs', '../Test.hs']), ghci_script, ['print034.script']) test('print035', extra_files(['../Unboxed.hs']), ghci_script, ['print035.script']) test('print036', expect_broken(9046), ghci_script, ['print036.script']) -test('print037', when(llvm_build() and integer_gmp(), +test('print037', when(llvm_build(), fragile_for(16205, ['ghci-ext'])) , ghci_script , ['print037.script']) diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr index 4622cb53e9..037a834eec 100644 --- a/testsuite/tests/ghci.debugger/scripts/break006.stderr +++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr @@ -6,10 +6,10 @@ Relevant bindings include it :: a (bound at <interactive>:4:1) These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ + instance Show Integer -- Defined in ‘GHC.Show’ ...plus 22 others - ...plus 18 instances involving out-of-scope types + ...plus 12 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it @@ -20,9 +20,9 @@ Relevant bindings include it :: a (bound at <interactive>:6:1) These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ + instance Show Integer -- Defined in ‘GHC.Show’ ...plus 22 others - ...plus 18 instances involving out-of-scope types + ...plus 12 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it diff --git a/testsuite/tests/ghci.debugger/scripts/print002.script b/testsuite/tests/ghci.debugger/scripts/print002.script index 401af2c212..1e56254d94 100644 --- a/testsuite/tests/ghci.debugger/scripts/print002.script +++ b/testsuite/tests/ghci.debugger/scripts/print002.script @@ -5,12 +5,9 @@ let f = Just (1.2::Float) f :p f --- With @integer-gmp@, small integer literals get converted directly into --- @S# 10#@. This optimization means that small integers are always already +-- With @ghc-bignum@, small integer literals get converted directly into +-- @IS 10#@. This optimization means that small integers are always already -- evaluated in the output for @:p@. --- --- Since we want this test to work on @integer-simple@ too, we explicitly --- force the literal. let ten = 10 :: Integer :f ten let i = Just ten diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr index 5815080f6a..189fc91eab 100644 --- a/testsuite/tests/ghci.debugger/scripts/print019.stderr +++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr @@ -7,8 +7,8 @@ These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ instance Show TyCon -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ + instance Show a => Show (List1 a) -- Defined at Test.hs:11:12 ...plus 29 others - ...plus 19 instances involving out-of-scope types + ...plus 13 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it diff --git a/testsuite/tests/ghci.debugger/scripts/print037.script b/testsuite/tests/ghci.debugger/scripts/print037.script index 7bf332c175..3e2a07f359 100644 --- a/testsuite/tests/ghci.debugger/scripts/print037.script +++ b/testsuite/tests/ghci.debugger/scripts/print037.script @@ -1,11 +1,8 @@ -- Test out printing of integers in GHCi --- With @integer-gmp@, small integer literals get converted directly into --- @S# i#@. This optimization means that small integers are always already +-- With @ghc-bignum@, small integer literals get converted directly into +-- @IS i#@. This optimization means that small integers are always already -- evaluated in the output for @:p@. --- --- Since we want this test to work on @integer-simple@ too, we explicitly --- force the literals. let smallNeg = -53 :: Integer :f smallNeg diff --git a/testsuite/tests/indexed-types/should_compile/T15711.stderr b/testsuite/tests/indexed-types/should_compile/T15711.stderr index 98cff51f12..ebca2b6ef7 100644 --- a/testsuite/tests/indexed-types/should_compile/T15711.stderr +++ b/testsuite/tests/indexed-types/should_compile/T15711.stderr @@ -3,5 +3,4 @@ TYPE CONSTRUCTORS associated type family F{2} :: forall a. Maybe a -> * roles nominal nominal Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/indexed-types/should_compile/T15852.stderr b/testsuite/tests/indexed-types/should_compile/T15852.stderr index 5ee0ade4d0..062ff7bda0 100644 --- a/testsuite/tests/indexed-types/should_compile/T15852.stderr +++ b/testsuite/tests/indexed-types/should_compile/T15852.stderr @@ -9,5 +9,4 @@ FAMILY INSTANCES data instance forall {k1} {k2} {j :: k1} {c :: k2}. DF (Proxy c) -- Defined at T15852.hs:10:15 Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr index b6d187b160..e7efd9ef68 100644 --- a/testsuite/tests/indexed-types/should_compile/T3017.stderr +++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr @@ -20,5 +20,4 @@ CLASS INSTANCES FAMILY INSTANCES type instance Elem (ListColl a) = a -- Defined at T3017.hs:13:9 Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/indexed-types/should_fail/T12522a.stderr b/testsuite/tests/indexed-types/should_fail/T12522a.stderr index c51b44f92a..9112a03314 100644 --- a/testsuite/tests/indexed-types/should_fail/T12522a.stderr +++ b/testsuite/tests/indexed-types/should_fail/T12522a.stderr @@ -8,8 +8,8 @@ T12522a.hs:23:26: error: Probable fix: use a type annotation to specify what ‘a0’ should be. These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ + instance Show Integer -- Defined in ‘GHC.Show’ ...plus 22 others ...plus 12 instances involving out-of-scope types (use -fprint-potential-instances to see them all) diff --git a/testsuite/tests/lib/integer/all.T b/testsuite/tests/lib/integer/all.T index 33c5ea172d..3364bea241 100644 --- a/testsuite/tests/lib/integer/all.T +++ b/testsuite/tests/lib/integer/all.T @@ -7,8 +7,9 @@ test('IntegerConversionRules', [], makefile_test, ['IntegerConversionRules']) test('gcdInteger', normal, compile_and_run, ['']) # skip ghci as it doesn't support unboxed tuples -test('integerImportExport', [reqlib('integer-gmp'), omit_ways(['ghci'])], compile_and_run, ['']) -test('integerGcdExt', [reqlib('integer-gmp'), omit_ways(['ghci'])], compile_and_run, ['']) +test('integerImportExport', [omit_ways(['ghci'])], compile_and_run, ['']) -test('integerPowMod', [reqlib('integer-gmp')], compile_and_run, ['']) -test('integerGmpInternals', [reqlib('integer-gmp')], compile_and_run, ['']) +# Disable GMP only tests +#test('integerGcdExt', [omit_ways(['ghci'])], compile_and_run, ['']) +#test('integerPowMod', [], compile_and_run, ['']) +#test('integerGmpInternals', [], compile_and_run, ['']) diff --git a/testsuite/tests/lib/integer/fromToInteger.hs b/testsuite/tests/lib/integer/fromToInteger.hs index c36153864c..0b8cb08eec 100644 --- a/testsuite/tests/lib/integer/fromToInteger.hs +++ b/testsuite/tests/lib/integer/fromToInteger.hs @@ -4,11 +4,11 @@ module Q where import GHC.Exts -import GHC.Integer +import GHC.Num.Integer v :: Int -v = I# (integerToInt (smallInteger 3#)) +v = I# (integerToInt# (IS 3#)) w :: Word -w = W# (integerToWord (wordToInteger 3##)) +w = W# (integerToWord# (integerFromWord# 3##)) diff --git a/testsuite/tests/lib/integer/gcdInteger.hs b/testsuite/tests/lib/integer/gcdInteger.hs index 2e945a876a..e25855c149 100644 --- a/testsuite/tests/lib/integer/gcdInteger.hs +++ b/testsuite/tests/lib/integer/gcdInteger.hs @@ -4,12 +4,12 @@ module Main (main) where import GHC.Base -import GHC.Integer +import GHC.Num.Integer main :: IO () main = case i of I# i# -> - print (gcd (smallInteger i#) (smallInteger i#)) + print (gcd (IS i#) (IS i#)) {-# NOINLINE i #-} i :: Int diff --git a/testsuite/tests/lib/integer/integerGmpInternals.hs b/testsuite/tests/lib/integer/integerGmpInternals.hs index 4d53560107..53a776e13d 100644 --- a/testsuite/tests/lib/integer/integerGmpInternals.hs +++ b/testsuite/tests/lib/integer/integerGmpInternals.hs @@ -9,8 +9,8 @@ import Control.Monad import GHC.Word import GHC.Base -import GHC.Integer.GMP.Internals (Integer(S#,Jp#,Jn#)) -import qualified GHC.Integer.GMP.Internals as I +import GHC.Num.Integer +import qualified GHC.Num.Integer as I recipModInteger :: Integer -> Integer -> Integer recipModInteger = I.recipModInteger diff --git a/testsuite/tests/lib/integer/integerImportExport.hs b/testsuite/tests/lib/integer/integerImportExport.hs index 276167b6b6..bef208afd0 100644 --- a/testsuite/tests/lib/integer/integerImportExport.hs +++ b/testsuite/tests/lib/integer/integerImportExport.hs @@ -10,20 +10,20 @@ import Unsafe.Coerce (unsafeCoerce#) import GHC.Word import GHC.Base -import GHC.Integer.GMP.Internals (Integer(S#,Jp#,Jn#)) -import qualified GHC.Integer.GMP.Internals as I +import GHC.Num.Integer +import qualified GHC.Num.Integer as I exportInteger :: Integer -> MutableByteArray# RealWorld -> Word# -> Int# -> IO Word -exportInteger = I.exportIntegerToMutableByteArray +exportInteger = I.integerToMutableByteArray exportIntegerAddr :: Integer -> Addr# -> Int# -> IO Word -exportIntegerAddr = I.exportIntegerToAddr +exportIntegerAddr = I.integerToAddr importInteger :: ByteArray# -> Word# -> Word# -> Int# -> Integer -importInteger = I.importIntegerFromByteArray +importInteger ba off sz = I.integerFromByteArray sz ba off importIntegerAddr :: Addr# -> Word# -> Int# -> IO Integer -importIntegerAddr a l e = I.importIntegerFromAddr a l e +importIntegerAddr a l = I.integerFromAddr l a -- helpers data MBA = MBA { unMBA :: !(MutableByteArray# RealWorld) } @@ -57,8 +57,8 @@ freezeByteArray arr = IO $ \s -> case unsafeFreezeByteArray# arr s of (# s, arr main :: IO () main = do -- import/export primitives - print $ [ W# (I.sizeInBaseInteger x 2#) | x <- [b1024,b*e,b,e,m,x,y,-1,0,1] ] - print $ [ W# (I.sizeInBaseInteger x 256#) | x <- [b1024,b*e,b,e,m,x,y,-1,0,1] ] + print $ [ W# (I.integerSizeInBase# 2## x) | x <- [b1024,b*e,b,e,m,x,y,-1,0,1] ] + print $ [ W# (I.integerSizeInBase# 256## x) | x <- [b1024,b*e,b,e,m,x,y,-1,0,1] ] BA ba <- do MBA mba <- newByteArray 128## diff --git a/testsuite/tests/lib/integer/integerImportExport.stdout b/testsuite/tests/lib/integer/integerImportExport.stdout index 950d72c90b..19f24d12e0 100644 --- a/testsuite/tests/lib/integer/integerImportExport.stdout +++ b/testsuite/tests/lib/integer/integerImportExport.stdout @@ -1,5 +1,5 @@ -[1024,462,231,231,133,123,125,1,1,1] -[128,58,29,29,17,16,16,1,1,1] +[1024,462,231,231,133,123,125,1,0,1] +[128,58,29,29,17,16,16,1,0,1] 0 0 23 diff --git a/testsuite/tests/llvm/should_compile/all.T b/testsuite/tests/llvm/should_compile/all.T index 070861565b..fedf5ac96c 100644 --- a/testsuite/tests/llvm/should_compile/all.T +++ b/testsuite/tests/llvm/should_compile/all.T @@ -5,7 +5,7 @@ def f( name, opts ): setTestOpts(f) -# test('T5486', reqlib('integer-gmp'), compile, ['']) +# test('T5486', normal, compile, ['']) test('T5681', normal, compile, ['']) test('T6158', [reqlib('vector'), reqlib('primitive')], compile, ['-package vector -package primitive']) test('T7571', cmm_src, compile, ['']) diff --git a/testsuite/tests/numeric/should_compile/T14465.hs b/testsuite/tests/numeric/should_compile/T14465.hs index 314aa89c56..93a3b20020 100644 --- a/testsuite/tests/numeric/should_compile/T14465.hs +++ b/testsuite/tests/numeric/should_compile/T14465.hs @@ -4,7 +4,7 @@ module M where import Numeric.Natural -import GHC.Natural +import GHC.Num.Natural -- test Natural literals one :: Natural @@ -15,7 +15,7 @@ plusOne n = n + 1 -- a built-in rule should convert this unfolding into a Natural literal in Core ten :: Natural -ten = wordToNatural 10 +ten = naturalFromWord 10 -- test basic constant folding for Natural twoTimesTwo :: Natural diff --git a/testsuite/tests/numeric/should_compile/T14465.stdout b/testsuite/tests/numeric/should_compile/T14465.stdout index 1eb5182a6c..579349af47 100644 --- a/testsuite/tests/numeric/should_compile/T14465.stdout +++ b/testsuite/tests/numeric/should_compile/T14465.stdout @@ -1,14 +1,14 @@ ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 39, types: 19, coercions: 0, joins: 0/0} + = {terms: 40, types: 17, coercions: 0, joins: 0/0} --- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} +-- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} ten :: Natural [GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=True, ConLike=True, - WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 100 0}] -ten = 10 + WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 10 20}] +ten = GHC.Num.Natural.NS 10## -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} M.$trModule4 :: GHC.Prim.Addr# @@ -52,19 +52,19 @@ M.minusOne1 :: Natural WorkFree=True, Expandable=True, Guidance=IF_ARGS [] 100 0}] M.minusOne1 = 1 --- RHS size: {terms: 11, types: 6, coercions: 0, joins: 0/0} +-- RHS size: {terms: 11, types: 4, coercions: 0, joins: 0/0} minusOne :: Natural [GblId, Unf=Unf{Src=<vanilla>, TopLvl=True, Value=False, ConLike=False, WorkFree=True, Expandable=False, Guidance=IF_ARGS [] 40 0}] minusOne - = case M.minusOne1 of { - NatS# ds1 -> + = case M.minusOne1 of wild { + NS ds1 -> case ds1 of { - __DEFAULT -> GHC.Natural.underflowError @Natural; - 0## -> GHC.Natural.zero + __DEFAULT -> GHC.Num.$fNumNatural1; + 0## -> wild }; - NatJ# ipv -> GHC.Natural.underflowError @Natural + NB ipv -> GHC.Num.$fNumNatural1 } -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} @@ -78,12 +78,12 @@ twoTimesTwo = 4 plusOne :: Natural -> Natural [GblId, Arity=1, - Str=<S,U>, + Str=<S,1*U>, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False) - Tmpl= \ (n [Occ=Once] :: Natural) -> plusNatural n M.minusOne1}] -plusOne = \ (n :: Natural) -> plusNatural n M.minusOne1 + Tmpl= \ (n [Occ=Once] :: Natural) -> naturalAdd n M.minusOne1}] +plusOne = \ (n :: Natural) -> naturalAdd n M.minusOne1 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} one :: Natural diff --git a/testsuite/tests/numeric/should_compile/all.T b/testsuite/tests/numeric/should_compile/all.T index a0ae051e81..7c39541e5b 100644 --- a/testsuite/tests/numeric/should_compile/all.T +++ b/testsuite/tests/numeric/should_compile/all.T @@ -1,7 +1,6 @@ test('T7116', normal, makefile_test, ['T7116']) -# These test Core output that depends upon integer-gmp test('T14170', normal, makefile_test, ['T14170']) -test('T14465', reqlib("integer-gmp"), makefile_test, ['T14465']) +test('T14465', normal, makefile_test, ['T14465']) test('T7895', normal, compile, ['']) test('T7881', normal, compile, ['']) # For T8542, the hpc way adds extra annotations that prevent diff --git a/testsuite/tests/numeric/should_run/T15301.hs b/testsuite/tests/numeric/should_run/T15301.hs index 6efbce4334..def28ecf8c 100644 --- a/testsuite/tests/numeric/should_run/T15301.hs +++ b/testsuite/tests/numeric/should_run/T15301.hs @@ -1,5 +1,5 @@ import Numeric -import GHC.Natural +import GHC.Num.Natural main = do -- test that GHC correctly compiles big Natural literals diff --git a/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr b/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr index c0d371f7bd..e7b8f6d252 100644 --- a/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr +++ b/testsuite/tests/overloadedlists/should_fail/overloadedlistsfail01.stderr @@ -5,10 +5,10 @@ overloadedlistsfail01.hs:5:8: error: Probable fix: use a type annotation to specify what ‘a0’ should be. These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ + instance Show Integer -- Defined in ‘GHC.Show’ ...plus 22 others - ...plus 13 instances involving out-of-scope types + ...plus 14 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In the expression: print [1] In an equation for ‘main’: main = print [1] @@ -19,7 +19,7 @@ overloadedlistsfail01.hs:5:14: error: Probable fix: use a type annotation to specify what ‘a0’ should be. These potential instances exist: instance GHC.Exts.IsList [a] -- Defined in ‘GHC.Exts’ - ...plus three instances involving out-of-scope types + ...plus four instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In the first argument of ‘print’, namely ‘[1]’ In the expression: print [1] diff --git a/testsuite/tests/partial-sigs/should_compile/ADT.stderr b/testsuite/tests/partial-sigs/should_compile/ADT.stderr index 73224c176b..33aee05341 100644 --- a/testsuite/tests/partial-sigs/should_compile/ADT.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ADT.stderr @@ -5,5 +5,4 @@ TYPE CONSTRUCTORS DATA CONSTRUCTORS Foo :: forall x y z. x -> y -> z -> Foo x y z Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr index d4842d377c..7091bf80a2 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES addAndOr1 :: (Int, Bool) -> (Bool, Int) -> (Int, Bool) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr index fc9f928bea..08c086f529 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES addAndOr2 :: (Int, Bool) -> (Bool, Int) -> (Int, Bool) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr index 2096a595c2..9d3008af50 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES addAndOr3 :: (Int, Bool) -> (Bool, Int) -> (Int, Bool) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr index b197a479bf..bea4f6c675 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES addAndOr4 :: (Int, Bool) -> (Bool, Int) -> (Int, Bool) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr index 367dce11ef..423d643075 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES addAndOr5 :: (Int, Bool) -> (Bool, Int) -> (Int, Bool) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr index c30d26758c..992b37063a 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES addAndOr6 :: (Int, Bool) -> (Bool, Int) -> (Int, Bool) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr b/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr index d4b3c353a7..b2392e6d2c 100644 --- a/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr +++ b/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES bar :: Bool -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr b/testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr index 6672efb7ac..7994687e98 100644 --- a/testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr +++ b/testsuite/tests/partial-sigs/should_compile/DataFamilyInstanceLHS.stderr @@ -15,5 +15,4 @@ DATA CONSTRUCTORS FAMILY INSTANCES data instance Sing _ -- Defined at DataFamilyInstanceLHS.hs:8:15 Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr index 9e5da651c4..c1f5119a03 100644 --- a/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES alpha :: Integer Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr index 441bfa5720..43372ee70d 100644 --- a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES bravo :: forall {w}. Num w => w Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr index 441bfa5720..43372ee70d 100644 --- a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES bravo :: forall {w}. Num w => w Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Either.stderr b/testsuite/tests/partial-sigs/should_compile/Either.stderr index 6e48357b33..f2f1d033af 100644 --- a/testsuite/tests/partial-sigs/should_compile/Either.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Either.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES barry :: forall {w}. w -> (Either String w, Either String w) Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr b/testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr index 1a54be18b4..623a07caaa 100644 --- a/testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr +++ b/testsuite/tests/partial-sigs/should_compile/EqualityConstraint.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: forall a. (a ~ Bool) => (a, Bool) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Every.stderr b/testsuite/tests/partial-sigs/should_compile/Every.stderr index d9f69686e1..6c9c0cdb1b 100644 --- a/testsuite/tests/partial-sigs/should_compile/Every.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Every.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES every :: forall {t}. (t -> Bool) -> [t] -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr index eff1cb3577..32301fdb56 100644 --- a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES every :: forall {w}. (w -> Bool) -> [w] -> Bool Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr b/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr index d4b3c353a7..b2392e6d2c 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES bar :: Bool -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr index d4b3c353a7..b2392e6d2c 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES bar :: Bool -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr index a7a6c9bab3..74e78acf47 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr @@ -5,5 +5,4 @@ TYPE SIGNATURES arbitCs4 :: forall a. (Eq a, Show a, Enum a) => a -> String arbitCs5 :: forall a. (Eq a, Enum a, Show a) => a -> String Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr index 5148ead190..08705b8ec9 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: String Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr index 73b2c3058f..ff953b055e 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr @@ -236,5 +236,4 @@ TYPE SIGNATURES (a -> b -> c -> d) -> [a] -> [b] -> [c] -> [d] (||) :: Bool -> Bool -> Bool Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr index 6f1a644847..7e2c9ba271 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: forall a. Num a => a Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr index 6f1a644847..7e2c9ba271 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROn.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: forall a. Num a => a Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Forall1.stderr b/testsuite/tests/partial-sigs/should_compile/Forall1.stderr index 73d6e8156f..64dbde28fb 100644 --- a/testsuite/tests/partial-sigs/should_compile/Forall1.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Forall1.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES fall :: forall a. a -> a Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr b/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr index d4b3c353a7..b2392e6d2c 100644 --- a/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES bar :: Bool -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr b/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr index ef06c5a898..f3c462822f 100644 --- a/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr +++ b/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: (forall a. [a] -> [a]) -> ([Bool], [Char]) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr b/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr index ef06c5a898..f3c462822f 100644 --- a/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr +++ b/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: (forall a. [a] -> [a]) -> ([Bool], [Char]) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr b/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr index 0d383badc7..edd11a6cab 100644 --- a/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr +++ b/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES monoLoc :: forall a. a -> ((a, String), (a, String)) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr b/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr index 6380befcc2..06caaddac5 100644 --- a/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr @@ -12,5 +12,4 @@ CLASS INSTANCES -- Defined at Meltdown.hs:11:10 instance Monad (NukeMonad a b) -- Defined at Meltdown.hs:15:10 Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr b/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr index 0d383badc7..edd11a6cab 100644 --- a/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr +++ b/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES monoLoc :: forall a. a -> ((a, String), (a, String)) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr b/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr index 9d43415bd0..c77aae875c 100644 --- a/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr +++ b/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: forall b a. (a, b) -> (a, b) Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr b/testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr index df3ebeed4f..3f674ea8f1 100644 --- a/testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr +++ b/testsuite/tests/partial-sigs/should_compile/NamedWildcardInDataFamilyInstanceLHS.stderr @@ -14,5 +14,4 @@ FAMILY INSTANCES data instance Sing _a -- Defined at NamedWildcardInDataFamilyInstanceLHS.hs:8:15 Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr b/testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr index 14d2c8d17c..8fb4718e99 100644 --- a/testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr +++ b/testsuite/tests/partial-sigs/should_compile/NamedWildcardInTypeFamilyInstanceLHS.stderr @@ -4,5 +4,4 @@ TYPE CONSTRUCTORS COERCION AXIOMS axiom NamedWildcardInTypeFamilyInstanceLHS.D:R:F :: F _t = Int Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr b/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr index f0eb80c5d2..d53e270802 100644 --- a/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES f :: forall a. Eq a => a -> a -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/PatBind.stderr b/testsuite/tests/partial-sigs/should_compile/PatBind.stderr index 1f71b4f434..68fa34f1fe 100644 --- a/testsuite/tests/partial-sigs/should_compile/PatBind.stderr +++ b/testsuite/tests/partial-sigs/should_compile/PatBind.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: forall {a}. a -> a Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/PatBind2.stderr b/testsuite/tests/partial-sigs/should_compile/PatBind2.stderr index 24f506f109..396feb25e8 100644 --- a/testsuite/tests/partial-sigs/should_compile/PatBind2.stderr +++ b/testsuite/tests/partial-sigs/should_compile/PatBind2.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: Bool -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr b/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr index d4b3c353a7..b2392e6d2c 100644 --- a/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr +++ b/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES bar :: Bool -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Recursive.stderr b/testsuite/tests/partial-sigs/should_compile/Recursive.stderr index 8a2f80ac10..163b453316 100644 --- a/testsuite/tests/partial-sigs/should_compile/Recursive.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Recursive.stderr @@ -3,5 +3,4 @@ TYPE SIGNATURES g :: Bool orr :: forall a. a -> a -> a Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr index f6dede6081..058a23ac63 100644 --- a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES test3 :: Bool -> Bool Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr index 869f0b9ebe..003a7c3b68 100644 --- a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES foo :: Bool -> Char Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr index 8ca152fd92..57f30231b2 100644 --- a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES showTwo :: forall {a}. Show a => a -> String Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr index 0bb722daf6..1f74a10e85 100644 --- a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES bar :: forall {w}. w -> Bool Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr b/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr index 4a205f9ca5..810c816164 100644 --- a/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr @@ -8,5 +8,4 @@ TYPE CONSTRUCTORS DATA CONSTRUCTORS GenParser :: forall tok st a. tok -> st -> a -> GenParser tok st a Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr b/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr index 6c91a9d418..4a34c3c81d 100644 --- a/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr @@ -1,8 +1,7 @@ TYPE SIGNATURES somethingShowable :: Show Bool => Bool -> String Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] SomethingShowable.hs:5:1: warning: [-Wsimplifiable-class-constraints (in -Wdefault)] • The constraint ‘Show Bool’ matches diff --git a/testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr b/testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr index 2010018e05..2b26ecfe58 100644 --- a/testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr +++ b/testsuite/tests/partial-sigs/should_compile/TypeFamilyInstanceLHS.stderr @@ -12,5 +12,4 @@ FAMILY INSTANCES type instance F Bool _ = Bool -- Defined at TypeFamilyInstanceLHS.hs:8:15 Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr index f83b50d0e7..e3efbbe5a5 100644 --- a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES unc :: forall {w1} {w2} {w3}. (w1 -> w2 -> w3) -> (w1, w2) -> w3 Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr index f83b50d0e7..e3efbbe5a5 100644 --- a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr @@ -1,5 +1,4 @@ TYPE SIGNATURES unc :: forall {w1} {w2} {w3}. (w1 -> w2 -> w3) -> (w1, w2) -> w3 Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr b/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr index fcefb13b71..2badd0d26f 100644 --- a/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr +++ b/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr @@ -2,8 +2,7 @@ TYPE SIGNATURES bar :: forall {t} {w}. t -> (t -> w) -> w foo :: forall {a}. (Show a, Enum a) => a -> String Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] WarningWildcardInstantiations.hs:5:14: warning: [-Wpartial-type-signatures (in -Wdefault)] • Found type wildcard ‘_a’ standing for ‘a’ diff --git a/testsuite/tests/partial-sigs/should_fail/T10999.stderr b/testsuite/tests/partial-sigs/should_fail/T10999.stderr index 6352548bd8..b0697fe60b 100644 --- a/testsuite/tests/partial-sigs/should_fail/T10999.stderr +++ b/testsuite/tests/partial-sigs/should_fail/T10999.stderr @@ -24,10 +24,9 @@ T10999.hs:8:28: error: These potential instances exist: instance Ord a => Ord (Set.Set a) -- Defined in ‘Data.Set.Internal’ instance Ord Ordering -- Defined in ‘GHC.Classes’ - instance Ord Integer - -- Defined in ‘integer-gmp-1.0.1.0:GHC.Integer.Type’ + instance Ord Integer -- Defined in ‘GHC.Num.Integer’ ...plus 22 others - ...plus three instances involving out-of-scope types + ...plus two instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In the second argument of ‘($)’, namely ‘f ()’ In the second argument of ‘($)’, namely ‘Set.toList $ f ()’ diff --git a/testsuite/tests/perf/compiler/T16473.stdout b/testsuite/tests/perf/compiler/T16473.stdout index 755017fd83..e6063e01e8 100644 --- a/testsuite/tests/perf/compiler/T16473.stdout +++ b/testsuite/tests/perf/compiler/T16473.stdout @@ -35,7 +35,7 @@ Rule fired: Class op >>= (BUILTIN) Rule fired: Class op show (BUILTIN) Rule fired: Class op mempty (BUILTIN) Rule fired: Class op fromInteger (BUILTIN) -Rule fired: integerToInt (BUILTIN) +Rule fired: Integer -> Int# (BUILTIN) Rule fired: Class op <> (BUILTIN) Rule fired: Class op + (BUILTIN) Rule fired: Class op enumFromTo (BUILTIN) diff --git a/testsuite/tests/perf/space_leaks/all.T b/testsuite/tests/perf/space_leaks/all.T index f067b84aa0..f5db1b05c0 100644 --- a/testsuite/tests/perf/space_leaks/all.T +++ b/testsuite/tests/perf/space_leaks/all.T @@ -5,8 +5,7 @@ test('space_leak_001', # 5% possible deviation. [collect_stats(['peak_megabytes_allocated','bytes allocated'],5), collect_runtime_residency(15), - omit_ways(['profasm','profthreaded','threaded1','threaded2','nonmoving_thr']), - reqlib('integer-gmp') + omit_ways(['profasm','profthreaded','threaded1','threaded2','nonmoving_thr']) ], compile_and_run, ['']) diff --git a/testsuite/tests/plugins/plugins09.stdout b/testsuite/tests/plugins/plugins09.stdout index 885850e598..0401941734 100644 --- a/testsuite/tests/plugins/plugins09.stdout +++ b/testsuite/tests/plugins/plugins09.stdout @@ -5,5 +5,4 @@ interfacePlugin: GHC.Base typeCheckPlugin (rn) interfacePlugin: GHC.Types typeCheckPlugin (tc) -interfacePlugin: GHC.Integer.Type -interfacePlugin: GHC.Natural +interfacePlugin: GHC.Num.BigNat diff --git a/testsuite/tests/plugins/plugins10.stdout b/testsuite/tests/plugins/plugins10.stdout index 33f8ff722d..ed31df86f1 100644 --- a/testsuite/tests/plugins/plugins10.stdout +++ b/testsuite/tests/plugins/plugins10.stdout @@ -8,8 +8,7 @@ interfacePlugin: Language.Haskell.TH.Syntax typeCheckPlugin (rn) interfacePlugin: GHC.Types typeCheckPlugin (tc) -interfacePlugin: GHC.Integer.Type -interfacePlugin: GHC.Natural +interfacePlugin: GHC.Num.BigNat parsePlugin(a) typeCheckPlugin (rn) interfacePlugin: Language.Haskell.TH.Lib.Internal diff --git a/testsuite/tests/plugins/plugins11.stdout b/testsuite/tests/plugins/plugins11.stdout index 8e0dca4335..b273bc7a10 100644 --- a/testsuite/tests/plugins/plugins11.stdout +++ b/testsuite/tests/plugins/plugins11.stdout @@ -5,5 +5,4 @@ interfacePlugin: GHC.Base typeCheckPlugin (rn) interfacePlugin: GHC.Types typeCheckPlugin (tc) -interfacePlugin: GHC.Integer.Type -interfacePlugin: GHC.Natural +interfacePlugin: GHC.Num.BigNat diff --git a/testsuite/tests/plugins/static-plugins.stdout b/testsuite/tests/plugins/static-plugins.stdout index f7520a7cfb..632af0076c 100644 --- a/testsuite/tests/plugins/static-plugins.stdout +++ b/testsuite/tests/plugins/static-plugins.stdout @@ -11,8 +11,7 @@ interfacePlugin: GHC.Types interfacePlugin: GHC.TopHandler typeCheckPlugin (tc) interfacePlugin: GHC.CString -interfacePlugin: GHC.Integer.Type -interfacePlugin: GHC.Natural +interfacePlugin: GHC.Num.BigNat ==pure.1 ==fp0.0 parsePlugin() diff --git a/testsuite/tests/polykinds/T15592.stderr b/testsuite/tests/polykinds/T15592.stderr index 966635442d..bef089eb7f 100644 --- a/testsuite/tests/polykinds/T15592.stderr +++ b/testsuite/tests/polykinds/T15592.stderr @@ -5,5 +5,4 @@ DATA CONSTRUCTORS MkT :: forall {k} k1 (f :: k1 -> k -> *) (a :: k1) (b :: k). f a b -> T f a b -> T f a b Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/polykinds/T15592b.stderr b/testsuite/tests/polykinds/T15592b.stderr index 9abb1964d1..f57aa363de 100644 --- a/testsuite/tests/polykinds/T15592b.stderr +++ b/testsuite/tests/polykinds/T15592b.stderr @@ -4,5 +4,4 @@ TYPE CONSTRUCTORS forall k (f :: k -> *) (a :: k). f a -> * roles nominal nominal nominal nominal Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/printer/T18052a.stderr b/testsuite/tests/printer/T18052a.stderr index 90eea5bb5a..bc7607e81e 100644 --- a/testsuite/tests/printer/T18052a.stderr +++ b/testsuite/tests/printer/T18052a.stderr @@ -6,8 +6,7 @@ TYPE CONSTRUCTORS PATTERN SYNONYMS (:||:) :: forall {a} {b}. a -> b -> (a, b) Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] ==================== Tidy Core ==================== Result size of Tidy Core diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T index fe98517d96..dec77add28 100644 --- a/testsuite/tests/profiling/should_run/all.T +++ b/testsuite/tests/profiling/should_run/all.T @@ -115,9 +115,8 @@ test('T5363', [], compile_and_run, ['']) test('profinline001', [], compile_and_run, ['']) test('T11627a', [ extra_ways(extra_prof_ways), - # integer-simple has an extremely large representation and - # consequently needs significantly more time - when(have_library('integer-simple'), skip) + # Slow bignum implementations timeout + when(have_slow_bignum(), skip) ], compile_and_run, ['']) diff --git a/testsuite/tests/rename/should_compile/T3103/GHC/Num.hs b/testsuite/tests/rename/should_compile/T3103/GHC/Num.hs index 1d403249f2..315bc24c46 100644 --- a/testsuite/tests/rename/should_compile/T3103/GHC/Num.hs +++ b/testsuite/tests/rename/should_compile/T3103/GHC/Num.hs @@ -3,7 +3,7 @@ module GHC.Num (fromInteger) where import GHC.Base -import GHC.Integer +import GHC.Num.Integer fromInteger :: Num a => Integer -> a fromInteger = fromInteger diff --git a/testsuite/tests/rename/should_compile/T3103/test.T b/testsuite/tests/rename/should_compile/T3103/test.T index 38406b075c..59e9290c5a 100644 --- a/testsuite/tests/rename/should_compile/T3103/test.T +++ b/testsuite/tests/rename/should_compile/T3103/test.T @@ -1,5 +1,5 @@ # Args to vtc are: extra compile flags -test('T3103', [reqlib("integer-gmp"), extra_files(['Foreign/', 'GHC/'])], multimod_compile, +test('T3103', [extra_files(['Foreign/', 'GHC/'])], multimod_compile, ['Foreign.Ptr', - '-v0 -hide-all-packages -package ghc-prim -package integer-gmp -this-unit-id base']) + '-v0 -hide-all-packages -package ghc-prim -package ghc-bignum -this-unit-id base']) diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr index e4f1683ee9..37e0a6fb31 100644 --- a/testsuite/tests/roles/should_compile/Roles1.stderr +++ b/testsuite/tests/roles/should_compile/Roles1.stderr @@ -20,8 +20,7 @@ DATA CONSTRUCTORS K2 :: forall a. a -> T2 a K1 :: forall a. a -> T1 a Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] ==================== Typechecker ==================== Roles1.$tcT7 diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr index 54e01992be..cdc97da20f 100644 --- a/testsuite/tests/roles/should_compile/Roles14.stderr +++ b/testsuite/tests/roles/should_compile/Roles14.stderr @@ -6,8 +6,7 @@ TYPE CONSTRUCTORS COERCION AXIOMS axiom Roles12.N:C2 :: C2 a = a -> a Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] ==================== Typechecker ==================== Roles12.$tcC2 diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr index 7d721f2c12..69898a98b9 100644 --- a/testsuite/tests/roles/should_compile/Roles2.stderr +++ b/testsuite/tests/roles/should_compile/Roles2.stderr @@ -6,8 +6,7 @@ DATA CONSTRUCTORS K2 :: forall a. FunPtr a -> T2 a K1 :: forall a. IO a -> T1 a Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] ==================== Typechecker ==================== Roles2.$tcT2 diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr index a7fb7a06c9..faa15f955d 100644 --- a/testsuite/tests/roles/should_compile/Roles3.stderr +++ b/testsuite/tests/roles/should_compile/Roles3.stderr @@ -21,8 +21,7 @@ COERCION AXIOMS axiom Roles3.N:C3 :: C3 a b = a -> F3 b -> F3 b axiom Roles3.N:C4 :: C4 a b = a -> F4 b -> F4 b Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] ==================== Typechecker ==================== Roles3.$tcC4 diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr index 8f1d58183b..2428a94ed0 100644 --- a/testsuite/tests/roles/should_compile/Roles4.stderr +++ b/testsuite/tests/roles/should_compile/Roles4.stderr @@ -9,8 +9,7 @@ COERCION AXIOMS axiom Roles4.N:C1 :: C1 a = a -> a axiom Roles4.N:C3 :: C3 a = a -> Syn1 a Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] ==================== Typechecker ==================== Roles4.$tcC3 diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr index 07d0496799..62042e8a0f 100644 --- a/testsuite/tests/roles/should_compile/T8958.stderr +++ b/testsuite/tests/roles/should_compile/T8958.stderr @@ -16,8 +16,7 @@ CLASS INSTANCES -- Defined at T8958.hs:10:10 instance [incoherent] Nominal a -- Defined at T8958.hs:7:10 Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.14.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] ==================== Typechecker ==================== T8958.$tcMap diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T index d4a63b5d7d..511c458815 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/all.T +++ b/testsuite/tests/safeHaskell/check/pkg01/all.T @@ -29,7 +29,7 @@ make_args = 'VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn test('safePkg01', [extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']), normalise_errmsg_fun(ignoreLdOutput, normalise_errmsg), - normalise_version("array", "integer-gmp", "integer-simple", "bytestring", + normalise_version("array", "ghc-bignum", "bytestring", "base", "deepseq", "ghc-prim"), normalise_fun(normalise_errmsg)], run_command, ['$MAKE -s --no-print-directory safePkg01 ' + make_args]) diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout index 53e219ddd5..85cf039635 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout +++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout @@ -4,42 +4,42 @@ pdb.safePkg01/local.db trusted: False M_SafePkg -package dependencies: base-4.13.0.0* ghc-prim-0.6.1 integer-gmp-1.0.2.0 +package dependencies: base-4.13.0.0* ghc-bignum-1.0 ghc-prim-0.6.1 trusted: safe require own pkg trusted: False M_SafePkg2 -package dependencies: base-4.13.0.0 ghc-prim-0.6.1 integer-gmp-1.0.2.0 +package dependencies: base-4.13.0.0 ghc-bignum-1.0 ghc-prim-0.6.1 trusted: trustworthy require own pkg trusted: False M_SafePkg3 -package dependencies: base-4.13.0.0* ghc-prim-0.6.1 integer-gmp-1.0.2.0 +package dependencies: base-4.13.0.0* ghc-bignum-1.0 ghc-prim-0.6.1 trusted: safe require own pkg trusted: True M_SafePkg4 -package dependencies: base-4.13.0.0* ghc-prim-0.6.1 integer-gmp-1.0.2.0 +package dependencies: base-4.13.0.0* ghc-bignum-1.0 ghc-prim-0.6.1 trusted: safe require own pkg trusted: True M_SafePkg5 -package dependencies: base-4.13.0.0* ghc-prim-0.6.1 integer-gmp-1.0.2.0 +package dependencies: base-4.13.0.0* ghc-bignum-1.0 ghc-prim-0.6.1 trusted: safe-inferred require own pkg trusted: True M_SafePkg6 -package dependencies: array-0.5.4.0 base-4.13.0.0* bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-prim-0.6.1 integer-gmp-1.0.2.0 +package dependencies: array-0.5.4.0 base-4.13.0.0* bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-bignum-1.0 ghc-prim-0.6.1 trusted: trustworthy require own pkg trusted: False M_SafePkg7 -package dependencies: array-0.5.4.0 base-4.13.0.0* bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-prim-0.6.1 integer-gmp-1.0.2.0 +package dependencies: array-0.5.4.0 base-4.13.0.0* bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-bignum-1.0 ghc-prim-0.6.1 trusted: safe require own pkg trusted: False M_SafePkg8 -package dependencies: array-0.5.4.0 base-4.13.0.0 bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-prim-0.6.1 integer-gmp-1.0.2.0 +package dependencies: array-0.5.4.0 base-4.13.0.0 bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-bignum-1.0 ghc-prim-0.6.1 trusted: trustworthy require own pkg trusted: False diff --git a/testsuite/tests/simplCore/should_compile/T15445.stderr b/testsuite/tests/simplCore/should_compile/T15445.stderr index d5deac5a59..6f25622a9d 100644 --- a/testsuite/tests/simplCore/should_compile/T15445.stderr +++ b/testsuite/tests/simplCore/should_compile/T15445.stderr @@ -1,6 +1,6 @@ Rule fired: Class op + (BUILTIN) Rule fired: Class op fromInteger (BUILTIN) -Rule fired: integerToInt (BUILTIN) +Rule fired: Integer -> Int# (BUILTIN) Rule fired: SPEC plusTwoRec (T15445a) Rule fired: SPEC $fShow[] (GHC.Show) Rule fired: Class op >> (BUILTIN) diff --git a/testsuite/tests/simplCore/should_run/T5603.hs b/testsuite/tests/simplCore/should_run/T5603.hs index c1545d2c39..c5bbaf9730 100644 --- a/testsuite/tests/simplCore/should_run/T5603.hs +++ b/testsuite/tests/simplCore/should_run/T5603.hs @@ -4,13 +4,13 @@ module Main (main) where import GHC.Base -import GHC.Integer.GMP.Internals +import GHC.Num.Integer main :: IO () main = (encodeDouble 0 :: Double) `seq` return () {-# INLINE encodeDouble #-} encodeDouble :: Integer -> Double -encodeDouble (S# _) = D# 3.0## -encodeDouble (Jp# _) = D# 4.0## -encodeDouble (Jn# _) = D# 5.0## +encodeDouble (IS _) = D# 3.0## +encodeDouble (IP _) = D# 4.0## +encodeDouble (IN _) = D# 5.0## diff --git a/testsuite/tests/simplCore/should_run/all.T b/testsuite/tests/simplCore/should_run/all.T index d730632345..48e3d90961 100644 --- a/testsuite/tests/simplCore/should_run/all.T +++ b/testsuite/tests/simplCore/should_run/all.T @@ -46,8 +46,7 @@ test('T3972', [], compile_and_run, ['']) test('T5315', normal, compile_and_run, ['']) test('T5453', normal, compile_and_run, ['']) test('T5441', [], multimod_compile_and_run, ['T5441', '']) -# This compares Core from integer-gmp -test('T5603', reqlib('integer-gmp'), compile_and_run, ['']) +test('T5603', normal, compile_and_run, ['']) test('T2110', normal, compile_and_run, ['']) test('AmapCoerce', normal, compile_and_run, ['']) test('T16208', normal, compile_and_run, ['']) diff --git a/testsuite/tests/stranal/sigs/T8598.hs b/testsuite/tests/stranal/sigs/T8598.hs index 1e0ca6f2b7..c636ae5ea3 100644 --- a/testsuite/tests/stranal/sigs/T8598.hs +++ b/testsuite/tests/stranal/sigs/T8598.hs @@ -3,14 +3,14 @@ module T8598(fun) where import GHC.Float (Double(..)) -import GHC.Integer (decodeDoubleInteger, encodeDoubleInteger) +import GHC.Num.Integer (integerDecodeDouble#, integerEncodeDouble#) -- Float.scaleFloat for Doubles, slightly simplified fun :: Double -> Double fun x | isFix = x | otherwise = case x of - (D# x#) -> case decodeDoubleInteger x# of - (# i, j #) -> D# (encodeDoubleInteger i j) + (D# x#) -> case integerDecodeDouble# x# of + (# i, j #) -> D# (integerEncodeDouble# i j) where isFix = isDoubleFinite x == 0 diff --git a/testsuite/tests/th/T16980.stderr b/testsuite/tests/th/T16980.stderr index b9d25b4aab..f11ae5774b 100644 --- a/testsuite/tests/th/T16980.stderr +++ b/testsuite/tests/th/T16980.stderr @@ -1,2 +1,2 @@ -T16980.aNumber :: GHC.Integer.Type.Integer -ConT GHC.Integer.Type.Integer +T16980.aNumber :: GHC.Num.Integer.Integer +ConT GHC.Num.Integer.Integer diff --git a/testsuite/tests/th/T2222.stderr b/testsuite/tests/th/T2222.stderr index c65f7da665..5ec25101d4 100644 --- a/testsuite/tests/th/T2222.stderr +++ b/testsuite/tests/th/T2222.stderr @@ -1,4 +1,4 @@ -inside b: GHC.Integer.Type.Integer +inside b: GHC.Num.Integer.Integer inside d: GHC.Types.Bool type of c: GHC.Types.Bool inside f: GHC.Types.Bool diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr index a536e4b62c..03e8fafd75 100644 --- a/testsuite/tests/th/TH_Roles2.stderr +++ b/testsuite/tests/th/TH_Roles2.stderr @@ -3,7 +3,7 @@ TYPE CONSTRUCTORS roles nominal representational Dependent modules: [] Dependent packages: [array-0.5.4.0, base-4.14.0.0, deepseq-1.4.4.0, - ghc-boot-th-8.11.0.20200416, ghc-prim-0.6.1, integer-gmp-1.0.3.0, + ghc-bignum-1.0, ghc-boot-th-8.9.0.20191106, ghc-prim-0.6.1, pretty-1.1.3.6, template-haskell-2.16.0.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/th/TH_tuple1.stdout b/testsuite/tests/th/TH_tuple1.stdout index e681bf8b3b..c79b30cd21 100644 --- a/testsuite/tests/th/TH_tuple1.stdout +++ b/testsuite/tests/th/TH_tuple1.stdout @@ -1,10 +1,10 @@ -SigE (AppE (AppE (ConE GHC.Tuple.(,)) (LitE (IntegerL 1))) (LitE (IntegerL 2))) (AppT (AppT (ConT GHC.Tuple.(,)) (ConT GHC.Integer.Type.Integer)) (ConT GHC.Integer.Type.Integer)) -GHC.Tuple.(,) 1 2 :: GHC.Tuple.(,) GHC.Integer.Type.Integer - GHC.Integer.Type.Integer -SigE (AppE (ConE GHC.Tuple.Solo) (LitE (IntegerL 1))) (AppT (ConT GHC.Tuple.Solo) (ConT GHC.Integer.Type.Integer)) -GHC.Tuple.Solo 1 :: GHC.Tuple.Solo GHC.Integer.Type.Integer -SigE (AppE (AppE (ConE GHC.Tuple.(#,#)) (LitE (IntegerL 1))) (LitE (IntegerL 2))) (AppT (AppT (ConT GHC.Tuple.(#,#)) (ConT GHC.Integer.Type.Integer)) (ConT GHC.Integer.Type.Integer)) -GHC.Tuple.(#,#) 1 2 :: GHC.Tuple.(#,#) GHC.Integer.Type.Integer - GHC.Integer.Type.Integer -SigE (AppE (ConE GHC.Tuple.Solo#) (LitE (IntegerL 1))) (AppT (ConT GHC.Tuple.Solo#) (ConT GHC.Integer.Type.Integer)) -GHC.Tuple.Solo# 1 :: GHC.Tuple.Solo# GHC.Integer.Type.Integer +SigE (AppE (AppE (ConE GHC.Tuple.(,)) (LitE (IntegerL 1))) (LitE (IntegerL 2))) (AppT (AppT (ConT GHC.Tuple.(,)) (ConT GHC.Num.Integer.Integer)) (ConT GHC.Num.Integer.Integer)) +GHC.Tuple.(,) 1 2 :: GHC.Tuple.(,) GHC.Num.Integer.Integer + GHC.Num.Integer.Integer +SigE (AppE (ConE GHC.Tuple.Solo) (LitE (IntegerL 1))) (AppT (ConT GHC.Tuple.Solo) (ConT GHC.Num.Integer.Integer)) +GHC.Tuple.Solo 1 :: GHC.Tuple.Solo GHC.Num.Integer.Integer +SigE (AppE (AppE (ConE GHC.Tuple.(#,#)) (LitE (IntegerL 1))) (LitE (IntegerL 2))) (AppT (AppT (ConT GHC.Tuple.(#,#)) (ConT GHC.Num.Integer.Integer)) (ConT GHC.Num.Integer.Integer)) +GHC.Tuple.(#,#) 1 2 :: GHC.Tuple.(#,#) GHC.Num.Integer.Integer + GHC.Num.Integer.Integer +SigE (AppE (ConE GHC.Tuple.Solo#) (LitE (IntegerL 1))) (AppT (ConT GHC.Tuple.Solo#) (ConT GHC.Num.Integer.Integer)) +GHC.Tuple.Solo# 1 :: GHC.Tuple.Solo# GHC.Num.Integer.Integer diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T index bd279e1128..e224641c92 100644 --- a/testsuite/tests/th/all.T +++ b/testsuite/tests/th/all.T @@ -254,7 +254,7 @@ test('T8028', [], multimod_compile, ['T8028', '-v0 ' + config.ghc_th_way_flags]) test('TH_Roles1', normal, compile_fail, ['-v0']) test('TH_Roles2', normalise_version('array', 'base', 'deepseq', 'ghc-prim', 'ghc-boot', 'ghc-boot-th', - 'integer-gmp', 'pretty', 'template-haskell', + 'ghc-bignum', 'pretty', 'template-haskell', 'binary', 'bytestring', 'containers' ), compile, ['-v0 -ddump-tc -dsuppress-uniques']) test('TH_Roles3', normal, compile, ['-v0 -dsuppress-uniques']) diff --git a/testsuite/tests/typecheck/should_compile/T12763.stderr b/testsuite/tests/typecheck/should_compile/T12763.stderr index efc3528342..ff456d946a 100644 --- a/testsuite/tests/typecheck/should_compile/T12763.stderr +++ b/testsuite/tests/typecheck/should_compile/T12763.stderr @@ -8,5 +8,4 @@ COERCION AXIOMS CLASS INSTANCES instance C Int -- Defined at T12763.hs:9:10 Dependent modules: [] -Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.3.0] +Dependent packages: [base-4.15.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/typecheck/should_compile/T14273.stderr b/testsuite/tests/typecheck/should_compile/T14273.stderr index 86268d837d..5761deac10 100644 --- a/testsuite/tests/typecheck/should_compile/T14273.stderr +++ b/testsuite/tests/typecheck/should_compile/T14273.stderr @@ -10,7 +10,7 @@ T14273.hs:7:27: warning: [-Wdeferred-type-errors (in -Wdefault)] instance (Show a, Show b) => Show (Either a b) -- Defined in ‘Data.Either’ instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ + instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ ...plus 23 others ...plus 70 instances involving out-of-scope types (use -fprint-potential-instances to see them all) @@ -64,7 +64,7 @@ T14273.hs:13:10: warning: [-Wdeferred-type-errors (in -Wdefault)] instance (Show a, Show b) => Show (Either a b) -- Defined in ‘Data.Either’ instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ + instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ ...plus 23 others ...plus 70 instances involving out-of-scope types (use -fprint-potential-instances to see them all) diff --git a/testsuite/tests/typecheck/should_compile/holes2.stderr b/testsuite/tests/typecheck/should_compile/holes2.stderr index 1f3242a43f..6a39bceeb0 100644 --- a/testsuite/tests/typecheck/should_compile/holes2.stderr +++ b/testsuite/tests/typecheck/should_compile/holes2.stderr @@ -7,7 +7,7 @@ holes2.hs:3:5: warning: [-Wdeferred-type-errors (in -Wdefault)] instance (Show a, Show b) => Show (Either a b) -- Defined in ‘Data.Either’ instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ + instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ ...plus 23 others ...plus 70 instances involving out-of-scope types (use -fprint-potential-instances to see them all) diff --git a/testsuite/tests/typecheck/should_compile/tc231.stderr b/testsuite/tests/typecheck/should_compile/tc231.stderr index 585e6d0340..64cfeb08ea 100644 --- a/testsuite/tests/typecheck/should_compile/tc231.stderr +++ b/testsuite/tests/typecheck/should_compile/tc231.stderr @@ -15,5 +15,4 @@ DATA CONSTRUCTORS Z :: forall a. a -> Z a Node :: forall s a chain. s -> a -> chain -> Q s a chain Dependent modules: [] -Dependent packages: [base-4.13.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.13.0.0, ghc-bignum-1.0, ghc-prim-0.6.1] diff --git a/testsuite/tests/typecheck/should_fail/T12921.stderr b/testsuite/tests/typecheck/should_fail/T12921.stderr index f10faf2751..4caa9ebe51 100644 --- a/testsuite/tests/typecheck/should_fail/T12921.stderr +++ b/testsuite/tests/typecheck/should_fail/T12921.stderr @@ -8,7 +8,8 @@ T12921.hs:4:1: error: Data.Data.Data (Either a b) -- Defined in ‘Data.Data’ instance Data.Data.Data Ordering -- Defined in ‘Data.Data’ - instance Data.Data.Data Integer -- Defined in ‘Data.Data’ + instance Data.Data.Data a => Data.Data.Data (Maybe a) + -- Defined in ‘Data.Data’ ...plus 15 others ...plus 50 instances involving out-of-scope types (use -fprint-potential-instances to see them all) diff --git a/testsuite/tests/typecheck/should_fail/T14884.stderr b/testsuite/tests/typecheck/should_fail/T14884.stderr index f454bb5625..e1738891a7 100644 --- a/testsuite/tests/typecheck/should_fail/T14884.stderr +++ b/testsuite/tests/typecheck/should_fail/T14884.stderr @@ -40,7 +40,7 @@ T14884.hs:4:7: error: instance (Show a, Show b) => Show (Either a b) -- Defined in ‘Data.Either’ instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ + instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ ...plus 23 others ...plus 67 instances involving out-of-scope types (use -fprint-potential-instances to see them all) diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr index 4f0e6ad3b2..0bfbc41c80 100644 --- a/testsuite/tests/typecheck/should_fail/T5095.stderr +++ b/testsuite/tests/typecheck/should_fail/T5095.stderr @@ -4,8 +4,7 @@ T5095.hs:9:11: error: Matching instances: instance [overlappable] Show a => Eq a -- Defined at T5095.hs:5:31 instance Eq Ordering -- Defined in ‘GHC.Classes’ - instance Eq Integer - -- Defined in ‘integer-gmp-1.0.3.0:GHC.Integer.Type’ + instance Eq a => Eq (Maybe a) -- Defined in ‘GHC.Maybe’ ...plus 23 others ...plus 7 instances involving out-of-scope types (use -fprint-potential-instances to see them all) diff --git a/testsuite/tests/typecheck/should_fail/tcfail072.stderr b/testsuite/tests/typecheck/should_fail/tcfail072.stderr index c3fdb254d0..0b69f4ef63 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail072.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail072.stderr @@ -8,11 +8,10 @@ tcfail072.hs:23:13: error: The type variable ‘p0’ is ambiguous These potential instances exist: instance Ord Ordering -- Defined in ‘GHC.Classes’ - instance Ord Integer - -- Defined in ‘integer-gmp-1.0.1.0:GHC.Integer.Type’ + instance Ord Integer -- Defined in ‘GHC.Num.Integer’ instance Ord () -- Defined in ‘GHC.Classes’ ...plus 21 others - ...plus three instances involving out-of-scope types + ...plus two instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In the expression: g A In an equation for ‘g’: g (B _ _) = g A diff --git a/testsuite/tests/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr index 9a70aedf5c..c3fc429bc4 100644 --- a/testsuite/tests/typecheck/should_fail/tcfail133.stderr +++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr @@ -8,9 +8,9 @@ tcfail133.hs:68:7: error: Probable fix: use a type annotation to specify what ‘a0’ should be. These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ instance (Number a, Digit b, Show a, Show b) => Show (a :@ b) -- Defined at tcfail133.hs:11:54 + instance Show One -- Defined at tcfail133.hs:9:28 ...plus 25 others ...plus 12 instances involving out-of-scope types (use -fprint-potential-instances to see them all) |