.gitlab/merge_request_templates/Default.md

@@ -7,7 +7,12 @@ expectations. Also please answer the following question in your MR description:*
 
 Please take a few moments to address the following points:
 
- * [ ] if your MR may break existing programs (e.g. touches `base` or causes the
+ * [ ] if your MR touches `base` (or touches parts of `ghc-internal` used
+   or re-exported by `base`) more substantially than just amending comments
+   or documentation, you likely need to raise a
+   [CLC proposal](https://github.com/haskell/core-libraries-committee#base-package)
+   before merging it.
+ * [ ] if your MR may break existing programs (e.g. causes the
    compiler to reject programs), please describe the expected breakage and add
    the ~"user-facing" label. This will run ghc/head.hackage> to characterise
    the effect of your change on Hackage.

compile_flags.txt

--xc
--Irts
+-Wimplicit
+-include
+rts/include/ghcversion.h
 -Irts/include
--I.hie-bios/stage0/lib
--I_build/stage1/rts/build/include/
+-I_build/stage1/rts/build
+-I_build/stage1/rts/build/include
+-Irts
+-Ilibraries/ghc-internal/include
+-I_build/stage1/libraries/ghc-internal/build/include
+-Ilibraries/ghc-bignum/include
+-I_build/stage1/libraries/ghc-bignum/build/include
+-Wno-unknown-pragmas
+-Wall
+-Wextra
+-Wstrict-prototypes
+-Wmissing-prototypes
+-Wmissing-declarations
+-Winline
+-Wpointer-arith
+-Wmissing-noreturn
+-Wnested-externs
+-Wredundant-decls
+-Wundef
+-DFS_NAMESPACE=rts
+-DCOMPILING_RTS
+-DTHREADED_RTS
+-DDEBUG
+-DDYNAMIC
+-DPROFILING

compiler/GHC/ByteCode/Instr.hs

@@ -130,7 +130,18 @@ data BCInstr
    | PUSH_APPLY_PPPPP
    | PUSH_APPLY_PPPPPP
 
-   | SLIDE     !WordOff{-this many-} !WordOff{-down by this much-}
+   -- | Drop entries @(n, n+by]@ entries from the stack. Graphically:
+   -- @
+   -- a_1  ← top
+   -- ...
+   -- a_n
+   -- b_1              =>    a_1  ← top
+   -- ...                    ...
+   -- b_by                   a_n
+   -- k                      k
+   -- @
+   | SLIDE     !WordOff -- ^ n = this many
+               !WordOff -- ^ by = down by this much
 
    -- To do with the heap
    | ALLOC_AP  !HalfWord {- make an AP with this many payload words.
@@ -175,7 +186,12 @@ data BCInstr
    -- The Word16 value is a constructor number and therefore
    -- stored in the insn stream rather than as an offset into
    -- the literal pool.
+
+   -- | Test whether the tag of a closure pointer is less than the given value.
+   -- If not, jump to the given label.
    | TESTLT_P  !Word16 LocalLabel
+   -- | Test whether the tag of a closure pointer is equal to the given value.
+   -- If not, jump to the given label.
    | TESTEQ_P  !Word16 LocalLabel
 
    | CASEFAIL

compiler/GHC/Runtime/Heap/Inspect.hs

@@ -892,8 +892,6 @@ extractSubTerms :: (Type -> ForeignHValue -> TcM Term)
                 -> GenClosure ForeignHValue -> [Type] -> TcM [Term]
 extractSubTerms recurse clos = liftM thdOf3 . go 0 0
   where
-    array = dataArgs clos
-
     go ptr_i arr_i [] = return (ptr_i, arr_i, [])
     go ptr_i arr_i (ty:tys)
       | Just (tc, elem_tys) <- tcSplitTyConApp_maybe ty
@@ -944,7 +942,7 @@ extractSubTerms recurse clos = liftM thdOf3 . go 0 0
                  | otherwise =
                      let (q, r) = size_b `quotRem` word_size
                      in assert (r == 0 )
-                        [ array!!i
+                        [ dataArgs clos !! i
                         | o <- [0.. q - 1]
                         , let i = (aligned_idx `quot` word_size) + o
                         ]
@@ -967,7 +965,7 @@ extractSubTerms recurse clos = liftM thdOf3 . go 0 0
       LittleEndian -> (word `shiftR` moveBits) `shiftL` zeroOutBits `shiftR` zeroOutBits
      where
       (q, r) = aligned_idx `quotRem` word_size
-      word = array!!q
+      word = dataArgs clos !! q
       moveBits = r * 8
       zeroOutBits = (word_size - size_b) * 8
 

libraries/base/tests/unicode002.stdout

@@ -2198,7 +2198,7 @@ Code C P S U L A D
 2196 F F F F F F F
 2197 F F F F F F F
 2198 F F F F F F F
-2199 F F F F F F F
+2199 F T F F F F F
 2200 F T F F F F F
 2201 F T F F F F F
 2202 F T F F F F F

libraries/base/tests/unicode003.hs

@@ -2,7 +2,7 @@
 
 -------------------------------------------------------------------------------
 -- |
--- Description: Test general caterory and simple case mappings for all characters.
+-- Description: Test general category and simple case mappings for all characters.
 --
 -- Checking the exact value of these properties for each character would result
 -- in a CSV-like file of several MiB. Thus we perform only a /sanity check/

libraries/base/tests/unicode003.stdout

@@ -3,9 +3,9 @@ First Char,GeneralCategory Digest,Case Mappings Digest
 64,-720430679,-1742101818
 c8,-1529066744,-1169261854
 12c,22022543,1992843935
-190,366447434,-319436678
+190,366447434,392930480
 1f4,1456425616,-2100393958
-258,1481707686,-1177178984
+258,1481707686,-1316081978
 2bc,-1022122772,1340246352
 320,-734975590,-791935307
 384,-2070429875,-892559431
@@ -20,7 +20,7 @@ c8,-1529066744,-1169261854
 708,-2079851624,1839559076
 76c,2068955683,43918784
 7d0,-1395935421,-683633188
-834,1342100208,-564949736
+834,1342100200,-564949736
 898,-708028503,55736148
 8fc,-58329064,-2065543152
 960,1105851853,-1812630068
@@ -68,11 +68,11 @@ fa0,299354809,273668620
 19c8,-1535390078,409791972
 1a2c,1430074966,1425156096
 1a90,359543298,-1811173604
-1af4,-122223694,59674968
-1b58,1902274427,-1937930732
+1af4,-1403775382,59674968
+1b58,-708350889,-1937930732
 1bbc,-2074398455,417932880
 1c20,-78501101,-1635539670
-1c84,36354108,1959176764
+1c84,-1909747515,-118954855
 1ce8,1962596869,-2124775484
 1d4c,1648199685,-120582836
 1db0,1138031515,-1724616916
@@ -91,7 +91,7 @@ fa0,299354809,273668620
 22c4,1077900556,1863936360
 2328,353682685,-756338300
 238c,-1593677756,-1195974880
-23f0,-1918270375,904827772
+23f0,-1767592831,904827772
 2454,-1696734763,-257614964
 24b8,1114906759,-1265032082
 251c,-1105473175,-830119696
@@ -126,7 +126,7 @@ fa0,299354809,273668620
 3070,-284421394,-1091054596
 30d4,-1569867234,-249848968
 3138,-1522355883,1427914804
-319c,-1320418159,-446832016
+319c,-375876063,-446832016
 3200,-2097029110,-1317869076
 3264,7156258,-2084614840
 32c8,-1105473175,1921081060
@@ -428,7 +428,7 @@ a604,-941462670,-1559596712
 a668,-1164349496,-222459552
 a6cc,-416278464,88220769
 a730,-1507948381,1981773285
-a794,-1891252978,-2045725957
+a794,-14024088,-2048971399
 a7f8,594607127,313626356
 a85c,2074129412,16581808
 a8c0,530025669,534989484
@@ -669,7 +669,7 @@ ffdc,-2015459986,1906523440
 1048c,429824816,-875393904
 104f0,1935087073,884116380
 10554,378171827,-1896598249
-105b8,379101729,-180562602
+105b8,-1029948339,-180562602
 1061c,657752308,-416625680
 10680,657752308,-1722711700
 106e4,1670657077,-615667256
@@ -688,11 +688,11 @@ ffdc,-2015459986,1906523440
 10bf8,759122150,-1134048524
 10c5c,-1240180536,-1231132432
 10cc0,-1232594677,-110718548
-10d24,1569263147,-59070968
-10d88,-847508383,-1808919772
+10d24,303535773,173056200
+10d88,1207178195,-1808919772
 10dec,-847508383,538515008
 10e50,-188198045,1503265372
-10eb4,-1370226063,-491064168
+10eb4,803124408,-491064168
 10f18,-350286230,-1694282284
 10f7c,1484313900,856053392
 10fe0,-723679588,-588754868
@@ -704,16 +704,16 @@ ffdc,-2015459986,1906523440
 11238,-659711824,1455451956
 1129c,-1148635252,-368614032
 11300,696218094,-2068618516
-11364,-686461423,208748104
-113c8,564626133,95052772
+11364,-1466263504,208748104
+113c8,-1687754988,95052772
 1142c,-401084886,1054700032
 11490,773187566,999350556
 114f4,-847508383,581701464
 11558,466114785,-14218220
 115bc,-133606728,352978000
 11620,884285309,1971150476
-11684,1154619062,1308684584
-116e8,42493442,179273156
+11684,248588370,1308684584
+116e8,-1662477305,179273156
 1174c,-847508383,-1085239456
 117b0,-1544306899,-2024912708
 11814,385152158,579255864
@@ -725,7 +725,7 @@ ffdc,-2015459986,1906523440
 11a6c,307339100,1598197440
 11ad0,-1522264485,-1283076388
 11b34,-847508383,-177855464
-11b98,-847508383,487104084
+11b98,-1366462816,487104084
 11bfc,-2065396652,888655120
 11c60,-498012856,151123148
 11cc4,2072718075,761583464
@@ -734,7 +734,7 @@ ffdc,-2015459986,1906523440
 11df0,-847508383,1176409468
 11e54,-847508383,-1707561992
 11eb8,2081578339,1494051508
-11f1c,-1149259987,367208176
+11f1c,1393663029,367208176
 11f80,1106256227,1888008812
 11fe4,757618445,-1421783352
 12048,657752308,332029284
@@ -788,47 +788,47 @@ ffdc,-2015459986,1906523440
 13308,657752308,-1755701852
 1336c,657752308,-1080401472
 133d0,1375666284,1547985372
-13434,934320124,-189064936
-13498,-847508383,-366597292
-134fc,-847508383,-1290482672
-13560,-847508383,410098124
-135c4,-847508383,1650913384
-13628,-847508383,846905476
-1368c,-847508383,-1577349600
-136f0,-847508383,1248831100
-13754,-847508383,502492408
-137b8,-847508383,-2001314380
-1381c,-847508383,590346736
-13880,-847508383,-882414740
-138e4,-847508383,1432051656
-13948,-847508383,506447460
-139ac,-847508383,-999404672
-13a10,-847508383,-1446317412
-13a74,-847508383,1451625432
-13ad8,-847508383,-1348073580
-13b3c,-847508383,-291132464
-13ba0,-847508383,417666572
-13c04,-847508383,-1721177432
-13c68,-847508383,373075780
-13ccc,-847508383,-815837472
-13d30,-847508383,-1333652932
-13d94,-847508383,-183172424
-13df8,-847508383,865224948
-13e5c,-847508383,762896048
-13ec0,-847508383,-1186668372
-13f24,-847508383,-989323256
-13f88,-847508383,1209091364
-13fec,-847508383,-2012604352
-14050,-847508383,-696935332
-140b4,-847508383,1332375192
-14118,-847508383,-1064422444
-1417c,-847508383,-180341616
-141e0,-847508383,997316172
-14244,-847508383,-581665048
-142a8,-847508383,-835523324
-1430c,-847508383,-1646572896
-14370,-847508383,-597711108
-143d4,-168142295,1239932536
+13434,-85032764,-189064936
+13498,657752308,-366597292
+134fc,657752308,-1290482672
+13560,657752308,410098124
+135c4,657752308,1650913384
+13628,657752308,846905476
+1368c,657752308,-1577349600
+136f0,657752308,1248831100
+13754,657752308,502492408
+137b8,657752308,-2001314380
+1381c,657752308,590346736
+13880,657752308,-882414740
+138e4,657752308,1432051656
+13948,657752308,506447460
+139ac,657752308,-999404672
+13a10,657752308,-1446317412
+13a74,657752308,1451625432
+13ad8,657752308,-1348073580
+13b3c,657752308,-291132464
+13ba0,657752308,417666572
+13c04,657752308,-1721177432
+13c68,657752308,373075780
+13ccc,657752308,-815837472
+13d30,657752308,-1333652932
+13d94,657752308,-183172424
+13df8,657752308,865224948
+13e5c,657752308,762896048
+13ec0,657752308,-1186668372
+13f24,657752308,-989323256
+13f88,657752308,1209091364
+13fec,657752308,-2012604352
+14050,657752308,-696935332
+140b4,657752308,1332375192
+14118,657752308,-1064422444
+1417c,657752308,-180341616
+141e0,657752308,997316172
+14244,657752308,-581665048
+142a8,657752308,-835523324
+1430c,657752308,-1646572896
+14370,657752308,-597711108
+143d4,-2081803167,1239932536
 14438,657752308,-347547340
 1449c,657752308,-1255237776
 14500,657752308,893669612
@@ -902,8 +902,8 @@ ffdc,-2015459986,1906523440
 15f90,-847508383,1885006364
 15ff4,-847508383,-451405224
 16058,-847508383,-1580057324
-160bc,-847508383,964346704
-16120,-847508383,-496888948
+160bc,651238903,964346704
+16120,110595372,-496888948
 16184,-847508383,1116315688
 161e8,-847508383,-60129596
 1624c,-847508383,-590500768
@@ -934,7 +934,7 @@ ffdc,-2015459986,1906523440
 16c10,-847508383,1194509468
 16c74,-847508383,-159326760
 16cd8,-847508383,-758285932
-16d3c,-847508383,-100018736
+16d3c,1580505997,-100018736
 16da0,-847508383,1592436748
 16e04,-162969167,553139304
 16e68,-1462513446,1841395012
@@ -1015,7 +1015,7 @@ ffdc,-2015459986,1906523440
 18bb4,657752308,-1033994856
 18c18,657752308,-1542142252
 18c7c,776662654,945544592
-18ce0,-1829767210,30855500
+18ce0,358712691,30855500
 18d44,-847508383,824806888
 18da8,-847508383,-1401805820
 18e0c,-847508383,-1060314720
@@ -1176,14 +1176,14 @@ ffdc,-2015459986,1906523440
 1ca98,-847508383,-1788637868
 1cafc,-847508383,649460240
 1cb60,-847508383,1080609740
-1cbc4,-847508383,620604008
-1cc28,-847508383,-1185572220
-1cc8c,-847508383,1687810080
-1ccf0,-847508383,75957372
-1cd54,-847508383,-1848586504
-1cdb8,-847508383,-703869004
-1ce1c,-847508383,1389442032
-1ce80,-847508383,1443621228
+1cbc4,1169384369,620604008
+1cc28,-1105473175,-1185572220
+1cc8c,-1105473175,1687810080
+1ccf0,624215450,75957372
+1cd54,-1105473175,-1848586504
+1cdb8,-1105473175,-703869004
+1ce1c,-1105473175,1389442032
+1ce80,-672487319,1443621228
 1cee4,133905225,1777869256
 1cf48,-1943297855,-803392412
 1cfac,-826965367,2113749376
@@ -1242,8 +1242,8 @@ ffdc,-2015459986,1906523440
 1e460,-847508383,1606163660
 1e4c4,1412498216,180346728
 1e528,-847508383,-1797992572
-1e58c,-847508383,2096370976
-1e5f0,-847508383,-2094838404
+1e58c,651238903,2096370976
+1e5f0,-887503671,-2094838404
 1e654,-847508383,-428329992
 1e6b8,-847508383,330183348
 1e71c,-847508383,-61862160
@@ -1291,15 +1291,15 @@ ffdc,-2015459986,1906523440
 1f784,-702101815,-343818712
 1f7e8,1976628113,-898518844
 1f84c,471140881,282876512
-1f8b0,-10438759,-395554372
+1f8b0,-915035399,-395554372
 1f914,-1105473175,-679784648
 1f978,-1105473175,1183875956
 1f9dc,-1105473175,1885428528
-1fa40,923756505,2004332332
-1faa4,467344305,2017661832
+1fa40,-2046266919,2004332332
+1faa4,-917260199,2017661832
 1fb08,-1105473175,1091204516
-1fb6c,1120513513,-117061184
-1fbd0,1887269219,1232484828
+1fb6c,-2092080927,-117061184
+1fbd0,1338409339,1232484828
 1fc34,-847508383,102285592
 1fc98,-847508383,-738286764
 1fcfc,-847508383,-263212016

libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc

@@ -73,7 +73,6 @@ import GHC.Internal.Control.Exception (catch, throw)
 import GHC.Internal.Data.Functor
 import GHC.Internal.Foreign.C.Types
 import GHC.Internal.Foreign.C.Error
-import GHC.Internal.Foreign.C.String
 import GHC.Internal.Foreign.Marshal.Alloc
 import GHC.Internal.Foreign.Marshal.Array
 import GHC.Internal.Foreign.Ptr

libraries/ghc-internal/src/GHC/Internal/Unicode/Char/UnicodeData/SimpleLowerCaseMapping.hs

 -- DO NOT EDIT: This file is automatically generated by the internal tool ucd2haskell,
--- with data from: https://www.unicode.org/Public/15.1.0/ucd/UnicodeData.txt.
+-- with data from: https://www.unicode.org/Public/16.0.0/ucd/UnicodeData.txt.
 
 {-# LANGUAGE NoImplicitPrelude, LambdaCase #-}
 {-# OPTIONS_HADDOCK hide #-}
@@ -616,6 +616,7 @@ toSimpleLowerCase = \case
   '\x13f3' -> '\x13fb'
   '\x13f4' -> '\x13fc'
   '\x13f5' -> '\x13fd'
+  '\x1c89' -> '\x1c8a'
   '\x1c90' -> '\x10d0'
   '\x1c91' -> '\x10d1'
   '\x1c92' -> '\x10d2'
@@ -1164,9 +1165,13 @@ toSimpleLowerCase = \case
   '\xa7c6' -> '\x1d8e'
   '\xa7c7' -> '\xa7c8'
   '\xa7c9' -> '\xa7ca'
+  '\xa7cb' -> '\x264'
+  '\xa7cc' -> '\xa7cd'
   '\xa7d0' -> '\xa7d1'
   '\xa7d6' -> '\xa7d7'
   '\xa7d8' -> '\xa7d9'
+  '\xa7da' -> '\xa7db'
+  '\xa7dc' -> '\x19b'
   '\xa7f5' -> '\xa7f6'
   '\xff21' -> '\xff41'
   '\xff22' -> '\xff42'
@@ -1356,6 +1361,28 @@ toSimpleLowerCase = \case
   '\x10cb0' -> '\x10cf0'
   '\x10cb1' -> '\x10cf1'
   '\x10cb2' -> '\x10cf2'
+  '\x10d50' -> '\x10d70'
+  '\x10d51' -> '\x10d71'
+  '\x10d52' -> '\x10d72'
+  '\x10d53' -> '\x10d73'
+  '\x10d54' -> '\x10d74'
+  '\x10d55' -> '\x10d75'
+  '\x10d56' -> '\x10d76'
+  '\x10d57' -> '\x10d77'
+  '\x10d58' -> '\x10d78'
+  '\x10d59' -> '\x10d79'
+  '\x10d5a' -> '\x10d7a'
+  '\x10d5b' -> '\x10d7b'
+  '\x10d5c' -> '\x10d7c'
+  '\x10d5d' -> '\x10d7d'
+  '\x10d5e' -> '\x10d7e'
+  '\x10d5f' -> '\x10d7f'
+  '\x10d60' -> '\x10d80'
+  '\x10d61' -> '\x10d81'
+  '\x10d62' -> '\x10d82'
+  '\x10d63' -> '\x10d83'
+  '\x10d64' -> '\x10d84'
+  '\x10d65' -> '\x10d85'
   '\x118a0' -> '\x118c0'
   '\x118a1' -> '\x118c1'
   '\x118a2' -> '\x118c2'

libraries/ghc-internal/src/GHC/Internal/Unicode/Char/UnicodeData/SimpleTitleCaseMapping.hs

 -- DO NOT EDIT: This file is automatically generated by the internal tool ucd2haskell,
--- with data from: https://www.unicode.org/Public/15.1.0/ucd/UnicodeData.txt.
+-- with data from: https://www.unicode.org/Public/16.0.0/ucd/UnicodeData.txt.
 
 {-# LANGUAGE NoImplicitPrelude, LambdaCase #-}
 {-# OPTIONS_HADDOCK hide #-}
@@ -151,6 +151,7 @@ toSimpleTitleCase = \case
   '\x195' -> '\x1f6'
   '\x199' -> '\x198'
   '\x19a' -> '\x23d'
+  '\x19b' -> '\xa7dc'
   '\x19e' -> '\x220'
   '\x1a1' -> '\x1a0'
   '\x1a3' -> '\x1a2'
@@ -245,6 +246,7 @@ toSimpleTitleCase = \case
   '\x260' -> '\x193'
   '\x261' -> '\xa7ac'
   '\x263' -> '\x194'
+  '\x264' -> '\xa7cb'
   '\x265' -> '\xa78d'
   '\x266' -> '\xa7aa'
   '\x268' -> '\x197'
@@ -581,6 +583,7 @@ toSimpleTitleCase = \case
   '\x1c86' -> '\x42a'
   '\x1c87' -> '\x462'
   '\x1c88' -> '\xa64a'
+  '\x1c8a' -> '\x1c89'
   '\x1d79' -> '\xa77d'
   '\x1d7d' -> '\x2c63'
   '\x1d8e' -> '\xa7c6'
@@ -1104,9 +1107,11 @@ toSimpleTitleCase = \case
   '\xa7c3' -> '\xa7c2'
   '\xa7c8' -> '\xa7c7'
   '\xa7ca' -> '\xa7c9'
+  '\xa7cd' -> '\xa7cc'
   '\xa7d1' -> '\xa7d0'
   '\xa7d7' -> '\xa7d6'
   '\xa7d9' -> '\xa7d8'
+  '\xa7db' -> '\xa7da'
   '\xa7f6' -> '\xa7f5'
   '\xab53' -> '\xa7b3'
   '\xab70' -> '\x13a0'
@@ -1377,6 +1382,28 @@ toSimpleTitleCase = \case
   '\x10cf0' -> '\x10cb0'
   '\x10cf1' -> '\x10cb1'
   '\x10cf2' -> '\x10cb2'
+  '\x10d70' -> '\x10d50'
+  '\x10d71' -> '\x10d51'
+  '\x10d72' -> '\x10d52'
+  '\x10d73' -> '\x10d53'
+  '\x10d74' -> '\x10d54'
+  '\x10d75' -> '\x10d55'
+  '\x10d76' -> '\x10d56'
+  '\x10d77' -> '\x10d57'
+  '\x10d78' -> '\x10d58'
+  '\x10d79' -> '\x10d59'
+  '\x10d7a' -> '\x10d5a'
+  '\x10d7b' -> '\x10d5b'
+  '\x10d7c' -> '\x10d5c'
+  '\x10d7d' -> '\x10d5d'
+  '\x10d7e' -> '\x10d5e'
+  '\x10d7f' -> '\x10d5f'
+  '\x10d80' -> '\x10d60'
+  '\x10d81' -> '\x10d61'
+  '\x10d82' -> '\x10d62'
+  '\x10d83' -> '\x10d63'
+  '\x10d84' -> '\x10d64'
+  '\x10d85' -> '\x10d65'
   '\x118c0' -> '\x118a0'
   '\x118c1' -> '\x118a1'
   '\x118c2' -> '\x118a2'

libraries/ghc-internal/src/GHC/Internal/Unicode/Char/UnicodeData/SimpleUpperCaseMapping.hs

 -- DO NOT EDIT: This file is automatically generated by the internal tool ucd2haskell,
--- with data from: https://www.unicode.org/Public/15.1.0/ucd/UnicodeData.txt.
+-- with data from: https://www.unicode.org/Public/16.0.0/ucd/UnicodeData.txt.
 
 {-# LANGUAGE NoImplicitPrelude, LambdaCase #-}
 {-# OPTIONS_HADDOCK hide #-}
@@ -151,6 +151,7 @@ toSimpleUpperCase = \case
   '\x195' -> '\x1f6'
   '\x199' -> '\x198'
   '\x19a' -> '\x23d'
+  '\x19b' -> '\xa7dc'
   '\x19e' -> '\x220'
   '\x1a1' -> '\x1a0'
   '\x1a3' -> '\x1a2'
@@ -241,6 +242,7 @@ toSimpleUpperCase = \case
   '\x260' -> '\x193'
   '\x261' -> '\xa7ac'
   '\x263' -> '\x194'
+  '\x264' -> '\xa7cb'
   '\x265' -> '\xa78d'
   '\x266' -> '\xa7aa'
   '\x268' -> '\x197'
@@ -577,6 +579,7 @@ toSimpleUpperCase = \case
   '\x1c86' -> '\x42a'
   '\x1c87' -> '\x462'
   '\x1c88' -> '\xa64a'
+  '\x1c8a' -> '\x1c89'
   '\x1d79' -> '\xa77d'
   '\x1d7d' -> '\x2c63'
   '\x1d8e' -> '\xa7c6'
@@ -1100,9 +1103,11 @@ toSimpleUpperCase = \case
   '\xa7c3' -> '\xa7c2'
   '\xa7c8' -> '\xa7c7'
   '\xa7ca' -> '\xa7c9'
+  '\xa7cd' -> '\xa7cc'
   '\xa7d1' -> '\xa7d0'
   '\xa7d7' -> '\xa7d6'
   '\xa7d9' -> '\xa7d8'
+  '\xa7db' -> '\xa7da'
   '\xa7f6' -> '\xa7f5'
   '\xab53' -> '\xa7b3'
   '\xab70' -> '\x13a0'
@@ -1373,6 +1378,28 @@ toSimpleUpperCase = \case
   '\x10cf0' -> '\x10cb0'
   '\x10cf1' -> '\x10cb1'
   '\x10cf2' -> '\x10cb2'
+  '\x10d70' -> '\x10d50'
+  '\x10d71' -> '\x10d51'
+  '\x10d72' -> '\x10d52'
+  '\x10d73' -> '\x10d53'
+  '\x10d74' -> '\x10d54'
+  '\x10d75' -> '\x10d55'
+  '\x10d76' -> '\x10d56'
+  '\x10d77' -> '\x10d57'
+  '\x10d78' -> '\x10d58'
+  '\x10d79' -> '\x10d59'
+  '\x10d7a' -> '\x10d5a'
+  '\x10d7b' -> '\x10d5b'
+  '\x10d7c' -> '\x10d5c'
+  '\x10d7d' -> '\x10d5d'
+  '\x10d7e' -> '\x10d5e'
+  '\x10d7f' -> '\x10d5f'
+  '\x10d80' -> '\x10d60'
+  '\x10d81' -> '\x10d61'
+  '\x10d82' -> '\x10d62'
+  '\x10d83' -> '\x10d63'
+  '\x10d84' -> '\x10d64'
+  '\x10d85' -> '\x10d65'
   '\x118c0' -> '\x118a0'
   '\x118c1' -> '\x118a1'
   '\x118c2' -> '\x118a2'

libraries/ghc-internal/src/GHC/Internal/Unicode/Version.hs

@@ -18,8 +18,8 @@ where
 import {-# SOURCE #-} GHC.Internal.Data.Version
 
 -- | Version of Unicode standard used by @base@:
--- [15.1.0](https://www.unicode.org/versions/Unicode15.1.0/).
+-- [16.0.0](https://www.unicode.org/versions/Unicode16.0.0/).
 --
 -- @since base-4.15.0.0
 unicodeVersion :: Version
-unicodeVersion = makeVersion [15, 1, 0]
+unicodeVersion = makeVersion [16, 0, 0]

libraries/ghc-internal/tools/ucd2haskell/ucd.sh

@@ -12,8 +12,8 @@ VERIFY_CHECKSUM=y
 
 # Filename:checksum
 FILES="\
-  ucd/DerivedCoreProperties.txt:f55d0db69123431a7317868725b1fcbf1eab6b265d756d1bd7f0f6d9f9ee108b \
-  ucd/UnicodeData.txt:2fc713e6a31a87c4850a37fe2caffa4218180fadb5de86b43a143ddb4581fb86"
+  ucd/DerivedCoreProperties.txt:39d35161f2954497f69e08bdb9e701493f476a3d30222de20028feda36c1dabd \
+  ucd/UnicodeData.txt:ff58e5823bd095166564a006e47d111130813dcf8bf234ef79fa51a870edb48f"
 
 # Download the files
 

libraries/ghc-internal/tools/ucd2haskell/unicode_version

-VERSION="15.1.0"
+VERSION="16.0.0"

libraries/ghci/GHCi/ObjLink.hs

@@ -76,7 +76,7 @@ loadDLL f =
       evaluate =<< js_loadDLL (toJSString f)
       pure $ Right nullPtr
 
-foreign import javascript safe "__exports.__dyld.loadDLL($1)"
+foreign import javascript safe "__ghc_wasm_jsffi_dyld.loadDLL($1)"
   js_loadDLL :: JSString -> IO ()
 
 loadArchive :: String -> IO ()
@@ -96,7 +96,7 @@ lookupSymbol sym = do
   r <- js_lookupSymbol $ toJSString sym
   evaluate $ if r == nullPtr then Nothing else Just r
 
-foreign import javascript unsafe "__exports.__dyld.lookupSymbol($1)"
+foreign import javascript unsafe "__ghc_wasm_jsffi_dyld.lookupSymbol($1)"
   js_lookupSymbol :: JSString -> IO (Ptr a)
 
 lookupSymbolInDLL :: Ptr LoadedDLL -> String -> IO (Maybe (Ptr a))
@@ -114,7 +114,7 @@ addLibrarySearchPath p = do
   evaluate =<< js_addLibrarySearchPath (toJSString p)
   pure nullPtr
 
-foreign import javascript safe "__exports.__dyld.addLibrarySearchPath($1)"
+foreign import javascript safe "__ghc_wasm_jsffi_dyld.addLibrarySearchPath($1)"
   js_addLibrarySearchPath :: JSString -> IO ()
 
 removeLibrarySearchPath :: Ptr () -> IO Bool
@@ -128,7 +128,7 @@ findSystemLibrary f = m `catch` \(_ :: JSException) -> pure Nothing
       p <- evaluate $ fromJSString p'
       pure $ Just p
 
-foreign import javascript safe "__exports.__dyld.findSystemLibrary($1)"
+foreign import javascript safe "__ghc_wasm_jsffi_dyld.findSystemLibrary($1)"
   js_findSystemLibrary :: JSString -> IO JSString
 
 #else

m4/fptools_happy.m4

@@ -24,13 +24,13 @@ changequote([, ])dnl
 ])
 if test ! -f compiler/GHC/Parser.hs || test ! -f compiler/GHC/Cmm/Parser.hs
 then
-    failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.1  is required to compile GHC"
+    failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2  is required to compile GHC"
     FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0],
       [AC_MSG_ERROR([$failure_msg])])[]
     FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0],
       FP_COMPARE_VERSIONS([$fptools_cv_happy_version], [-le], [2.0.1],
         [AC_MSG_ERROR([$failure_msg])])[])[]
-    FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.1.0],
+    FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.2.0],
       [AC_MSG_ERROR([$failure_msg])])[]
 
 fi

rts/Interpreter.c

@@ -1630,7 +1630,11 @@ run_BCO:
         case bci_SLIDE: {
             W_ n  = BCO_GET_LARGE_ARG;
             W_ by = BCO_GET_LARGE_ARG;
-            /* a_1, .. a_n, b_1, .. b_by, s => a_1, .. a_n, s */
+            /*
+             * a_1 ... a_n, b_1 ... b_by, k
+             *           =>
+             * a_1 ... a_n, k
+             */
             while(n-- > 0) {
                 SpW(n+by) = SpW(n);
             }
@@ -1744,23 +1748,29 @@ run_BCO:
         }
 
         case bci_PACK: {
-            W_ i;
             W_ o_itbl         = BCO_GET_LARGE_ARG;
             W_ n_words        = BCO_GET_LARGE_ARG;
-            StgInfoTable* itbl = INFO_PTR_TO_STRUCT((StgInfoTable *)BCO_LIT(o_itbl));
-            int request        = CONSTR_sizeW( itbl->layout.payload.ptrs,
-                                               itbl->layout.payload.nptrs );
+            StgConInfoTable* itbl = CON_INFO_PTR_TO_STRUCT((StgInfoTable *)BCO_LIT(o_itbl));
+            W_ n_ptrs         = itbl->i.layout.payload.ptrs;
+            W_ n_nptrs        = itbl->i.layout.payload.nptrs;
+            W_ request        = CONSTR_sizeW( n_ptrs, n_nptrs );
             StgClosure* con = (StgClosure*)allocate_NONUPD(cap,request);
-            ASSERT( itbl->layout.payload.ptrs + itbl->layout.payload.nptrs > 0);
-            for (i = 0; i < n_words; i++) {
+            ASSERT(ip_HNF(&itbl->i)); // We don't have a CON flag, HNF is a good approximation
+                                      // N.
+            // N.B. we may have a nullary datacon with padding, in which case
+            // n_nptrs=1, n_ptrs=0.
+            ASSERT(n_ptrs + n_nptrs == n_words || (n_nptrs == 1 && n_ptrs == 0));
+            ASSERT(n_ptrs + n_nptrs > 0);
+            //ASSERT(n_words > 0); // We shouldn't ever need to allocate nullary constructors
+            for (W_ i = 0; i < n_words; i++) {
                 con->payload[i] = (StgClosure*)SpW(i);
             }
             Sp_addW(n_words);
             Sp_subW(1);
             // No write barrier is needed here as this is a new allocation
             // visible only from our stack
-            StgInfoTable *con_itbl = (StgInfoTable*) BCO_LIT(o_itbl);
-            SET_HDR(con, con_itbl, cap->r.rCCCS);
+            StgInfoTable *con_ptr = (StgInfoTable*) BCO_LIT(o_itbl);
+            SET_HDR(con, con_ptr, cap->r.rCCCS);
 
             StgClosure* tagged_con = tagConstr(con);
             SpW(0) = (W_)tagged_con;
@@ -1775,6 +1785,7 @@ run_BCO:
         case bci_TESTLT_P: {
             unsigned int discr  = BCO_NEXT;
             int failto = BCO_GET_LARGE_ARG;
+            ASSERT(discr <= TAG_MASK);
             StgClosure* con = UNTAG_CLOSURE((StgClosure*)SpW(0));
             if (GET_TAG(con) >= discr) {
                 bciPtr = failto;
@@ -1785,6 +1796,7 @@ run_BCO:
         case bci_TESTEQ_P: {
             unsigned int discr  = BCO_NEXT;
             int failto = BCO_GET_LARGE_ARG;
+            ASSERT(discr <= TAG_MASK);
             StgClosure* con = UNTAG_CLOSURE((StgClosure*)SpW(0));
             if (GET_TAG(con) != discr) {
                 bciPtr = failto;

rts/Linker.c

@@ -105,12 +105,12 @@
  */
 
 #if defined(freebsd_HOST_OS)
-extern void iconvctl();
-extern void iconv_open_into();
-extern void iconv_open();
-extern void iconv_close();
-extern void iconv_canonicalize();
-extern void iconv();
+extern void iconvctl(void);
+extern void iconv_open_into(void);
+extern void iconv_open(void);
+extern void iconv_close(void);
+extern void iconv_canonicalize(void);
+extern void iconv(void);
 #endif
 
 /*