[Git][ghc/ghc][wip/js-th] 3 commits: JS: disable debugging info for heap objects

Sylvain Henry (@hsyl20) gitlab at gitlab.haskell.org
Wed Feb 15 16:31:05 UTC 2023



Sylvain Henry pushed to branch wip/js-th at Glasgow Haskell Compiler / GHC


Commits:
0c9e2a9c by Sylvain Henry at 2023-02-15T09:45:17+01:00
JS: disable debugging info for heap objects

- - - - -
a4f32f82 by Sylvain Henry at 2023-02-15T16:03:21+01:00
Testsuite: skip req_bco tests as there are false positive

- - - - -
a725f9a3 by Sylvain Henry at 2023-02-15T17:35:32+01:00
Testsuite: fix more tests

- - - - -


8 changed files:

- compiler/GHC/StgToJS/Linker/Linker.hs
- testsuite/driver/testlib.py
- testsuite/tests/partial-sigs/should_compile/all.T
- testsuite/tests/quasiquotation/T13863/all.T
- testsuite/tests/quasiquotation/T4491/test.T
- testsuite/tests/quasiquotation/qq007/test.T
- testsuite/tests/quasiquotation/qq008/test.T
- testsuite/tests/showIface/all.T


Changes:

=====================================
compiler/GHC/StgToJS/Linker/Linker.hs
=====================================
@@ -1025,11 +1025,13 @@ linkModules mods = (compact_mods, meta)
     statics = nubStaticInfo (concatMap mc_statics mods)
 
     infos   = concatMap mc_closures mods
+    debug   = False -- TODO: this could be enabled in a debug build.
+                    -- It adds debug info to heap objects
     meta = mconcat
             -- render metadata as individual statements
             [ mconcat (map staticDeclStat statics)
             , mconcat (map staticInitStat statics)
-            , mconcat (map (closureInfoStat True) infos)
+            , mconcat (map (closureInfoStat debug) infos)
             ]
 
 -- | Only keep a single StaticInfo with a given name


=====================================
testsuite/driver/testlib.py
=====================================
@@ -268,11 +268,10 @@ def req_bco( name, opts ):
     '''
 
     # Requires the interpreter
-    req_interp
+    req_interp(name, opts)
 
     # JS backend doesn't support ByteCode either
-    if arch("js"):
-        opts.expect = 'fail'
+    js_skip(name, opts)
 
 def req_rts_linker( name, opts ):
     if not config.have_RTS_linker:


=====================================
testsuite/tests/partial-sigs/should_compile/all.T
=====================================
@@ -62,7 +62,7 @@ test('Uncurry', normal, compile, ['-ddump-types -fno-warn-partial-type-signature
 test('UncurryNamed', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
 test('WarningWildcardInstantiations', normal, compile, ['-ddump-types'])
 test('SplicesUsed', [extra_files(['Splices.hs']),
-                     req_interp, omit_ways(prof_ways)], multimod_compile,
+                     req_th, omit_ways(prof_ways)], multimod_compile,
      ['SplicesUsed', config.ghc_th_way_flags])
 test('TypedSplice', normal, compile, [''])
 test('T10403', normal, compile, [''])


=====================================
testsuite/tests/quasiquotation/T13863/all.T
=====================================
@@ -1 +1 @@
-test('T13863', [req_interp, omit_ways(prof_ways), extra_files(['A.hs', 'B.hs'])], multimod_compile, ['B', '-fno-code -v0'])
\ No newline at end of file
+test('T13863', [req_th, omit_ways(prof_ways), extra_files(['A.hs', 'B.hs'])], multimod_compile, ['B', '-fno-code -v0'])


=====================================
testsuite/tests/quasiquotation/T4491/test.T
=====================================
@@ -1,7 +1,7 @@
 test('T4491',
      [extra_files(['A.hs']),
       
-      req_interp,
+      req_th,
       # We'd need to jump through some hoops to run this test the
       # other ways, due to the TH use, so for now we only run it
       # the TH way


=====================================
testsuite/tests/quasiquotation/qq007/test.T
=====================================
@@ -2,5 +2,5 @@ test('qq007',
      [extra_files(['QQ.hs', 'Test.hs']),
       when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
       omit_ways(prof_ways),
-      req_interp],
+      req_th],
      multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags])


=====================================
testsuite/tests/quasiquotation/qq008/test.T
=====================================
@@ -2,5 +2,5 @@ test('qq008',
      [extra_files(['QQ.hs', 'Test.hs']),
       when(fast(), skip), pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
       omit_ways(prof_ways),
-      req_interp],
+      req_th],
      multimod_compile, ['Test', '-v0 ' + config.ghc_th_way_flags])


=====================================
testsuite/tests/showIface/all.T
=====================================
@@ -7,7 +7,7 @@ test('DocsInHiFile1',
      makefile_test, ['DocsInHiFile1'])
 test('T17871', [extra_files(['T17871a.hs'])], multimod_compile, ['T17871', '-v0'])
 test('DocsInHiFileTH',
-     [extra_files(['DocsInHiFileTHExternal.hs', 'DocsInHiFileTH.hs']), js_broken(22261)],
+     [extra_files(['DocsInHiFileTHExternal.hs', 'DocsInHiFileTH.hs']), req_th],
      makefile_test, ['DocsInHiFileTH'])
 test('NoExportList',
      normal,



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/085fc04bd2fda63cfb918bb4952714748ad48406...a725f9a3281a5f190f55e7f76edfc1832e1694bd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/085fc04bd2fda63cfb918bb4952714748ad48406...a725f9a3281a5f190f55e7f76edfc1832e1694bd
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/20230215/4a911af6/attachment-0001.html>


More information about the ghc-commits mailing list