[commit: ghc] master: genapply: Explicitly specify arguments (de1b802)

git at git.haskell.org git at git.haskell.org
Tue Oct 3 21:56:27 UTC 2017


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

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

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

commit de1b802b651de5397bb3c42cdf0189fdc41a8f82
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Tue Oct 3 15:06:29 2017 -0400

    genapply: Explicitly specify arguments
    
    We seem to not be feeding either live registers or the arguments when
    generating the fast call in genapply.  This results in strange signature
    missmatches between the callee (expecting no registers) and the call
    site, expecting to pass registers.
    
    Test Plan: validate
    
    Reviewers: bgamari, simonmar, austin
    
    Reviewed By: simonmar
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D4029


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

de1b802b651de5397bb3c42cdf0189fdc41a8f82
 utils/genapply/Main.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/genapply/Main.hs b/utils/genapply/Main.hs
index 9248c22..b30c9f8 100644
--- a/utils/genapply/Main.hs
+++ b/utils/genapply/Main.hs
@@ -858,7 +858,7 @@ genApplyFast regstatus args =
           nest 4 (vcat [
              text "Sp_adj" <> parens (int (-sp_offset)) <> semi,
              saveRegOffs reg_locs,
-             mkJump regstatus fun_ret_label [] [] <> semi
+             mkJump regstatus fun_ret_label [] args <> semi
           ]),
           char '}'
         ]),



More information about the ghc-commits mailing list