[commit: ghc] wip/fix-i386-1: Revert "ghc-heap: Fix writing closures on big endian" (a815a22)

git at git.haskell.org git at git.haskell.org
Tue Oct 30 16:18:27 UTC 2018


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

On branch  : wip/fix-i386-1
Link       : http://ghc.haskell.org/trac/ghc/changeset/a815a22cadfab6ab6f8d23f1140e7584713e896c/ghc

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

commit a815a22cadfab6ab6f8d23f1140e7584713e896c
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Oct 30 12:17:34 2018 -0400

    Revert "ghc-heap: Fix writing closures on big endian"
    
    This reverts commit 058c2813d882266309e8045af7a72eedecbf2dbb.


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

a815a22cadfab6ab6f8d23f1140e7584713e896c
 libraries/ghc-heap/GHC/Exts/Heap/InfoTable.hsc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/ghc-heap/GHC/Exts/Heap/InfoTable.hsc b/libraries/ghc-heap/GHC/Exts/Heap/InfoTable.hsc
index 95151b4..25fe498 100644
--- a/libraries/ghc-heap/GHC/Exts/Heap/InfoTable.hsc
+++ b/libraries/ghc-heap/GHC/Exts/Heap/InfoTable.hsc
@@ -59,7 +59,7 @@ pokeItbl a0 itbl = do
 #endif
   (#poke StgInfoTable, layout.payload.ptrs) a0 (ptrs itbl)
   (#poke StgInfoTable, layout.payload.nptrs) a0 (nptrs itbl)
-  (#poke StgInfoTable, type) a0 (toHalfWord (fromEnum (tipe itbl)))
+  (#poke StgInfoTable, type) a0 (fromEnum (tipe itbl))
 #if __GLASGOW_HASKELL__ > 804
   (#poke StgInfoTable, srt) a0 (srtlen itbl)
 #else
@@ -72,9 +72,6 @@ pokeItbl a0 itbl = do
     Just (Left xs) -> pokeArray code_offset xs
     Just (Right xs) -> pokeArray code_offset xs
 #endif
-  where
-    toHalfWord :: Int -> HalfWord
-    toHalfWord i = fromIntegral i
 
 -- | Size in bytes of a standard InfoTable
 itblSize :: Int



More information about the ghc-commits mailing list