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/stgSyn/CoreToStg.hs | |
| 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/stgSyn/CoreToStg.hs')
| -rw-r--r-- | compiler/stgSyn/CoreToStg.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |