fix: always take local env into account when executing debug commands

Author: csabahruska

external-stg-interpreter/lib/Stg/Interpreter.hs

@@ -181,7 +181,7 @@ buildCallGraph so hoName = do
 builtinStgEval :: HasCallStack => StaticOrigin -> Atom -> M [Atom]
 builtinStgEval so a@HeapPtr{} = do
   o <- readHeap a
-  Debugger.checkBreakpoint $ BkpCustom "eval"
+  Debugger.checkBreakpoint [a] $ BkpCustom "eval"
   case o of
     ApStack{..} -> do
       tid <- gets ssCurrentThreadId
@@ -242,7 +242,7 @@ builtinStgEval so a@HeapPtr{} = do
         -- check breakpoints and region entering
         let closureName = binderUniqueName $ unId hoName
         markClosure closureName -- HINT: this list can be deleted by a debugger command, so this is not the same as `markExecutedId`
-        Debugger.checkBreakpoint . BkpStgPoint . SP_RhsClosureExpr . binderToStgId . unId $ hoName
+        Debugger.checkBreakpoint [a] . BkpStgPoint . SP_RhsClosureExpr . binderToStgId . unId $ hoName
         Debugger.checkRegion closureName
         GC.checkGC [a] -- HINT: add local env as GC root
 
@@ -467,7 +467,7 @@ evalStackMachine result = do
         resultStr <- mapM debugPrintAtom result
         traceLog $ showStackCont stackCont ++ " current-result: " ++ show resultStr
 
-      Debugger.checkBreakpoint $ BkpCustom "stack"
+      Debugger.checkBreakpoint result $ BkpCustom "stack"
       nextResult <- evalStackContinuation result stackCont
       case stackCont of
         RunScheduler{} -> pure ()
@@ -709,7 +709,7 @@ evalExpr localEnv = \case
     evalExpr localEnv e
 
   StgOpApp (StgPrimOp op) l t tc -> do
-    Debugger.checkBreakpoint $ BkpPrimOp op
+    Debugger.checkBreakpoint (envToAtoms localEnv) $ BkpPrimOp op
     Debugger.checkRegion op
     markPrimOp op
     args <- mapM (evalArg localEnv) l
@@ -723,7 +723,7 @@ evalExpr localEnv = \case
     -- check foreign target region and breakpoint
     case foreignCTarget foreignCall of
       StaticTarget _ targetName _ _ -> do
-        Debugger.checkBreakpoint $ BkpFFISymbol targetName
+        Debugger.checkBreakpoint (envToAtoms localEnv) $ BkpFFISymbol targetName
         Debugger.checkRegion targetName
       _ -> pure ()
 
@@ -955,7 +955,7 @@ runProgram isQuiet switchCWD progFilePath mods0 progArgs dbgChan dbgState tracin
 
         exportCallGraph
 
-        Debugger.checkBreakpoint $ BkpCustom "program finished"
+        Debugger.checkBreakpoint [] $ BkpCustom "program finished"
         -- HINT: start debugger REPL in debug mode
         when (dbgState == DbgStepByStep) $ do
           Debugger.processCommandsUntilExit

external-stg-interpreter/lib/Stg/Interpreter/Debugger.hs

@@ -109,8 +109,9 @@ hasFuel = do
   modify' $ \s@StgState{..} -> s {ssDebugFuel = fmap pred ssDebugFuel, ssStepCounter = succ ssStepCounter}
   pure $ maybe True (> 0) fuel
 
-checkBreakpoint :: Breakpoint -> M ()
-checkBreakpoint breakpoint = do
+checkBreakpoint :: [Atom] -> Breakpoint -> M ()
+checkBreakpoint localEnv breakpoint = do
+  modify' $ \s@StgState{..} -> s {ssLocalEnv = localEnv}
   dbgState <- gets ssDebugState
   exit <- processCommandsNonBlocking
   shouldStep <- hasFuel

external-stg-interpreter/lib/Stg/Interpreter/Debugger/Internal.hs

@@ -131,8 +131,8 @@ dbgCommands =
   [ ( ["gc"]
     , "run sync. garbage collector"
     , wrapWithDbgOut $ \_ -> do
-        curClosureAddr <- gets ssCurrentClosureAddr
-        GC.runGCSync [HeapPtr curClosureAddr]
+        localEnv <- gets ssLocalEnv
+        GC.runGCSync localEnv
     )
   , ( ["cleardb"]
     , "clear retainer db"
@@ -177,7 +177,7 @@ dbgCommands =
     , "[START] [END] list a given region or all regions if the arguments are omitted"
     , wrapWithDbgOut $ \case
       [] -> do
-        regions <- Map.keys <$> gets ssRegions
+        regions <- Map.keys <$> gets ssRegionStack
         liftIO $ putStrLn $ unlines $ map show regions
       [start]       -> showRegion False start start
       [start, end]  -> showRegion False start end
@@ -286,14 +286,14 @@ dbgCommands =
     , "list all trace markers and heap address state"
     , wrapWithDbgOut $ \_-> do
         markers <- gets ssTraceMarkers
-        forM_ (reverse markers) $ \(msg, AddressState{..}) -> liftIO $ printf "%-10d  %s\n" asNextHeapAddr (show msg)
+        forM_ (reverse markers) $ \(msg, _tid, AddressState{..}) -> liftIO $ printf "%-10d  %s\n" asNextHeapAddr (show msg)
     )
 
   , ( ["?m-dump"]
     , "list all trace markers and the whole address state"
     , wrapWithDbgOut $ \_-> do
         markers <- gets ssTraceMarkers
-        forM_ (reverse markers) $ \(msg, a) -> liftIO $ do
+        forM_ (reverse markers) $ \(msg, _tid, a) -> liftIO $ do
           print msg
           print a
     )

external-stg-interpreter/lib/Stg/Interpreter/ThreadScheduler.hs

@@ -285,7 +285,7 @@ stopIfThereIsNoRunnableThread = do
           putStrLn $ show (tid, tsStatus ts, tsBlockExceptions ts, tsInterruptible ts, tsBlockedExceptions ts, tsLabel ts)
       dumpStgState
       modify' $ \s@StgState{..} -> s {ssDebugState = DbgStepByStep}
-      Debugger.checkBreakpoint $ BkpCustom "thread-scheduler"
+      Debugger.checkBreakpoint [] $ BkpCustom "thread-scheduler"
 
 {-
   IDEA: