X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FAsmCodeGen.lhs;h=126d1b8abd439bf353f39f9e3617d9c4ad6f1325;hb=5a82864902fc01cf8eee847fcf4ee88e74aa535d;hp=fee6209b391cd7beb45e3bc9754601b0a9f8761f;hpb=f5d4c3239e57b0396672ffc302961f84398d730e;p=ghc-hetmet.git diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs index fee6209..126d1b8 100644 --- a/compiler/nativeGen/AsmCodeGen.lhs +++ b/compiler/nativeGen/AsmCodeGen.lhs @@ -456,7 +456,7 @@ sequenceBlocks (entry:blocks) = -- the first block is the entry point ==> it must remain at the start. sccBlocks :: [NatBasicBlock] -> [SCC (NatBasicBlock,Unique,[Unique])] -sccBlocks blocks = stronglyConnCompR (map mkNode blocks) +sccBlocks blocks = stronglyConnCompFromEdgedVerticesR (map mkNode blocks) getOutEdges :: [Instr] -> [Unique] getOutEdges instrs = case jumpDests (last instrs) [] of @@ -719,9 +719,9 @@ cmmStmtConFold stmt e' <- cmmExprConFold CallReference e return $ CmmCallee e' conv other -> return other - args' <- mapM (\(CmmHinted arg hint) -> do + args' <- mapM (\(CmmKinded arg hint) -> do arg' <- cmmExprConFold DataReference arg - return (CmmHinted arg' hint)) args + return (CmmKinded arg' hint)) args return $ CmmCall target' regs args' srt returns CmmCondBranch test dest