diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2017-06-02 13:12:11 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-06-02 13:12:13 -0400 |
| commit | a786b136f48dfcf907dad55bcdbc4fcd247f2794 (patch) | |
| tree | 9c6abee43aa398fdd8168b1cb7bd2d3fb5e6bacf /compiler/ghci/ByteCodeGen.hs | |
| parent | 811a2986475d88f73bb22b4600970039e1b582d6 (diff) | |
| download | haskell-a786b136f48dfcf907dad55bcdbc4fcd247f2794.tar.gz | |
Use lengthIs and friends in more places
While investigating #12545, I discovered several places in the code
that performed length-checks like so:
```
length ts == 4
```
This is not ideal, since the length of `ts` could be much longer than 4,
and we'd be doing way more work than necessary! There are already a slew
of helper functions in `Util` such as `lengthIs` that are designed to do
this efficiently, so I found every place where they ought to be used and
did just that. I also defined a couple more utility functions for list
length that were common patterns (e.g., `ltLength`).
Test Plan: ./validate
Reviewers: austin, hvr, goldfire, bgamari, simonmar
Reviewed By: bgamari, simonmar
Subscribers: goldfire, rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3622
Diffstat (limited to 'compiler/ghci/ByteCodeGen.hs')
| -rw-r--r-- | compiler/ghci/ByteCodeGen.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/ghci/ByteCodeGen.hs b/compiler/ghci/ByteCodeGen.hs index 0033df1cea..7ad51a7138 100644 --- a/compiler/ghci/ByteCodeGen.hs +++ b/compiler/ghci/ByteCodeGen.hs @@ -600,7 +600,7 @@ schemeE d s p (AnnCase scrut bndr _ [(DataAlt dc, [bind1, bind2], rhs)]) schemeE d s p (AnnCase scrut bndr _ [(DataAlt dc, [bind1], rhs)]) | isUnboxedTupleCon dc - , length (typePrimRep (idType bndr)) <= 1 -- handles unit tuples + , typePrimRep (idType bndr) `lengthAtMost` 1 -- handles unit tuples = doCase d s p scrut bind1 [(DEFAULT, [], rhs)] (Just bndr) schemeE d s p (AnnCase scrut bndr _ alt@[(DEFAULT, [], _)]) @@ -729,7 +729,7 @@ mkConAppCode _ _ _ con [] -- Nullary constructor -- copy of this constructor, use the single shared version. mkConAppCode orig_d _ p con args_r_to_l - = ASSERT( dataConRepArity con == length args_r_to_l ) + = ASSERT( args_r_to_l `lengthIs` dataConRepArity con ) do_pushery orig_d (non_ptr_args ++ ptr_args) where -- The args are already in reverse order, which is the way PACK |