diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-02-13 21:19:21 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-02-13 21:19:21 +0000 |
| commit | ec2184eded032ec3305cc40c61149c4f8408ce49 (patch) | |
| tree | 9cbe1184a655a4afa5bebe20c0187b4eca3df7dc /compiler/codeGen/StgCmmForeign.hs | |
| parent | 3a47819657f6b8542107d14cbd883d93f6fbf442 (diff) | |
| parent | 4a0973bb25f8d328f1a41d43d9f45c374178113c (diff) | |
| download | haskell-ec2184eded032ec3305cc40c61149c4f8408ce49.tar.gz | |
Merge remote-tracking branch 'origin/master' into newcg
Conflicts:
compiler/cmm/CmmLint.hs
compiler/cmm/OldCmm.hs
compiler/codeGen/CgMonad.lhs
compiler/main/CodeOutput.lhs
Diffstat (limited to 'compiler/codeGen/StgCmmForeign.hs')
| -rw-r--r-- | compiler/codeGen/StgCmmForeign.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs index 3580481043..16edc9c4fb 100644 --- a/compiler/codeGen/StgCmmForeign.hs +++ b/compiler/codeGen/StgCmmForeign.hs @@ -247,7 +247,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 |