Luite Stegeman pushed to branch wip/ubxsumtag at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • testsuite/tests/unboxedsums/UbxSumUnpackedSize.hs
    ... ... @@ -143,6 +143,9 @@ data U_E2 = U_E2 {-# UNPACK #-} !E2
    143 143
                      {-# UNPACK #-} !Int8
    
    144 144
         deriving (Show)
    
    145 145
     
    
    146
    +{-
    
    147
    +  disabled to reduce memory consumption of test
    
    148
    +
    
    146 149
     data U_E3 = U_E3 {-# UNPACK #-} !E3
    
    147 150
                      {-# UNPACK #-} !Int8
    
    148 151
                      {-# UNPACK #-} !Int8
    
    ... ... @@ -162,6 +165,7 @@ data U_Mixed = U_Mixed {-# UNPACK #-} !E1
    162 165
                            {-# UNPACK #-} !Bool
    
    163 166
                            {-# UNPACK #-} !Bool
    
    164 167
         deriving (Show)
    
    168
    +-}
    
    165 169
     
    
    166 170
     data U_Maybe = U_Maybe {-# UNPACK #-} !(Maybe Bool)
    
    167 171
                            {-# UNPACK #-} !(Maybe Bool)
    
    ... ... @@ -209,7 +213,7 @@ u_e1d = U_E1 E1_254 126 127 0 1 2 3 4
    209 213
     u_e2a :: U_E2
    
    210 214
     u_e2a = U_E2 minBound maxBound minBound maxBound
    
    211 215
                  minBound maxBound minBound maxBound
    
    212
    -
    
    216
    +{-
    
    213 217
     u_e3a :: U_E3
    
    214 218
     u_e3a = U_E3 minBound maxBound minBound maxBound
    
    215 219
                  minBound maxBound minBound maxBound
    
    ... ... @@ -217,6 +221,7 @@ u_e3a = U_E3 minBound maxBound minBound maxBound
    217 221
     u_mixed :: U_Mixed
    
    218 222
     u_mixed = U_Mixed maxBound minBound maxBound minBound
    
    219 223
                       maxBound minBound maxBound minBound
    
    224
    +-}
    
    220 225
     
    
    221 226
     u_maybe :: U_Maybe
    
    222 227
     u_maybe = U_Maybe Nothing (Just False) Nothing (Just True)
    
    ... ... @@ -243,7 +248,7 @@ main = do
    243 248
         test "u_e1c"      u_e1c
    
    244 249
         test "u_e1d"      u_e1d
    
    245 250
         test "u_e2a"      u_e2a
    
    246
    -    test "u_e3a"      u_e3a
    
    247
    -    test "u_mixed"    u_mixed
    
    251
    +    -- test "u_e3a"      u_e3a
    
    252
    +    -- test "u_mixed"    u_mixed
    
    248 253
         test "u_maybe"    u_maybe
    
    249 254
         test "u_maybeW32" u_maybeW32

  • testsuite/tests/unboxedsums/UbxSumUnpackedSize.stdout
    ... ... @@ -23,14 +23,6 @@ size: 2
    23 23
     U_E2 E2_1 127 (-128) 127 (-128) 127 (-128) 127
    
    24 24
     size: 2
    
    25 25
     
    
    26
    -### u_e3a
    
    27
    -U_E3 E3_1 127 (-128) 127 (-128) 127 (-128) 127
    
    28
    -size: 3
    
    29
    -
    
    30
    -### u_mixed
    
    31
    -U_Mixed E1_254 (-128) E2_255 (-32768) 32767 (-32768) True False
    
    32
    -size: 3
    
    33
    -
    
    34 26
     ### u_maybe
    
    35 27
     U_Maybe Nothing (Just False) Nothing (Just True) Nothing (Just False) Nothing (Just True)
    
    36 28
     size: 10
    

  • testsuite/tests/unboxedsums/UbxSumUnpackedSize.stdout-ws-32
    ... ... @@ -23,14 +23,6 @@ size: 3
    23 23
     U_E2 E2_1 127 (-128) 127 (-128) 127 (-128) 127
    
    24 24
     size: 3
    
    25 25
     
    
    26
    -### u_e3a
    
    27
    -U_E3 E3_1 127 (-128) 127 (-128) 127 (-128) 127
    
    28
    -size: 4
    
    29
    -
    
    30
    -### u_mixed
    
    31
    -U_Mixed E1_254 (-128) E2_255 (-32768) 32767 (-32768) True False
    
    32
    -size: 4
    
    33
    -
    
    34 26
     ### u_maybe
    
    35 27
     U_Maybe Nothing (Just False) Nothing (Just True) Nothing (Just False) Nothing (Just True)
    
    36 28
     size: 11