X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplify.lhs;h=36d0440df46369a3c06137a4777c156c6005d81e;hb=1241c26f3552a2037263769e5ef7fa68d9f3be36;hp=514263231c787513ee284f96c4468a20c63fdba6;hpb=43d903cfaafb0b41242af128c7ddbf0b649f63bd;p=ghc-hetmet.git

diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index 5142632..36d0440 100644
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -4,6 +4,13 @@
 \section[Simplify]{The main module of the simplifier}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module Simplify ( simplTopBinds, simplExpr ) where
 
 #include "HsVersions.h"
@@ -892,10 +899,10 @@ simplNote env (SCC cc) e cont
 
 -- See notes with SimplMonad.inlineMode
 simplNote env InlineMe e cont
-  | contIsRhsOrArg cont		-- Totally boring continuation; see notes above
+  | Just (inside, outside) <- splitInlineCont cont  -- Boring boring continuation; see notes above
   = do	{ 			-- Don't inline inside an INLINE expression
-	  e' <- simplExpr (setMode inlineMode env) e
-	; rebuild env (mkInlineMe e') cont }
+	  e' <- simplExprC (setMode inlineMode env) e inside
+	; rebuild env (mkInlineMe e') outside }
 
   | otherwise  	-- Dissolve the InlineMe note if there's
 		-- an interesting context of any kind to combine with