Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
-
a8aa1868
by Ilias Tsitsimpis at 2026-03-06T06:26:29-05:00
1 changed file:
Changes:
| ... | ... | @@ -112,7 +112,7 @@ import System.FilePath as FilePath |
| 112 | 112 | import Control.Monad
|
| 113 | 113 | import Data.Graph (stronglyConnComp, SCC(..))
|
| 114 | 114 | import Data.Char ( toUpper )
|
| 115 | -import Data.List ( intersperse, partition, sortBy, sortOn )
|
|
| 115 | +import Data.List ( intersperse, partition, sortBy, sortOn, sort )
|
|
| 116 | 116 | import Data.Set (Set)
|
| 117 | 117 | import Data.Monoid (First(..))
|
| 118 | 118 | import qualified Data.Semigroup as Semigroup
|
| ... | ... | @@ -1695,7 +1695,9 @@ mkUnitState logger cfg = do |
| 1695 | 1695 | -- NB: preload IS important even for type-checking, because we
|
| 1696 | 1696 | -- need the correct include path to be set.
|
| 1697 | 1697 | --
|
| 1698 | - let preload1 = nonDetKeysUniqMap (filterUniqMap (isJust . uv_explicit) vis_map)
|
|
| 1698 | + -- NB: Sorting keys here to ensure a deterministic order for the linker.
|
|
| 1699 | + --
|
|
| 1700 | + let preload1 = sort $ nonDetKeysUniqMap (filterUniqMap (isJust . uv_explicit) vis_map)
|
|
| 1699 | 1701 | |
| 1700 | 1702 | -- add default preload units if they can be found in the db
|
| 1701 | 1703 | basicLinkedUnits = fmap (RealUnit . Definite)
|