diff options
| author | Sebastian Graf <sgraf1337@gmail.com> | 2019-02-01 06:46:32 -0500 |
|---|---|---|
| committer | Sebastian Graf <sgraf1337@gmail.com> | 2019-02-01 06:46:32 -0500 |
| commit | ef6b28339b18597a2df1ce39116f1d4e4533804c (patch) | |
| tree | 92655fc77db24b38660c5621b524815e217cebb0 /compiler/coreSyn | |
| parent | d6d735c1114082b9e9cc1ba7da87c49f52891320 (diff) | |
| download | haskell-ef6b28339b18597a2df1ce39116f1d4e4533804c.tar.gz | |
Remove ExnStr and ThrowsExn business
Diffstat (limited to 'compiler/coreSyn')
| -rw-r--r-- | compiler/coreSyn/CoreArity.hs | 4 | ||||
| -rw-r--r-- | compiler/coreSyn/MkCore.hs | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/compiler/coreSyn/CoreArity.hs b/compiler/coreSyn/CoreArity.hs index 2947518352..37454ebee0 100644 --- a/compiler/coreSyn/CoreArity.hs +++ b/compiler/coreSyn/CoreArity.hs @@ -153,9 +153,7 @@ exprBotStrictness_maybe e Just ar -> Just (ar, sig ar) where env = AE { ae_ped_bot = True, ae_cheap_fn = \ _ _ -> False } - sig ar = mkClosedStrictSig (replicate ar topDmd) exnRes - -- For this purpose we can be very simple - -- exnRes is a bit less aggressive than botRes + sig ar = mkClosedStrictSig (replicate ar topDmd) botRes {- Note [exprArity invariant] diff --git a/compiler/coreSyn/MkCore.hs b/compiler/coreSyn/MkCore.hs index b1046c9a84..8de684bced 100644 --- a/compiler/coreSyn/MkCore.hs +++ b/compiler/coreSyn/MkCore.hs @@ -758,7 +758,7 @@ tYPE_ERROR_ID = mkRuntimeErrorId typeErrorName aBSENT_SUM_FIELD_ERROR_ID = mkVanillaGlobalWithInfo absentSumFieldErrorName (mkSpecForAllTys [alphaTyVar] (mkTyVarTy alphaTyVar)) -- forall a . a - (vanillaIdInfo `setStrictnessInfo` mkClosedStrictSig [] exnRes + (vanillaIdInfo `setStrictnessInfo` mkClosedStrictSig [] botRes `setArityInfo` 0 `setCafInfo` NoCafRefs) -- #15038 @@ -785,8 +785,7 @@ mkRuntimeErrorId name -- any pc_bottoming_Id will itself have CafRefs, which bloats -- SRTs. - strict_sig = mkClosedStrictSig [evalDmd] exnRes - -- exnRes: these throw an exception, not just diverge + strict_sig = mkClosedStrictSig [evalDmd] botRes runtimeErrorTy :: Type -- forall (rr :: RuntimeRep) (a :: rr). Addr# -> a |