feat: JavaScript/GHCJS backend support

- Fix RTS for JavaScript target
- Implement stage2 JavaScript build
- Add stage3 support
- Fix JavaScript-specific issues

Author: GHC GitLab CI

Makefile

@@ -137,6 +137,7 @@ STAGE2_UTIL_TARGETS := \
 	$(STAGE_UTIL_TARGETS) \
 	ghc-iserv:ghc-iserv \
 	rts:nonthreaded-debug \
+	rts:nonthreaded-nodebug \
 	hp2ps:hp2ps \
 	hpc-bin:hpc \
 	runghc:runghc \

compiler/GHC/Iface/Errors/Ppr.hs

@@ -42,6 +42,7 @@ import GHC.Utils.Outputable
 import GHC.Utils.Panic
 
 import GHC.Iface.Errors.Types
+import qualified Data.List as List
 
 defaultIfaceMessageOpts :: IfaceMessageOpts
 defaultIfaceMessageOpts = IfaceMessageOpts { ifaceShowTriedFiles = False
@@ -174,14 +175,12 @@ cantFindErrorX pkg_hidden_hint may_show_locations mod_or_interface (CantFindInst
           looks_like_srcpkgid =
      -- Unsafely coerce a unit id (i.e. an installed package component
      -- identifier) into a PackageId and see if it means anything.
-           case cands of
-             (pkg:pkgs) ->
-              parens (text "This unit ID looks like the source package ID;" $$
-                      text "the real unit ID is" <+> quotes (ftext (unitIdFS (unitId pkg))) $$
-                     (if null pkgs then empty
-                                  else text "and" <+> int (length pkgs) <+> text "other candidate" <> plural pkgs))
+           case List.sortOn unitPackageNameString cands of
              -- Todo: also check if it looks like a package name!
              [] -> empty
+             pkgs ->
+              parens (text "This unit-id looks like a source package name-version;" <+>
+                      text "candidates real unit-ids are:" $$ vcat (map (quotes . ftext . unitIdFS . unitId)  pkgs))
 
       in hsep [ text "no unit id matching" <+> quotes (ppr pkg)
               , text "was found"] $$ looks_like_srcpkgid

compiler/GHC/Linker/Dynamic.hs

@@ -86,7 +86,7 @@ linkDynLib logger tmpfs dflags0 unit_env o_files dep_packages
     --   WASM_DYLINK_NEEDED, otherwise dyld can't load it.
     --
     --
-    let pkgs_without_rts = filter ((/= rtsUnitId) . unitId) pkgs_with_rts
+    let pkgs_without_rts = filter ((/= PackageName (fsLit "rts")) . unitPackageName) pkgs_with_rts
         pkgs
          | ArchWasm32 <- arch      = pkgs_with_rts
          | OSMinGW32 <- os         = pkgs_with_rts

compiler/GHC/Linker/Static.hs

@@ -293,7 +293,7 @@ linkStaticLib logger dflags unit_env o_files dep_units = do
         | gopt Opt_LinkRts dflags
         = pkg_cfgs_init
         | otherwise
-        = filter ((/= rtsUnitId) . unitId) pkg_cfgs_init
+        = filter ((/= PackageName (fsLit "rts")) . unitPackageName) pkg_cfgs_init
 
   archives <- concatMapM (collectArchives namever ways_) pkg_cfgs
 

testsuite/tests/driver/T21097b/Makefile

@@ -4,4 +4,4 @@ include $(TOP)/mk/test.mk
 
 T21097b:
 	'$(GHC_PKG)' recache --package-db pkgdb
-	'$(TEST_HC)' -no-global-package-db -no-user-package-db -package-db pkgdb -v0 Test.hs -ddump-mod-map
+	'$(TEST_HC)' -no-global-package-db -no-user-package-db -package-db pkgdb -v0 Test.hs -no-rts -ddump-mod-map

testsuite/tests/rts/linker/T20494-obj.c

@@ -1,8 +1,11 @@
 #include <stdio.h>
+#include <unistd.h>
 
 #define CONSTRUCTOR(prio) __attribute__((constructor(prio)))
 #define DESTRUCTOR(prio)  __attribute__((destructor(prio)))
-#define PRINT(str) printf(str); fflush(stdout)
+// don't use "stdout" variable here as it is not properly defined when loading
+// this object in a statically linked GHC.
+#define PRINT(str) dprintf(1,str); fsync(1)
 
 CONSTRUCTOR(1000) void constr_a(void) { PRINT("constr a\n"); }
 CONSTRUCTOR(2000) void constr_b(void) { PRINT("constr b\n"); }

testsuite/tests/rts/linker/all.T

@@ -157,8 +157,7 @@ test('T7072',
                 ],
 	makefile_test, ['T7072'])
 
-test('T20494', [req_rts_linker, when(opsys('linux') and not ghc_dynamic(), expect_broken(20706))],
-     makefile_test, ['T20494'])
+test('T20494', [req_rts_linker], makefile_test, ['T20494'])
 
 test('T20918',
      [extra_files(['T20918_v.cc']),

testsuite/tests/th/T10279.hs

@@ -1,10 +1,11 @@
 module T10279 where
 import Language.Haskell.TH
 import Language.Haskell.TH.Syntax
+import T10279h
 
 -- NB: rts-1.0.2 is used here because it doesn't change.
 -- You do need to pick the right version number, otherwise the
 -- error message doesn't recognize it as a source package ID,
 -- (This is OK,  since it will look obviously wrong when they
 -- try to find the package in their package database.)
-blah = $(conE (Name (mkOccName "Foo") (NameG VarName (mkPkgName "rts-1.0.3") (mkModName "A"))))
+blah = $(conE (Name (mkOccName "Foo") (NameG VarName (mkPkgName ("ghc-internal-" <> pkg_version)) (mkModName "A"))))

testsuite/tests/th/T10279.stderr

@@ -1,12 +1,13 @@
-
-T10279.hs:10:9: error: [GHC-51294]
+T10279.hs:11:9: error: [GHC-51294]
     • Failed to load interface for ‘A’.
-      no unit id matching ‘rts-1.0.3’ was found
-      (This unit ID looks like the source package ID;
-       the real unit ID is ‘rts’
-       and 1 other candidate)
+      no unit id matching ‘ghc-internal-9.1300.0’ was found
+      (This unit-id looks like a source package name-version; candidates real unit-ids are:
+       ‘ghc-internal’)
     • In the untyped splice:
         $(conE
             (Name
                (mkOccName "Foo")
-               (NameG VarName (mkPkgName "rts-1.0.3") (mkModName "A"))))
+               (NameG
+                  VarName (mkPkgName ("ghc-internal-" <> pkg_version))
+                  (mkModName "A"))))
+

testsuite/tests/th/T10279h.hs

@@ -0,0 +1,4 @@
+{-# LANGUAGE CPP #-}
+module T10279h where
+
+pkg_version = VERSION_ghc_internal