Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC
Commits:
-
d90e4e76
by Rodrigo Mesquita at 2026-06-16T12:12:54+01:00
-
c05644d8
by Rodrigo Mesquita at 2026-06-16T14:14:52+01:00
-
c4a4dfcb
by Rodrigo Mesquita at 2026-06-16T15:06:04+01:00
-
7a4d1cf1
by Rodrigo Mesquita at 2026-06-16T15:09:53+01:00
9 changed files:
- libraries/ghc-internal/src/GHC/Internal/Conc/POSIX/Const.hsc
- testsuite/tests/backpack/cabal/bkpcabal07/Makefile
- testsuite/tests/driver/make-prim/Makefile
- testsuite/tests/ghci.debugger/scripts/break006.stderr
- testsuite/tests/interface-stability/base-exports.stdout
- testsuite/tests/package/all.T
- testsuite/tests/profiling/should_run/callstack001.stdout
- testsuite/tests/profiling/should_run/callstack002.stderr
- testsuite/tests/profiling/should_run/callstack002.stdout
Changes:
| ... | ... | @@ -21,6 +21,7 @@ |
| 21 | 21 | module GHC.Internal.Conc.POSIX.Const where
|
| 22 | 22 | |
| 23 | 23 | import GHC.Internal.Word
|
| 24 | +import qualified GHC.Internal.Num as Rebindable
|
|
| 24 | 25 | |
| 25 | 26 | #include <Rts.h>
|
| 26 | 27 |
| ... | ... | @@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk |
| 3 | 3 | include $(TOP)/mk/test.mk
|
| 4 | 4 | |
| 5 | 5 | SETUP='$(PWD)/Setup' -v0
|
| 6 | -CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --ghc-options='$(TEST_HC_OPTS)' --package-db='$(PWD)/tmp.d' --prefix='$(PWD)/inst'
|
|
| 6 | +CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --ghc-options='$(TEST_HC_OPTS)' --ghc-option=-frebindable-known-names --package-db='$(PWD)/tmp.d' --prefix='$(PWD)/inst'
|
|
| 7 | 7 | |
| 8 | 8 | # This test checks that instantiating an indefinite package
|
| 9 | 9 | # with a wired in package works.
|
| ... | ... | @@ -5,7 +5,7 @@ include $(TOP)/mk/test.mk |
| 5 | 5 | make-prim:
|
| 6 | 6 | # build once to test the substitution of the virtual interface in --make
|
| 7 | 7 | # mode with codegen
|
| 8 | - "$(TEST_HC)" $(TEST_HC_OPTS) --make Test.hs -this-unit-id ghc-internal -hide-all-packages -dno-typeable-binds -v0
|
|
| 8 | + "$(TEST_HC)" $(TEST_HC_OPTS) --make Test.hs -this-unit-id ghc-internal -hide-all-packages -dno-typeable-binds -v0 -frebindable-known-names
|
|
| 9 | 9 | # build a different module (Test2) in --make mode to test the reloading
|
| 10 | 10 | # of the GHC.Internal.Prim interface
|
| 11 | - "$(TEST_HC)" $(TEST_HC_OPTS) --make Test2.hs -this-unit-id ghc-internal -hide-all-packages -dno-typeable-binds -v0 |
|
| 11 | + "$(TEST_HC)" $(TEST_HC_OPTS) --make Test2.hs -this-unit-id ghc-internal -hide-all-packages -dno-typeable-binds -v0 -frebindable-known-names |
| ... | ... | @@ -4,8 +4,8 @@ |
| 4 | 4 | Use :print or :force to determine these types
|
| 5 | 5 | Relevant bindings include it :: a (bound at <interactive>:4:1)
|
| 6 | 6 | Potentially matching instances:
|
| 7 | - instance Show Ordering -- Defined in ‘GHC.Internal.Show’
|
|
| 8 | 7 | instance Show Integer -- Defined in ‘GHC.Internal.Show’
|
| 8 | + instance Show a => Show (Maybe a) -- Defined in ‘GHC.Internal.Show’
|
|
| 9 | 9 | ...plus 25 others
|
| 10 | 10 | ...plus 13 instances involving out-of-scope types
|
| 11 | 11 | (use -fprint-potential-instances to see them all)
|
| ... | ... | @@ -17,8 +17,8 @@ |
| 17 | 17 | Use :print or :force to determine these types
|
| 18 | 18 | Relevant bindings include it :: a (bound at <interactive>:6:1)
|
| 19 | 19 | Potentially matching instances:
|
| 20 | - instance Show Ordering -- Defined in ‘GHC.Internal.Show’
|
|
| 21 | 20 | instance Show Integer -- Defined in ‘GHC.Internal.Show’
|
| 21 | + instance Show a => Show (Maybe a) -- Defined in ‘GHC.Internal.Show’
|
|
| 22 | 22 | ...plus 25 others
|
| 23 | 23 | ...plus 13 instances involving out-of-scope types
|
| 24 | 24 | (use -fprint-potential-instances to see them all)
|
| ... | ... | @@ -5638,6 +5638,8 @@ module GHC.Essentials where |
| 5638 | 5638 | data RuleMatch = ConLike | FunLike
|
| 5639 | 5639 | type S1 :: forall {k}. Meta -> (k -> *) -> k -> *
|
| 5640 | 5640 | type S1 = M1 GHC.Internal.Generics.S
|
| 5641 | + type SPEC :: *
|
|
| 5642 | + data SPEC = SPEC | SPEC2
|
|
| 5641 | 5643 | type Selector :: forall {k}. k -> Constraint
|
| 5642 | 5644 | class Selector s where
|
| 5643 | 5645 | selName :: forall k1 (t :: k -> (k1 -> *) -> k1 -> *) (f :: k1 -> *) (a :: k1). t s f a -> [GHC.Internal.Types.Char]
|
| ... | ... | @@ -6040,6 +6042,7 @@ module GHC.Essentials where |
| 6040 | 6042 | roleAnnotD :: forall (m :: * -> *). Quote m => Name -> [Role] -> m Dec
|
| 6041 | 6043 | ruleVar :: forall (m :: * -> *). Quote m => Name -> m RuleBndr
|
| 6042 | 6044 | runMainIO :: forall a. IO a -> IO a
|
| 6045 | + runRW# :: forall (r :: GHC.Internal.Types.RuntimeRep) (o :: TYPE r). (GHC.Internal.Prim.State# GHC.Internal.Prim.RealWorld -> o) -> o
|
|
| 6043 | 6046 | safe :: GHC.Internal.TH.Syntax.Safety
|
| 6044 | 6047 | sectionL :: forall (m :: * -> *). Quote m => m Exp -> m Exp -> m Exp
|
| 6045 | 6048 | sectionR :: forall (m :: * -> *). Quote m => m Exp -> m Exp -> m Exp
|
| ... | ... | @@ -5,10 +5,10 @@ incr_ghc = '-package "ghc (GHC.Hs.Type as GHC.Hs.MyTypes, GHC.Hs.Utils)" ' |
| 5 | 5 | inc_ghc = '-package ghc '
|
| 6 | 6 | hide_ghc = '-hide-package ghc '
|
| 7 | 7 | |
| 8 | -test('package01', normal, compile, [hide_all + incr_containers])
|
|
| 8 | +test('package01', normal, compile, [hide_all + incr_containers + '-frebindable-known-names'])
|
|
| 9 | 9 | test('package01e', normalise_version('containers'), compile_fail, [hide_all + incr_containers])
|
| 10 | -test('package02', normal, compile, [hide_all + inc_containers + incr_containers])
|
|
| 11 | -test('package03', normal, compile, [hide_all + incr_containers + inc_containers])
|
|
| 10 | +test('package02', normal, compile, [hide_all + inc_containers + incr_containers + '-frebindable-known-names'])
|
|
| 11 | +test('package03', normal, compile, [hide_all + incr_containers + inc_containers + '-frebindable-known-names'])
|
|
| 12 | 12 | test('package04', normal, compile, [incr_containers])
|
| 13 | 13 | test('package05', normal, compile, [incr_ghc + inc_ghc])
|
| 14 | 14 | test('package06', normal, compile, [incr_ghc])
|
| ... | ... | @@ -16,7 +16,7 @@ test('package06e', normalise_version('ghc'), compile_fail, [incr_ghc]) |
| 16 | 16 | test('package07e', normalise_version('ghc'), compile_fail, [incr_ghc + inc_ghc + hide_ghc])
|
| 17 | 17 | test('package08e', normalise_version('ghc'), compile_fail, [incr_ghc + hide_ghc])
|
| 18 | 18 | test('package09e', normal, compile_fail, ['-package "containers (Data.Map as M, Data.Set as M)"'])
|
| 19 | -test('package10', normal, compile, ['-hide-all-packages -package "ghc (GHC.Types.Unique.FM as Prelude)" '])
|
|
| 19 | +test('package10', normal, compile, ['-hide-all-packages -package "ghc (GHC.Types.Unique.FM as Prelude)" -frebindable-known-names'])
|
|
| 20 | 20 | |
| 21 | 21 | test('T4806', normalise_version('containers'), compile_fail, ['-ignore-package containers'])
|
| 22 | 22 | test('T4806a', normalise_version('deepseq', 'containers', 'template-haskell'), compile_fail, ['-ignore-package deepseq'])
|
| 1 | -["GHC.Internal.TopHandler.runMainIO1 (<no location info>)","Main.main (callstack001.hs:17:8-21)","Main.mapM (callstack001.hs:10:13-17)","Main.mapM.go (callstack001.hs:(12,21)-(15,25))","Main.mapM.go (callstack001.hs:13:11-19)","Main.mapM.go (callstack001.hs:13:17-19)","Main.f (callstack001.hs:7:7-49)","Main.f (callstack001.hs:7:10-35)","GHC.Internal.Base.>>= (libraries/ghc-internal/src/GHC/Internal/Base.hs:1347:5-55)","GHC.Internal.Base.$fMonadIO1 (<no location info>)","GHC.Internal.Stack.CCS.currentCallStack (libraries/ghc-internal/src/GHC/Internal/Stack/CCS.hsc:129:1-16)","GHC.Internal.Stack.CCS.currentCallStack1 (<no location info>)"]
|
|
| 2 | -["GHC.Internal.TopHandler.runMainIO1 (<no location info>)","Main.main (callstack001.hs:17:8-21)","Main.mapM (callstack001.hs:10:13-17)","Main.mapM.go (callstack001.hs:(12,21)-(15,25))","Main.mapM.go (callstack001.hs:13:11-19)","GHC.Internal.Base.>>= (libraries/ghc-internal/src/GHC/Internal/Base.hs:1347:5-55)","GHC.Internal.Base.$fMonadIO1 (<no location info>)","GHC.Internal.Stack.CCS.currentCallStack (libraries/ghc-internal/src/GHC/Internal/Stack/CCS.hsc:129:1-16)","GHC.Internal.Stack.CCS.currentCallStack1 (<no location info>)"] |
|
| \ No newline at end of file | ||
| 1 | +["GHC.Internal.TopHandler.runMainIO1 (<no location info>)","Main.main (callstack001.hs:17:8-21)","Main.mapM (callstack001.hs:10:13-17)","Main.mapM.go (callstack001.hs:(12,21)-(15,25))","Main.mapM.go (callstack001.hs:13:11-19)","Main.mapM.go (callstack001.hs:13:17-19)","Main.f (callstack001.hs:7:7-49)","Main.f (callstack001.hs:7:10-35)","GHC.Internal.Base.>>= (libraries/ghc-internal/src/GHC/Internal/Base.hs:1368:5-55)","GHC.Internal.Base.$fMonadIO1 (<no location info>)","GHC.Internal.Stack.CCS.currentCallStack (libraries/ghc-internal/src/GHC/Internal/Stack/CCS.hsc:128:1-16)","GHC.Internal.Stack.CCS.currentCallStack1 (<no location info>)"]
|
|
| 2 | +["GHC.Internal.TopHandler.runMainIO1 (<no location info>)","Main.main (callstack001.hs:17:8-21)","Main.mapM (callstack001.hs:10:13-17)","Main.mapM.go (callstack001.hs:(12,21)-(15,25))","Main.mapM.go (callstack001.hs:13:11-19)","GHC.Internal.Base.>>= (libraries/ghc-internal/src/GHC/Internal/Base.hs:1368:5-55)","GHC.Internal.Base.$fMonadIO1 (<no location info>)","GHC.Internal.Stack.CCS.currentCallStack (libraries/ghc-internal/src/GHC/Internal/Stack/CCS.hsc:128:1-16)","GHC.Internal.Stack.CCS.currentCallStack1 (<no location info>)"] |
| 1 | 1 | f: 42
|
| 2 | 2 | CallStack (from -prof):
|
| 3 | - GHC.Internal.Debug.Trace.traceStack (libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs:243:1-10)
|
|
| 3 | + GHC.Internal.Debug.Trace.traceStack (libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs:241:1-10)
|
|
| 4 | 4 | Main.f (callstack002.hs:10:7-43)
|
| 5 | 5 | Main.map.go (callstack002.hs:15:21-23)
|
| 6 | 6 | Main.map.go (callstack002.hs:15:21-34)
|
| ... | ... | @@ -9,7 +9,7 @@ CallStack (from -prof): |
| 9 | 9 | Main.CAF (<entire-module>)
|
| 10 | 10 | f: 43
|
| 11 | 11 | CallStack (from -prof):
|
| 12 | - GHC.Internal.Debug.Trace.traceStack (libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs:243:1-10)
|
|
| 12 | + GHC.Internal.Debug.Trace.traceStack (libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs:241:1-10)
|
|
| 13 | 13 | Main.f (callstack002.hs:10:7-43)
|
| 14 | 14 | Main.map.go (callstack002.hs:15:21-23)
|
| 15 | 15 | Main.map.go (callstack002.hs:15:21-34)
|
| 1 | 1 | [84,86]
|
| 2 | 2 | CallStack (from -prof):
|
| 3 | - GHC.Internal.Num.$fNumInt_$c* (libraries/ghc-internal/src/GHC/Internal/Num.hs:114:10)
|
|
| 4 | - GHC.Internal.Num.* (libraries/ghc-internal/src/GHC/Internal/Num.hs:76:5-38)
|
|
| 3 | + GHC.Internal.Num.$fNumInt_$c* (libraries/ghc-internal/src/GHC/Internal/Num.hs:116:10)
|
|
| 4 | + GHC.Internal.Num.* (libraries/ghc-internal/src/GHC/Internal/Num.hs:78:5-38)
|
|
| 5 | 5 | Main.f (callstack002.hs:10:38-42)
|
| 6 | 6 | Main.f (callstack002.hs:10:7-43)
|
| 7 | 7 | Main.map.go (callstack002.hs:15:21-23)
|