X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCorePrep.lhs;h=e90a12a505e830149a68cf19e04c7e8bc1535a8a;hb=c3fe0f3699fa59261a340686bba648c981b3511d;hp=f0c2d9fc534f05910ee6f61ce6b63c14cad50b3e;hpb=30c122df62ec75f9ed7f392f24c2925675bf1d06;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CorePrep.lhs b/compiler/coreSyn/CorePrep.lhs
index f0c2d9f..e90a12a 100644
--- a/compiler/coreSyn/CorePrep.lhs
+++ b/compiler/coreSyn/CorePrep.lhs
@@ -634,7 +634,7 @@ mkBinds (Floats _ binds) body
 etaExpandRhs :: CoreBndr -> CoreExpr -> UniqSM CoreExpr
 etaExpandRhs bndr rhs = do
    	-- Eta expand to match the arity claimed by the binder
-	-- Remember, after CorePrep we must not change arity
+	-- Remember, CorePrep must not change arity
 	--
 	-- Eta expansion might not have happened already, 
 	-- because it is done by the simplifier only when 
@@ -663,7 +663,12 @@ etaExpandRhs bndr rhs = do
 	--		f = /\a -> \y -> let s = h 3 in g s y
 	--
     us <- getUniquesM
-    return (etaExpand arity us rhs (idType bndr))
+    let eta_rhs = etaExpand arity us rhs (idType bndr)
+
+    ASSERT2( manifestArity eta_rhs == arity, (ppr bndr <+> ppr arity <+> ppr (exprArity rhs)) 
+					      $$ ppr rhs $$ ppr eta_rhs )
+	-- Assertion checks that eta expansion was successful
+      return eta_rhs
   where
 	-- For a GlobalId, take the Arity from the Id.
 	-- It was set in CoreTidy and must not change
@@ -841,5 +846,5 @@ newVar :: Type -> UniqSM Id
 newVar ty
  = seqType ty `seq` do
      uniq <- getUniqueM
-     return (mkSysLocal FSLIT("sat") uniq ty)
+     return (mkSysLocal (fsLit "sat") uniq ty)
 \end{code}