[commit: ghc] master: nativeGen: Use plusUFMList instead of foldr (55e621c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/55e621c38d51e1b1969f3477d07028cca87c71de/ghc

>---------------------------------------------------------------

commit 55e621c38d51e1b1969f3477d07028cca87c71de
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 27 20:02:25 2017 -0500

    nativeGen: Use plusUFMList instead of foldr


>---------------------------------------------------------------

55e621c38d51e1b1969f3477d07028cca87c71de
 compiler/nativeGen/AsmCodeGen.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/nativeGen/AsmCodeGen.hs b/compiler/nativeGen/AsmCodeGen.hs
index 373852a..d11eada 100644
--- a/compiler/nativeGen/AsmCodeGen.hs
+++ b/compiler/nativeGen/AsmCodeGen.hs
@@ -929,7 +929,7 @@ generateJumpTables ncgImpl xs = concatMap f xs
 
 shortcutBranches
         :: DynFlags
-    -> NcgImpl statics instr jumpDest
+        -> NcgImpl statics instr jumpDest
         -> [NatCmmDecl statics instr]
         -> [NatCmmDecl statics instr]
 
@@ -938,7 +938,7 @@ shortcutBranches dflags ncgImpl tops
   | otherwise           = map (apply_mapping ncgImpl mapping) tops'
   where
     (tops', mappings) = mapAndUnzip (build_mapping ncgImpl) tops
-    mapping = foldr plusUFM emptyUFM mappings
+    mapping = plusUFMList mappings
 
 build_mapping :: NcgImpl statics instr jumpDest
               -> GenCmmDecl d (LabelMap t) (ListGraph instr)