X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmLint.hs;h=1b60ed7193b4bb49840c48c5c3db3c18b290ff0e;hb=497302c44ad08c6c27d0e15d94a787f332c0cfec;hp=7c8f2b3ce45ed1c2decb6cd6f216c4ef7010c6f2;hpb=176fa33f17dd78355cc572e006d2ab26898e2c69;p=ghc-hetmet.git diff --git a/compiler/cmm/CmmLint.hs b/compiler/cmm/CmmLint.hs index 7c8f2b3..1b60ed7 100644 --- a/compiler/cmm/CmmLint.hs +++ b/compiler/cmm/CmmLint.hs @@ -22,7 +22,6 @@ import CLabel import Maybe import Outputable import PprCmm -import Unique import Constants import FastString @@ -59,7 +58,7 @@ lintCmmTop (CmmData {}) lintCmmBlock :: BlockSet -> GenBasicBlock CmmStmt -> CmmLint () lintCmmBlock labels (BasicBlock id stmts) - = addLintInfo (text "in basic block " <> ppr (getUnique id)) $ + = addLintInfo (text "in basic block " <> ppr id) $ mapM_ (lintCmmStmt labels) stmts -- ----------------------------------------------------------------------------- @@ -88,20 +87,11 @@ lintCmmExpr expr = -- Check for some common byte/word mismatches (eg. Sp + 1) cmmCheckMachOp :: MachOp -> [CmmExpr] -> [CmmType] -> CmmLint CmmType -cmmCheckMachOp op args@[CmmReg reg, CmmLit (CmmInt i _)] _ - | isWordOffsetReg reg && isOffsetOp op && i `rem` fromIntegral wORD_SIZE /= 0 - = cmmLintDubiousWordOffset (CmmMachOp op args) cmmCheckMachOp op [lit@(CmmLit (CmmInt { })), reg@(CmmReg _)] tys = cmmCheckMachOp op [reg, lit] tys cmmCheckMachOp op _ tys = return (machOpResultType op tys) -isWordOffsetReg :: CmmReg -> Bool -isWordOffsetReg (CmmGlobal Sp) = True --- No warnings for unaligned arithmetic, which is used to tag dynamic constructor closures. ---isWordOffsetReg (CmmGlobal Hp) = True -isWordOffsetReg _ = False - isOffsetOp :: MachOp -> Bool isOffsetOp (MO_Add _) = True isOffsetOp (MO_Sub _) = True