diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-18 17:40:23 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-18 17:40:23 +0100 |
| commit | 8e7d41525dd6360eb828b14b2c1c764ed5023916 (patch) | |
| tree | 9c9482d8c27173064199232fa01a4f27af84114d /compiler/codeGen/CgProf.hs | |
| parent | 94291904305fb4885cbbd3b8011d1b8fa4e308b2 (diff) | |
| parent | 16cc37ff034213250c764cd941908398e4150100 (diff) | |
| download | haskell-8e7d41525dd6360eb828b14b2c1c764ed5023916.tar.gz | |
Merge remote-tracking branch 'origin/master' into tc-untouchables
Diffstat (limited to 'compiler/codeGen/CgProf.hs')
| -rw-r--r-- | compiler/codeGen/CgProf.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/codeGen/CgProf.hs b/compiler/codeGen/CgProf.hs index 6d87ee7127..1c78dd8ec6 100644 --- a/compiler/codeGen/CgProf.hs +++ b/compiler/codeGen/CgProf.hs @@ -307,8 +307,8 @@ ldvEnter cl_ptr = do (stmtC (CmmStore ldv_wd new_ldv_wd)) loadEra :: DynFlags -> CmmExpr -loadEra dflags = CmmMachOp (MO_UU_Conv cIntWidth (wordWidth dflags)) - [CmmLoad (mkLblExpr (mkCmmDataLabel rtsPackageId $ fsLit("era"))) cInt] +loadEra dflags = CmmMachOp (MO_UU_Conv (cIntWidth dflags) (wordWidth dflags)) + [CmmLoad (mkLblExpr (mkCmmDataLabel rtsPackageId $ fsLit("era"))) (cInt dflags)] ldvWord :: DynFlags -> CmmExpr -> CmmExpr -- Takes the address of a closure, and returns |