Florian Ragwitz pushed to branch wip/rafl/hpc-instances at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • compiler/GHC/HsToCore/Ticks.hs
    ... ... @@ -312,6 +312,8 @@ addTickLHsBind (L pos (funBind@(FunBind { fun_id = L _ id, fun_matches = matches
    312 312
           exported = idName id `elemNameSet` exported_names
    
    313 313
     
    
    314 314
       -- See Note [Instance Method Coverage].
    
    315
    +  -- We only exclude generated instance methods for now, not generated code in
    
    316
    +  -- general, whose coverage semantics may need to be considered separately.
    
    315 317
       let generatedInstMeth = tickishType env == HpcTicks
    
    316 318
             && id `elemVarEnv` instMeths env
    
    317 319
             && isGenerated (mg_origin (mg_ext matches))
    

  • compiler/GHC/Types/Id/Info.hs
    ... ... @@ -222,9 +222,10 @@ data IdDetails
    222 222
             --   - the [CbvMark] is always empty (and ignored) until after Tidy
    
    223 223
             --     for ids from the current module
    
    224 224
             --   - If non-empty, at least is isMarkedCbbv; see (CBV2)
    
    225
    -  | InstMethId Name
    
    226
    -        -- ^ An instance method. The 'Name' identifies the dictionary of the
    
    227
    -        -- instance it belongs to.
    
    225
    +  | InstMethId
    
    226
    +        -- ^ An instance method.
    
    227
    +      Name
    
    228
    +        -- ^ 'Name' of the dictionary function the instance it belongs to.
    
    228 229
     
    
    229 230
     data RecSelInfo
    
    230 231
       = RSI { rsi_def   :: [ConLike]   -- Record selector defined for these
    

  • libraries/containers
    1
    -Subproject commit 953428ad079d5708df696442f9bdeaccd1acfc6c
    1
    +Subproject commit 801b06e5d4392b028e519d5ca116a2881d559721