diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-07-08 13:31:51 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-07-08 13:31:51 +0100 |
| commit | 85016d31bed8c051552e9fa67f33a260954452c8 (patch) | |
| tree | 349ede27c9daa037b36c98efcd979bbca4cf2d08 | |
| parent | 1b10c87df24acaf5773df852727dc85a3e500e6e (diff) | |
| download | haskell-85016d31bed8c051552e9fa67f33a260954452c8.tar.gz | |
Fix the build
The seq# case in the new codegen was being shadowed by a more general
case.
| -rw-r--r-- | compiler/codeGen/StgCmmExpr.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/codeGen/StgCmmExpr.hs b/compiler/codeGen/StgCmmExpr.hs index 0edcbe48c6..fa16b2a7f5 100644 --- a/compiler/codeGen/StgCmmExpr.hs +++ b/compiler/codeGen/StgCmmExpr.hs @@ -53,6 +53,11 @@ import UniqSupply cgExpr :: StgExpr -> FCode () cgExpr (StgApp fun args) = cgIdApp fun args + +{- seq# a s ==> a -} +cgExpr (StgOpApp (StgPrimOp SeqOp) [StgVarArg a, _] _res_ty) = + cgIdApp a [] + cgExpr (StgOpApp op args ty) = cgOpApp op args ty cgExpr (StgConApp con args) = cgConApp con args cgExpr (StgSCC cc expr) = do { emitSetCCC cc; cgExpr expr } @@ -71,10 +76,6 @@ cgExpr (StgLetNoEscape _ _ binds expr) = cgExpr (StgCase expr _live_vars _save_vars bndr srt alt_type alts) = cgCase expr bndr srt alt_type alts -{- seq# a s ==> a -} -cgExpr (StgOpApp (StgPrimOp SeqOp) [StgVarArg a, _] _res_ty) = - cgIdApp a [] - cgExpr (StgLam {}) = panic "cgExpr: StgLam" ------------------------------------------------------------------------ |