Numeric literal overflow is now an error.

CHANGELOG.md

@@ -31,6 +31,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
+  * Out-of-bounds literals are now an error rather than a warning.
+
 ### Fixed
 
   * Fix bug in slice simplification (#992).

examples/rosettacode/md5.fut

@@ -20,7 +20,6 @@ let rs: [64]u32 =
     6, 10, 15, 21,  6, 10, 15, 21,  6, 10, 15, 21,  6, 10, 15, 21 ]
 
 let ks: [64]u32 =
-  map us32
   [ 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee ,
     0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501 ,
     0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be ,

src/Language/Futhark/TypeChecker/Terms.hs

@@ -2464,7 +2464,8 @@ literalOverflowCheck = void . check
         inBoundsF x Float32 = not $ isInfinite (realToFrac x :: Float)
         inBoundsF x Float64 = not $ isInfinite x
         warnBounds inBounds x ty loc = unless inBounds
-          $ warn loc $ "Literal " <> show x <> " out of bounds for inferred type " <> pretty ty <> "."
+          $ typeError loc mempty $ "Literal " <> ppr x <>
+          " out of bounds for inferred type " <> ppr ty <> "."
 
 -- | Type-check a top-level (or module-level) function definition.
 -- Despite the name, this is also used for checking constant

tests/bitwise.fut

@@ -4,32 +4,32 @@
 -- Originally distilled from MD5 sum calculation.
 -- ==
 -- input {
---   1732584193
---   -271733879
---   -1732584194
---   271733878
+--   1732584193u32
+--   -271733879u32
+--   -1732584194u32
+--   271733878u32
 --   1
 -- }
 -- output {
---   271733878
---   757607282
---   -271733879
---   -1732584194
+--   271733878u32
+--   757607282u32
+--   -271733879u32
+--   -1732584194u32
 -- }
 
-let funF(x: i32, y: i32, z: i32): i32 = x & y | !x & z
+let funF(x: u32, y: u32, z: u32): u32 = x & y | !x & z
 
-let rotateL (x: i32, i: i32): i32 =
+let rotateL (x: u32, i: u32): u32 =
   let post = x << i
   let pre = (x >> i) & (!(0xFFFFFFFF << i)) in
   post | pre
 
-let frob(a: i32, b: i32, c: i32, d: i32): (i32, i32, i32, i32) =
+let frob(a: u32, b: u32, c: u32, d: u32): (u32, u32, u32, u32) =
   let w = 0x97989910
   let f' = funF(b,c,d)
   let a' = b + rotateL((a + f' + w + 0xd76aa478), 7) in
   (d, a', b, c)
 
-let main (a: i32) (b: i32) (c: i32) (d: i32) (n: i32): (i32, i32, i32, i32) =
-  loop (a',b',c',d') = (a,b,c,d) for i < n do
+let main (a: u32) (b: u32) (c: u32) (d: u32) (n: i32): (u32, u32, u32, u32) =
+  loop (a',b',c',d') = (a,b,c,d) for _i < n do
     frob(a',b',c',d')

tests/overflowing_lits2.fut → tests/overflowing/edgecases.fut

@@ -1,6 +1,5 @@
 -- Some edge cases of literals that don't overflow, but are close
 --
 -- ==
--- warning: ^$
 
 entry main : (i8, i8, u16, f64) = (-128, 127, 65535, 1.79e308)

tests/overflowing/f32high.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : f32 = 9.7e42

tests/overflowing/f32low.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : f32 = -1e40

tests/overflowing/f64low.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : f64 = 1.8e308

tests/overflowing/i16low.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : i16 = -10000000

tests/overflowing/i32high.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : i32 = 1000000000000

tests/overflowing/i8high.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : i8 = 128

tests/overflowing/i8low.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : i8 = -129

tests/overflowing/u16high.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : u16 = 100000

tests/overflowing/u32low.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : u32 = -4

tests/overflowing/u8high.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : u8 = 256

tests/overflowing/u8low.fut

@@ -0,0 +1,4 @@
+-- ==
+-- error: (out of bounds.*)
+
+let main : u8 = -4