Simon Peyton Jones pushed to branch wip/spj-try-opt-coercion at Glasgow Haskell Compiler / GHC Commits: f024f6b6 by Simon Peyton Jones at 2026-04-17T00:12:16+01:00 Wibbles - - - - - 2 changed files: - compiler/GHC/Core/Coercion/Opt.hs - compiler/GHC/Core/LateCC/TopLevelBinds.hs Changes: ===================================== compiler/GHC/Core/Coercion/Opt.hs ===================================== @@ -321,13 +321,10 @@ opt_co_refl subst co go (Refl ty) = Refl (substTy subst ty) go (GRefl r ty mco) = GRefl r $!! go_ty ty $!! go_m mco go (CoVarCo cv) = substCoVar subst cv - go (HoleCo h) = HoleCo $!! go_hole h - go (SymCo co) = mkSymCo $!! go co - go (KindCo co) = mkKindCo $!! go co - go (SubCo co) = mkSubCo $!! (let co' = go co in - if isReflexiveCo co' && not (isReflCo co') - then pprTrace "yuike" (ppr co $$ ppr co') co' - else co') + go (HoleCo h) = HoleCo $!! go_hole h + go (SymCo co) = mkSymCo $!! go co + go (KindCo co) = mkKindCo $!! go co + go (SubCo co) = mkSubCo $!! go co go (SelCo n co) = mkSelCo n $!! go co go (LRCo n co) = mkLRCo n $!! go co go (AppCo co1 co2) = mkAppCo $!! go co1 $!! go co2 ===================================== compiler/GHC/Core/LateCC/TopLevelBinds.hs ===================================== @@ -117,9 +117,11 @@ topLevelBindsCC pred core_bind = -- executions of the RHS. Note that the lambdas might be hidden under ticks -- or casts. So look through these as well. addCC :: Id -> CoreExpr -> LateCCM s CoreExpr - addCC bndr (Cast rhs co) = pure Cast <*> addCC bndr rhs <*> pure co - addCC bndr (Tick t rhs) = (Tick t) <$> addCC bndr rhs - addCC bndr (Lam b rhs) = Lam b <$> addCC bndr rhs + addCC bndr (Cast rhs co) = Cast <$> addCC bndr rhs <*> pure co + addCC bndr (Tick t rhs) = Tick t <$> addCC bndr rhs + addCC bndr (Lam b rhs) = Lam b <$> addCC bndr rhs + addCC _ e@(Coercion {}) = return e -- Do not add cost centres + addCC _ e@(Type {}) = return e -- around coercions or types addCC bndr rhs = do let name = idName bndr cc_loc = nameSrcSpan name View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f024f6b65ad9489aee6e961fc04887de... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f024f6b65ad9489aee6e961fc04887de... You're receiving this email because of your account on gitlab.haskell.org.
participants (1)
-
Simon Peyton Jones (@simonpj)