[commit: ghc] master: llvmGen: Fix build with Clang (da1a8da)

git at git.haskell.org git at git.haskell.org
Sat Oct 31 23:11:25 UTC 2015


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

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

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

commit da1a8da78df3ea8715dc95a874ca6050f06b1908
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Nov 1 00:11:02 2015 +0100

    llvmGen: Fix build with Clang
    
    Another weird case of Clang not accepting whitespace in CPP that
    GCC accepts without a problem.
    
    Test Plan: Build with Clang and GCC
    
    Reviewers: austin, thomie, hvr, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1409


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

da1a8da78df3ea8715dc95a874ca6050f06b1908
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
index b754a93..cde3276 100644
--- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
@@ -476,11 +476,11 @@ genCallWithOverflow
   :: ForeignTarget -> Width -> [CmmFormal] -> [CmmActual] -> LlvmM StmtData
 genCallWithOverflow t@(PrimTarget op) w [dstV, dstO] [lhs, rhs] = do
     -- So far this was only tested for the following four CallishMachOps.
-    MASSERT( (op `elem` [ MO_Add2 w
+    MASSERT((op `elem`  [ MO_Add2 w
                         , MO_AddIntC w
                         , MO_SubIntC w
                         , MO_SubWordC w
-                        ]) )
+                        ]))
     let width = widthToLlvmInt w
     -- This will do most of the work of generating the call to the intrinsic and
     -- extracting the values from the struct.



More information about the ghc-commits mailing list