X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FGraphColor.hs;h=307803a988109660ca35c224bb2f1b1c7e4436c5;hb=86f1f4e0748ba1146cf74786af38a68a88164e2f;hp=dfb2d17edffe8e4d7e273d5af74233295b490ec5;hpb=d438785e9c5e47e6e1ed3bfafcd504a2f1c8c774;p=ghc-hetmet.git diff --git a/compiler/nativeGen/GraphColor.hs b/compiler/nativeGen/GraphColor.hs index dfb2d17..307803a 100644 --- a/compiler/nativeGen/GraphColor.hs +++ b/compiler/nativeGen/GraphColor.hs @@ -154,7 +154,10 @@ colorScan_spin iterative triv spill graph $ graph , ksTrivFound <- map nodeId nsTrivFound - , graph3 <- foldr delNode graph ksTrivFound + , graph3 <- foldr (\k g -> let Just g' = delNode k g + in g') + graph ksTrivFound + = colorScan_spin iterative triv spill graph3 (ksTrivFound ++ ksTriv) ksSpill @@ -204,8 +207,8 @@ colorScan_spin iterative triv spill graph colorScan_spill iterative triv spill graph ksTriv ksSpill kksCoalesce - = let kSpill = spill graph - graph' = delNode kSpill graph + = let kSpill = spill graph + Just graph' = delNode kSpill graph in colorScan_spin iterative triv spill graph' ksTriv (kSpill : ksSpill) kksCoalesce