1. 01 Dec, 2011 5 commits
  2. 30 Nov, 2011 9 commits
    • Ian Lynagh's avatar
      Fix parsing of OPTIONS*/LANGUAGE pragmas in haddock mode · b3e30449
      Ian Lynagh authored
      When getting options from basicTypes/RdrName.lhs, we were seeing
      text like "-- |\n-- ...\n" in the buffer, and lexer then recognises
      "-- |\n-- ..." as a complete ITdocCommentNext token, with the end of
      the buffer not reached.
      
      Next time round, when we get more input into the buffer, it started
      "\n-- * 'Var.Var': see", so the lexer gave us an ITdocSection token.
      
      However, getOptions' only knew about ITdocCommentNext, and so it
      stopped at that point, and didn't see the pragmas further down the file.
      This caused the build to fail due to -fwarn-tabs not being turned off.
      
      But actually, we don't really want the haddock docs at this point, so
      now we just unset Opt_Haddock in getOptionsFromFile.
      b3e30449
    • Ian Lynagh's avatar
    • Simon Marlow's avatar
      Include a stack trace in the panic message, when GHC is compiled profiled. · f85c084c
      Simon Marlow authored
      I tried this out on the panic we're currently getting for #3103:
      
      ghc-stage2: panic! (the 'impossible' happened)
        (GHC version 7.3.20111128 for x86_64-unknown-linux):
              tcIfaceGlobal (local): not found:
          base:GHC.Word.W#{d 6w}
          [(32R, Type constructor `base:GHC.Word.Word{tc 32R}'),
           (r6O, Identifier `base:GHC.Word.$fNumWord{v r6O}'),
           (r6P, Identifier `base:GHC.Word.$fEqWord{v r6P}'),
           (r6Q, Identifier `base:GHC.Word.$fNumWord1{v r6Q}'),
           (r6R, Identifier `base:GHC.Word.$fNumWord2{v r6R}'),
           (r6S, Data constructor `base:GHC.Word.W#{d r6S}'),
           (r6U, Identifier `base:GHC.Word.W#{v r6U}'),
           (r75, Identifier `base:GHC.Word.$fNumWord_$csignum{v r75}'),
           (r76, Identifier `base:GHC.Word.$fEqWord_$c/={v r76}'),
           (r77, Identifier `base:GHC.Word.$fEqWord_$c=={v r77}')]
      { Main.main
         GHC.defaultErrorHandler
          GHC.runGhc
           GhcMonad.>>=
            GhcMonad.>>=.\
             Main.main'
              Main.doMake
               GhcMake.load
                GhcMake.load2
                 GhcMake.upsweep
                  GhcMake.upsweep.upsweep'
                   GhcMake.reTypecheckLoop
                    GhcMake.typecheckLoop
                     GhcMake.typecheckLoop.\
                      TcRnMonad.initIfaceCheck
                       TcRnMonad.initTcRnIf
                        IOEnv.runIOEnv
                         IOEnv.thenM
                          IOEnv.thenM.\
                           TcIface.typecheckIface
                            TcIface.typecheckIface.\
                             LoadIface.loadDecls
                              LoadIface.loadDecl
                               TcIface.tcIfaceDecl
                                TcIface.tc_iface_decl
                                 TcIface.tcIdInfo
                                  MonadUtils.foldlM
                                   TcIface.tcIdInfo.tcPrag
                                    TcIface.tcUnfolding
                                     TcIface.tcPragExpr
                                      TcIface.tcIfaceExpr
                                       TcIface.tcIfaceAlt
                                        TcIface.tcIfaceDataCon }
      f85c084c
    • Simon Marlow's avatar
      Further tweaks to the ccs primops · 1fc25dfd
      Simon Marlow authored
       - add getCCSOf# :: a -> State# s -> (# State# s, Addr# #)
         (returns the CCS attached to the supplied object)
      
       - remove traceCcs# (obsoleted by getCCSOf#)
      
       - rename getCCCS# to getCurrentCCS#
      1fc25dfd
    • Simon Marlow's avatar
      remove obsolete notes (#5660) · b35a12aa
      Simon Marlow authored
      b35a12aa
    • Simon Marlow's avatar
      53055bb5
    • Ian Lynagh's avatar
      2d68dbbb
    • Ian Lynagh's avatar
    • Simon Peyton Jones's avatar
  3. 29 Nov, 2011 17 commits
  4. 28 Nov, 2011 9 commits