[Git][ghc/ghc][wip/js-staging] 2 commits: Apply: fix tag generation

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
19142037 by Sylvain Henry at 2022-08-25T16:03:55+02:00
Apply: fix tag generation

- - - - -
6f2659d9 by Sylvain Henry at 2022-08-25T16:04:17+02:00
Remove redundant import

- - - - -


2 changed files:

- compiler/GHC/StgToJS/Apply.hs
- compiler/GHC/StgToJS/Linker/Linker.hs


Changes:

=====================================
compiler/GHC/StgToJS/Apply.hs
=====================================
@@ -807,7 +807,7 @@ stackApply s fun_name nargs nvars =
         [ rs |= (arity .>>. 8)
         , loadRegs rs
         , sp |= sp - rs
-        , newAp |= (var "h$apply" .! (toJExpr nargs-arity0.|.((toJExpr nvars-rs).<<.8)))
+        , newAp |= (var "h$apply" .! ((toJExpr nargs-arity0).|.((toJExpr nvars-rs).<<.8)))
         , stack .! sp |= newAp
         , profStat s pushRestoreCCS
         , traceRts s (toJExpr (fun_name <> ": new stack frame: ") + (newAp .^ "n"))
@@ -891,7 +891,7 @@ fastApply s fun_name nargs nvars = func ||= body0
                           + rsRemain)
            , saveRegs rs
            , sp |= sp + rsRemain + 1
-           , stack .! sp |= var "h$apply" .! ((rsRemain.<<.8).|. toJExpr nargs - mask8 arity)
+           , stack .! sp |= var "h$apply" .! ((rsRemain.<<.8).|. (toJExpr nargs - mask8 arity))
            , profStat s pushRestoreCCS
            , returnS c
            ]


=====================================
compiler/GHC/StgToJS/Linker/Linker.hs
=====================================
@@ -50,7 +50,6 @@ import           GHC.Unit.Env
 import           GHC.Unit.Home
 import           GHC.Unit.Types
 import           GHC.Utils.Error
-import           GHC.Driver.Env.Types
 import           GHC.Data.FastString
 
 import           Control.Concurrent.MVar



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9e2d99d800d76d69c64a251803ff3dd96c62b21e...6f2659d90589a29a1786eca8057fe29ecac6d04e

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9e2d99d800d76d69c64a251803ff3dd96c62b21e...6f2659d90589a29a1786eca8057fe29ecac6d04e
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220825/5be5a587/attachment-0001.html>