Handle breakpoint jumps while splicing TH functions in ghci

The dynamic linker has been modified so that it won't panic if one of the breakpointJump functions fails to resolve.
Now, if the dynamic linker fails to find a HValue for a Name, before looking for a static symbol it will ask to

Breakpoints.lookupBogusBreakpointVal :: Name -> Maybe HValue

which returns an identity function for the Jump names or Nothing else.

A TH function might contain a call to a breakpoint function. So if it is compiled to bytecodes, the breakpoints will be desugared to 'jumps'. Whenever this code is spliced, the linker will fail to find the jumpfunctions unless there is a default.

diff --git a/compiler/ghci/ByteCodeLink.lhs b/compiler/ghci/ByteCodeLink.lhs
index 427fa1e..c58ae87 100644 (file)
--- a/compiler/ghci/ByteCodeLink.lhs
+++ b/compiler/ghci/ByteCodeLink.lhs
@@ -27,6 +27,7 @@ import Module
 import PackageConfig
 import FastString
 import Panic
+import Breakpoints
 
 #ifdef DEBUG
 import Outputable
@@ -211,6 +212,8 @@ lookupName :: ClosureEnv -> Name -> IO HValue
 lookupName ce nm
    = case lookupNameEnv ce nm of
         Just (_,aa) -> return aa
+        Nothing | Just bk <- lookupBogusBreakpointVal nm
+           -> return bk
         Nothing 
            -> ASSERT2(isExternalName nm, ppr nm)
              do let sym_to_find = nameToCLabel nm "closure"

diff --git a/compiler/main/Breakpoints.hs b/compiler/main/Breakpoints.hs
index 14d9ea2..b1b0118 100644 (file)
--- a/compiler/main/Breakpoints.hs
+++ b/compiler/main/Breakpoints.hs
@@ -9,7 +9,16 @@
 \r
 module Breakpoints where\r
 \r
+#ifdef GHCI\r
+import {-#SOURCE#-} ByteCodeLink ( HValue ) \r
+#endif\r
+\r
 import {-#SOURCE#-} HscTypes     ( Session )\r
+import Name\r
+import Var                       ( Id )\r
+import PrelNames\r
+\r
+import GHC.Exts                  ( unsafeCoerce# )\r
 \r
 data BkptHandler a = BkptHandler {\r
      handleBreakpoint  :: forall b. Session -> [(Id,HValue)] -> BkptLocation a ->  String -> b -> IO b\r
@@ -29,3 +38,16 @@ type Coord        = (Int, Int)
 \r
 noDbgSites :: SiteMap\r
 noDbgSites = []\r
+\r
+-- | Returns the 'identity' jumps\r
+--   Used to deal with spliced code, where we don't want breakpoints\r
+#ifdef GHCI\r
+lookupBogusBreakpointVal :: Name -> Maybe HValue\r
+lookupBogusBreakpointVal name \r
+  | name == breakpointJumpName     = Just$ unsafeCoerce# (\_ _ _ _ a->a)\r
+  | name == breakpointAutoJumpName = Just$ unsafeCoerce# (\_ _ _ _ a->a)\r
+  | name == breakpointCondJumpName = Just$ unsafeCoerce# (\_ _ _ _ _ a->a)\r
+  | otherwise = Nothing\r
+#else \r
+lookupBogusBreakpointVal _ = Nothing\r
+#endif //GHCI\r