[commit: ghc] master: Fix validate for GHCi without TABLES_NEXT_TO_CODE (bdfc85b)

git at git.haskell.org git at git.haskell.org
Wed May 30 14:02:37 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bdfc85b8cbcb49cc879aebad4cc1b50123f8c02c/ghc

>---------------------------------------------------------------

commit bdfc85b8cbcb49cc879aebad4cc1b50123f8c02c
Author: Peter Trommler <ptrommler at acm.org>
Date:   Sun May 27 11:11:37 2018 -0400

    Fix validate for GHCi without TABLES_NEXT_TO_CODE
    
    Suppress warning about unused match.
    
    Fixes #15187
    
    Reviewers: bgamari, simonmar, erikd, hvr
    
    Reviewed By: bgamari, simonmar
    
    Subscribers: rwbarton, thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D4741


>---------------------------------------------------------------

bdfc85b8cbcb49cc879aebad4cc1b50123f8c02c
 libraries/ghci/GHCi/InfoTable.hsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index cd712ba..ca57572 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -320,11 +320,11 @@ data StgConInfoTable = StgConInfoTable {
 pokeConItbl
   :: Ptr StgConInfoTable -> Ptr StgConInfoTable -> StgConInfoTable
   -> IO ()
-pokeConItbl wr_ptr ex_ptr itbl = do
+pokeConItbl wr_ptr _ex_ptr itbl = do
 #if defined(TABLES_NEXT_TO_CODE)
   -- Write the offset to the con_desc from the end of the standard InfoTable
   -- at the first byte.
-  let con_desc_offset = conDesc itbl `minusPtr` (ex_ptr `plusPtr` conInfoTableSizeB)
+  let con_desc_offset = conDesc itbl `minusPtr` (_ex_ptr `plusPtr` conInfoTableSizeB)
   (#poke StgConInfoTable, con_desc) wr_ptr con_desc_offset
 #else
   -- Write the con_desc address after the end of the info table.



More information about the ghc-commits mailing list