[commit: ghc] wip/kavon-nosplit-llvm: cpscall and shrink-wraping don't get along at the moment (d4c3662)

[git at git.haskell.org]

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

On branch  : wip/kavon-nosplit-llvm
Link       : http://ghc.haskell.org/trac/ghc/changeset/d4c36625529effd1ee3f806c29729933d14bd257/ghc

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

commit d4c36625529effd1ee3f806c29729933d14bd257
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Thu Jun 29 17:48:07 2017 +0100

    cpscall and shrink-wraping don't get along at the moment


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

d4c36625529effd1ee3f806c29729933d14bd257
 compiler/main/DriverPipeline.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index a34c5dc..f885424 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1493,8 +1493,8 @@ runPhase (RealPhaseWithInfo mangInfo LlvmLlc) input_fn dflags
     output_fn <- phaseOutputFilename next_phase
 
     liftIO $ SysTools.runLlvmLlc dflags
-                ([ -- FIXME(kavon) SysTools.Option (llvmOpts !! opt_lvl),
-                    SysTools.Option cpscall_workaround,
+                ( map SysTools.Option cpscall_workaround
+                ++ [ -- FIXME(kavon) SysTools.Option (llvmOpts !! opt_lvl),
                     SysTools.Option $ "-relocation-model=" ++ rmodel,
                     SysTools.FileOption "" input_fn,
                     SysTools.Option "-o", SysTools.FileOption "" output_fn]
@@ -1518,7 +1518,7 @@ runPhase (RealPhaseWithInfo mangInfo LlvmLlc) input_fn dflags
   where
         
         -- TODO(kavon): temporary
-        cpscall_workaround = "-disable-machine-cse"
+        cpscall_workaround = ["-disable-machine-cse", "-enable-shrink-wrap=false"]
       
         -- Bug in LLVM at O3 on OSX.
         llvmOpts = if platformOS (targetPlatform dflags) == OSDarwin