[Git][ghc/ghc][wip/spj-reinstallable-base2] 4 commits: Fix handful more tests

16 Jun 2026


      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
Fix handful more tests

- - - - -
c05644d8 by Rodrigo Mesquita at 2026-06-16T14:14:52+01:00
break006 new out

- - - - -
c4a4dfcb by Rodrigo Mesquita at 2026-06-16T15:06:04+01:00
upd callstack00{1,2} out

- - - - -
7a4d1cf1 by Rodrigo Mesquita at 2026-06-16T15:09:53+01:00
Rebindable import in windows

- - - - -


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:

=====================================
libraries/ghc-internal/src/GHC/Internal/Conc/POSIX/Const.hsc
=====================================
@@ -21,6 +21,7 @@
 module GHC.Internal.Conc.POSIX.Const where
 
 import GHC.Internal.Word
+import qualified GHC.Internal.Num as Rebindable
 
 #include <Rts.h>
 


=====================================
testsuite/tests/backpack/cabal/bkpcabal07/Makefile
=====================================
@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
 SETUP='$(PWD)/Setup' -v0
-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'
+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'
 
 # This test checks that instantiating an indefinite package
 # with a wired in package works.


=====================================
testsuite/tests/driver/make-prim/Makefile
=====================================
@@ -5,7 +5,7 @@ include $(TOP)/mk/test.mk
 make-prim:
 	# build once to test the substitution of the virtual interface in --make
 	# mode with codegen
-	"$(TEST_HC)" $(TEST_HC_OPTS) --make Test.hs -this-unit-id ghc-internal -hide-all-packages -dno-typeable-binds -v0
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make Test.hs -this-unit-id ghc-internal -hide-all-packages -dno-typeable-binds -v0 -frebindable-known-names
 	# build a different module (Test2) in --make mode to test the reloading
 	# of the GHC.Internal.Prim interface
-	"$(TEST_HC)" $(TEST_HC_OPTS) --make Test2.hs -this-unit-id ghc-internal -hide-all-packages -dno-typeable-binds -v0
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make Test2.hs -this-unit-id ghc-internal -hide-all-packages -dno-typeable-binds -v0 -frebindable-known-names


=====================================
testsuite/tests/ghci.debugger/scripts/break006.stderr
=====================================
@@ -4,8 +4,8 @@
       Use :print or :force to determine these types
       Relevant bindings include it :: a (bound at <interactive>:4:1)
       Potentially matching instances:
-        instance Show Ordering -- Defined in ‘GHC.Internal.Show’
         instance Show Integer -- Defined in ‘GHC.Internal.Show’
+        instance Show a => Show (Maybe a) -- Defined in ‘GHC.Internal.Show’
         ...plus 25 others
         ...plus 13 instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)
@@ -17,8 +17,8 @@
       Use :print or :force to determine these types
       Relevant bindings include it :: a (bound at <interactive>:6:1)
       Potentially matching instances:
-        instance Show Ordering -- Defined in ‘GHC.Internal.Show’
         instance Show Integer -- Defined in ‘GHC.Internal.Show’
+        instance Show a => Show (Maybe a) -- Defined in ‘GHC.Internal.Show’
         ...plus 25 others
         ...plus 13 instances involving out-of-scope types
         (use -fprint-potential-instances to see them all)


=====================================
testsuite/tests/interface-stability/base-exports.stdout
=====================================
@@ -5638,6 +5638,8 @@ module GHC.Essentials where
   data RuleMatch = ConLike | FunLike
   type S1 :: forall {k}. Meta -> (k -> *) -> k -> *
   type S1 = M1 GHC.Internal.Generics.S
+  type SPEC :: *
+  data SPEC = SPEC | SPEC2
   type Selector :: forall {k}. k -> Constraint
   class Selector s where
     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
   roleAnnotD :: forall (m :: * -> *). Quote m => Name -> [Role] -> m Dec
   ruleVar :: forall (m :: * -> *). Quote m => Name -> m RuleBndr
   runMainIO :: forall a. IO a -> IO a
+  runRW# :: forall (r :: GHC.Internal.Types.RuntimeRep) (o :: TYPE r). (GHC.Internal.Prim.State# GHC.Internal.Prim.RealWorld -> o) -> o
   safe :: GHC.Internal.TH.Syntax.Safety
   sectionL :: forall (m :: * -> *). Quote m => m Exp -> m Exp -> m Exp
   sectionR :: forall (m :: * -> *). Quote m => m Exp -> m Exp -> m Exp


