[Git][ghc/ghc][wip/js-staging] 2 commits: Fix note
Sylvain Henry (@hsyl20)
gitlab at gitlab.haskell.org
Mon Oct 17 23:19:26 UTC 2022
Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC
Commits:
5b9d3643 by Sylvain Henry at 2022-10-18T01:19:52+02:00
Fix note
- - - - -
5444cee9 by Sylvain Henry at 2022-10-18T01:22:53+02:00
Disable more tests
- - - - -
7 changed files:
- compiler/GHC/Driver/Pipeline/Execute.hs
- testsuite/tests/cmm/opt/all.T
- testsuite/tests/driver/fat-iface/all.T
- testsuite/tests/driver/multipleHomeUnits/all.T
- testsuite/tests/driver/multipleHomeUnits/hi-dir/all.T
- testsuite/tests/driver/multipleHomeUnits/o-files/all.T
- testsuite/tests/driver/multipleHomeUnits/target-file-path/all.T
Changes:
=====================================
compiler/GHC/Driver/Pipeline/Execute.hs
=====================================
@@ -345,8 +345,8 @@ runAsPhase with_cpp pipe_env hsc_env location input_fn = do
return output_fn
--- Note [JS Backend .o file procedure ]
--- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-- Note [JS Backend .o file procedure]
+-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--
-- The JS backend breaks some of the assumptions on file generation order
-- because it directly produces .o files. This violation breaks some of the
@@ -360,8 +360,7 @@ runAsPhase with_cpp pipe_env hsc_env location input_fn = do
-- 3. Then we generate a .o file in a postHsc phase (calling the asm phase etc.)
--
-- For the JS Backend this order is different
--- 1. The JS Backend _directly_ produces .o files (via
--- 'GHC.StgToJS.Linker.Linker.embedJsFile')
+-- 1. The JS Backend _directly_ produces .o files
-- 2. Then we write the interface file. Notice that this breaks the ordering
-- of .hi > .o (step 2 and step 3 in the NCG above).
--
@@ -384,7 +383,7 @@ runJsPhase pipe_env hsc_env input_fn = do
-- if the input filename is the same as the output, then we've probably
-- generated the object ourselves. In this case, we touch the object file to
- -- ensure the timestamp is refreshed, see Note [ JS Backend .o Files ]. If
+ -- ensure the timestamp is refreshed, see Note [JS Backend .o file procedure]. If
-- they are not the same then we embed the .js file into a .o file with the
-- addition of a header
if (input_fn /= output_fn)
=====================================
testsuite/tests/cmm/opt/all.T
=====================================
@@ -1,5 +1,5 @@
# Verify that we optimize away conditional branches which always jump
# to the same target.
-test('T15188', normal, makefile_test, [])
+test('T15188', cmm_src, makefile_test, [])
test('T18141', normal, compile, [''])
test('T20142', normal, compile, [''])
=====================================
testsuite/tests/driver/fat-iface/all.T
=====================================
@@ -5,7 +5,7 @@ test('fat006a', [extra_files(['Fat.hs'])], makefile_test, ['fat006a'])
test('fat007', [extra_files(['Fat.hs'])], makefile_test, ['fat007'])
test('fat008', [req_th, unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote.hs']), copy_files], makefile_test, ['fat008'])
test('fat009', [req_th, extra_files(['FatTH.hs', 'FatQuote.hs']), copy_files], makefile_test, ['fat009'])
-test('fat010', [extra_files(['THA.hs', 'THB.hs', 'THC.hs']), copy_files], makefile_test, ['fat010'])
+test('fat010', [req_th,extra_files(['THA.hs', 'THB.hs', 'THC.hs']), copy_files], makefile_test, ['fat010'])
# Check linking works when using -fbyte-code-and-object-code
test('fat011', [req_th, extra_files(['FatMain.hs', 'FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatMain', '-fbyte-code-and-object-code -fprefer-byte-code'])
# Check that we use interpreter rather than enable dynamic-too if needed for TH
=====================================
testsuite/tests/driver/multipleHomeUnits/all.T
=====================================
@@ -1,7 +1,7 @@
test('multipleHomeUnits_single1', [extra_files([ 'a/', 'unitA'])], multiunit_compile, [['unitA'], '-fhide-source-paths'])
test('multipleHomeUnits_single2', [extra_files([ 'b/', 'unitB'])], multiunit_compile, [['unitB'], '-fhide-source-paths'])
-test('multipleHomeUnits_single3', [extra_files([ 'c/', 'unitC'])], multiunit_compile, [['unitC'], '-fhide-source-paths'])
-test('multipleHomeUnits_single4', [extra_files([ 'd/', 'unitD'])], multiunit_compile, [['unitD'], '-fhide-source-paths'])
+test('multipleHomeUnits_single3', [js_broken(22261),extra_files([ 'c/', 'unitC'])], multiunit_compile, [['unitC'], '-fhide-source-paths'])
+test('multipleHomeUnits_single4', [js_broken(22261),extra_files([ 'd/', 'unitD'])], multiunit_compile, [['unitD'], '-fhide-source-paths'])
test('multipleHomeUnits_single5', [req_th,extra_files([ 'th/', 'unitTH'])], multiunit_compile, [['unitTH'], '-fhide-source-paths'])
test('multipleHomeUnits_cpp', [extra_files([ 'cpp-includes/', 'unitCPPIncludes'])], multiunit_compile, [['unitCPPIncludes'], '-fhide-source-paths'])
test('multipleHomeUnits_cfile', [extra_files([ 'c-file/', 'unitCFile'])], multiunit_compile, [['unitCFile'], '-fhide-source-paths'])
@@ -22,12 +22,14 @@ test('multipleHomeUnits002',
[ extra_files(
[ 'c/', 'd/'
, 'unitC', 'unitD'])
+ , js_broken(22261)
], makefile_test, [])
test('multipleHomeUnits003',
[ extra_files(
[ 'a/', 'b/', 'c/', 'd/'
, 'unitA', 'unitB', 'unitC', 'unitD'])
+ , js_broken(22261)
], makefile_test, [])
test('multipleHomeUnits004',
=====================================
testsuite/tests/driver/multipleHomeUnits/hi-dir/all.T
=====================================
@@ -1,6 +1,7 @@
# This test checks that getRootSummary doesn't cross package boundaries.
test('multipleHomeUnits_hidir'
, [extra_files([ 'p1/', 'unitP1'])
+ , js_broken(22261)
]
, makefile_test
, ['mhu-hidir'])
=====================================
testsuite/tests/driver/multipleHomeUnits/o-files/all.T
=====================================
@@ -1,6 +1,7 @@
# This test checks that getRootSummary doesn't cross package boundaries.
test('multipleHomeUnits_o-files'
, [extra_files([ 'p1/', 'unitP1'])
+ , js_broken(22261)
, pre_cmd('$MAKE -s --no-print-directory setup')]
, multiunit_compile
, [['unitP1'], '-fhide-source-paths'])
=====================================
testsuite/tests/driver/multipleHomeUnits/target-file-path/all.T
=====================================
@@ -1,6 +1,7 @@
# This test checks that getRootSummary doesn't cross package boundaries.
test('multipleHomeUnits_target-file-path'
, [extra_files([ 'p1/', 'unitP1'])
+ , js_broken(22261)
]
, multiunit_compile
, [['unitP1'], '-fhide-source-paths'])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8f73a16d3c093ce319308de7a85cff4f4182676b...5444cee974edd2ccf0cdb797771e772ddea547a8
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8f73a16d3c093ce319308de7a85cff4f4182676b...5444cee974edd2ccf0cdb797771e772ddea547a8
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221017/49d3824d/attachment-0001.html>
More information about the ghc-commits
mailing list