Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
Commits on Sep 29, 2013
@rwbarton rwbarton Deal with failures for T367, T367_letnoescape under ghci
These tests had a very short timeout (0.3 s). With WAY=ghci,
the time ghci takes to start up and compile the test modules
is counted in this timeout, and that causes the tests to fail.

T367 really needs the very short timeout, so this commit disables
the ghci way for T367. T367_letnoescape can handle any timeout,
so I bumped up the timeout to 6 s to give ghci time to start up.
b6856d6
@rwbarton rwbarton Update compareAndSwap for new comparison primops a717258
@rwbarton rwbarton Mark T7881 as expected failure for WAY=hpc (#8384) fb2e29b
@rwbarton rwbarton Update spec001 for new Typeable, and disable AMP warning
I'd like to just "import Prelude hiding (..., join)", but the
patch to make that turn off the warning hasn't been merged yet.
8a63c69
@rwbarton rwbarton Update prog001 output (see #7633) 7585c1a
@rwbarton rwbarton Update role annotation syntax in TcCoercible 762d5a7
View
4 tests/concurrent/should_run/all.T
@@ -22,8 +22,8 @@ test('conc072', only_ways(['threaded2']), compile_and_run, [''])
test('conc073', normal, compile_and_run, [''])
# vector code must get inlined to become non-allocating
-test('T367', [reqlib('vector'), timeout_multiplier(0.001)], compile_and_run, ['-O2 -fno-omit-yields'])
-test('T367_letnoescape', [timeout_multiplier(0.001)], compile_and_run, ['-fno-omit-yields'])
+test('T367', [reqlib('vector'), omit_ways(['ghci']), timeout_multiplier(0.001)], compile_and_run, ['-O2 -fno-omit-yields'])
+test('T367_letnoescape', [timeout_multiplier(0.02)], compile_and_run, ['-fno-omit-yields'])
test('T1980', normal, compile_and_run, [''])
test('T2910', normal, compile_and_run, [''])
View
4 tests/concurrent/should_run/compareAndSwap.hs
@@ -19,7 +19,7 @@ import Control.Monad
casArrayST :: MutableArray s a -> Int -> a -> a -> ST s (Bool, a)
casArrayST (MutableArray arr#) (I# i#) old new = ST$ \s1# ->
case casArray# arr# i# old new s1# of
- (# s2#, x#, res #) -> (# s2#, (x# ==# 0#, res) #)
+ (# s2#, x#, res #) -> (# s2#, (isTrue# (x# ==# 0#), res) #)
casSTRef :: STRef s a -- ^ The 'STRef' containing a value 'current'
-> a -- ^ The 'old' value to compare
@@ -30,7 +30,7 @@ casSTRef (STRef var#) old new = ST $ \s1# ->
-- Zero means the CAS worked, one that it didn't.
-- We flip that here:
case casMutVar# var# old new s1# of
- (# s2#, x#, res #) -> (# s2#, (x# ==# 0#, res) #)
+ (# s2#, x#, res #) -> (# s2#, (isTrue# (x# ==# 0#), res) #)
-- | Performs a machine-level compare and swap operation on an
-- 'IORef'. Returns a tuple containing a 'Bool' which is 'True' when a
View
2  tests/numeric/should_compile/all.T
@@ -1,3 +1,3 @@
test('T7116', normal, run_command, ['$MAKE -s --no-print-directory T7116'])
test('T7895', normal, compile, [''])
-test('T7881', normal, compile, [''])
+test('T7881', [expect_broken_for('8384','hpc')], compile, [''])
View
4 tests/simplCore/should_compile/spec001.hs
@@ -1,5 +1,6 @@
{-# LANGUAGE CPP, UnboxedTuples, MagicHash, StandaloneDeriving, DeriveDataTypeable #-}
{-# OPTIONS_GHC -O #-}
+{-# OPTIONS_GHC -fno-warn-amp #-}
-- In GHC 6.4, compiling this module gave a Core Lint failure following the
-- specialier, because a function was floated out that had a RULE that
@@ -136,8 +137,7 @@ comparePS (PS off1 len1 fp1) (PS off2 len2 fp2)
instance Show PackedString where
showsPrec p ps r = showsPrec p (unpack ps) r
-#include "Typeable.h"
-INSTANCE_TYPEABLE0(PackedString,packedStringTc,"PackedString")
+deriving instance Typeable PackedString
-- -----------------------------------------------------------------------------
-- Constructor functions
View
3  tests/typecheck/prog001/typecheck.prog001.stderr-ghc
@@ -1,4 +1,5 @@
B.hs:7:10: Warning:
- No explicit method or default declaration for ‛row’
+ No explicit implementation for
+ ‛row’
In the instance declaration for ‛Matrix Bool Val’
View
3  tests/typecheck/should_run/TcCoercible.hs
@@ -8,7 +8,8 @@ newtype Foo = Foo Age deriving Show
newtype Bar = Bar Age deriving Show
newtype Baz = Baz Bar deriving Show
-data Map a@N b = Map a b deriving Show
+type role Map nominal representational
+data Map a b = Map a b deriving Show
main = do
print (coerce $ one :: Age)

No commit comments for this range

Something went wrong with that request. Please try again.