diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-01-04 15:13:23 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-01-05 15:20:16 +0000 |
| commit | 3478213ac422912df85308029e16c3f31b5a91d2 (patch) | |
| tree | 3912df78d1b76f8e42d00ccc123942c4f9fb2256 /compiler/codeGen | |
| parent | 6a9e521713cb4cbc3c49fa861aa936730c346e5e (diff) | |
| download | haskell-3478213ac422912df85308029e16c3f31b5a91d2.tar.gz | |
Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register
Needed by #5357
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CgForeignCall.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmForeign.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs index 8d8b97d76a..bdc9e50c11 100644 --- a/compiler/codeGen/CgForeignCall.hs +++ b/compiler/codeGen/CgForeignCall.hs @@ -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 diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs index 7c739c61b6..af88ba848a 100644 --- a/compiler/codeGen/StgCmmForeign.hs +++ b/compiler/codeGen/StgCmmForeign.hs @@ -246,7 +246,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 |