X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FstgSyn%2FCoreToStg.lhs;h=2f59489e0aa5a0ce1795c2d64f8fd4bc0105c637;hb=0a095555ecc6400aba433bb7562140ac407730e1;hp=15e9fc3cd65015eda357ce509949fe69b17a60ae;hpb=1cfc9faaa059b9b090971399e4eb8ae9d364335c;p=ghc-hetmet.git

diff --git a/ghc/compiler/stgSyn/CoreToStg.lhs b/ghc/compiler/stgSyn/CoreToStg.lhs
index 15e9fc3..2f59489 100644
--- a/ghc/compiler/stgSyn/CoreToStg.lhs
+++ b/ghc/compiler/stgSyn/CoreToStg.lhs
@@ -17,9 +17,9 @@ import StgSyn
 
 import Type
 import TyCon		( isAlgTyCon )
-import Literal
 import Id
-import Var		( Var, globalIdDetails, varType )
+import Var		( Var, globalIdDetails, idType )
+import TyCon		( isUnboxedTupleTyCon, isPrimTyCon, isFunTyCon, isHiBootTyCon )
 #ifdef ILX
 import MkId		( unsafeCoerceId )
 #endif
@@ -257,7 +257,7 @@ mkTopStgRhs is_static rhs_fvs srt binder_info (StgConApp con args)
   = StgRhsCon noCCS con args
 
 mkTopStgRhs is_static rhs_fvs srt binder_info rhs
-  = ASSERT( not is_static )
+  = ASSERT2( not is_static, ppr rhs )
     StgRhsClosure noCCS binder_info
 		  (getFVs rhs_fvs)		 
 	          Updatable
@@ -333,7 +333,7 @@ coreToStgExpr (Note other_note expr)
 coreToStgExpr (Case scrut bndr alts)
   = extendVarEnvLne [(bndr, LambdaBound)]	(
 	 mapAndUnzip3Lne vars_alt alts	`thenLne` \ (alts2, fvs_s, escs_s) ->
-	 returnLne ( mkStgAlts (idType bndr) alts2,
+	 returnLne ( alts2,
 		     unionFVInfos fvs_s,
 		     unionVarSets escs_s )
     )			   		`thenLne` \ (alts2, alts_fvs, alts_escs) ->
@@ -367,6 +367,7 @@ coreToStgExpr (Case scrut bndr alts)
 		     (getLiveVars alts_lv_info)
 		     bndr'
 		     (mkSRT alts_lv_info)
+		     (mkStgAltType (idType bndr)) 
 		     alts2,
       scrut_fvs `unionFVInfo` alts_fvs_wo_bndr,
       alts_escs_wo_bndr `unionVarSet` getFVSet scrut_fvs
@@ -406,28 +407,15 @@ coreToStgExpr (Let bind body)
 \end{code}
 
 \begin{code}
-mkStgAlts scrut_ty orig_alts
- | is_prim_case = StgPrimAlts (tyConAppTyCon scrut_ty) prim_alts deflt
- | otherwise    = StgAlgAlts  maybe_tycon	       alg_alts  deflt
-  where
-    is_prim_case = isUnLiftedType scrut_ty && not (isUnboxedTupleType scrut_ty)
-
-    prim_alts    = [(lit, rhs) 		   | (LitAlt lit, _, _, rhs)	    <- other_alts]
-    alg_alts	 = [(con, bndrs, use, rhs) | (DataAlt con, bndrs, use, rhs) <- other_alts]
-
-    (other_alts, deflt) 
-	= case orig_alts of	-- DEFAULT is always first if it's there at all
-	    (DEFAULT, _, _, rhs) : other_alts -> (other_alts, StgBindDefault rhs)
-	    other			      -> (orig_alts,  StgNoDefault)
-
-    maybe_tycon = case alg_alts of 
-			-- Get the tycon from the data con
-			(dc, _, _, _) : _rest -> Just (dataConTyCon dc)
-
-			-- Otherwise just do your best
-			[] -> case splitTyConApp_maybe (repType scrut_ty) of
-				Just (tc,_) | isAlgTyCon tc -> Just tc
-				_other			    -> Nothing
+mkStgAltType scrut_ty
+  = case splitTyConApp_maybe (repType scrut_ty) of
+	Just (tc,_) | isUnboxedTupleTyCon tc -> UbxTupAlt tc
+		    | isPrimTyCon tc	     -> PrimAlt tc
+		    | isHiBootTyCon tc	     -> PolyAlt	-- Algebraic, but no constructors visible
+		    | isAlgTyCon tc 	     -> AlgAlt tc
+		    | isFunTyCon tc	     -> PolyAlt
+		    | otherwise		     -> pprPanic "mkStgAlts" (ppr tc)
+	Nothing				     -> PolyAlt
 \end{code}
 
 
@@ -458,7 +446,7 @@ coreToStgApp maybe_thunk_body f args
             -- Here the free variables are "f", "x" AND the type variable "a"
             -- coreToStgArgs will deal with the arguments recursively
             if opt_RuntimeTypes then
-	      fvs `unionFVInfo` tyvarFVInfo (tyVarsOfType (varType f))
+	      fvs `unionFVInfo` tyvarFVInfo (tyVarsOfType (idType f))
 	    else fvs
 
 	-- Mostly, the arity info of a function is in the fn's IdInfo
@@ -873,15 +861,7 @@ thenLne :: LneM a -> (a -> LneM b) -> LneM b
 thenLne m k env lvs_cont 
   = k (m env lvs_cont) env lvs_cont
 
-mapLne  :: (a -> LneM b)   -> [a] -> LneM [b]
-mapLne f [] = returnLne []
-mapLne f (x:xs)
-  = f x		`thenLne` \ r  ->
-    mapLne f xs	`thenLne` \ rs ->
-    returnLne (r:rs)
-
 mapAndUnzipLne  :: (a -> LneM (b,c))   -> [a] -> LneM ([b],[c])
-
 mapAndUnzipLne f [] = returnLne ([],[])
 mapAndUnzipLne f (x:xs)
   = f x		    	`thenLne` \ (r1,  r2)  ->
@@ -889,7 +869,6 @@ mapAndUnzipLne f (x:xs)
     returnLne (r1:rs1, r2:rs2)
 
 mapAndUnzip3Lne :: (a -> LneM (b,c,d)) -> [a] -> LneM ([b],[c],[d])
-
 mapAndUnzip3Lne f []	= returnLne ([],[],[])
 mapAndUnzip3Lne f (x:xs)
   = f x		    	 `thenLne` \ (r1,  r2,  r3)  ->
@@ -897,7 +876,6 @@ mapAndUnzip3Lne f (x:xs)
     returnLne (r1:rs1, r2:rs2, r3:rs3)
 
 mapAndUnzip4Lne :: (a -> LneM (b,c,d,e)) -> [a] -> LneM ([b],[c],[d],[e])
-
 mapAndUnzip4Lne f []	= returnLne ([],[],[],[])
 mapAndUnzip4Lne f (x:xs)
   = f x		    	 `thenLne` \ (r1,  r2,  r3, r4)  ->