summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-07-29 21:48:15 +0100
committerIan Lynagh <igloo@earth.li>2011-07-29 21:50:02 +0100
commitb65f16d0055032077867a1cf804543ff83f0b35f (patch)
treeb3b9b4964094624b497a53a99d4a3ac43b17e6cb
parentf79861daf8b23183f33f70fcc6fdb8bbba2946aa (diff)
downloadhaskell-b65f16d0055032077867a1cf804543ff83f0b35f.tar.gz
Fix integerConstantFolding on 32bit platforms
Daniel Fischer pointed out that the timesInteger test result doesn't fir into Int on 32bit platforms.
-rw-r--r--testsuite/tests/lib/integer/Makefile2
-rw-r--r--testsuite/tests/lib/integer/integerConstantFolding.hs2
-rw-r--r--testsuite/tests/lib/integer/integerConstantFolding.stdout2
3 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/lib/integer/Makefile b/testsuite/tests/lib/integer/Makefile
index 1e2aa6eb9b..ffb498f7f0 100644
--- a/testsuite/tests/lib/integer/Makefile
+++ b/testsuite/tests/lib/integer/Makefile
@@ -11,7 +11,7 @@ integerConstantFolding:
# All the 100nnn values should be constant-folded away
! grep -q '\<100[0-9][0-9][0-9]\>' integerConstantFolding.simpl || { echo "Unfolded values found"; grep '\<100[0-9][0-9][0-9]\>' integerConstantFolding.simpl; }
$(call CHECK,\<200007\>,plusInteger)
- $(call CHECK,\<10001100030\>,timesInteger)
+ $(call CHECK,\<683234160\>,timesInteger)
$(call CHECK,-991\>,minusIntegerN)
$(call CHECK,\<989\>,minusIntegerP)
$(call CHECK,-200011\>,negateInteger)
diff --git a/testsuite/tests/lib/integer/integerConstantFolding.hs b/testsuite/tests/lib/integer/integerConstantFolding.hs
index 49fd1832bd..8eb3f63823 100644
--- a/testsuite/tests/lib/integer/integerConstantFolding.hs
+++ b/testsuite/tests/lib/integer/integerConstantFolding.hs
@@ -48,7 +48,7 @@ plusInteger :: Integer
plusInteger = 100003 + 100004
timesInteger :: Integer
-timesInteger = 100005 * 100006
+timesInteger = 100005 * 6832
minusIntegerN :: Integer
minusIntegerN = 100007 - 100998
diff --git a/testsuite/tests/lib/integer/integerConstantFolding.stdout b/testsuite/tests/lib/integer/integerConstantFolding.stdout
index a392ba18bc..d3756c1f08 100644
--- a/testsuite/tests/lib/integer/integerConstantFolding.stdout
+++ b/testsuite/tests/lib/integer/integerConstantFolding.stdout
@@ -1,5 +1,5 @@
plusInteger: 200007
-timesInteger: 10001100030
+timesInteger: 683234160
minusIntegerN: -991
minusIntegerP: 989
negateInteger: -200011