[Git][ghc/ghc][wip/romes/25170-idea4] wibble

[Simon Peyton Jones (@simonpj)]

Simon Peyton Jones pushed to branch wip/romes/25170-idea4 at Glasgow Haskell Compiler / GHC


Commits:
5e0831bd by Simon Peyton Jones at 2025-03-14T22:23:20+00:00
wibble

- - - - -


1 changed file:

- compiler/GHC/Core/Opt/Simplify/Iteration.hs


Changes:

=====================================
compiler/GHC/Core/Opt/Simplify/Iteration.hs
=====================================
@@ -2252,7 +2252,7 @@ simplInId :: SimplEnv -> InId -> SimplCont -> SimplM (SimplFloats, OutExpr)
 simplInId env var cont
   | Just dc <- isDataConWorkId_maybe var
   , isLazyDataConRep dc                    -- See Note [Fast path for lazy data constructors]
-  = rebuild env (Var var) cont
+  = rebuild zapped_env (Var var) cont
   | otherwise
   = case substId env var of
       ContEx tvs cvs ids e -> simplExprF env' e cont
@@ -2261,15 +2261,15 @@ simplInId env var cont
         where
           env' = setSubstEnv env tvs cvs ids
 
-      DoneId out_id -> simplOutId env' out_id cont'
+      DoneId out_id -> simplOutId zapped_env out_id cont'
         where
-          cont' = trimJoinCont var (idJoinPointHood var) cont
-          env'  = zapSubstEnv env  -- See Note [zapSubstEnv]
+          cont' = trimJoinCont out_id (idJoinPointHood out_id) cont
 
-      DoneEx e mb_join -> simplExprF env' e cont'
+      DoneEx e mb_join -> simplExprF zapped_env e cont'
         where
           cont' = trimJoinCont var mb_join cont
-          env'  = zapSubstEnv env  -- See Note [zapSubstEnv]
+  where
+    zapped_env =  zapSubstEnv env  -- See Note [zapSubstEnv]
 
 ---------------------------------------------------------
 simplOutId :: SimplEnvIS -> OutId -> SimplCont -> SimplM (SimplFloats, OutExpr)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5e0831bd71a76c4cc89cbbbdec4dcd5ab2a4a043

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5e0831bd71a76c4cc89cbbbdec4dcd5ab2a4a043
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250314/635ff0e3/attachment-0001.html>