diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-07-27 11:05:30 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-07-27 11:05:30 +0100 |
| commit | 64a27638cd3260e0487dd43147d55436735763e7 (patch) | |
| tree | 214c0974205faa88fba7e850c062117e80b5ae6c /compiler/codeGen/CgMonad.lhs | |
| parent | 3fdd294af643a86162e544f442b0e36c57e1db36 (diff) | |
| parent | 7639e7518b8430b3f2eff2b847c3283e0f00e8ec (diff) | |
| download | haskell-64a27638cd3260e0487dd43147d55436735763e7.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Conflicts:
compiler/coreSyn/CoreSubst.lhs
compiler/rename/RnNames.lhs
Diffstat (limited to 'compiler/codeGen/CgMonad.lhs')
| -rw-r--r-- | compiler/codeGen/CgMonad.lhs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/codeGen/CgMonad.lhs b/compiler/codeGen/CgMonad.lhs index 9b195bfab2..273c1bf16e 100644 --- a/compiler/codeGen/CgMonad.lhs +++ b/compiler/codeGen/CgMonad.lhs @@ -736,7 +736,7 @@ emitCgStmt stmt ; setState $ state { cgs_stmts = cgs_stmts state `snocOL` stmt } } -emitData :: Section -> [CmmStatic] -> Code +emitData :: Section -> CmmStatics -> Code emitData sect lits = do { state <- getState ; setState $ state { cgs_tops = cgs_tops state `snocOL` data_block } } |