Merge remote branch 'origin/master'
Fixed conflicts in: compiler/typecheck/TcCanonical.lhs compiler/typecheck/TcErrors.lhs compiler/typecheck/TcInteract.lhs
No related branches found
No related tags found
Showing
- compiler/basicTypes/BasicTypes.lhs 37 additions, 1 deletioncompiler/basicTypes/BasicTypes.lhs
- compiler/basicTypes/DataCon.lhs 48 additions, 40 deletionscompiler/basicTypes/DataCon.lhs
- compiler/basicTypes/Id.lhs 29 additions, 10 deletionscompiler/basicTypes/Id.lhs
- compiler/basicTypes/IdInfo.lhs 4 additions, 1 deletioncompiler/basicTypes/IdInfo.lhs
- compiler/basicTypes/IdInfo.lhs-boot 2 additions, 0 deletionscompiler/basicTypes/IdInfo.lhs-boot
- compiler/basicTypes/MkId.lhs 59 additions, 62 deletionscompiler/basicTypes/MkId.lhs
- compiler/basicTypes/Var.lhs 20 additions, 67 deletionscompiler/basicTypes/Var.lhs
- compiler/basicTypes/VarEnv.lhs 3 additions, 2 deletionscompiler/basicTypes/VarEnv.lhs
- compiler/basicTypes/VarSet.lhs 4 additions, 2 deletionscompiler/basicTypes/VarSet.lhs
- compiler/cmm/Cmm.hs 3 additions, 2 deletionscompiler/cmm/Cmm.hs
- compiler/cmm/CmmCPS.hs 44 additions, 46 deletionscompiler/cmm/CmmCPS.hs
- compiler/cmm/CmmNode.hs 27 additions, 7 deletionscompiler/cmm/CmmNode.hs
- compiler/cmm/CmmParse.y 15 additions, 10 deletionscompiler/cmm/CmmParse.y
- compiler/cmm/CmmSpillReload.hs 462 additions, 100 deletionscompiler/cmm/CmmSpillReload.hs
- compiler/cmm/OldCmm.hs 3 additions, 1 deletioncompiler/cmm/OldCmm.hs
- compiler/codeGen/StgCmmUtils.hs 62 additions, 0 deletionscompiler/codeGen/StgCmmUtils.hs
- compiler/coreSyn/CoreArity.lhs 21 additions, 21 deletionscompiler/coreSyn/CoreArity.lhs
- compiler/coreSyn/CoreFVs.lhs 14 additions, 10 deletionscompiler/coreSyn/CoreFVs.lhs
- compiler/coreSyn/CoreLint.lhs 224 additions, 216 deletionscompiler/coreSyn/CoreLint.lhs
- compiler/coreSyn/CorePrep.lhs 23 additions, 14 deletionscompiler/coreSyn/CorePrep.lhs
Loading
Please register or sign in to comment