Simon Jakobi pushed to branch wip/sjakobi/regression-tests-3 at Glasgow Haskell Compiler / GHC

Commits:

4 changed files:

Changes:

  • testsuite/tests/typecheck/should_compile/T11505Bar.hs
    1
    +module T11505Bar where
    
    2
    +
    
    3
    +import {-# SOURCE #-} T11505Foo

  • testsuite/tests/typecheck/should_compile/T11505Foo.hs
    1
    +module T11505Foo where
    
    2
    +
    
    3
    +import T11505Bar
    
    4
    +
    
    5
    +-- #11505: this used to fail with:
    
    6
    +--
    
    7
    +-- T11505Foo.hs:12:1:
    
    8
    +--     Type constructor `Foo' has conflicting definitions in the module
    
    9
    +--     and its hs-boot file
    
    10
    +--     Main module: data Foo = Foo {x :: {-# UNPACK #-} !Int}
    
    11
    +--     Boot file:   data Foo = Foo {x :: !Int}
    
    12
    +data Foo = Foo { x :: {-# UNPACK #-} !Int }

  • testsuite/tests/typecheck/should_compile/T11505Foo.hs-boot
    1
    +module T11505Foo where
    
    2
    +
    
    3
    +data Foo = Foo { x :: {-# UNPACK #-} !Int }

  • testsuite/tests/typecheck/should_compile/all.T
    ... ... @@ -818,6 +818,7 @@ test('T20356', normal, compile, [''])
    818 818
     test('T20584', normal, compile, [''])
    
    819 819
     test('T21558', normal, compile, ['-w'])
    
    820 820
     test('T20584b', normal, compile, [''])
    
    821
    +test('T11505', [extra_files(['T11505Foo.hs', 'T11505Foo.hs-boot', 'T11505Bar.hs'])], multimod_compile, ['T11505Foo', '-v0'])
    
    821 822
     test('T20588b', [extra_files(['T20588b.hs', 'T20588b.hs-boot', 'T20588b_aux.hs'])], multimod_compile, ['T20588b_aux.hs', '-v0'])
    
    822 823
     test('T20588d', [extra_files(['T20588d.hs', 'T20588d.hs-boot', 'T20588d_aux.hs'])], multimod_compile, ['T20588d_aux.hs', '-v0'])
    
    823 824
     test('T20661', [extra_files(['T20661.hs', 'T20661.hs-boot', 'T20661_aux.hs'])], multimod_compile, ['T20661_aux.hs', '-v0'])
    
    ... ... @@ -963,4 +964,3 @@ test('T26746', normal, compile, [''])
    963 964
     test('T26737', normal, compile, [''])
    
    964 965
     test('T26805a', normal, compile, [''])
    
    965 966
     test('T24464', normal, compile, [''])
    966
    -