X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUtils.lhs;h=95f35afbacad30c28cc85ff0652b2a3220527618;hb=703ca1542c8e0983cc9d8eebce6e9f3dd3fd71e2;hp=0708d7aa7582add1bfbb205f4854d8d306da8ab6;hpb=9414bda057e8ac8422ca5590c8500c7cdee323bb;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs
index 0708d7a..95f35af 100644
--- a/compiler/coreSyn/CoreUtils.lhs
+++ b/compiler/coreSyn/CoreUtils.lhs
@@ -74,8 +74,6 @@ import Maybes
 import Util
 import Data.Word
 import Data.Bits
-
-import GHC.Exts		-- For `xori` 
 \end{code}
 
 
@@ -200,8 +198,9 @@ But it hardly seems worth it, so I don't bother.
 -- | Wraps the given expression in an inlining hint unless the expression
 -- is trivial in some sense, so that doing so would usually hurt us
 mkInlineMe :: CoreExpr -> CoreExpr
-mkInlineMe (Var v) = Var v
-mkInlineMe e	   = Note InlineMe e
+mkInlineMe e@(Var _)           = e
+mkInlineMe e@(Note InlineMe _) = e
+mkInlineMe e	               = Note InlineMe e
 \end{code}
 
 \begin{code}
@@ -641,8 +640,6 @@ isDivOp IntQuotOp	 = True
 isDivOp IntRemOp	 = True
 isDivOp WordQuotOp	 = True
 isDivOp WordRemOp	 = True
-isDivOp IntegerQuotRemOp = True
-isDivOp IntegerDivModOp  = True
 isDivOp FloatDivOp       = True
 isDivOp DoubleDivOp      = True
 isDivOp _                = False