diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-08-22 01:29:28 +0100 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-08-22 14:26:06 +0100 |
| commit | 22520cd7071e624cb3cbde6fdd65e872855dd6ff (patch) | |
| tree | 19f67f87f173c84020188f9cc98e77070be62a2c /testsuite/tests/roles | |
| parent | bf1b117b6ab87a915bf24bcc85e216e5d51cb012 (diff) | |
| download | haskell-22520cd7071e624cb3cbde6fdd65e872855dd6ff.tar.gz | |
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
Diffstat (limited to 'testsuite/tests/roles')
6 files changed, 12 insertions, 6 deletions
diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr index 96d5603bbf..b59b5d3e1f 100644 --- a/testsuite/tests/roles/should_compile/Roles1.stderr +++ b/testsuite/tests/roles/should_compile/Roles1.stderr @@ -17,7 +17,8 @@ TYPE CONSTRUCTORS data T7 (a :: k) b = K7 b COERCION AXIOMS Dependent modules: [] -Dependent packages: [base, ghc-prim, integer-gmp] +Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0, + integer-gmp-0.5.1.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr index e0f26a14d3..e7a7b65ff1 100644 --- a/testsuite/tests/roles/should_compile/Roles14.stderr +++ b/testsuite/tests/roles/should_compile/Roles14.stderr @@ -6,7 +6,8 @@ TYPE CONSTRUCTORS COERCION AXIOMS axiom Roles12.NTCo:C2 :: C2 a = a -> a Dependent modules: [] -Dependent packages: [base, ghc-prim, integer-gmp] +Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0, + integer-gmp-0.5.1.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr index 2c7ab6c66f..053c957d1e 100644 --- a/testsuite/tests/roles/should_compile/Roles2.stderr +++ b/testsuite/tests/roles/should_compile/Roles2.stderr @@ -5,7 +5,8 @@ TYPE CONSTRUCTORS data T2 a = K2 (FunPtr a) COERCION AXIOMS Dependent modules: [] -Dependent packages: [base, ghc-prim, integer-gmp] +Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0, + integer-gmp-0.5.1.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr index 270afca9cd..23925867b1 100644 --- a/testsuite/tests/roles/should_compile/Roles3.stderr +++ b/testsuite/tests/roles/should_compile/Roles3.stderr @@ -18,7 +18,8 @@ COERCION AXIOMS axiom Roles3.NTCo:C3 :: C3 a b = a -> F3 b -> F3 b axiom Roles3.NTCo:C4 :: C4 a b = a -> F4 b -> F4 b Dependent modules: [] -Dependent packages: [base, ghc-prim, integer-gmp] +Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0, + integer-gmp-0.5.1.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr index f2b590fadd..93a27f3ded 100644 --- a/testsuite/tests/roles/should_compile/Roles4.stderr +++ b/testsuite/tests/roles/should_compile/Roles4.stderr @@ -9,7 +9,8 @@ COERCION AXIOMS axiom Roles4.NTCo:C1 :: C1 a = a -> a axiom Roles4.NTCo:C3 :: C3 a = a -> Syn1 a Dependent modules: [] -Dependent packages: [base, ghc-prim, integer-gmp] +Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0, + integer-gmp-0.5.1.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr index b53df162a8..5c144c204d 100644 --- a/testsuite/tests/roles/should_compile/T8958.stderr +++ b/testsuite/tests/roles/should_compile/T8958.stderr @@ -16,7 +16,8 @@ INSTANCES instance [incoherent] Representational a -- Defined at T8958.hs:10:10 Dependent modules: [] -Dependent packages: [base, ghc-prim, integer-gmp] +Dependent packages: [base-4.7.1.0, ghc-prim-0.3.1.0, + integer-gmp-0.5.1.0] ==================== Typechecker ==================== AbsBinds [a] [] |