diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-12-27 10:14:16 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-01-24 05:37:52 -0500 |
| commit | ada29f5ca5a567b69713f08feac9ee4f247de117 (patch) | |
| tree | 2bdf26e2872e6adca0219a8903ed3799b80432b5 | |
| parent | 4fe9eaff11ccf1fe185de2918aef4f96fd200c72 (diff) | |
| download | haskell-ada29f5ca5a567b69713f08feac9ee4f247de117.tar.gz | |
Finder: Look in current unit before looking in any home package dependencies
In order to preserve existing behaviour it's important to look within the current component before consideirng a module might come from an external component.
This already happened by accident in `downsweep`, (because roots are used to repopulated the cache) but in the `Finder` the logic was the wrong way around.
Fixes #22680
-------------------------
Metric Decrease:
MultiComponentModules
MultiComponentModulesRecomp
-------------------------p
9 files changed, 30 insertions, 1 deletions
diff --git a/compiler/GHC/Unit/Finder.hs b/compiler/GHC/Unit/Finder.hs index e722e432af..25d3f68d00 100644 --- a/compiler/GHC/Unit/Finder.hs +++ b/compiler/GHC/Unit/Finder.hs @@ -180,7 +180,10 @@ findImportedModuleNoHsc fc fopts ue mhome_unit mod_name mb_pkg = | otherwise = findHomePackageModule fc opts uid mod_name - any_home_import = foldr orIfNotFound home_import (map home_pkg_import other_fopts) + -- Do not be smart and change this to `foldr orIfNotFound home_import hs` as + -- that is not the same!! home_import is first because we need to look within ourselves + -- first before looking at the packages in order. + any_home_import = foldr1 orIfNotFound (home_import: map home_pkg_import other_fopts) pkg_import = findExposedPackageModule fc fopts units mod_name mb_pkg diff --git a/testsuite/tests/driver/multipleHomeUnits/all.T b/testsuite/tests/driver/multipleHomeUnits/all.T index d289a447a6..6b2ad64eb5 100644 --- a/testsuite/tests/driver/multipleHomeUnits/all.T +++ b/testsuite/tests/driver/multipleHomeUnits/all.T @@ -62,6 +62,9 @@ test('MHU_OptionsGHC', normal, compile_fail, ['']) test('multipleHomeUnits_loop', [extra_files([ 'a/', 'unitA', 'loop', 'unitLoop'])], multiunit_compile, [['unitA', 'unitLoop'], '-fhide-source-paths']) +# This test checks that we look for things in our home unit before looking in dependencies +test('multipleHomeUnits_import_order', [extra_files([ 'unitOrder1', 'unitOrder2', 'order-matters1', 'order-matters2'])], multiunit_compile, [['unitOrder1', 'unitOrder2'], '-fhide-source-paths']) + test('multipleHomeUnits_recomp', [copy_files,extra_files([ 'Recomp.hs', 'unitRecomp', 'unitDep', 'Dep.hs'])], makefile_test, []) test('multipleHomeUnits_recomp_th', [filter_stdout_lines(r'.*Compiling.*'), copy_files, extra_files(['thRecomp.script', 'unitRecompTH', 'unitDep', 'RecompTH.hs', 'Dep.hs', '../../ghci/shell.hs']) , extra_run_opts('-v1 -unit @unitRecompTH -unit @unitDep')], ghci_script, ['thRecomp.script']) diff --git a/testsuite/tests/driver/multipleHomeUnits/multipleHomeUnits_import_order.stderr b/testsuite/tests/driver/multipleHomeUnits/multipleHomeUnits_import_order.stderr new file mode 100644 index 0000000000..4358ec822b --- /dev/null +++ b/testsuite/tests/driver/multipleHomeUnits/multipleHomeUnits_import_order.stderr @@ -0,0 +1,4 @@ +[1 of 4] Compiling A[order-matters1] +[2 of 4] Compiling A[order-matters2] +[3 of 4] Compiling B[order-matters1] +[4 of 4] Compiling B[order-matters2] diff --git a/testsuite/tests/driver/multipleHomeUnits/order-matters1/A.hs b/testsuite/tests/driver/multipleHomeUnits/order-matters1/A.hs new file mode 100644 index 0000000000..a1934d7fab --- /dev/null +++ b/testsuite/tests/driver/multipleHomeUnits/order-matters1/A.hs @@ -0,0 +1,3 @@ +module A where + +a1 = () diff --git a/testsuite/tests/driver/multipleHomeUnits/order-matters1/B.hs b/testsuite/tests/driver/multipleHomeUnits/order-matters1/B.hs new file mode 100644 index 0000000000..413e95083a --- /dev/null +++ b/testsuite/tests/driver/multipleHomeUnits/order-matters1/B.hs @@ -0,0 +1,5 @@ +module B where + +import A + +foo = a1 diff --git a/testsuite/tests/driver/multipleHomeUnits/order-matters2/A.hs b/testsuite/tests/driver/multipleHomeUnits/order-matters2/A.hs new file mode 100644 index 0000000000..c1b1a23f67 --- /dev/null +++ b/testsuite/tests/driver/multipleHomeUnits/order-matters2/A.hs @@ -0,0 +1,3 @@ +module A where + +a2 = () diff --git a/testsuite/tests/driver/multipleHomeUnits/order-matters2/B.hs b/testsuite/tests/driver/multipleHomeUnits/order-matters2/B.hs new file mode 100644 index 0000000000..400c23723a --- /dev/null +++ b/testsuite/tests/driver/multipleHomeUnits/order-matters2/B.hs @@ -0,0 +1,6 @@ +module B where + +-- Refers to A from current unit +import A + +foo = a2 diff --git a/testsuite/tests/driver/multipleHomeUnits/unitOrder1 b/testsuite/tests/driver/multipleHomeUnits/unitOrder1 new file mode 100644 index 0000000000..2fd867cb08 --- /dev/null +++ b/testsuite/tests/driver/multipleHomeUnits/unitOrder1 @@ -0,0 +1 @@ +-i -iorder-matters1 A B -this-unit-id order-matters1 diff --git a/testsuite/tests/driver/multipleHomeUnits/unitOrder2 b/testsuite/tests/driver/multipleHomeUnits/unitOrder2 new file mode 100644 index 0000000000..44ee993a07 --- /dev/null +++ b/testsuite/tests/driver/multipleHomeUnits/unitOrder2 @@ -0,0 +1 @@ +-i -iorder-matters2 A B -package-id order-matters1 -this-unit-id order-matters2 |