Use Reduction instead of pairs

ucsd-progsys · Nov 3, 2023 · 0b5fc21 · 0b5fc21
1 parent 8e390a1
commit 0b5fc21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/liquidhaskell-boot/src-ghc/Liquid/GHC/API.hs b/liquidhaskell-boot/src-ghc/Liquid/GHC/API.hs
@@ -318,6 +318,8 @@ import GHC.Core.Make                  as Ghc
     , pAT_ERROR_ID
     )
 import GHC.Core.Predicate             as Ghc (getClassPredTys_maybe, getClassPredTys, isEvVarType, isEqPrimPred, isEqPred, isClassPred, isDictId, mkClassPred)
+import GHC.Core.Reduction             as Ghc
+    ( Reduction(Reduction) )
 import GHC.Core.Subst                 as Ghc (deShadowBinds, emptySubst, extendCvSubst)
 import GHC.Core.TyCo.Rep              as Ghc
     ( AnonArgFlag(VisArg)

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/RefType.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Types/RefType.hs
@@ -1721,8 +1721,8 @@ deepSplitProductType :: FamInstEnvs -> Type -> Maybe DataConAppContext
 -- Why do we return the strictness of the data-con arguments?
 -- Answer: see Note [Record evaluated-ness in worker/wrapper]
 deepSplitProductType fam_envs ty
-  | let (co, ty1) = topNormaliseType_maybe fam_envs ty
-                    `orElse` (mkRepReflCo ty, ty)
+  | let Reduction co ty1 = topNormaliseType_maybe fam_envs ty
+                    `orElse` Reduction (mkRepReflCo ty) ty
   , Just (tc, tc_args) <- splitTyConApp_maybe ty1
   , Just con <- tyConSingleDataCon_maybe tc
   , let arg_tys = dataConInstArgTys con tc_args