Fix #2176.

diku-dk · Sep 9, 2024 · dd52518 · dd52518
1 parent fbe0be4
commit dd52518
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Constant folding for loops that produce floating point results could
   result in different numerical behaviour.
 
+* Compiler crash in memory short circuiting (#2176).
+
 ## [0.25.21]
 
 ### Added

diff --git a/src/Futhark/Optimise/ArrayShortCircuiting/ArrayCoalescing.hs b/src/Futhark/Optimise/ArrayShortCircuiting/ArrayCoalescing.hs
@@ -147,23 +147,28 @@ mkCoalsTabProg ::
   ComputeScalarTableOnOp rep ->
   Prog (Aliases rep) ->
   m (M.Map Name CoalsTab)
-mkCoalsTabProg (_, lutab_prog) r computeScalarOnOp =
-  fmap M.fromList . mapM onFun . progFuns
+mkCoalsTabProg (_, lutab_prog) r computeScalarOnOp prog =
+  fmap M.fromList . mapM onFun . progFuns $ prog
   where
+    consts_scope = scopeOf (progConsts prog)
     onFun fun@(FunDef _ _ fname _ fpars body) = do
       -- First compute last-use information
       let unique_mems = getUniqueMemFParam fpars
           lutab = lutab_prog M.! fname
           scalar_table =
             runReader
               ( concatMapM
-                  (computeScalarTable $ scopeOf fun <> scopeOf (bodyStms body))
+                  ( computeScalarTable $
+                      consts_scope
+                        <> scopeOf fun
+                        <> scopeOf (bodyStms body)
+                  )
                   (stmsToList $ bodyStms body)
               )
               computeScalarOnOp
           topenv =
             emptyTopdownEnv
-              { scope = scopeOfFParams fpars,
+              { scope = consts_scope <> scopeOfFParams fpars,
                 alloc = unique_mems,
                 scalarTable = scalar_table,
                 nonNegatives = foldMap paramSizes fpars