diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2016-01-07 11:36:41 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2016-01-08 08:49:26 +0000 |
| commit | 6be09e884730f19da6c24fc565980f515300e53c (patch) | |
| tree | b7e0e13c4b4acd138d4da91013562cd5637db865 /compiler/main/HscMain.hs | |
| parent | c78fedde7055490ca6f6210ada797190f3c35d87 (diff) | |
| download | haskell-6be09e884730f19da6c24fc565980f515300e53c.tar.gz | |
Enable stack traces with ghci -fexternal-interpreter -prof
Summary:
The main goal here is enable stack traces in GHCi. After this change,
if you start GHCi like this:
ghci -fexternal-interpreter -prof
(which requires packages to be built for profiling, but not GHC
itself) then the interpreter manages cost-centre stacks during
execution and can produce a stack trace on request. Call locations
are available for all interpreted code, and any compiled code that was
built with the `-fprof-auto` familiy of flags.
There are a couple of ways to get a stack trace:
* `error`/`undefined` automatically get one attached
* `Debug.Trace.traceStack` can be used anywhere, and prints the current
stack
Because the interpreter is running in a separate process, only the
interpreted code is running in profiled mode and the compiler itself
isn't slowed down by profiling.
The GHCi debugger still doesn't work with -fexternal-interpreter,
although this patch gets it a step closer. Most of the functionality
of breakpoints is implemented, but the runtime value introspection is
still not supported.
Along the way I also did some refactoring and added type arguments to
the various remote pointer types in `GHCi.RemotePtr`, so there's
better type safety and documentation in the bridge code between GHC
and ghc-iserv.
Test Plan: validate
Reviewers: bgamari, ezyang, austin, hvr, goldfire, erikd
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1747
GHC Trac Issues: #11047, #11100
Diffstat (limited to 'compiler/main/HscMain.hs')
| -rw-r--r-- | compiler/main/HscMain.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs index 558341aebc..7807f653e3 100644 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -1284,7 +1284,7 @@ hscGenHardCode hsc_env cgguts mod_summary output_filename = do hscInteractive :: HscEnv -> CgGuts -> ModSummary - -> IO (Maybe FilePath, CompiledByteCode, ModBreaks) + -> IO (Maybe FilePath, CompiledByteCode) #ifdef GHCI hscInteractive hsc_env cgguts mod_summary = do let dflags = hsc_dflags hsc_env @@ -1311,7 +1311,7 @@ hscInteractive hsc_env cgguts mod_summary = do ------------------ Create f-x-dynamic C-side stuff --- (_istub_h_exists, istub_c_exists) <- outputForeignStubs dflags this_mod location foreign_stubs - return (istub_c_exists, comp_bc, mod_breaks) + return (istub_c_exists, comp_bc) #else hscInteractive _ _ = panic "GHC not compiled with interpreter" #endif @@ -1705,7 +1705,7 @@ mkModGuts mod safe binds = mg_warns = NoWarnings, mg_anns = [], mg_hpc_info = emptyHpcInfo False, - mg_modBreaks = emptyModBreaks, + mg_modBreaks = Nothing, mg_vect_info = noVectInfo, mg_inst_env = emptyInstEnv, mg_fam_inst_env = emptyFamInstEnv, |