[commit: ghc] ghc-7.2: Fix the build (b863bde)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-7.2

http://hackage.haskell.org/trac/ghc/changeset/b863bde7fa7b8d57a2e6068aa6694f23a1a5075e

>---------------------------------------------------------------

commit b863bde7fa7b8d57a2e6068aa6694f23a1a5075e
Author: Ian Lynagh <igloo at earth.li>
Date:   Fri Jul 8 13:31:51 2011 +0100

    Fix the build
    
    The seq# case in the new codegen was being shadowed by a more general
    case.

>---------------------------------------------------------------

 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 0edcbe4..fa16b2a 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"
 
 ------------------------------------------------------------------------