diff options
| author | Josh Meredith <joshmeredith2008@gmail.com> | 2019-12-04 23:39:28 +1100 |
|---|---|---|
| committer | Josh Meredith <joshmeredith2008@gmail.com> | 2019-12-04 23:39:28 +1100 |
| commit | a8435165b84c32fd2ebdd1281dd6ee077e07ad5a (patch) | |
| tree | 791936d014aeaa26174c2dcbef34c14f3329dd04 /compiler/specialise | |
| parent | 7805441b4d5e22eb63a501e1e40383d10380dc92 (diff) | |
| parent | f03a41d4bf9418ee028ecb51654c928b2da74edd (diff) | |
| download | haskell-wip/binary-readerT.tar.gz | |
Merge branch 'master' into wip/binary-readerTwip/binary-readerT
Diffstat (limited to 'compiler/specialise')
| -rw-r--r-- | compiler/specialise/SpecConstr.hs | 2 | ||||
| -rw-r--r-- | compiler/specialise/Specialise.hs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/specialise/SpecConstr.hs b/compiler/specialise/SpecConstr.hs index 8ced5a87c0..56c81ea101 100644 --- a/compiler/specialise/SpecConstr.hs +++ b/compiler/specialise/SpecConstr.hs @@ -699,7 +699,7 @@ specConstrProgram guts = do dflags <- getDynFlags us <- getUniqueSupplyM - annos <- getFirstAnnotations deserializeWithData guts + (_, annos) <- getFirstAnnotations deserializeWithData guts this_mod <- getModule let binds' = reverse $ fst $ initUs us $ do -- Note [Top-level recursive groups] diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs index 75e80d0c46..b79a559436 100644 --- a/compiler/specialise/Specialise.hs +++ b/compiler/specialise/Specialise.hs @@ -576,7 +576,7 @@ Hence, the invariant is this: ************************************************************************ -} --- | Specialise calls to type-class overloaded functions occuring in a program. +-- | Specialise calls to type-class overloaded functions occurring in a program. specProgram :: ModGuts -> CoreM ModGuts specProgram guts@(ModGuts { mg_module = this_mod , mg_rules = local_rules @@ -2107,7 +2107,7 @@ Consider We gather the call info for (f @T $df), and we don't want to drop it when we come across the binding for $df. So we add $df to the floats and continue. But then we have to add $c== to the floats, and so on. -These all float above the binding for 'f', and and now we can +These all float above the binding for 'f', and now we can successfully specialise 'f'. So the DictBinds in (ud_binds :: Bag DictBind) may contain @@ -2378,7 +2378,7 @@ pair_fvs (bndr, rhs) = exprSomeFreeVars interesting rhs interesting :: InterestingVarFun interesting v = isLocalVar v || (isId v && isDFunId v) -- Very important: include DFunIds /even/ if it is imported - -- Reason: See Note [Avoiding loops], the second exmaple + -- Reason: See Note [Avoiding loops], the second example -- involving an imported dfun. We must know whether -- a dictionary binding depends on an imported dfun, -- in case we try to specialise that imported dfun |