Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : newcg
http://hackage.haskell.org/trac/ghc/changeset/293054a611f3f43126e1f45c2fb3c973cee87c15 >--------------------------------------------------------------- commit 293054a611f3f43126e1f45c2fb3c973cee87c15 Author: Simon Marlow <[email protected]> Date: Fri Jan 27 10:03:46 2012 +0000 Thread the UniqSupply around properly >--------------------------------------------------------------- compiler/nativeGen/AsmCodeGen.lhs | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs index 04eef44..767e3ec 100644 --- a/compiler/nativeGen/AsmCodeGen.lhs +++ b/compiler/nativeGen/AsmCodeGen.lhs @@ -303,9 +303,9 @@ cmmNativeGenStream dflags ncgImpl h us cmm_stream impAcc profAcc count case r of Left () -> return (reverse impAcc, reverse profAcc) Right (cmms, cmm_stream') -> do - (impAcc,profAcc) <- cmmNativeGens dflags ncgImpl h us cmms + (impAcc,profAcc,us') <- cmmNativeGens dflags ncgImpl h us cmms impAcc profAcc count - cmmNativeGenStream dflags ncgImpl h us cmm_stream' + cmmNativeGenStream dflags ncgImpl h us' cmm_stream' impAcc profAcc count @@ -324,11 +324,12 @@ cmmNativeGens :: (PlatformOutputable statics, PlatformOutputable instr, Instruct -> Int -> IO ( [[CLabel]], [([NatCmmDecl statics instr], - Maybe [Color.RegAllocStats statics instr], - Maybe [Linear.RegAllocStats])] ) + Maybe [Color.RegAllocStats statics instr], + Maybe [Linear.RegAllocStats])], + UniqSupply ) -cmmNativeGens _ _ _ _ [] impAcc profAcc _ - = return (impAcc,profAcc) +cmmNativeGens _ _ _ us [] impAcc profAcc _ + = return (impAcc,profAcc,us) cmmNativeGens dflags ncgImpl h us (cmm : cmms) impAcc profAcc count = do _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
