[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: ghci: Use loadInterfaceForModule rather than loadSrcInterface in mkTopLevEnv

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 91564daf by Matthew Pickering at 2025-04-24T00:29:02-04:00 ghci: Use loadInterfaceForModule rather than loadSrcInterface in mkTopLevEnv loadSrcInterface takes a user given `ModuleName` and resolves it to the module which needs to be loaded (taking into account module renaming/visibility etc). loadInterfaceForModule takes a specific module and loads it. The modules in `ImpDeclSpec` have already been resolved to the actual module to get the information from during renaming. Therefore we just need to fetch the precise interface from disk (and not attempt to rename it again). Fixes #25951 - - - - - 2e0c07ab by Simon Peyton Jones at 2025-04-24T00:29:43-04:00 Test for #23298 - - - - - fc85e73f by Sven Tennie at 2025-04-24T03:04:18-04:00 RV64: Introduce J instruction (non-local jumps) and don't deallocate stack slots for J_TBL (#25738) J_TBL result in local jumps, there should not deallocate stack slots (see Note [extra spill slots].) J is for non-local jumps, these may need to deallocate stack slots. - - - - - 52e76dbd by fendor at 2025-04-24T03:04:18-04:00 Add `UnitId` to `EvalBreakpoint` The `EvalBreakpoint` is used to communicate that a breakpoint was encountered during code evaluation. This `EvalBreakpoint` needs to be converted to an `InternalBreakpointId` which stores a `Module` to uniquely find the correct `Module` in the Home Package Table. The `EvalBreakpoint` used to store only a `ModuleName` which is then converted to a `Module` based on the currently active home unit. This is incorrect in the face of multiple home units, the break point could be in an entirely other home unit! To fix this, we additionally store the `UnitId` of the `Module` in `EvalBreakpoint` to later reconstruct the correct `Module` All of the changes are the consequence of extending `EvalBreakpoint` with the additional `ShortByteString` of the `UnitId`. For performance reasons, we store the `ShortByteString` backing the `UnitId` directly, avoiding marshalling overhead. - - - - - 21 changed files: - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/CmmToAsm/RV64/CodeGen.hs - compiler/GHC/CmmToAsm/RV64/Instr.hs - compiler/GHC/CmmToAsm/RV64/Ppr.hs - compiler/GHC/HsToCore/Breakpoints.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Runtime/Interpreter.hs - compiler/GHC/StgToByteCode.hs - libraries/ghci/GHCi/Message.hs - libraries/ghci/GHCi/Run.hs - rts/Exception.cmm - rts/Interpreter.c - + testsuite/tests/gadt/T23298.hs - + testsuite/tests/gadt/T23298.stderr - testsuite/tests/gadt/all.T - + testsuite/tests/ghci/scripts/GhciPackageRename.hs - + testsuite/tests/ghci/scripts/GhciPackageRename.script - + testsuite/tests/ghci/scripts/GhciPackageRename.stdout - testsuite/tests/ghci/scripts/all.T Changes: ===================================== compiler/GHC/ByteCode/Asm.hs ===================================== @@ -732,13 +732,16 @@ assembleI platform i = case i of CCALL off m_addr i -> do np <- addr m_addr emit_ bci_CCALL [wOp off, Op np, SmallOp i] PRIMCALL -> emit_ bci_PRIMCALL [] - BRK_FUN arr tick_mod tickx info_mod infox cc -> + BRK_FUN arr tick_mod tick_mod_id tickx info_mod info_mod_id infox cc -> do p1 <- ptr (BCOPtrBreakArray arr) tick_addr <- addr tick_mod + tick_unitid_addr <- addr tick_mod_id info_addr <- addr info_mod + info_unitid_addr <- addr info_mod_id np <- addr cc emit_ bci_BRK_FUN [ Op p1 , Op tick_addr, Op info_addr + , Op tick_unitid_addr, Op info_unitid_addr , SmallOp tickx, SmallOp infox , Op np ] ===================================== compiler/GHC/ByteCode/Instr.hs ===================================== @@ -37,6 +37,7 @@ import GHC.Stg.Syntax import GHCi.BreakArray (BreakArray) import Language.Haskell.Syntax.Module.Name (ModuleName) import GHC.Types.Unique +import GHC.Unit.Types (UnitId) -- ---------------------------------------------------------------------------- -- Bytecode instructions @@ -233,8 +234,10 @@ data BCInstr -- Breakpoints | BRK_FUN (ForeignRef BreakArray) (RemotePtr ModuleName) -- breakpoint tick module + (RemotePtr UnitId) -- breakpoint tick module unit id !Word16 -- breakpoint tick index (RemotePtr ModuleName) -- breakpoint info module + (RemotePtr UnitId) -- breakpoint info module unit id !Word16 -- breakpoint info index (RemotePtr CostCentre) @@ -403,10 +406,10 @@ instance Outputable BCInstr where ppr ENTER = text "ENTER" ppr (RETURN pk) = text "RETURN " <+> ppr pk ppr (RETURN_TUPLE) = text "RETURN_TUPLE" - ppr (BRK_FUN _ _tick_mod tickx _info_mod infox _) + ppr (BRK_FUN _ _tick_mod _tick_mod_id tickx _info_mod _info_mod_id infox _) = text "BRK_FUN" <+> text "<breakarray>" - <+> text "" <+> ppr tickx - <+> text "" <+> ppr infox + <+> text "" <+> text "" <+> ppr tickx + <+> text "" <+> text "" <+> ppr infox <+> text "<cc>" #if MIN_VERSION_rts(1,0,3) ppr (BCO_NAME nm) = text "BCO_NAME" <+> text (show nm) ===================================== compiler/GHC/ByteCode/Types.hs ===================================== @@ -50,6 +50,7 @@ import GHC.Stack.CCS import GHC.Cmm.Expr ( GlobalRegSet, emptyRegSet, regSetToList ) import GHC.Iface.Syntax import Language.Haskell.Syntax.Module.Name (ModuleName) +import GHC.Unit.Types (UnitId) -- ----------------------------------------------------------------------------- -- Compiled Byte Code @@ -263,6 +264,9 @@ data ModBreaks , modBreaks_breakInfo :: IntMap CgBreakInfo -- ^ info about each breakpoint from the bytecode generator , modBreaks_module :: RemotePtr ModuleName + -- ^ info about the module in which we are setting the breakpoint + , modBreaks_module_unitid :: RemotePtr UnitId + -- ^ The 'UnitId' of the 'ModuleName' } seqModBreaks :: ModBreaks -> () @@ -273,7 +277,8 @@ seqModBreaks ModBreaks{..} = rnf modBreaks_decls `seq` rnf modBreaks_ccs `seq` rnf (fmap seqCgBreakInfo modBreaks_breakInfo) `seq` - rnf modBreaks_module + rnf modBreaks_module `seq` + rnf modBreaks_module_unitid -- | Construct an empty ModBreaks emptyModBreaks :: ModBreaks @@ -286,6 +291,7 @@ emptyModBreaks = ModBreaks , modBreaks_ccs = array (0,-1) [] , modBreaks_breakInfo = IntMap.empty , modBreaks_module = toRemotePtr nullPtr + , modBreaks_module_unitid = toRemotePtr nullPtr } {- ===================================== compiler/GHC/CmmToAsm/RV64/CodeGen.hs ===================================== @@ -1481,7 +1481,7 @@ assignReg_FltCode = assignReg_IntCode genJump :: CmmExpr {-the branch target-} -> NatM InstrBlock genJump expr = do (target, _format, code) <- getSomeReg expr - return (code `appOL` unitOL (annExpr expr (B (TReg target)))) + return (code `appOL` unitOL (annExpr expr (J (TReg target)))) -- ----------------------------------------------------------------------------- -- Unconditional branches @@ -2226,5 +2226,6 @@ makeFarBranches {- only used when debugging -} _platform statics basic_blocks = BCOND {} -> long_bc_jump_size B (TBlock _) -> long_b_jump_size B (TReg _) -> 1 + J op -> instr_size (B op) BL _ _ -> 1 J_TBL {} -> 1 ===================================== compiler/GHC/CmmToAsm/RV64/Instr.hs ===================================== @@ -97,6 +97,7 @@ regUsageOfInstr platform instr = case instr of ORI dst src1 _ -> usage (regOp src1, regOp dst) XORI dst src1 _ -> usage (regOp src1, regOp dst) J_TBL _ _ t -> usage ([t], []) + J t -> usage (regTarget t, []) B t -> usage (regTarget t, []) BCOND _ l r t -> usage (regTarget t ++ regOp l ++ regOp r, []) BL t ps -> usage (t : ps, callerSavedRegisters) @@ -195,6 +196,7 @@ patchRegsOfInstr instr env = case instr of ORI o1 o2 o3 -> ORI (patchOp o1) (patchOp o2) (patchOp o3) XORI o1 o2 o3 -> XORI (patchOp o1) (patchOp o2) (patchOp o3) J_TBL ids mbLbl t -> J_TBL ids mbLbl (env t) + J t -> J (patchTarget t) B t -> B (patchTarget t) BL t ps -> BL (patchReg t) ps BCOND c o1 o2 t -> BCOND c (patchOp o1) (patchOp o2) (patchTarget t) @@ -235,6 +237,7 @@ isJumpishInstr :: Instr -> Bool isJumpishInstr instr = case instr of ANN _ i -> isJumpishInstr i J_TBL {} -> True + J {} -> True B {} -> True BL {} -> True BCOND {} -> True @@ -243,6 +246,7 @@ isJumpishInstr instr = case instr of canFallthroughTo :: Instr -> BlockId -> Bool canFallthroughTo insn bid = case insn of + J (TBlock target) -> bid == target B (TBlock target) -> bid == target BCOND _ _ _ (TBlock target) -> bid == target J_TBL targets _ _ -> all isTargetBid targets @@ -256,6 +260,7 @@ canFallthroughTo insn bid = jumpDestsOfInstr :: Instr -> [BlockId] jumpDestsOfInstr (ANN _ i) = jumpDestsOfInstr i jumpDestsOfInstr (J_TBL ids _mbLbl _r) = catMaybes ids +jumpDestsOfInstr (J t) = [id | TBlock id <- [t]] jumpDestsOfInstr (B t) = [id | TBlock id <- [t]] jumpDestsOfInstr (BCOND _ _ _ t) = [id | TBlock id <- [t]] jumpDestsOfInstr _ = [] @@ -269,6 +274,7 @@ patchJumpInstr instr patchF = case instr of ANN d i -> ANN d (patchJumpInstr i patchF) J_TBL ids mbLbl r -> J_TBL (map (fmap patchF) ids) mbLbl r + J (TBlock bid) -> J (TBlock (patchF bid)) B (TBlock bid) -> B (TBlock (patchF bid)) BCOND c o1 o2 (TBlock bid) -> BCOND c o1 o2 (TBlock (patchF bid)) _ -> panic $ "patchJumpInstr: " ++ instrCon instr @@ -475,7 +481,7 @@ allocMoreStack platform slots proc@(CmmProc info lbl live (ListGraph code)) = do block' = foldr insert_dealloc [] insns insert_dealloc insn r = case insn of - J_TBL {} -> dealloc ++ (insn : r) + J {} -> dealloc ++ (insn : r) ANN _ e -> insert_dealloc e r _other | jumpDestsOfInstr insn /= [] -> @@ -591,6 +597,8 @@ data Instr -- -- @if(o2 cond o3) op <- 1 else op <- 0@ CSET Operand Operand Operand Cond + -- | Like B, but only used for non-local jumps. Used to distinguish genJumps from others. + | J Target | -- | A jump instruction with data for switch/jump tables J_TBL [Maybe BlockId] (Maybe CLabel) Reg | -- | Unconditional jump (no linking) @@ -663,6 +671,7 @@ instrCon i = LDRU {} -> "LDRU" CSET {} -> "CSET" J_TBL {} -> "J_TBL" + J {} -> "J" B {} -> "B" BL {} -> "BL" BCOND {} -> "BCOND" ===================================== compiler/GHC/CmmToAsm/RV64/Ppr.hs ===================================== @@ -543,6 +543,7 @@ pprInstr platform instr = case instr of | otherwise -> op3 (text "\taddi") o1 o2 (OpImm (ImmInt 0)) ORI o1 o2 o3 -> op3 (text "\tori") o1 o2 o3 XORI o1 o2 o3 -> op3 (text "\txori") o1 o2 o3 + J o1 -> pprInstr platform (B o1) J_TBL _ _ r -> pprInstr platform (B (TReg r)) B l | isLabel l -> line $ text "\tjal" <+> pprOp platform x0 <> comma <+> getLabel platform l B (TReg r) -> line $ text "\tjalr" <+> pprOp platform x0 <> comma <+> pprReg W64 r <> comma <+> text "0" ===================================== compiler/GHC/HsToCore/Breakpoints.hs ===================================== @@ -34,7 +34,7 @@ mkModBreaks interp mod extendedMixEntries breakArray <- GHCi.newBreakArray interp count ccs <- mkCCSArray interp mod count entries - mod_ptr <- GHCi.newModuleName interp (moduleName mod) + (mod_ptr, mod_id_ptr) <- GHCi.newModule interp mod let locsTicks = listArray (0,count-1) [ tick_loc t | t <- entries ] varsTicks = listArray (0,count-1) [ tick_ids t | t <- entries ] @@ -46,6 +46,7 @@ mkModBreaks interp mod extendedMixEntries , modBreaks_decls = declsTicks , modBreaks_ccs = ccs , modBreaks_module = mod_ptr + , modBreaks_module_unitid = mod_id_ptr } mkCCSArray ===================================== compiler/GHC/Runtime/Eval.hs ===================================== @@ -78,7 +78,7 @@ import GHC.Core.Type hiding( typeKind ) import qualified GHC.Core.Type as Type import GHC.Iface.Env ( newInteractiveBinder ) -import GHC.Iface.Load ( loadSrcInterface ) +import GHC.Iface.Load ( loadInterfaceForModule ) import GHC.Tc.Utils.TcType import GHC.Tc.Types.Constraint import GHC.Tc.Types.Origin @@ -345,7 +345,7 @@ handleRunStatus step expr bindings final_ids status history0 = do -- Just case: we stopped at a breakpoint EvalBreak apStack_ref (Just eval_break) resume_ctxt ccs -> do - ibi <- liftIO $ evalBreakpointToId (hsc_HPT hsc_env) eval_break + let ibi = evalBreakpointToId eval_break tick_brks <- liftIO $ readModBreaks hsc_env (ibi_tick_mod ibi) let span = modBreaks_locs tick_brks ! ibi_tick_index ibi @@ -843,7 +843,7 @@ mkTopLevEnv hsc_env modl $ fmap (foldr plusGlobalRdrEnv emptyGlobalRdrEnv) $ forM imports $ \iface_import -> do let ImpUserSpec spec details = tcIfaceImport iface_import - iface <- loadSrcInterface (text "imported by GHCi") (moduleName $ is_mod spec) (is_isboot spec) (is_pkg_qual spec) + iface <- loadInterfaceForModule (text "imported by GHCi") (is_mod spec) pure $ case details of ImpUserAll -> importsFromIface hsc_env iface spec Nothing ImpUserEverythingBut ns -> importsFromIface hsc_env iface spec (Just ns) ===================================== compiler/GHC/Runtime/Interpreter.hs ===================================== @@ -21,7 +21,7 @@ module GHC.Runtime.Interpreter , mkCostCentres , costCentreStackInfo , newBreakArray - , newModuleName + , newModule , storeBreakpoint , breakpointStatus , getBreakpointVar @@ -93,9 +93,8 @@ import GHC.Utils.Outputable(brackets, ppr, showSDocUnsafe) import GHC.Utils.Fingerprint import GHC.Unit.Module -import GHC.Unit.Module.ModIface import GHC.Unit.Home.ModInfo -import GHC.Unit.Home.PackageTable +import GHC.Unit.Home.Graph (lookupHugByModule) import GHC.Unit.Env #if defined(HAVE_INTERNAL_INTERPRETER) @@ -377,9 +376,13 @@ newBreakArray interp size = do breakArray <- interpCmd interp (NewBreakArray size) mkFinalizedHValue interp breakArray -newModuleName :: Interp -> ModuleName -> IO (RemotePtr ModuleName) -newModuleName interp mod_name = - castRemotePtr <$> interpCmd interp (NewBreakModule (moduleNameString mod_name)) +newModule :: Interp -> Module -> IO (RemotePtr ModuleName, RemotePtr UnitId) +newModule interp mod = do + let + mod_name = moduleNameString $ moduleName mod + mod_id = fastStringToShortByteString $ unitIdFS $ toUnitId $ moduleUnit mod + (mod_ptr, mod_id_ptr) <- interpCmd interp (NewBreakModule mod_name mod_id) + pure (castRemotePtr mod_ptr, castRemotePtr mod_id_ptr) storeBreakpoint :: Interp -> ForeignRef BreakArray -> Int -> Int -> IO () storeBreakpoint interp ref ix cnt = do -- #19157 @@ -415,19 +418,21 @@ seqHValue interp unit_env ref = status <- interpCmd interp (Seq hval) handleSeqHValueStatus interp unit_env status -evalBreakpointToId :: HomePackageTable -> EvalBreakpoint -> IO InternalBreakpointId -evalBreakpointToId hpt eval_break = - let load_mod x = mi_module . hm_iface . expectJust <$> lookupHpt hpt (mkModuleName x) - in do - tickl <- load_mod (eb_tick_mod eval_break) - infol <- load_mod (eb_info_mod eval_break) - return - InternalBreakpointId - { ibi_tick_mod = tickl - , ibi_tick_index = eb_tick_index eval_break - , ibi_info_mod = infol - , ibi_info_index = eb_info_index eval_break - } +evalBreakpointToId :: EvalBreakpoint -> InternalBreakpointId +evalBreakpointToId eval_break = + let + mkUnitId u = fsToUnit $ mkFastStringShortByteString u + + toModule u n = mkModule (mkUnitId u) (mkModuleName n) + tickl = toModule (eb_tick_mod_unit eval_break) (eb_tick_mod eval_break) + infol = toModule (eb_info_mod_unit eval_break) (eb_info_mod eval_break) + in + InternalBreakpointId + { ibi_tick_mod = tickl + , ibi_tick_index = eb_tick_index eval_break + , ibi_info_mod = infol + , ibi_info_index = eb_info_index eval_break + } -- | Process the result of a Seq or ResumeSeq message. #2950 handleSeqHValueStatus :: Interp -> UnitEnv -> EvalStatus () -> IO (EvalResult ()) @@ -447,12 +452,12 @@ handleSeqHValueStatus interp unit_env eval_status = mkGeneralSrcSpan (fsLit "<unknown>") Just break -> do - bi <- evalBreakpointToId (ue_hpt unit_env) break + let bi = evalBreakpointToId break -- Just case: Stopped at a breakpoint, extract SrcSpan information -- from the breakpoint. breaks_tick <- getModBreaks . expectJust <$> - lookupHpt (ue_hpt unit_env) (moduleName (ibi_tick_mod bi)) + lookupHugByModule (ibi_tick_mod bi) (ue_home_unit_graph unit_env) put $ brackets . ppr $ (modBreaks_locs breaks_tick) ! ibi_tick_index bi ===================================== compiler/GHC/StgToByteCode.hs ===================================== @@ -416,7 +416,7 @@ schemeER_wrk d p (StgTick (Breakpoint tick_ty tick_no fvs tick_mod) rhs) = do Nothing -> pure code Just current_mod_breaks -> break_info hsc_env tick_mod current_mod mb_current_mod_breaks >>= \case Nothing -> pure code - Just ModBreaks {modBreaks_flags = breaks, modBreaks_module = tick_mod_ptr, modBreaks_ccs = cc_arr} -> do + Just ModBreaks {modBreaks_flags = breaks, modBreaks_module = tick_mod_ptr, modBreaks_module_unitid = tick_mod_id_ptr, modBreaks_ccs = cc_arr} -> do platform <- profilePlatform <$> getProfile let idOffSets = getVarOffSets platform d p fvs ty_vars = tyCoVarsOfTypesWellScoped (tick_ty:map idType fvs) @@ -425,6 +425,7 @@ schemeER_wrk d p (StgTick (Breakpoint tick_ty tick_no fvs tick_mod) rhs) = do breakInfo = dehydrateCgBreakInfo ty_vars (map toWord idOffSets) tick_ty let info_mod_ptr = modBreaks_module current_mod_breaks + info_mod_id_ptr = modBreaks_module_unitid current_mod_breaks infox <- newBreakInfo breakInfo let cc | Just interp <- hsc_interp hsc_env @@ -437,7 +438,7 @@ schemeER_wrk d p (StgTick (Breakpoint tick_ty tick_no fvs tick_mod) rhs) = do in if fromIntegral r == x then r else pprPanic "schemeER_wrk: breakpoint tick/info index too large!" (ppr x) - breakInstr = BRK_FUN breaks tick_mod_ptr (toW16 tick_no) info_mod_ptr (toW16 infox) cc + breakInstr = BRK_FUN breaks tick_mod_ptr tick_mod_id_ptr (toW16 tick_no) info_mod_ptr info_mod_id_ptr (toW16 infox) cc return $ breakInstr `consOL` code schemeER_wrk d p rhs = schemeE d 0 p rhs ===================================== libraries/ghci/GHCi/Message.hs ===================================== @@ -23,6 +23,7 @@ module GHCi.Message , getMessage, putMessage, getTHMessage, putTHMessage , Pipe, mkPipeFromHandles, mkPipeFromContinuations, remoteCall, remoteTHCall, readPipe, writePipe , BreakModule + , BreakUnitId , LoadedDLL ) where @@ -51,6 +52,7 @@ import Data.ByteString (ByteString) import qualified Data.ByteString as B import qualified Data.ByteString.Builder as B import qualified Data.ByteString.Lazy as LB +import qualified Data.ByteString.Short as BS import Data.Dynamic import Data.Typeable (TypeRep) import Data.IORef @@ -245,8 +247,9 @@ data Message a where -- | Allocate a string for a breakpoint module name. -- This uses an empty dummy type because @ModuleName@ isn't available here. NewBreakModule - :: String - -> Message (RemotePtr BreakModule) + :: String -- ^ @ModuleName@ + -> BS.ShortByteString -- ^ @UnitId@ for the given @ModuleName@ + -> Message (RemotePtr BreakModule, RemotePtr BreakUnitId) deriving instance Show (Message a) @@ -410,10 +413,12 @@ data EvalStatus_ a b instance Binary a => Binary (EvalStatus_ a b) data EvalBreakpoint = EvalBreakpoint - { eb_tick_mod :: String -- ^ Breakpoint tick module - , eb_tick_index :: Int -- ^ Breakpoint tick index - , eb_info_mod :: String -- ^ Breakpoint info module - , eb_info_index :: Int -- ^ Breakpoint info index + { eb_tick_mod :: String -- ^ Breakpoint tick module + , eb_tick_mod_unit :: BS.ShortByteString -- ^ Breakpoint tick module unit id + , eb_tick_index :: Int -- ^ Breakpoint tick index + , eb_info_mod :: String -- ^ Breakpoint info module + , eb_info_mod_unit :: BS.ShortByteString -- ^ Breakpoint tick module unit id + , eb_info_index :: Int -- ^ Breakpoint info index } deriving (Generic, Show) @@ -430,6 +435,10 @@ instance Binary a => Binary (EvalResult a) -- that type isn't available here. data BreakModule +-- | A dummy type that tags the pointer to a breakpoint's @UnitId@, because +-- that type isn't available here. +data BreakUnitId + -- | A dummy type that tags pointers returned by 'LoadDLL'. data LoadedDLL @@ -580,7 +589,7 @@ getMessage = do 36 -> Msg <$> (Seq <$> get) 37 -> Msg <$> return RtsRevertCAFs 38 -> Msg <$> (ResumeSeq <$> get) - 39 -> Msg <$> (NewBreakModule <$> get) + 39 -> Msg <$> (NewBreakModule <$> get <*> get) 40 -> Msg <$> (LookupSymbolInDLL <$> get <*> get) 41 -> Msg <$> (WhereFrom <$> get) _ -> error $ "Unknown Message code " ++ (show b) @@ -627,7 +636,7 @@ putMessage m = case m of Seq a -> putWord8 36 >> put a RtsRevertCAFs -> putWord8 37 ResumeSeq a -> putWord8 38 >> put a - NewBreakModule name -> putWord8 39 >> put name + NewBreakModule name unitid -> putWord8 39 >> put name >> put unitid LookupSymbolInDLL dll str -> putWord8 40 >> put dll >> put str WhereFrom a -> putWord8 41 >> put a ===================================== libraries/ghci/GHCi/Run.hs ===================================== @@ -33,6 +33,7 @@ import Control.DeepSeq import Control.Exception import Control.Monad import Data.ByteString (ByteString) +import qualified Data.ByteString.Short as BS import qualified Data.ByteString.Unsafe as B import GHC.Exts import qualified GHC.Exts.Heap as Heap @@ -95,7 +96,10 @@ run m = case m of MkCostCentres mod ccs -> mkCostCentres mod ccs CostCentreStackInfo ptr -> ccsToStrings (fromRemotePtr ptr) NewBreakArray sz -> mkRemoteRef =<< newBreakArray sz - NewBreakModule name -> newModuleName name + NewBreakModule name unitid -> do + namePtr <- newModuleName name + uidPtr <- newUnitId unitid + pure (namePtr, uidPtr) SetupBreakpoint ref ix cnt -> do arr <- localRef ref; _ <- setupBreakpoint arr ix cnt @@ -335,7 +339,7 @@ withBreakAction opts breakMVar statusMVar act -- as soon as it is hit, or in resetBreakAction below. onBreak :: BreakpointCallback - onBreak tick_mod# tickx# info_mod# infox# is_exception apStack = do + onBreak tick_mod# tick_mod_uid# tickx# info_mod# info_mod_uid# infox# is_exception apStack = do tid <- myThreadId let resume = ResumeContext { resumeBreakMVar = breakMVar @@ -349,8 +353,10 @@ withBreakAction opts breakMVar statusMVar act then pure Nothing else do tick_mod <- peekCString (Ptr tick_mod#) + tick_mod_uid <- BS.packCString (Ptr tick_mod_uid#) info_mod <- peekCString (Ptr info_mod#) - pure (Just (EvalBreakpoint tick_mod (I# tickx#) info_mod (I# infox#))) + info_mod_uid <- BS.packCString (Ptr info_mod_uid#) + pure (Just (EvalBreakpoint tick_mod tick_mod_uid (I# tickx#) info_mod info_mod_uid (I# infox#))) putMVar statusMVar $ EvalBreak apStack_r breakpoint resume_r ccs takeMVar breakMVar @@ -400,8 +406,10 @@ resetStepFlag = poke stepFlag 0 type BreakpointCallback = Addr# -- pointer to the breakpoint tick module name + -> Addr# -- pointer to the breakpoint tick module unit id -> Int# -- breakpoint tick index -> Addr# -- pointer to the breakpoint info module name + -> Addr# -- pointer to the breakpoint info module unit id -> Int# -- breakpoint info index -> Bool -- exception? -> HValue -- the AP_STACK, or exception @@ -414,8 +422,8 @@ noBreakStablePtr :: StablePtr BreakpointCallback noBreakStablePtr = unsafePerformIO $ newStablePtr noBreakAction noBreakAction :: BreakpointCallback -noBreakAction _ _ _ _ False _ = putStrLn "*** Ignoring breakpoint" -noBreakAction _ _ _ _ True _ = return () -- exception: just continue +noBreakAction _ _ _ _ _ _ False _ = putStrLn "*** Ignoring breakpoint" +noBreakAction _ _ _ _ _ _ True _ = return () -- exception: just continue -- Malloc and copy the bytes. We don't have any way to monitor the -- lifetime of this memory, so it just leaks. @@ -432,6 +440,13 @@ mkString0 bs = B.unsafeUseAsCStringLen bs $ \(cstr,len) -> do pokeElemOff (ptr :: Ptr CChar) len 0 return (castRemotePtr (toRemotePtr ptr)) +mkShortByteString0 :: BS.ShortByteString -> IO (RemotePtr ()) +mkShortByteString0 bs = BS.useAsCStringLen bs $ \(cstr,len) -> do + ptr <- mallocBytes (len+1) + copyBytes ptr cstr len + pokeElemOff (ptr :: Ptr CChar) len 0 + return (castRemotePtr (toRemotePtr ptr)) + mkCostCentres :: String -> [(String,String)] -> IO [RemotePtr CostCentre] #if defined(PROFILING) mkCostCentres mod ccs = do @@ -453,6 +468,10 @@ newModuleName :: String -> IO (RemotePtr BreakModule) newModuleName name = castRemotePtr . toRemotePtr <$> newCString name +newUnitId :: BS.ShortByteString -> IO (RemotePtr BreakUnitId) +newUnitId name = + castRemotePtr <$> mkShortByteString0 name + getIdValFromApStack :: HValue -> Int -> IO (Maybe HValue) getIdValFromApStack apStack (I# stackDepth) = do case getApStackVal# apStack stackDepth of ===================================== rts/Exception.cmm ===================================== @@ -535,12 +535,16 @@ retry_pop_stack: // be per-thread. CInt[rts_stop_on_exception] = 0; ("ptr" ioAction) = ccall deRefStablePtr (W_[rts_breakpoint_io_action] "ptr"); - Sp = Sp - WDS(13); - Sp(12) = exception; - Sp(11) = stg_raise_ret_info; - Sp(10) = exception; - Sp(9) = ghczminternal_GHCziInternalziTypes_True_closure; // True <=> an exception - Sp(8) = stg_ap_ppv_info; + Sp = Sp - WDS(17); + Sp(16) = exception; + Sp(15) = stg_raise_ret_info; + Sp(14) = exception; + Sp(13) = ghczminternal_GHCziInternalziTypes_True_closure; // True <=> an exception + Sp(12) = stg_ap_ppv_info; + Sp(11) = 0; + Sp(10) = stg_ap_n_info; + Sp(9) = 0; + Sp(8) = stg_ap_n_info; Sp(7) = 0; Sp(6) = stg_ap_n_info; Sp(5) = 0; ===================================== rts/Interpreter.c ===================================== @@ -1245,9 +1245,9 @@ run_BCO: /* check for a breakpoint on the beginning of a let binding */ case bci_BRK_FUN: { - int arg1_brk_array, arg2_tick_mod, arg3_info_mod, arg4_tick_index, arg5_info_index; + int arg1_brk_array, arg2_tick_mod, arg3_info_mod, arg4_tick_mod_id, arg5_info_mod_id, arg6_tick_index, arg7_info_index; #if defined(PROFILING) - int arg6_cc; + int arg8_cc; #endif StgArrBytes *breakPoints; int returning_from_break; @@ -1264,10 +1264,12 @@ run_BCO: arg1_brk_array = BCO_GET_LARGE_ARG; arg2_tick_mod = BCO_GET_LARGE_ARG; arg3_info_mod = BCO_GET_LARGE_ARG; - arg4_tick_index = BCO_NEXT; - arg5_info_index = BCO_NEXT; + arg4_tick_mod_id = BCO_GET_LARGE_ARG; + arg5_info_mod_id = BCO_GET_LARGE_ARG; + arg6_tick_index = BCO_NEXT; + arg7_info_index = BCO_NEXT; #if defined(PROFILING) - arg6_cc = BCO_GET_LARGE_ARG; + arg8_cc = BCO_GET_LARGE_ARG; #else BCO_GET_LARGE_ARG; #endif @@ -1280,7 +1282,7 @@ run_BCO: #if defined(PROFILING) cap->r.rCCCS = pushCostCentre(cap->r.rCCCS, - (CostCentre*)BCO_LIT(arg6_cc)); + (CostCentre*)BCO_LIT(arg8_cc)); #endif // if we are returning from a break then skip this section @@ -1292,11 +1294,11 @@ run_BCO: // stop the current thread if either the // "rts_stop_next_breakpoint" flag is true OR if the // ignore count for this particular breakpoint is zero - StgInt ignore_count = ((StgInt*)breakPoints->payload)[arg4_tick_index]; + StgInt ignore_count = ((StgInt*)breakPoints->payload)[arg6_tick_index]; if (rts_stop_next_breakpoint == false && ignore_count > 0) { // decrement and write back ignore count - ((StgInt*)breakPoints->payload)[arg4_tick_index] = --ignore_count; + ((StgInt*)breakPoints->payload)[arg6_tick_index] = --ignore_count; } else if (rts_stop_next_breakpoint == true || ignore_count == 0) { @@ -1330,8 +1332,10 @@ run_BCO: // continue execution of this BCO when the IO action returns. // // ioAction :: Addr# -- the breakpoint tick module + // -> Addr# -- the breakpoint tick module unit id // -> Int# -- the breakpoint tick index // -> Addr# -- the breakpoint info module + // -> Addr# -- the breakpoint info module unit id // -> Int# -- the breakpoint info index // -> Bool -- exception? // -> HValue -- the AP_STACK, or exception @@ -1340,17 +1344,21 @@ run_BCO: ioAction = (StgClosure *) deRefStablePtr ( rts_breakpoint_io_action); - Sp_subW(15); - SpW(14) = (W_)obj; - SpW(13) = (W_)&stg_apply_interp_info; - SpW(12) = (W_)new_aps; - SpW(11) = (W_)False_closure; // True <=> an exception - SpW(10) = (W_)&stg_ap_ppv_info; - SpW(9) = (W_)arg5_info_index; + Sp_subW(19); + SpW(18) = (W_)obj; + SpW(17) = (W_)&stg_apply_interp_info; + SpW(16) = (W_)new_aps; + SpW(15) = (W_)False_closure; // True <=> an exception + SpW(14) = (W_)&stg_ap_ppv_info; + SpW(13) = (W_)arg7_info_index; + SpW(12) = (W_)&stg_ap_n_info; + SpW(11) = (W_)BCO_LIT(arg5_info_mod_id); + SpW(10) = (W_)&stg_ap_n_info; + SpW(9) = (W_)BCO_LIT(arg3_info_mod); SpW(8) = (W_)&stg_ap_n_info; - SpW(7) = (W_)BCO_LIT(arg3_info_mod); + SpW(7) = (W_)arg6_tick_index; SpW(6) = (W_)&stg_ap_n_info; - SpW(5) = (W_)arg4_tick_index; + SpW(5) = (W_)BCO_LIT(arg4_tick_mod_id); SpW(4) = (W_)&stg_ap_n_info; SpW(3) = (W_)BCO_LIT(arg2_tick_mod); SpW(2) = (W_)&stg_ap_n_info; ===================================== testsuite/tests/gadt/T23298.hs ===================================== @@ -0,0 +1,25 @@ +{-# LANGUAGE GADTs #-} +module T23298 where + +import Data.Kind (Type) + +type HList :: Type -> Type +data HList a where + HCons :: HList x -> HList (Maybe x) + +eq :: HList a -> Bool +eq x = case x of + HCons ms -> True + +go (HCons x) = go x + +{- go :: HList alpha -> beta + +Under HCons + [G] alpha ~ Maybe x + [W] HList x ~ HList alpha +==> + [W] x ~ alpha +==> + [W] x ~ Maybe x +-} ===================================== testsuite/tests/gadt/T23298.stderr ===================================== @@ -0,0 +1,12 @@ + T23298.hs:14:16: error: [GHC-25897] + • Couldn't match type ‘x’ with ‘Maybe x’ + Expected: HList x -> t + Actual: HList a -> t + ‘x’ is a rigid type variable bound by + a pattern with constructor: + HCons :: forall x. HList x -> HList (Maybe x), + in an equation for ‘go’ + at T23298.hs:14:5-11 + • In the expression: go x + In an equation for ‘go’: go (HCons x) = go x + • Relevant bindings include x :: HList x (bound at T23298.hs:14:11) ===================================== testsuite/tests/gadt/all.T ===================================== @@ -131,3 +131,4 @@ test('T19847a', normalise_version('base'), compile, ['-ddump-types']) test('T19847b', normal, compile, ['']) test('T23022', normal, compile, ['-dcore-lint']) test('T23023', normal, compile_fail, ['-O -dcore-lint']) # todo: move this test? +test('T23298', normal, compile_fail, ['']) ===================================== testsuite/tests/ghci/scripts/GhciPackageRename.hs ===================================== @@ -0,0 +1,4 @@ +module GhciPackageRename where + +foo :: Map k v +foo = empty \ No newline at end of file ===================================== testsuite/tests/ghci/scripts/GhciPackageRename.script ===================================== @@ -0,0 +1,6 @@ +:l GhciPackageRename.hs +-- Test that Data.Map is available as Prelude +:t fromList + +-- Test using a Map function +fromList [(1,"a"), (2,"b")] \ No newline at end of file ===================================== testsuite/tests/ghci/scripts/GhciPackageRename.stdout ===================================== @@ -0,0 +1,3 @@ +fromList + :: ghc-internal:GHC.Internal.Classes.Ord k => [(k, a)] -> Map k a +fromList [(1,"a"),(2,"b")] ===================================== testsuite/tests/ghci/scripts/all.T ===================================== @@ -386,3 +386,9 @@ test('T13869', extra_files(['T13869a.hs', 'T13869b.hs']), ghci_script, ['T13869. test('ListTuplePunsPpr', normal, ghci_script, ['ListTuplePunsPpr.script']) test('ListTuplePunsPprNoAbbrevTuple', [expect_broken(23135), limit_stdout_lines(13)], ghci_script, ['ListTuplePunsPprNoAbbrevTuple.script']) test('T24459', normal, ghci_script, ['T24459.script']) + +# Test package renaming in GHCi session +test('GhciPackageRename', + [extra_hc_opts("-hide-all-packages -package 'containers (Data.Map as Prelude)'")], + ghci_script, + ['GhciPackageRename.script']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/df8442ae955e81bf3516c03c128874f... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/df8442ae955e81bf3516c03c128874f... You're receiving this email because of your account on gitlab.haskell.org.