summaryrefslogtreecommitdiff
path: root/libraries/base/GHC/Generics.hs
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2016-02-26 23:02:31 +0100
committerBen Gamari <ben@smart-cactus.org>2016-02-26 23:02:37 +0100
commit890e2bb72b9953ca3e6990911b4cf6e51a0dd0f8 (patch)
tree37eaee614785092d8d74c548fce6d06d61dcfbd3 /libraries/base/GHC/Generics.hs
parenteee040c17ad2feb6706f206eb8ea66c7ea131921 (diff)
downloadhaskell-890e2bb72b9953ca3e6990911b4cf6e51a0dd0f8.tar.gz
GHC.Generics: Ensure some, many for U1 don't bottom
Reviewers: austin, hvr, ekmett, RyanGlScott Reviewed By: RyanGlScott Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1952 GHC Trac Issues: #11650
Diffstat (limited to 'libraries/base/GHC/Generics.hs')
-rw-r--r--libraries/base/GHC/Generics.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/libraries/base/GHC/Generics.hs b/libraries/base/GHC/Generics.hs
index 4e01c137f3..f723127bdc 100644
--- a/libraries/base/GHC/Generics.hs
+++ b/libraries/base/GHC/Generics.hs
@@ -745,6 +745,9 @@ instance Applicative U1 where
instance Alternative U1 where
empty = U1
U1 <|> U1 = U1
+ -- The defaults will otherwise bottom; see #11650.
+ some U1 = U1
+ many U1 = U1
instance Monad U1 where
U1 >>= _ = U1