[commit: ghc] wip/T13861: Merge branch 'wip/cross-constr-cse' into wip/T13861 (793a94f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T13861
Link       : http://ghc.haskell.org/trac/ghc/changeset/793a94f072d6e34c3b4c17346b50a565426aab82/ghc

>---------------------------------------------------------------

commit 793a94f072d6e34c3b4c17346b50a565426aab82
Merge: 5719218 63c09d3
Author: Gabor Greif <ggreif at gmail.com>
Date:   Fri Dec 22 00:58:52 2017 +0100

    Merge branch 'wip/cross-constr-cse' into wip/T13861
    
    Conflicts:
    	compiler/codeGen/StgCmmClosure.hs



>---------------------------------------------------------------

793a94f072d6e34c3b4c17346b50a565426aab82
 compiler/cmm/CmmType.hs                           |  9 +--
 compiler/simplStg/StgCse.hs                       | 60 +++++++++++---
 testsuite/tests/simplStg/should_run/T13861.hs     | 95 +++++++++++++++++++++++
 testsuite/tests/simplStg/should_run/T13861.stdout |  8 ++
 testsuite/tests/simplStg/should_run/all.T         |  2 +
 5 files changed, 154 insertions(+), 20 deletions(-)