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@cs.stanford.edu>

Test Plan: validate

Reviewers: hvr, austin

Subscribers: simonmar, ezyang, carter

Differential Revision: https://phabricator.haskell.org/D170

3 files changed, 12 insertions, 10 deletions

diff --git a/testsuite/tests/package/package06e.stderr b/testsuite/tests/package/package06e.stderr
index 2d4945549e..05894ee119 100644
--- a/testsuite/tests/package/package06e.stderr
+++ b/testsuite/tests/package/package06e.stderr
@@ -1,10 +1,10 @@
 
 package06e.hs:2:1:
     Failed to load interface for ‘HsTypes’
-    It is a member of the hidden package ‘ghc’.
+    It is a member of the hidden package ‘ghc-7.9.20140821’.
     Use -v to see a list of the files searched for.
 
 package06e.hs:3:1:
     Failed to load interface for ‘UniqFM’
-    It is a member of the hidden package ‘ghc’.
+    It is a member of the hidden package ‘ghc-7.9.20140821’.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/package/package07e.stderr b/testsuite/tests/package/package07e.stderr
index 6a72a2e89c..40eaa063e2 100644
--- a/testsuite/tests/package/package07e.stderr
+++ b/testsuite/tests/package/package07e.stderr
@@ -1,20 +1,21 @@
 
 package07e.hs:2:1:
     Failed to load interface for ‘MyHsTypes’
-    Perhaps you meant HsTypes (needs flag -package-key ghc)
+    Perhaps you meant
+      HsTypes (needs flag -package-key ghc-7.9.20140821)
     Use -v to see a list of the files searched for.
 
 package07e.hs:3:1:
     Failed to load interface for ‘HsTypes’
-    It is a member of the hidden package ‘ghc’.
+    It is a member of the hidden package ‘ghc-7.9.20140821’.
     Use -v to see a list of the files searched for.
 
 package07e.hs:4:1:
     Failed to load interface for ‘HsUtils’
-    It is a member of the hidden package ‘ghc’.
+    It is a member of the hidden package ‘ghc-7.9.20140821’.
     Use -v to see a list of the files searched for.
 
 package07e.hs:5:1:
     Failed to load interface for ‘UniqFM’
-    It is a member of the hidden package ‘ghc’.
+    It is a member of the hidden package ‘ghc-7.9.20140821’.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/package/package08e.stderr b/testsuite/tests/package/package08e.stderr
index a7e8433f7a..7b5c2a848e 100644
--- a/testsuite/tests/package/package08e.stderr
+++ b/testsuite/tests/package/package08e.stderr
@@ -1,20 +1,21 @@
 
 package08e.hs:2:1:
     Failed to load interface for ‘MyHsTypes’
-    Perhaps you meant HsTypes (needs flag -package-key ghc)
+    Perhaps you meant
+      HsTypes (needs flag -package-key ghc-7.9.20140821)
     Use -v to see a list of the files searched for.
 
 package08e.hs:3:1:
     Failed to load interface for ‘HsTypes’
-    It is a member of the hidden package ‘ghc’.
+    It is a member of the hidden package ‘ghc-7.9.20140821’.
     Use -v to see a list of the files searched for.
 
 package08e.hs:4:1:
     Failed to load interface for ‘HsUtils’
-    It is a member of the hidden package ‘ghc’.
+    It is a member of the hidden package ‘ghc-7.9.20140821’.
     Use -v to see a list of the files searched for.
 
 package08e.hs:5:1:
     Failed to load interface for ‘UniqFM’
-    It is a member of the hidden package ‘ghc’.
+    It is a member of the hidden package ‘ghc-7.9.20140821’.
     Use -v to see a list of the files searched for.