diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2020-10-02 16:41:40 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-10-09 08:47:00 -0400 |
commit | 12191a99d3b978b697ec0fb4412276fbea5dce8f (patch) | |
tree | f4c60bed13d6141e817bda264b24a4a3ab9ae0b6 /testsuite | |
parent | e691a5a04692beb601d480ccf9f283199a70ed62 (diff) | |
download | haskell-12191a99d3b978b697ec0fb4412276fbea5dce8f.tar.gz |
Bignum: match on small Integer/Natural
Previously we only matched on *variables* whose unfoldings were a ConApp
of the form `IS lit#` or `NS lit##`. But we forgot to match on the
ConApp directly... As a consequence, constant folding only worked after
the FloatOut pass which creates bindings for most sub-expressions. With
this patch, matching on bignums works even with -O0 (see bignumMatch
test).
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/tests/lib/integer/all.T | 1 | ||||
-rw-r--r-- | testsuite/tests/lib/integer/bignumMatch.hs | 9 | ||||
-rw-r--r-- | testsuite/tests/lib/integer/bignumMatch.stderr | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/testsuite/tests/lib/integer/all.T b/testsuite/tests/lib/integer/all.T index 43bcb0f3e4..fc6b77f6fa 100644 --- a/testsuite/tests/lib/integer/all.T +++ b/testsuite/tests/lib/integer/all.T @@ -10,6 +10,7 @@ test('gcdeInteger', normal, compile_and_run, ['']) test('integerPowMod', [], compile_and_run, ['']) test('integerGcdExt', [], compile_and_run, ['']) test('integerRecipMod', [], compile_and_run, ['']) +test('bignumMatch', [], compile, ['']) # skip ghci as it doesn't support unboxed tuples test('integerImportExport', [omit_ways(['ghci'])], compile_and_run, ['']) diff --git a/testsuite/tests/lib/integer/bignumMatch.hs b/testsuite/tests/lib/integer/bignumMatch.hs new file mode 100644 index 0000000000..5d9df14c27 --- /dev/null +++ b/testsuite/tests/lib/integer/bignumMatch.hs @@ -0,0 +1,9 @@ +{-# LANGUAGE MagicHash #-} +{-# OPTIONS_GHC -ddump-rule-firings -O0 -v0 #-} + +module Test where + +import GHC.Num.Integer + +foo :: Integer +foo = IS 45# `integerAdd` (IS 0# `integerMul` IS 18#) diff --git a/testsuite/tests/lib/integer/bignumMatch.stderr b/testsuite/tests/lib/integer/bignumMatch.stderr new file mode 100644 index 0000000000..d2a5a07dcb --- /dev/null +++ b/testsuite/tests/lib/integer/bignumMatch.stderr @@ -0,0 +1,2 @@ +Rule fired: integerMul (BUILTIN) +Rule fired: integerAdd (BUILTIN) |