diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-01-07 13:56:17 -0800 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-01-07 13:56:17 -0800 |
| commit | f784eb7585901e2297d504dcf777ebc58d60aaa5 (patch) | |
| tree | 7bf8bc625882724f5db96121c327ee3e80ae781a /compiler/codeGen/CgForeignCall.hs | |
| parent | 7655c718d56666a918c06f6d4e32d98482620b9c (diff) | |
| parent | a5b365ac3ea7277817541f8bc3341eecfb083490 (diff) | |
| download | haskell-f784eb7585901e2297d504dcf777ebc58d60aaa5.tar.gz | |
Merge remote-tracking branch 'origin/master' into type-nats
Diffstat (limited to 'compiler/codeGen/CgForeignCall.hs')
| -rw-r--r-- | compiler/codeGen/CgForeignCall.hs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs index 8d8b97d76a..09636bc6b2 100644 --- a/compiler/codeGen/CgForeignCall.hs +++ b/compiler/codeGen/CgForeignCall.hs @@ -7,15 +7,15 @@ ----------------------------------------------------------------------------- module CgForeignCall ( - cgForeignCall, - emitForeignCall, - emitForeignCall', - shimForeignCallArg, - emitSaveThreadState, -- will be needed by the Cmm parser - emitLoadThreadState, -- ditto - emitCloseNursery, - emitOpenNursery, - ) where + cgForeignCall, + emitForeignCall, + emitForeignCall', + shimForeignCallArg, + emitSaveThreadState, -- will be needed by the Cmm parser + emitLoadThreadState, -- ditto + emitCloseNursery, + emitOpenNursery, + ) where import StgSyn import CgProf @@ -271,7 +271,7 @@ nursery_bdescr_blocks = cmmOffset stgCurrentNursery oFFSET_bdescr_blocks tso_stackobj, tso_CCCS, stack_STACK, stack_SP :: ByteOff tso_stackobj = closureField oFFSET_StgTSO_stackobj -tso_CCCS = closureField oFFSET_StgTSO_CCCS +tso_CCCS = closureField oFFSET_StgTSO_cccs stack_STACK = closureField oFFSET_StgStack_stack stack_SP = closureField oFFSET_StgStack_sp |