1. 18 Feb, 2018 9 commits
    • Michal Terepeta's avatar
      CBE: re-introduce bgamari's fixes · 4e513bf7
      Michal Terepeta authored
      During some recent work on CBE we discovered that `zipWith` is used to
      check for equality, but that doesn't quite work if lists are of
      different lengths! This was fixed by bgamari, but unfortunately the fix
      had to be rolled back due to other changes in CBE in
      . Since I wanted to have another
      look at CBE anyway, we agreed that the first thing to do would be to
      re-introduce the fix.
      Sadly I don't have any actual test case that would exercise this.
      Signed-off-by: Michal Terepeta's avatarMichal Terepeta <michal.terepeta@gmail.com>
      Test Plan: ./validate
      Reviewers: bgamari, simonmar
      Reviewed By: bgamari
      Subscribers: rwbarton, thomie, carter
      GHC Trac Issues: #14226
      Differential Revision: https://phabricator.haskell.org/D4387
    • Simon Marlow's avatar
      myThreadId# is trivial; make it an inline primop · c05529c2
      Simon Marlow authored
      The pattern `threadCapability =<< myThreadId` is used a lot in code
      that uses `hs_try_putmvar`, I want to make it cheaper.
      Test Plan: validate
      Reviewers: bgamari, erikd
      Reviewed By: bgamari
      Subscribers: rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4381
    • Simon Marlow's avatar
      Tidy up and consolidate canned CmmReg and CmmGlobals · ccda4862
      Simon Marlow authored
      Test Plan: validate
      Reviewers: bgamari, erikd
      Reviewed By: bgamari
      Subscribers: rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4380
    • Adam Sandberg Eriksson's avatar
      Remove doubled words · bfb90bca
      Adam Sandberg Eriksson authored
      Reviewers: bgamari
      Reviewed By: bgamari
      Subscribers: rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4368
    • Ben Gamari's avatar
      Build Haddocks with --quickjump · 9ff4cce3
      Ben Gamari authored
      By request of @alexbiehl.
      CCing @snowleopard and @alpmestan as the same should be done in Hadrian.
      Bumps haddock submodule.
      Reviewers: alexbiehl
      Reviewed By: alexbiehl
      Subscribers: rwbarton, thomie, carter, snowleopard, alpmestan, alexbiehl
      Differential Revision: https://phabricator.haskell.org/D4365
    • Matthías Páll Gissurarson's avatar
      Add valid refinement substitution suggestions for typed holes · 918c0b39
      Matthías Páll Gissurarson authored
      This adds valid refinement substitution suggestions for typed holes and
      documentation thereof.
      Inspired by Agda's refinement facilities, this extends the typed holes
      feature to be able to search for valid refinement substitutions, which
      are substitutions that have one or more holes in them.
      When the flag `-frefinement-level-substitutions=n` where `n > 0` is
      passed, we also look for valid refinement substitutions, i.e.
      substitutions that are valid, but adds more holes. Consider the
        f :: [Integer] -> Integer
        f = _
      Here the valid substitutions suggested will be (with the new
      `-funclutter-valid-substitutions` flag for less verbosity set):
        Valid substitutions include
          f :: [Integer] -> Integer
          product :: forall (t :: * -> *).
                    Foldable t => forall a. Num a => t a -> a
          sum :: forall (t :: * -> *).
                Foldable t => forall a. Num a => t a -> a
          maximum :: forall (t :: * -> *).
                    Foldable t => forall a. Ord a => t a -> a
          minimum :: forall (t :: * -> *).
                    Foldable t => forall a. Ord a => t a -> a
          head :: forall a. [a] -> a
          (Some substitutions suppressed; use -fmax-valid-substitutions=N or
      When the `-frefinement-level-substitutions=1` flag is given, we
      additionally compute and report valid refinement substitutions:
        Valid refinement substitutions include
          foldl1 _ :: forall (t :: * -> *).
                      Foldable t => forall a. (a -> a -> a) -> t a -> a
          foldr1 _ :: forall (t :: * -> *).
                      Foldable t => forall a. (a -> a -> a) -> t a -> a
          head _ :: forall a. [a] -> a
          last _ :: forall a. [a] -> a
          error _ :: forall (a :: TYPE r).
                      GHC.Stack.Types.HasCallStack => [Char] -> a
          errorWithoutStackTrace _ :: forall (a :: TYPE r). [Char] -> a
          (Some refinement substitutions suppressed; use
      -fmax-refinement-substitutions=N or -fno-max-refinement-substitutions)
      Which are substitutions with holes in them. This allows e.g. beginners
      to discover the fold functions and similar.
      We find these refinement suggestions by considering substitutions that
      don't fit the type of the hole, but ones that would fit if given an
      additional argument. We do this by creating a new type variable with
      newOpenFlexiTyVarTy (e.g. `t_a1/m[tau:1]`), and then considering
      substitutions of the type `t_a1/m[tau:1] -> v` where `v` is the type of
      the hole. Since the simplifier is free to unify this new type variable
      with any type (and it is cloned before each check to avoid
      side-effects), we can now discover any identifiers that would fit if
      given another identifier of a suitable type. This is then generalized
      so that we can consider any number of additional arguments by setting
      the `-frefinement-level-substitutions` flag to any number, and then
      considering substitutions like e.g. `foldl _ _` with two additional
      This can e.g. help beginners discover the `fold` functions.
      This could also help more advanced users figure out which morphisms
      they can use when arrow chasing.
      Then you could write `m = _ . m2 . m3` where `m2` and `m3` are some
      morphisms, and not only get exact fits, but also help in finding
      morphisms that might get you a little bit closer to where you want to
      go in the diagram.
      Reviewers: bgamari
      Reviewed By: bgamari
      Subscribers: rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4357
    • Ryan Scott's avatar
      Implement stopgap solution for #14728 · 1ede46d4
      Ryan Scott authored
      It turns out that one can produce ill-formed Core by
      combining `GeneralizedNewtypeDeriving`, `TypeInType`, and
      `TypeFamilies`, as demonstrated in #14728. The root of the problem
      is allowing the last parameter of a class to appear in a //kind// of
      an associated type family, as our current approach to deriving
      associated type family instances simply doesn't work well for that
      Although it might be possible to properly implement this feature
      today (see https://ghc.haskell.org/trac/ghc/ticket/14728#comment:3
      for a sketch of how this might work), there does not currently exist
      a performant implementation of the algorithm needed to accomplish
      this. Until such an implementation surfaces, we will make this corner
      case of `GeneralizedNewtypeDeriving` an error.
      Test Plan: make test TEST="T14728a T14728b"
      Reviewers: bgamari
      Reviewed By: bgamari
      Subscribers: rwbarton, thomie, carter
      GHC Trac Issues: #14728
      Differential Revision: https://phabricator.haskell.org/D4402
    • Ben Gamari's avatar
      base: Fix changelog entry for openTempFile · 90804660
      Ben Gamari authored
      This change is present in
    • Ben Gamari's avatar
  2. 16 Feb, 2018 1 commit
    • Ryan Scott's avatar
      Fix #14811 by wiring in $tcUnit# · d5ac5820
      Ryan Scott authored
      Previously, we were skipping over `$tcUnit#` entirely when
      wiring in `Typeable` tycons, resulting in #14811. Easily fixed.
      Test Plan: make test TEST=T14811
      Reviewers: bgamari, dfeuer
      Reviewed By: dfeuer
      Subscribers: dfeuer, rwbarton, thomie, carter
      GHC Trac Issues: #14811
      Differential Revision: https://phabricator.haskell.org/D4414
  3. 15 Feb, 2018 6 commits
    • Moritz Angermann's avatar
      Move `iserv` into `utils` and change package name from `iserv-bin` to `iserv` · 7c173b90
      Moritz Angermann authored
      This is done for consistency. We usually call the package file the same name the
      folder has.  The move into `utils` is done so that we can move the library into
      `libraries/iserv` and the proxy into `utils/iserv-proxy` and then break the
      `iserv.cabal` apart.  This will make building the cross compiler with TH
      simpler, because we can build the library and proxy as separate packages.
      Reviewers: bgamari, simonmar, goldfire, erikd
      Reviewed By: simonmar
      Subscribers: tdammers, rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4377
    • David Feuer's avatar
      Get eqTypeRep to inline · 8529fbba
      David Feuer authored
      GHC didn't inline `eqTypeRep`, presumably because it ended up
      being too big. This was unfortunate because it produces a
      `Maybe`, which will almost always be scrutinized immediately.
      Split `eqTypeRep` into a worker and a tiny wrapper, and mark the
      wrapper `INLINABLE`. This change actually seems to reduce Core size,
      at least in a small test.
      Reviewers: hvr, bgamari, mpickering
      Reviewed By: mpickering
      Subscribers: mpickering, rwbarton, thomie, carter
      GHC Trac Issues: #14790
      Differential Revision: https://phabricator.haskell.org/D4405
    • Alp Mestanogullari's avatar
      rts.cabal.in: advertise profiling flavours of libraries, behind a flag · 0c2350c2
      Alp Mestanogullari authored
      The make build system appears to be doing a bit of magic in order to supply
      the profiled flavours of libHSrts and libCffi, as they're not advertised in
      the 'extra-library-flavours' field of rts.cabal.in. This patch explicitly
      advertises _p and _thr_p flavours of the RTS library and libCffi, but only
      when the RTS is configured with the (newly introduced) 'profiling' flag.
      This is necessary for Hadrian, as a branch (soon to be merged) does away with
      ghc-cabal and relies just on Cabal to get package information. Without this
      patch, Cabal can never inform us that _p and _thr_p flavours should be
      built (and registered in the package db) as well, which obviously prevents us
      from building a profiled GHC.
      Reviewers: bgamari, erikd, simonmar
      Reviewed By: bgamari
      Subscribers: rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4409
    • Moritz Angermann's avatar
      Update .cabal files for Cabal 2.1 · e03ca71f
      Moritz Angermann authored
      cabal introduces SPDX identifier, and as such we need to change the
      BSD3 license name. Also the >= qualifier is no longer prefered.
      Test Plan: ./validate
      Reviewers: bgamari, erikd, simonmar
      Reviewed By: bgamari
      Subscribers: alpmestan, rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4406
    • Moritz Angermann's avatar
      Adds `smp` flag to rts.cabal. · d5ff33d3
      Moritz Angermann authored
      Reviewers: bgamari, erikd, simonmar
      Reviewed By: simonmar
      Subscribers: rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4393
    • Moritz Angermann's avatar
      adds -latomic to. ghc-prim · ec9aacf3
      Moritz Angermann authored
      Reviewers: bgamari, hvr
      Reviewed By: bgamari
      Subscribers: erikd, hvr, rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4378
  4. 14 Feb, 2018 1 commit
    • Sergey Vinokurov's avatar
      Various documentation improvements · df449e17
      Sergey Vinokurov authored
       * Fix missing code example in changelog for 8.4.1
       * List 'setEnv' as opposite of 'getEnv'
         It seems best to direct users to use 'System.Environment.setEnv'
         rather than 'System.Posix.Env.putEnv'. This is due to 'setEnv' being
         located in the same module as 'getEnv' and my virtue of working on
         Windows platform, whereas 'putEnv' does not have that quality because
         it's part of the 'unix' package.
       * Reflect in docs the fact that 'readMVar' is not a composition of
         'takeMVVar' and 'putMVar' any more
  5. 13 Feb, 2018 4 commits
    • Tao He's avatar
      Raise parse error for `data T where`. · 8936ab69
      Tao He authored
      Empty GADTs data declarations can't be identified in type checker. This
      patch adds additional checks in parser and raise a parse error when
      encounter empty GADTs declarations but extension `GADTs` is not enabled.
      Only empty declarations are checked in parser to avoid affecting
      error messages related to missing GADTs extension.
      This patch should fix issue 8258.
      Signed-off-by: Tao He's avatarHE, Tao <sighingnow@gmail.com>
      Test Plan: make test TEST="T8258 T8258NoGADTs"
      Reviewers: bgamari, mpickering, alanz, RyanGlScott
      Reviewed By: bgamari, RyanGlScott
      Subscribers: adamse, RyanGlScott, rwbarton, thomie, mpickering, carter
      GHC Trac Issues: #8258
      Differential Revision: https://phabricator.haskell.org/D4350
    • Ben Gamari's avatar
      Fix tests broken by c9a88db3 · 0c9777b7
      Ben Gamari authored
    • Ömer Sinan Ağacan's avatar
      Collect CCs in CorePrep, including CCs in unfoldings · 59574058
      Ömer Sinan Ağacan authored
      This patch includes two changes:
      1. Move cost centre collection from `SCCfinal` to `CorePrep`, to be able
         to collect cost centres in unfoldings. `CorePrep` drops unfoldings, so
         that's the latest stage in the compilation pipeline for this.
         After this change `SCCfinal` no longer collects all cost centres, but
         it still generates & collects CAF cost centres + updates cost centre
         stacks of `StgRhsClosure` and `StgRhsCon`s.
         This fixes #5889.
      2. Initialize cost centre stack fields of `StgRhs` in `coreToStg`. With
         this we no longer need to update cost centre stack fields in
         `SCCfinal`, so that module is removed.
         Cost centre initialization explained in Note [Cost-centre
         initialization plan].
         Because with -fcaf-all we need to attach a new cost-centre to each
         CAF, `coreTopBindToStg` now returns `CollectedCCs`.
      Test Plan: validate
      Reviewers: simonpj, bgamari, simonmar
      Reviewed By: simonpj, bgamari
      Subscribers: rwbarton, thomie, carter
      GHC Trac Issues: #5889
      Differential Revision: https://phabricator.haskell.org/D4325
    • David Feuer's avatar
      Make ($!) representation-polymorphic · c9a88db3
      David Feuer authored
      Now that `($)` is representation-polymorphic, `($!)` should
      surely follow suit.
      Reviewers: hvr, bgamari, simonpj
      Reviewed By: bgamari, simonpj
      Subscribers: simonpj, rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4382
  6. 12 Feb, 2018 1 commit
  7. 10 Feb, 2018 1 commit
  8. 08 Feb, 2018 2 commits
    • Simon Peyton Jones's avatar
      Fix isDroppableCt (Trac #14763) · 6edafe3b
      Simon Peyton Jones authored
      When finishing up an implication constraint, it's a bit tricky to
      decide which Derived constraints to retain (for error reporting) and
      which to discard.  I got this wrong in commit
         (Remove wc_insol from WantedConstraints)
      The particular problem in Trac #14763 was that we were reporting as an
      error a fundep-generated constraint
        (ex ~ T)
      where 'ex' is an existentially-bound variable in a pattern match.
      But this isn't really an error at all.
      This patch fixes the problem. Indeed, since I had to understand
      this rather tricky code, I took the opportunity to clean it up
      and document better.  See
        isDroppableCt :: Ct -> Bool
      and Note [Dropping derived constraints]
      I also removed wl_deriv altogether from the WorkList data type.  It
      was there in the hope of gaining efficiency by not even processing
      lots of derived constraints, but it has turned out that most derived
      constraints (notably equalities) must be processed anyway; see
      Note [Prioritise equalities] in TcSMonad.
      The two are coupled because to decide which constraints to put in
      wl_deriv I was using another variant of isDroppableCt.  Now it's much
      simpler -- and perhaps even more efficient too.
    • Douglas Wilson's avatar
      rts: fix barf format attribute · 059596df
      Douglas Wilson authored
      Summary: See definition of PRINTF above the change
      Reviewers: bgamari, erikd, simonmar, Phyx
      Reviewed By: Phyx
      Subscribers: Phyx, rwbarton, thomie, carter
      Differential Revision: https://phabricator.haskell.org/D4392
  9. 07 Feb, 2018 4 commits
    • Herbert Valerio Riedel's avatar
      Use SPDX syntax in rts/package.conf.in · be53d19e
      Herbert Valerio Riedel authored
      This was an oversight from 2671cccd
      as it wasn't obvious to assume one would go the trouble to manually
      construct the pkg-db entries... :-)
    • Simon Peyton Jones's avatar
      Fix solveOneFromTheOther for RecursiveSuperclasses · 65069806
      Simon Peyton Jones authored
      This patch fixes the redundant superclass expansion
      in Trac #14774.
      The main change is to fix TcInterac.solveOneFromTheOther, so
      that it does not prefer a work-item with a binding if that binding
      transitively depends on the inert item we are comparing it with.
      Explained in Note [Replacement vs keeping] in TcInert, esp
      item (c) of the "Constraints coming from the same level" part.
      To make this work I refactored out a new function
      TcEvidence.findNeededEvVars, which was previously buried
      inside TcSimplify.neededEvVars.
      I added quite a few more comments and signposts about superclass
    • Simon Peyton Jones's avatar
      Comments only · 41d29d5a
      Simon Peyton Jones authored
    • Simon Peyton Jones's avatar
      Fix utterly bogus TagToEnum rule in caseRules · 4aa98f4a
      Simon Peyton Jones authored
      In prelRules we had:
        tx_con_tte :: DynFlags -> AltCon -> AltCon
        tx_con_tte _      DEFAULT      = DEFAULT
        tx_con_tte dflags (DataAlt dc)
          | tag == 0  = DEFAULT   -- See Note [caseRules for tagToEnum]
          | otherwise = LitAlt (mkMachInt dflags (toInteger tag))
      The tag==0 case is totally wrong, and led directly to Trac #14768.
      See "Beware" in Note [caseRules for tagToEnum] (in the patch).
      Easily fixed, though!
  10. 06 Feb, 2018 10 commits
  11. 05 Feb, 2018 1 commit