diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-07-22 14:59:44 +0200 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2016-07-22 17:19:17 +0200 |
| commit | d068220f4249cce66ed5b6cc5504f79e7c8c0184 (patch) | |
| tree | 8e53c04f56be1e6b83a287c6a44c8adb2d71f28c /compiler | |
| parent | 1fe5c8916a2bdf90ed2d9c70f900642b56650592 (diff) | |
| download | haskell-d068220f4249cce66ed5b6cc5504f79e7c8c0184.tar.gz | |
Fix the non-Linux build
Summary:
The recent Compact Regions commit (cf989ffe49) builds fine on Linux
but doesn't build on OS X r Windows.
* rts/sm/CNF.c: Drop un-needed #includes.
* Fix parenthesis usage with CPP ASSERT macro.
* Fix format string in debugBelch messages.
* Use stg_max() instead hand rolled inline max() function.
Test Plan: Build on Linux, OS X and Windows
Reviewers: gcampax, simonmar, austin, bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2421
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/simplStg/UnariseStg.hs | 16 | ||||
| -rw-r--r-- | compiler/stgSyn/CoreToStg.hs | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/compiler/simplStg/UnariseStg.hs b/compiler/simplStg/UnariseStg.hs index af2928d770..24c0ce84a8 100644 --- a/compiler/simplStg/UnariseStg.hs +++ b/compiler/simplStg/UnariseStg.hs @@ -241,10 +241,10 @@ instance Outputable UnariseVal where -- | Extend the environment, checking the UnariseEnv invariant. extendRho :: UnariseEnv -> Id -> UnariseVal -> UnariseEnv extendRho rho x (MultiVal args) - = ASSERT (all (isNvUnaryType . stgArgType) args) + = ASSERT(all (isNvUnaryType . stgArgType) args) extendVarEnv rho x (MultiVal args) extendRho rho x (UnaryVal val) - = ASSERT (isNvUnaryType (stgArgType val)) + = ASSERT(isNvUnaryType (stgArgType val)) extendVarEnv rho x (UnaryVal val) -------------------------------------------------------------------------------- @@ -273,7 +273,7 @@ unariseRhs rho (StgRhsClosure ccs b_info fvs update_flag args expr) return (StgRhsClosure ccs b_info fvs' update_flag args1 expr') unariseRhs rho (StgRhsCon ccs con args) - = ASSERT (not (isUnboxedTupleCon con || isUnboxedSumCon con)) + = ASSERT(not (isUnboxedTupleCon con || isUnboxedSumCon con)) return (StgRhsCon ccs con (unariseConArgs rho args)) -------------------------------------------------------------------------------- @@ -356,7 +356,7 @@ unariseMulti_maybe rho dc args ty_args = Just (unariseConArgs rho args) | isUnboxedSumCon dc - , let args1 = ASSERT (isSingleton args) (unariseConArgs rho args) + , let args1 = ASSERT(isSingleton args) (unariseConArgs rho args) = Just (mkUbxSum dc ty_args args1) | otherwise @@ -374,7 +374,7 @@ elimCase rho args bndr (MultiValAlt _) [(_, bndrs, rhs)] | isUnboxedTupleBndr bndr = mapTupleIdBinders bndrs args rho1 | otherwise - = ASSERT (isUnboxedSumBndr bndr) + = ASSERT(isUnboxedSumBndr bndr) if null bndrs then rho1 else mapSumIdBinders bndrs args rho1 @@ -480,7 +480,7 @@ mapTupleIdBinders -> UnariseEnv -> UnariseEnv mapTupleIdBinders ids args0 rho0 - = ASSERT (not (any (isVoidTy . stgArgType) args0)) + = ASSERT(not (any (isVoidTy . stgArgType) args0)) let ids_unarised :: [(Id, RepType)] ids_unarised = map (\id -> (id, repType (idType id))) ids @@ -498,7 +498,7 @@ mapTupleIdBinders ids args0 rho0 | isMultiRep x_rep = extendRho rho x (MultiVal x_args) | otherwise - = ASSERT (x_args `lengthIs` 1) + = ASSERT(x_args `lengthIs` 1) extendRho rho x (UnaryVal (head x_args)) in map_ids rho' xs args' @@ -514,7 +514,7 @@ mapSumIdBinders -> UnariseEnv mapSumIdBinders [id] args rho0 - = ASSERT (not (any (isVoidTy . stgArgType) args)) + = ASSERT(not (any (isVoidTy . stgArgType) args)) let arg_slots = concatMap (repTypeSlots . repType . stgArgType) args id_slots = repTypeSlots (repType (idType id)) diff --git a/compiler/stgSyn/CoreToStg.hs b/compiler/stgSyn/CoreToStg.hs index cba139a532..d130b74ea2 100644 --- a/compiler/stgSyn/CoreToStg.hs +++ b/compiler/stgSyn/CoreToStg.hs @@ -774,7 +774,7 @@ mkStgRhs' con_updateable rhs_fvs bndr binder_info rhs | StgConApp con args _ <- unticked_rhs , not (con_updateable con args) = -- CorePrep does this right, but just to make sure - ASSERT (not (isUnboxedTupleCon con || isUnboxedSumCon con)) + ASSERT(not (isUnboxedTupleCon con || isUnboxedSumCon con)) StgRhsCon noCCS con args | otherwise = StgRhsClosure noCCS binder_info |