diff options
| author | Gabor Greif <ggreif@gmail.com> | 2014-08-08 18:01:19 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2014-08-08 18:01:19 +0200 |
| commit | 5f003d228340c3ce8e500f9053f353c58dc1dc94 (patch) | |
| tree | a855b0f173ff635b48354e1136ef6cbb2a1214a4 /compiler/codeGen/StgCmmLayout.hs | |
| parent | ff9c5570395bcacf8963149b3a8475f5644ce694 (diff) | |
| parent | dff0623d5ab13222c06b3ff6b32793e05b417970 (diff) | |
| download | haskell-wip/generics-propeq.tar.gz | |
Merge branch 'master' into wip/generics-propeqwip/generics-propeq
Conflicts:
compiler/typecheck/TcGenGenerics.lhs
Diffstat (limited to 'compiler/codeGen/StgCmmLayout.hs')
| -rw-r--r-- | compiler/codeGen/StgCmmLayout.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/codeGen/StgCmmLayout.hs b/compiler/codeGen/StgCmmLayout.hs index 99e926c987..d62101f27e 100644 --- a/compiler/codeGen/StgCmmLayout.hs +++ b/compiler/codeGen/StgCmmLayout.hs @@ -359,10 +359,10 @@ slowArgs dflags args -- careful: reps contains voids (V), but args does not (arg_pat, n) = slowCallPattern (map fst args) (call_args, rest_args) = splitAt n args - stg_ap_pat = mkCmmRetInfoLabel rtsPackageId arg_pat + stg_ap_pat = mkCmmRetInfoLabel rtsPackageKey arg_pat this_pat = (N, Just (mkLblExpr stg_ap_pat)) : call_args save_cccs = [(N, Just (mkLblExpr save_cccs_lbl)), (N, Just curCCS)] - save_cccs_lbl = mkCmmRetInfoLabel rtsPackageId (fsLit "stg_restore_cccs") + save_cccs_lbl = mkCmmRetInfoLabel rtsPackageKey (fsLit "stg_restore_cccs") ------------------------------------------------------------------------- ---- Laying out objects on the heap and stack |