Skip to content

Runtime array bounds check #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dorchard merged 1 commit into from
Dec 18, 2025
Merged

Runtime array bounds check #255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions runtime/src/Language/Granule/Runtime.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Language.Granule.Runtime
-- Re-exported from Prelude
, String, Int, IO, Float, Maybe(..), Show(..), Char, getLine
, putStr, read, (<$>) , fromIntegral, Monad(..)
, ($), error, (>), (++), id, Num(..), (.)
, ($), error, (>=), (++), id, Num(..), (.)
, pack, Text
) where

Expand All @@ -39,7 +39,7 @@ import Criterion.Main ( defaultMain, bench, bgroup, nfAppIO )
import System.IO.Silently ( silence )
import Prelude
( Int, IO, Double, Maybe(..), Show(..), Char, read, fromEnum, toEnum
, (<$>), (<>), fromIntegral, ($), error, (>), (++), id, Num (..), (.) )
, (<$>), (<>), fromIntegral, ($), error, (>=), (++), id, Num (..), (.) )
import Control.Monad
import GHC.Err (undefined)
import Data.Function (const)
Expand Down Expand Up @@ -183,8 +183,8 @@ writeFloatArray a i v = unsafePerformIO $ writeFloatArraySafe a i v

writeFloatArraySafe :: FloatArray -> Int -> Float -> IO FloatArray
writeFloatArraySafe a i v =
if i > grLength a
then error $ "array index out of bounds: " ++ show i ++ " > " ++ show (grLength a)
if i >= grLength a
then error $ "array index out of bounds: " ++ show i ++ " >= " ++ show (grLength a)
else case a of
HaskellArray{} -> error "expected unique array"
PointerArray len ptr -> do
Expand All @@ -197,8 +197,8 @@ writeFloatArrayI a i v = unsafePerformIO $ writeFloatArrayISafe a i v

writeFloatArrayISafe :: FloatArray -> Int -> Float -> IO FloatArray
writeFloatArrayISafe a i v =
if i > grLength a
then error $ "array index out of bounds: " ++ show i ++ " > " ++ show (grLength a)
if i >= grLength a
then error $ "array index out of bounds: " ++ show i ++ " >= " ++ show (grLength a)
else case a of
PointerArray{} -> error "expected non-unique array"
HaskellArray len arr -> do
Expand Down Expand Up @@ -231,8 +231,8 @@ readFloatArray a i = unsafePerformIO $ readFloatArraySafe a i

readFloatArraySafe :: FloatArray -> Int -> IO (Float, FloatArray)
readFloatArraySafe a i =
if i > grLength a
then error $ "readFloatArray index out of bounds: " ++ show i ++ " > " ++ show (grLength a)
if i >= grLength a
then error $ "readFloatArray index out of bounds: " ++ show i ++ " >= " ++ show (grLength a)
else case a of
HaskellArray{} -> error "expected unique array"
PointerArray len ptr -> do
Expand All @@ -245,8 +245,8 @@ readFloatArrayI a i = unsafePerformIO $ readFloatArrayISafe a i

readFloatArrayISafe :: FloatArray -> Int -> IO (Float, FloatArray)
readFloatArrayISafe a i =
if i > grLength a
then error $ "readFloatArrayI index out of bounds: " ++ show i ++ " > " ++ show (grLength a)
if i >= grLength a
then error $ "readFloatArrayI index out of bounds: " ++ show i ++ " >= " ++ show (grLength a)
else case a of
PointerArray{} -> error "expected non-unique array"
HaskellArray _ arr -> do
Expand Down Expand Up @@ -360,4 +360,4 @@ type instance CapabilityType 'TimeDateTag = () -> Text
{-# NOINLINE cap #-}
cap :: Capability cap -> () -> CapabilityType cap
cap Console () = \x -> unsafePerformIO $ toStdout $ x
cap TimeDate () = \() -> unsafePerformIO $ timeDate ()
cap TimeDate () = \() -> unsafePerformIO $ timeDate ()
Loading