[commit: ghc] master: Do not zero out version number when processing wired-in packages. (22520cd)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/22520cd7071e624cb3cbde6fdd65e872855dd6ff/ghc

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

commit 22520cd7071e624cb3cbde6fdd65e872855dd6ff
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Aug 22 01:29:28 2014 +0100

    Do not zero out version number when processing wired-in packages.
    
    Summary:
    Previously, GHC would look for instances of wired-in packages in the
    in-memory package database and null out the version number.  This was
    necessary when the sourcePackageId was used to determine the linker
    symbols; however, we now use a package key, so only that needs to be
    updated.
    
    Long-term, we can remove this hack by ensuring that Cabal actually records
    the proper package key in the database.  This will also fix an unrelated
    hack elsewhere.
    
    Keeping version numbers means that wired in packages get rendered differently
    when output by GHC.  This is the source of all the test-case output changes.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: hvr, austin
    
    Subscribers: simonmar, ezyang, carter
    
    Differential Revision: https://phabricator.haskell.org/D170


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

22520cd7071e624cb3cbde6fdd65e872855dd6ff
 compiler/main/Packages.lhs                                   |  3 +--
 testsuite/tests/ghci/scripts/ghci025.stdout                  |  5 +++--
 testsuite/tests/indexed-types/should_compile/T3017.stderr    |  3 ++-
 testsuite/tests/indexed-types/should_fail/T9160.stderr       |  8 ++++----
 testsuite/tests/package/package06e.stderr                    |  4 ++--
 testsuite/tests/package/package07e.stderr                    |  9 +++++----
 testsuite/tests/package/package08e.stderr                    |  9 +++++----
 testsuite/tests/roles/should_compile/Roles1.stderr           |  3 ++-
 testsuite/tests/roles/should_compile/Roles14.stderr          |  3 ++-
 testsuite/tests/roles/should_compile/Roles2.stderr           |  3 ++-
 testsuite/tests/roles/should_compile/Roles3.stderr           |  3 ++-
 testsuite/tests/roles/should_compile/Roles4.stderr           |  3 ++-
 testsuite/tests/roles/should_compile/T8958.stderr            |  3 ++-
 testsuite/tests/safeHaskell/check/Check01.stderr             |  2 +-
 testsuite/tests/safeHaskell/check/Check06.stderr             |  2 +-
 testsuite/tests/safeHaskell/check/Check08.stderr             |  2 +-
 testsuite/tests/safeHaskell/check/Check09.stderr             |  4 ++--
 testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr     |  2 +-
 testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr |  2 +-
 testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr |  2 +-
 testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout     | 10 +++++-----
 testsuite/tests/safeHaskell/flags/SafeFlags17.stderr         |  2 +-
 testsuite/tests/simplCore/should_compile/T5550.stderr        |  6 +++---
 testsuite/tests/th/TH_Roles2.stderr                          |  4 ++--
 testsuite/tests/typecheck/should_compile/tc231.stderr        |  3 ++-
 testsuite/tests/typecheck/should_fail/T5095.stderr           |  3 ++-
 testsuite/tests/typecheck/should_fail/tcfail182.stderr       |  3 ++-
 27 files changed, 59 insertions(+), 47 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 22520cd7071e624cb3cbde6fdd65e872855dd6ff