[Git][ghc/ghc][wip/T22010] Revert "Make GHCi work with 64-bit uniques"

[Jaro Reinders (@Noughtmare)]

Jaro Reinders pushed to branch wip/T22010 at Glasgow Haskell Compiler / GHC


Commits:
39592e1d by Jaro Reinders at 2023-06-22T14:38:12+02:00
Revert "Make GHCi work with 64-bit uniques"

This reverts commit c962ef3bf43b09770298a9f195e104c02b25d7e2.

- - - - -


2 changed files:

- libraries/ghci/GHCi/Message.hs
- libraries/ghci/GHCi/Run.hs


Changes:

=====================================
libraries/ghci/GHCi/Message.hs
=====================================
@@ -380,7 +380,7 @@ data EvalStatus_ a b
   | EvalBreak Bool
        HValueRef{- AP_STACK -}
        Int {- break index -}
-       Word64 {- uniq of ModuleName -}
+       Int {- uniq of ModuleName -}
        (RemoteRef (ResumeContext b))
        (RemotePtr CostCentreStack) -- Cost centre stack
   deriving (Generic, Show)


=====================================
libraries/ghci/GHCi/Run.hs
=====================================
@@ -40,7 +40,6 @@ import GHC.Conc.Sync
 import GHC.IO hiding ( bracket )
 import System.Mem.Weak  ( deRefWeak )
 import Unsafe.Coerce
-import GHC.Word
 
 -- -----------------------------------------------------------------------------
 -- Implement messages
@@ -294,11 +293,7 @@ withBreakAction opts breakMVar statusMVar act
      resume_r <- mkRemoteRef resume
      apStack_r <- mkRemoteRef apStack
      ccs <- toRemotePtr <$> getCCSOf apStack
-#if !MIN_VERSION_GLASGOW_HASKELL(9,3,0,0) || WORD_SIZE_IN_BITS < 64
-     putMVar statusMVar $ EvalBreak is_exception apStack_r (I# ix#) (W64# uniq#) resume_r ccs
-#else
-     putMVar statusMVar $ EvalBreak is_exception apStack_r (I# ix#) (W64# (word64ToWord# uniq#)) resume_r ccs
-#endif
+     putMVar statusMVar $ EvalBreak is_exception apStack_r (I# ix#) uniq# resume_r ccs
      takeMVar breakMVar
 
    resetBreakAction stablePtr = do
@@ -347,7 +342,7 @@ resetStepFlag = poke stepFlag 0
 
 type BreakpointCallback
      = Int#    -- the breakpoint index
-    -> Word64# -- the module uniq
+    -> Int#    -- the module uniq
     -> Bool    -- exception?
     -> HValue  -- the AP_STACK, or exception
     -> IO ()



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/39592e1d48add9a7da1fb2367f0ceef9c3a1272e

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


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230622/d2bcf95a/attachment-0001.html>