=====================================
testsuite/tests/package/all.T
=====================================
@@ -5,10 +5,10 @@ incr_ghc = '-package "ghc (GHC.Hs.Type as GHC.Hs.MyTypes, GHC.Hs.Utils)" '
 inc_ghc = '-package ghc '
 hide_ghc = '-hide-package ghc '
 
-test('package01',  normal, compile,      [hide_all + incr_containers])
+test('package01',  normal, compile,      [hide_all + incr_containers + '-frebindable-known-names'])
 test('package01e', normalise_version('containers'), compile_fail, [hide_all + incr_containers])
-test('package02',  normal, compile,      [hide_all + inc_containers + incr_containers])
-test('package03',  normal, compile,      [hide_all + incr_containers + inc_containers])
+test('package02',  normal, compile,      [hide_all + inc_containers + incr_containers + '-frebindable-known-names'])
+test('package03',  normal, compile,      [hide_all + incr_containers + inc_containers + '-frebindable-known-names'])
 test('package04',  normal, compile,      [incr_containers])
 test('package05',  normal, compile,      [incr_ghc + inc_ghc])
 test('package06',  normal, compile,      [incr_ghc])
@@ -16,7 +16,7 @@ test('package06e', normalise_version('ghc'), compile_fail, [incr_ghc])
 test('package07e', normalise_version('ghc'), compile_fail, [incr_ghc + inc_ghc + hide_ghc])
 test('package08e', normalise_version('ghc'), compile_fail, [incr_ghc + hide_ghc])
 test('package09e', normal, compile_fail, ['-package "containers (Data.Map as M, Data.Set as M)"'])
-test('package10',  normal, compile,      ['-hide-all-packages -package "ghc (GHC.Types.Unique.FM as Prelude)" '])
+test('package10',  normal, compile,      ['-hide-all-packages -package "ghc (GHC.Types.Unique.FM as Prelude)" -frebindable-known-names'])
 
 test('T4806', normalise_version('containers'), compile_fail, ['-ignore-package containers'])
 test('T4806a', normalise_version('deepseq', 'containers', 'template-haskell'), compile_fail, ['-ignore-package deepseq'])


=====================================
testsuite/tests/profiling/should_run/callstack001.stdout
=====================================
@@ -1,2 +1,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)","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>)"]
-["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
+["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>)"]
+["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>)"]


=====================================
testsuite/tests/profiling/should_run/callstack002.stderr
=====================================
@@ -1,6 +1,6 @@
 f: 42
 CallStack (from -prof):
-  GHC.Internal.Debug.Trace.traceStack (libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs:243:1-10)
+  GHC.Internal.Debug.Trace.traceStack (libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs:241:1-10)
   Main.f (callstack002.hs:10:7-43)
   Main.map.go (callstack002.hs:15:21-23)
   Main.map.go (callstack002.hs:15:21-34)
@@ -9,7 +9,7 @@ CallStack (from -prof):
   Main.CAF (<entire-module>)
 f: 43
 CallStack (from -prof):
-  GHC.Internal.Debug.Trace.traceStack (libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs:243:1-10)
+  GHC.Internal.Debug.Trace.traceStack (libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs:241:1-10)
   Main.f (callstack002.hs:10:7-43)
   Main.map.go (callstack002.hs:15:21-23)
   Main.map.go (callstack002.hs:15:21-34)


=====================================
testsuite/tests/profiling/should_run/callstack002.stdout
=====================================
@@ -1,7 +1,7 @@
 [84,86]
 CallStack (from -prof):
-  GHC.Internal.Num.$fNumInt_$c* (libraries/ghc-internal/src/GHC/Internal/Num.hs:114:10)
-  GHC.Internal.Num.* (libraries/ghc-internal/src/GHC/Internal/Num.hs:76:5-38)
+  GHC.Internal.Num.$fNumInt_$c* (libraries/ghc-internal/src/GHC/Internal/Num.hs:116:10)
+  GHC.Internal.Num.* (libraries/ghc-internal/src/GHC/Internal/Num.hs:78:5-38)
   Main.f (callstack002.hs:10:38-42)
   Main.f (callstack002.hs:10:7-43)
   Main.map.go (callstack002.hs:15:21-23)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a715d7d3ce7b591b9be53e5ddf3bf11...

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a715d7d3ce7b591b9be53e5ddf3bf11...
You're receiving this email because of your account on gitlab.haskell.org.

    

Rodrigo Mesquita (＠alt-romes)

tags

participants (1)