From git at git.haskell.org  Sun Nov  1 09:46:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 09:46:49 +0000 (UTC)
Subject: [commit: ghc] master: llvmGen: Really fix build with Clang (8fd5cff)
Message-ID: <20151101094649.9C2983A300@ghc.haskell.org>

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

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

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

commit 8fd5cff6fa1cd943a90f19df87389d10a2cb27d1
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Nov 1 10:15:24 2015 +0100

    llvmGen: Really fix build with Clang
    
    Test Plan: Build with Clang and GCC
    
    Reviewers: austin, thomie, hvr, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1414


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

8fd5cff6fa1cd943a90f19df87389d10a2cb27d1
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
index cde3276..aa3a0c3 100644
--- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
@@ -476,11 +476,12 @@ 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
-                        , MO_AddIntC w
-                        , MO_SubIntC w
-                        , MO_SubWordC w
-                        ]))
+    let valid = op `elem`   [ MO_Add2 w
+                            , MO_AddIntC w
+                            , MO_SubIntC w
+                            , MO_SubWordC w
+                            ]
+    MASSERT(valid)
     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.


From git at git.haskell.org  Sun Nov  1 09:46:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 09:46:52 +0000 (UTC)
Subject: [commit: ghc] master: Add rts/Linker support for more than 64k
 sections (3021cc0)
Message-ID: <20151101094652.4D1BF3A300@ghc.haskell.org>

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

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

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

commit 3021cc06f84109c6e7a529318d690c520748f936
Author: Simon Brenner <olsner at gmail.com>
Date:   Sun Nov 1 10:15:31 2015 +0100

    Add rts/Linker support for more than 64k sections
    
    Since some ELF fields ran out of range to represent that many sections,
    they've been extended with magic numbers that indicate that the full
    value is stored in another field.
    
    This will be necessary for GHCi with -split-sections on ELF platforms
    that don't use GNU ld.
    
    Reviewers: austin, bgamari, simonmar, erikd
    
    Reviewed By: bgamari, simonmar, erikd
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1357
    
    GHC Trac Issues: #8405


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

3021cc06f84109c6e7a529318d690c520748f936
 rts/Linker.c | 180 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 141 insertions(+), 39 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3021cc06f84109c6e7a529318d690c520748f936

From git at git.haskell.org  Sun Nov  1 09:46:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 09:46:54 +0000 (UTC)
Subject: [commit: ghc] master: Apply WERROR only to stage2 HC options (31bcf9b)
Message-ID: <20151101094654.E200C3A300@ghc.haskell.org>

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

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

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

commit 31bcf9b62ceaed98bdd3b7605e68d315bcff0c8a
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Nov 1 10:18:07 2015 +0100

    Apply WERROR only to stage2 HC options
    
    Otherwise validate unnecessarily may fail during the stage1 build when
    booting with an older compiler.
    
    Test Plan: Try it
    
    Reviewers: thomie, austin
    
    Reviewed By: thomie, austin
    
    Differential Revision: https://phabricator.haskell.org/D1390


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

31bcf9b62ceaed98bdd3b7605e68d315bcff0c8a
 ghc.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index bf521b2..07e1edc 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -143,7 +143,8 @@ include mk/warnings.mk
 # (Optional) build-specific configuration
 include mk/custom-settings.mk
 SRC_CC_OPTS     += $(WERROR)
-SRC_HC_OPTS     += $(WERROR)
+GhcStage2HcOpts += $(WERROR)
+GhcLibHcOpts    += $(WERROR)
 
 # -----------------------------------------------------------------------------
 # Check for inconsistent settings, after reading mk/build.mk.


From git at git.haskell.org  Sun Nov  1 09:46:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 09:46:57 +0000 (UTC)
Subject: [commit: ghc] master: Provide a utility to check API Annotations docs
 (c3b0215)
Message-ID: <20151101094657.A331C3A300@ghc.haskell.org>

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

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

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

commit c3b02150b516963422ed4b9b200a38814a35b535
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Nov 1 10:18:25 2015 +0100

    Provide a utility to check API Annotations docs
    
    A utility to check API Annotations was provided in
    https://git.haskell.org/ghc.git/commitdiff/43751b2436f370d956d8021b3cdd3
    eb77801470b
    
    This commit had poor documentation.
    
    This patch improves the output generated by the utility as well as
    supplying better documentation
    
    Test Plan: ./validate
    
    Reviewers: simonpj, austin, bgamari
    
    Reviewed By: austin, bgamari
    
    Subscribers: thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1397
    
    GHC Trac Issues: #10917


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

c3b02150b516963422ed4b9b200a38814a35b535
 compiler/parser/Parser.y                           |   5 +
 testsuite/tests/ghc-api/annotations/Makefile       |   3 +-
 testsuite/tests/ghc-api/annotations/T10255.stdout  |  57 +-
 testsuite/tests/ghc-api/annotations/T10268.stdout  |  81 +--
 testsuite/tests/ghc-api/annotations/T10269.stdout  |  51 +-
 testsuite/tests/ghc-api/annotations/T10278.stdout  | 252 +++----
 testsuite/tests/ghc-api/annotations/T10280.stdout  |  54 +-
 testsuite/tests/ghc-api/annotations/T10307.stdout  |  52 +-
 testsuite/tests/ghc-api/annotations/T10309.stdout  |  55 +-
 testsuite/tests/ghc-api/annotations/T10312.stdout  | 729 +++++++--------------
 testsuite/tests/ghc-api/annotations/T10354.stdout  | 129 ++--
 testsuite/tests/ghc-api/annotations/T10357.stdout  | 162 ++---
 testsuite/tests/ghc-api/annotations/T10358.stdout  |  84 +--
 testsuite/tests/ghc-api/annotations/T10396.stdout  |  60 +-
 testsuite/tests/ghc-api/annotations/T10399.stdout  | 225 +++----
 .../tests/ghc-api/annotations/boolFormula.stdout   | 335 ++++------
 .../tests/ghc-api/annotations/exampleTest.stdout   | 231 +++----
 utils/check-api-annotations/Main.hs                |  34 +-
 utils/check-api-annotations/README                 |  85 +++
 19 files changed, 974 insertions(+), 1710 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c3b02150b516963422ed4b9b200a38814a35b535

From git at git.haskell.org  Sun Nov  1 09:47:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 09:47:00 +0000 (UTC)
Subject: [commit: ghc] master: rts/posix: Reduce heap allocation amount on
 mmap failure (4ad2a8f)
Message-ID: <20151101094700.50F193A300@ghc.haskell.org>

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

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

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

commit 4ad2a8f9a503a5ee060eb8e0d5ae71b98d605cfa
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Nov 1 10:18:41 2015 +0100

    rts/posix: Reduce heap allocation amount on mmap failure
    
    Since the two-step allocator the RTS asks the kernel for a large upfront
    mmap'd region of memory (on the order of terabytes). While we have no
    expectation that this entire region will be backed by physical memory,
    this scheme nevertheless fails on some systems with resource limits.
    Here we use a back-off scheme to reduce our allocation request until we
    find a size agreeable to the kernel. Fixes #10877.
    
    This also fixes a latent bug wherein the heap reservation retry logic
    would fail to free the previously reserved address space, which would
    likely result in a heap allocation failure.
    
    Test Plan:
    set address space limit with `ulimit -v 67108864` and try running
    a compiled program
    
    Reviewers: simonmar, austin
    
    Reviewed By: simonmar
    
    Subscribers: thomie, RyanGlScott
    
    Differential Revision: https://phabricator.haskell.org/D1405
    
    GHC Trac Issues: #10877


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

4ad2a8f9a503a5ee060eb8e0d5ae71b98d605cfa
 rts/posix/OSMem.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++--------
 rts/sm/MBlock.c   |  2 +-
 rts/sm/OSMem.h    |  6 +++++-
 rts/win32/OSMem.c |  4 ++--
 4 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index 43c7831..274d5ad 100644
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -102,6 +102,7 @@ enum
     MEM_RESERVE_AND_COMMIT = MEM_RESERVE | MEM_COMMIT
 };
 
+/* Returns NULL on failure; errno set */
 static void *
 my_mmap (void *addr, W_ size, int operation)
 {
@@ -196,6 +197,19 @@ my_mmap (void *addr, W_ size, int operation)
 #endif
 
     if (ret == (void *)-1) {
+        return NULL;
+    }
+
+    return ret;
+}
+
+/* Variant of my_mmap which aborts in the case of an error */
+static void *
+my_mmap_or_barf (void *addr, W_ size, int operation)
+{
+    void *ret = my_mmap(addr, size, operation);
+
+    if (ret == NULL) {
         if (errno == ENOMEM ||
             (errno == EINVAL && sizeof(void*)==4 && size >= 0xc0000000)) {
             // If we request more than 3Gig, then we get EINVAL
@@ -222,7 +236,7 @@ gen_map_mblocks (W_ size)
     // Try to map a larger block, and take the aligned portion from
     // it (unmap the rest).
     size += MBLOCK_SIZE;
-    ret = my_mmap(0, size, MEM_RESERVE_AND_COMMIT);
+    ret = my_mmap_or_barf(0, size, MEM_RESERVE_AND_COMMIT);
 
     // unmap the slop bits around the chunk we allocated
     slop = (W_)ret & MBLOCK_MASK;
@@ -261,7 +275,7 @@ osGetMBlocks(nat n)
       // use gen_map_mblocks the first time.
       ret = gen_map_mblocks(size);
   } else {
-      ret = my_mmap(next_request, size, MEM_RESERVE_AND_COMMIT);
+      ret = my_mmap_or_barf(next_request, size, MEM_RESERVE_AND_COMMIT);
 
       if (((W_)ret & MBLOCK_MASK) != 0) {
           // misaligned block!
@@ -387,6 +401,9 @@ osTryReserveHeapMemory (W_ len, void *hint)
        and then we discard what we don't need */
 
     base = my_mmap(hint, len + MBLOCK_SIZE, MEM_RESERVE);
+    if (base == NULL)
+        return NULL;
+
     top = (void*)((W_)base + len + MBLOCK_SIZE);
 
     if (((W_)base & MBLOCK_MASK) != 0) {
@@ -407,7 +424,7 @@ osTryReserveHeapMemory (W_ len, void *hint)
     return start;
 }
 
-void *osReserveHeapMemory(W_ len)
+void *osReserveHeapMemory(W_ *len)
 {
     int attempt;
     void *at;
@@ -419,15 +436,43 @@ void *osReserveHeapMemory(W_ len)
        libraries are position independent but cannot be loaded about 4GB.
 
        We do so with a hint to the mmap, and we verify the OS satisfied our
-       hint. We loop a few times in case there is already something allocated
-       there, but we bail if we cannot allocate at all.
+       hint. We loop, shifting our hint by 1 BLOCK_SIZE every time, in case
+       there is already something allocated there.
+
+       Some systems impose resource limits restricting the amount of memory we
+       can request (see, e.g. #10877). If mmap fails we halve our allocation
+       request and try again. If our request size gets absurdly small we simply
+       give up.
+
     */
 
     attempt = 0;
-    do {
+    while (1) {
+        if (*len < MBLOCK_SIZE) {
+            // Give up if the system won't even give us 16 blocks worth of heap
+            barf("osReserveHeapMemory: Failed to allocate heap storage");
+        }
+
         void *hint = (void*)((W_)8 * (1 << 30) + attempt * BLOCK_SIZE);
-        at = osTryReserveHeapMemory(len, hint);
-    } while ((W_)at < ((W_)8 * (1 << 30)));
+        at = osTryReserveHeapMemory(*len, hint);
+        if (at == NULL) {
+            // This means that mmap failed which we take to mean that we asked
+            // for too much memory. This can happen due to POSIX resource
+            // limits. In this case we reduce our allocation request by a factor
+            // of two and try again.
+            *len /= 2;
+        } else if ((W_)at >= ((W_)8 * (1 << 30))) {
+            // Success! We were given a block of memory starting above the 8 GB
+            // mark, which is what we were looking for.
+            break;
+        } else {
+            // We got addressing space but it wasn't above the 8GB mark.
+            // Try again.
+            if (munmap(at, *len) < 0) {
+                sysErrorBelch("unable to release reserved heap");
+            }
+        }
+    }
 
     return at;
 }
diff --git a/rts/sm/MBlock.c b/rts/sm/MBlock.c
index e1daa71..2131ae6 100644
--- a/rts/sm/MBlock.c
+++ b/rts/sm/MBlock.c
@@ -645,7 +645,7 @@ initMBlocks(void)
 #else
         size = (W_)1 << 40; // 1 TByte
 #endif
-        void *addr = osReserveHeapMemory(size);
+        void *addr = osReserveHeapMemory(&size);
 
         mblock_address_space.begin = (W_)addr;
         mblock_address_space.end = (W_)addr + size;
diff --git a/rts/sm/OSMem.h b/rts/sm/OSMem.h
index 6bcaf65..533f6f7 100644
--- a/rts/sm/OSMem.h
+++ b/rts/sm/OSMem.h
@@ -34,8 +34,12 @@ void setExecutable (void *p, W_ len, rtsBool exec);
 // pointed to by the return value, until that memory is committed using
 // osCommitMemory().
 //
+// The value pointed to by len will be filled by the caller with an upper
+// bound on the amount of memory to reserve. On return this will be set
+// to the amount of memory actually reserved.
+//
 // This function is called once when the block allocator is initialized.
-void *osReserveHeapMemory(W_ len);
+void *osReserveHeapMemory(W_ *len);
 
 // Commit (allocate memory for) a piece of address space, which must
 // be within the previously reserved space After this call, it is safe
diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c
index 2d2af0d..47e24f0 100644
--- a/rts/win32/OSMem.c
+++ b/rts/win32/OSMem.c
@@ -429,11 +429,11 @@ void setExecutable (void *p, W_ len, rtsBool exec)
 
 static void* heap_base = NULL;
 
-void *osReserveHeapMemory (W_ len)
+void *osReserveHeapMemory (W_ *len)
 {
     void *start;
 
-    heap_base = VirtualAlloc(NULL, len + MBLOCK_SIZE,
+    heap_base = VirtualAlloc(NULL, *len + MBLOCK_SIZE,
                               MEM_RESERVE, PAGE_READWRITE);
     if (heap_base == NULL) {
         if (GetLastError() == ERROR_NOT_ENOUGH_MEMORY) {


From git at git.haskell.org  Sun Nov  1 09:47:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 09:47:03 +0000 (UTC)
Subject: [commit: ghc] master: Enforce linkage with pthread library on OpenBSD
 (c8e866a)
Message-ID: <20151101094703.13C883A300@ghc.haskell.org>

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

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

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

commit c8e866a190d4d5866bf364ee794db28b227a2e0e
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Sun Nov 1 10:18:55 2015 +0100

    Enforce linkage with pthread library on OpenBSD
    
    This patch enforces linkage with pthread library on OpenBSD. This is
    done in order to avoid linker errors when linking with libffi which
    requires POSIX threading but itself is not linked with libpthread
    directly. So client binaries (of libffi) needs to link against
    libpthread explicitly
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1410


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

c8e866a190d4d5866bf364ee794db28b227a2e0e
 configure.ac        | 9 +++++++++
 rts/package.conf.in | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/configure.ac b/configure.ac
index bc18c12..6bd2103 100644
--- a/configure.ac
+++ b/configure.ac
@@ -919,6 +919,15 @@ AS_IF([test "$UseSystemLibFFI" = "YES"], [
  CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
  LDFLAGS2="$LDFLAGS"
  LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS"
+ if test "$HostOS" = "openbsd";
+ then
+   # OpenBSD's libffi is not directly linked to the libpthread but
+   # still requires pthread functionality. This means that any client
+   # binary which links with libffi also needs to link with
+   # libpthread. If it does not, then linking fails with unresolved
+   # symbols.
+   LDFLAGS="$LDFLAGS -lpthread"
+ fi
  AC_CHECK_LIB(ffi, ffi_call,
   [AC_CHECK_HEADERS([ffi.h], [break], [])
    AC_DEFINE([HAVE_LIBFFI], [1], [Define to 1 if you have libffi.])],
diff --git a/rts/package.conf.in b/rts/package.conf.in
index 97cc4f9..fff645d 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -45,6 +45,14 @@ extra-libraries:
 #ifdef freebsd_HOST_OS
                               , "pthread" /* for pthread_getthreadid_np() */
 #endif
+#ifdef openbsd_HOST_OS
+/* OpenBSD's libffi is not directly linked to the libpthread but still requires
+pthread functionality. This means that any client binary which links with libffi
+also need to link with libpthread. If it does not, then linking fails with
+unresolved symbols. */
+                              , "pthread"
+
+#endif
 #if defined(DEBUG) && defined(HAVE_LIBBFD)
                               ,"bfd", "iberty"  /* for debugging */
 #endif


From git at git.haskell.org  Sun Nov  1 09:47:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 09:47:05 +0000 (UTC)
Subject: [commit: ghc] master: Linker: More uint64_t to uintptr_t fixes
 (184dfce)
Message-ID: <20151101094705.AF6883A300@ghc.haskell.org>

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

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

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

commit 184dfced1b07e1b178e98ae55f293187844b3105
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Nov 1 10:19:15 2015 +0100

    Linker: More uint64_t to uintptr_t fixes
    
    Need to use `uintptr_t` on PowerPC and possibly other 32 bit
    architectures.
    
    Test Plan: Validate on x86_64 and powerpc Linux
    
    Reviewers: austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1412


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

184dfced1b07e1b178e98ae55f293187844b3105
 rts/Linker.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index af3854f..cd94561 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -1300,7 +1300,7 @@ m32_alloc(m32_allocator m32, unsigned int size,
             void * addr = (char*)m32->pages[i].base_addr + alsize;
             m32->pages[i].current_size = alsize + size;
             // increment the counter atomically
-            __sync_fetch_and_add((uint64_t*)m32->pages[i].base_addr, 1);
+            __sync_fetch_and_add((uintptr_t*)m32->pages[i].base_addr, 1);
             return addr;
          }
          // most filled?
@@ -1329,7 +1329,7 @@ m32_alloc(m32_allocator m32, unsigned int size,
       m32->pages[empty].current_size = size+ROUND_UP(8,alignment);
       // Initialize the counter:
       // 1 for the allocator + 1 for the returned allocated memory
-      *((uint64_t*)addr)             = 2;
+      *((uintptr_t*)addr)            = 2;
       return (char*)addr + ROUND_UP(8,alignment);
    }
 }


From git at git.haskell.org  Sun Nov  1 09:47:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 09:47:08 +0000 (UTC)
Subject: [commit: ghc] master: ghc-prim: Fix hs_ctz64 for powerpc (9f0ecb4)
Message-ID: <20151101094708.589353A300@ghc.haskell.org>

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

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

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

commit 9f0ecb41c288aacec43c5f736cb7aeaa469c9801
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Nov 1 10:19:23 2015 +0100

    ghc-prim: Fix hs_ctz64 for powerpc
    
    Test Plan: Test on powerpc/linux
    
    Reviewers: austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1413


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

9f0ecb41c288aacec43c5f736cb7aeaa469c9801
 libraries/ghc-prim/cbits/ctz.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/ghc-prim/cbits/ctz.c b/libraries/ghc-prim/cbits/ctz.c
index f68f628..95f327a 100644
--- a/libraries/ghc-prim/cbits/ctz.c
+++ b/libraries/ghc-prim/cbits/ctz.c
@@ -31,7 +31,7 @@ hs_ctz32(StgWord x)
 StgWord
 hs_ctz64(StgWord64 x)
 {
-#if defined(__GNUC__) && defined(i386_HOST_ARCH)
+#if defined(__GNUC__) && (defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH))
   /* On Linux/i386, the 64bit `__builtin_ctzll()` instrinsic doesn't
      get inlined by GCC but rather a short `__ctzdi2` runtime function
      is inserted when needed into compiled object files.


From git at git.haskell.org  Sun Nov  1 10:58:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 10:58:50 +0000 (UTC)
Subject: [commit: hsc2hs] master: Reduce CPP need (f91c12c)
Message-ID: <20151101105850.EA2B53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hsc2hs

On branch  : master
Link       : http://git.haskell.org/hsc2hs.git/commitdiff/f91c12c4749068a5b38bb536a021b5896f033dc0

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

commit f91c12c4749068a5b38bb536a021b5896f033dc0
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 11:19:47 2015 +0100

    Reduce CPP need


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

f91c12c4749068a5b38bb536a021b5896f033dc0
 CrossCodegen.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CrossCodegen.hs b/CrossCodegen.hs
index a8a7f3d..d30e145 100644
--- a/CrossCodegen.hs
+++ b/CrossCodegen.hs
@@ -28,9 +28,7 @@ import System.Directory (removeFile)
 import Data.Char (toLower,toUpper,isSpace)
 import Control.Exception (assert, onException)
 import Control.Monad (when, liftM, forM, ap)
-#if __GLASGOW_HASKELL__ < 709
-import Control.Applicative (Applicative(..))
-#endif
+import Control.Applicative as AP (Applicative(..))
 import Data.Foldable (concatMap)
 import Data.Maybe (fromMaybe)
 import qualified Data.Sequence as S
@@ -56,7 +54,7 @@ instance Applicative TestMonad where
     (<*>) = ap
 
 instance Monad TestMonad where
-    return = pure
+    return = AP.pure
     x >>= fn = TestMonad (\e c -> (runTest x e c) >>=
                                       (\(a,c') -> either (\err -> return (Left err, c'))
                                                          (\result -> runTest (fn result) e c')


From git at git.haskell.org  Sun Nov  1 10:58:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 10:58:52 +0000 (UTC)
Subject: [commit: hsc2hs] master: Update bounds on `process` (ff34f78)
Message-ID: <20151101105852.EEF993A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hsc2hs

On branch  : master
Link       : http://git.haskell.org/hsc2hs.git/commitdiff/ff34f784abc868b22003717c1265d59af1c43a9f

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

commit ff34f784abc868b22003717c1265d59af1c43a9f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 11:20:09 2015 +0100

    Update bounds on `process`
    
    While at it, reduce need for CPP in CrossCodegen module


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

ff34f784abc868b22003717c1265d59af1c43a9f
 CrossCodegen.hs | 8 +-------
 hsc2hs.cabal    | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/CrossCodegen.hs b/CrossCodegen.hs
index d30e145..30bb438 100644
--- a/CrossCodegen.hs
+++ b/CrossCodegen.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
 
 module CrossCodegen where
@@ -561,12 +560,7 @@ runCompileTest testStr = do
 
 runCompiler :: FilePath -> [String] -> Maybe FilePath -> TestMonad Bool
 runCompiler prog args mStdoutFile = do
-  let cmdLine =
-#if MIN_VERSION_process(1,1,0)
-            showCommandForUser prog args
-#else
-            unwords (prog : args)
-#endif
+  let cmdLine = showCommandForUser prog args
   testLog ("executing: " ++ cmdLine) $ liftTestIO $ do
       mHOut <- case mStdoutFile of
                Nothing -> return Nothing
diff --git a/hsc2hs.cabal b/hsc2hs.cabal
index 0d5e3b2..3da739b 100644
--- a/hsc2hs.cabal
+++ b/hsc2hs.cabal
@@ -40,5 +40,5 @@ Executable hsc2hs
                    containers >= 0.2 && < 0.6,
                    directory  >= 1   && < 1.3,
                    filepath   >= 1   && < 1.5,
-                   process    >= 1   && < 1.3
+                   process    >= 1.1 && < 1.4
 


From git at git.haskell.org  Sun Nov  1 11:00:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:00:34 +0000 (UTC)
Subject: [commit: ghc] master: Update directory submodule (d2a7fb9)
Message-ID: <20151101110034.29C5F3A300@ghc.haskell.org>

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

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

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

commit d2a7fb9715799b6f420241a4647bdb113a0a928e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 10:13:01 2015 +0100

    Update directory submodule
    
    This is needed to prepare for #11026 as this update
    relaxes the upper bounds on `base` to allow for `base-4.9.0.0`


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

d2a7fb9715799b6f420241a4647bdb113a0a928e
 libraries/directory | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/directory b/libraries/directory
index 7233248..a7a5b0b 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit 7233248952648ed4dd213f91ed52af2317a3f23b
+Subproject commit a7a5b0b738aad432a9cad512a26d7564120ef0e8


From git at git.haskell.org  Sun Nov  1 11:00:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:00:36 +0000 (UTC)
Subject: [commit: ghc] master: Update filepath submodule (12abc77)
Message-ID: <20151101110036.BA0453A300@ghc.haskell.org>

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

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

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

commit 12abc77386751f7aa9fa6e8731fd1eabc52397f2
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 10:21:15 2015 +0100

    Update filepath submodule
    
    This is needed to prepare for #11026 as this update
    relaxes the upper bounds on `base` to allow for `base-4.9.0.0`


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

12abc77386751f7aa9fa6e8731fd1eabc52397f2
 libraries/filepath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/filepath b/libraries/filepath
index 81375ae..32e8dba 160000
--- a/libraries/filepath
+++ b/libraries/filepath
@@ -1 +1 @@
-Subproject commit 81375ae0c892b5951f2c1184c655a8f3a5193c9c
+Subproject commit 32e8dba40bd2ff3ae0b1c16ea2c0db05c5d4b63c


From git at git.haskell.org  Sun Nov  1 11:00:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:00:39 +0000 (UTC)
Subject: [commit: ghc] master: Update array/stm/hpc/haddock submodules
 (62e1b35)
Message-ID: <20151101110039.5637E3A300@ghc.haskell.org>

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

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

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

commit 62e1b3594c233d333e87e72d57c1e182d0aa0802
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 10:35:02 2015 +0100

    Update array/stm/hpc/haddock submodules
    
    This is needed to prepare for #11026 as these updates
    relax the upper bounds on `base` to allow for `base-4.9.0.0`


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

62e1b3594c233d333e87e72d57c1e182d0aa0802
 libraries/array | 2 +-
 libraries/hpc   | 2 +-
 libraries/stm   | 2 +-
 utils/haddock   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/array b/libraries/array
index 2f5b772..dd75c73 160000
--- a/libraries/array
+++ b/libraries/array
@@ -1 +1 @@
-Subproject commit 2f5b772f4475d70a68c6f9d10390ac9812afdb7d
+Subproject commit dd75c73d191b3f07209c38f78ebe9dcc26fc5ed4
diff --git a/libraries/hpc b/libraries/hpc
index 886429b..e20c61c 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit 886429bf84097bbc16cdb6602b60ba1b9156cf6a
+Subproject commit e20c61c358e749ea62f6687089ad2a878d5d1a66
diff --git a/libraries/stm b/libraries/stm
index f7db2c3d..e917b59 160000
--- a/libraries/stm
+++ b/libraries/stm
@@ -1 +1 @@
-Subproject commit f7db2c3df86ec644e5e06baa8090a1cb525754e2
+Subproject commit e917b5944ce0a5b4e32dcc8f00eaddbec1256e98
diff --git a/utils/haddock b/utils/haddock
index 174f236..987b506 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 174f23631a0a8de7dc0f3cd67c393a5ca88c4a2b
+Subproject commit 987b5062482e20a032fb6358e655265b0b7a3cd2


From git at git.haskell.org  Sun Nov  1 11:00:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:00:41 +0000 (UTC)
Subject: [commit: ghc] master: Bump `base` version to 4.9.0.0 (closes #11026)
 (f8ba4b5)
Message-ID: <20151101110041.F2B593A300@ghc.haskell.org>

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

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

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

commit f8ba4b55cc3a061458f5cfabf17de96128defbbb
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 10:54:32 2015 +0100

    Bump `base` version to 4.9.0.0 (closes #11026)
    
    This also relaxes a few upper bounds on base in the ghc.git repo;
    
    This required a mass-rewrite in testsuite/
    
      sed -i s,base-4.8.2.0,base-4.9.0.0,g $(git grep -Fl 'base-4.8.2.0')
    
    because it turns out the testsuite is still sensitive to package version
    changes.


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

f8ba4b55cc3a061458f5cfabf17de96128defbbb
 libraries/base/base.cabal                                |  2 +-
 libraries/base/changelog.md                              |  6 +++---
 libraries/template-haskell/template-haskell.cabal        |  2 +-
 testsuite/tests/ado/ado004.stderr                        |  2 +-
 testsuite/tests/cabal/cabal06/q/q-1.0.conf               |  2 +-
 testsuite/tests/ghci/scripts/ghci008.stdout              |  2 +-
 .../tests/indexed-types/should_compile/T3017.stderr      |  2 +-
 testsuite/tests/partial-sigs/should_compile/ADT.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr1.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr2.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr3.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr4.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr5.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr6.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/BoolToBool.stderr  |  2 +-
 .../should_compile/DataFamilyInstanceLHS.stderr          |  2 +-
 .../partial-sigs/should_compile/Defaulting1MROn.stderr   |  2 +-
 .../partial-sigs/should_compile/Defaulting2MROff.stderr  |  2 +-
 .../partial-sigs/should_compile/Defaulting2MROn.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/Either.stderr      |  2 +-
 .../should_compile/EqualityConstraint.stderr             |  2 +-
 testsuite/tests/partial-sigs/should_compile/Every.stderr |  2 +-
 .../tests/partial-sigs/should_compile/EveryNamed.stderr  |  2 +-
 .../partial-sigs/should_compile/ExpressionSig.stderr     |  2 +-
 .../should_compile/ExpressionSigNamed.stderr             |  2 +-
 .../partial-sigs/should_compile/ExtraConstraints1.stderr |  2 +-
 .../partial-sigs/should_compile/ExtraConstraints2.stderr |  2 +-
 .../partial-sigs/should_compile/ExtraConstraints3.stderr |  2 +-
 .../partial-sigs/should_compile/ExtraNumAMROff.stderr    |  2 +-
 .../partial-sigs/should_compile/ExtraNumAMROn.stderr     |  2 +-
 .../tests/partial-sigs/should_compile/Forall1.stderr     |  2 +-
 .../tests/partial-sigs/should_compile/GenNamed.stderr    |  2 +-
 .../tests/partial-sigs/should_compile/HigherRank1.stderr |  2 +-
 .../tests/partial-sigs/should_compile/HigherRank2.stderr |  2 +-
 .../should_compile/LocalDefinitionBug.stderr             |  2 +-
 .../tests/partial-sigs/should_compile/Meltdown.stderr    |  2 +-
 .../partial-sigs/should_compile/MonoLocalBinds.stderr    |  2 +-
 .../tests/partial-sigs/should_compile/NamedTyVar.stderr  |  2 +-
 .../should_compile/ParensAroundContext.stderr            |  2 +-
 .../tests/partial-sigs/should_compile/PatBind.stderr     |  2 +-
 .../tests/partial-sigs/should_compile/PatBind2.stderr    |  2 +-
 .../tests/partial-sigs/should_compile/PatternSig.stderr  |  2 +-
 .../tests/partial-sigs/should_compile/Recursive.stderr   |  2 +-
 .../should_compile/ScopedNamedWildcards.stderr           |  2 +-
 .../should_compile/ScopedNamedWildcardsGood.stderr       |  2 +-
 .../tests/partial-sigs/should_compile/ShowNamed.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/SimpleGen.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/SkipMany.stderr    |  2 +-
 .../partial-sigs/should_compile/SomethingShowable.stderr |  2 +-
 .../should_compile/TypeFamilyInstanceLHS.stderr          |  2 +-
 .../tests/partial-sigs/should_compile/Uncurry.stderr     |  2 +-
 .../partial-sigs/should_compile/UncurryNamed.stderr      |  2 +-
 .../should_compile/WarningWildcardInstantiations.stderr  |  2 +-
 .../plugins/annotation-plugin/annotation-plugin.cabal    |  2 +-
 testsuite/tests/rename/should_fail/rnfail040.stderr      |  2 +-
 testsuite/tests/roles/should_compile/Roles1.stderr       |  2 +-
 testsuite/tests/roles/should_compile/Roles14.stderr      |  2 +-
 testsuite/tests/roles/should_compile/Roles2.stderr       |  2 +-
 testsuite/tests/roles/should_compile/Roles3.stderr       |  2 +-
 testsuite/tests/roles/should_compile/Roles4.stderr       |  2 +-
 testsuite/tests/roles/should_compile/T8958.stderr        |  2 +-
 testsuite/tests/safeHaskell/check/Check01.stderr         |  2 +-
 testsuite/tests/safeHaskell/check/Check06.stderr         |  2 +-
 testsuite/tests/safeHaskell/check/Check08.stderr         |  2 +-
 testsuite/tests/safeHaskell/check/Check09.stderr         |  2 +-
 testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr |  2 +-
 testsuite/tests/safeHaskell/check/pkg01/ImpSafe04.stderr |  2 +-
 .../tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr   |  2 +-
 .../tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr   |  2 +-
 testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout | 16 ++++++++--------
 testsuite/tests/safeHaskell/flags/SafeFlags17.stderr     |  2 +-
 testsuite/tests/th/TH_Roles2.stderr                      |  2 +-
 testsuite/tests/typecheck/should_compile/tc231.stderr    |  2 +-
 testsuite/tests/typecheck/should_fail/tcfail182.stderr   |  2 +-
 74 files changed, 83 insertions(+), 83 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f8ba4b55cc3a061458f5cfabf17de96128defbbb

From git at git.haskell.org  Sun Nov  1 11:00:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:00:44 +0000 (UTC)
Subject: [commit: ghc] master: Update process submodule (de8443c)
Message-ID: <20151101110044.909F03A300@ghc.haskell.org>

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

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

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

commit de8443c1a26276dc33a97ecdb9ec5c67f61ff969
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 10:32:31 2015 +0100

    Update process submodule
    
    This is needed to prepare for #11026 as this update
    relaxes the upper bounds on `base` to allow for `base-4.9.0.0`
    
    This also needs to relax a few upper bounds on process in some cabal files
    
    (there will be another process submodule update soon, as a major
    version bump of process' version is still pending)


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

de8443c1a26276dc33a97ecdb9ec5c67f61ff969
 compiler/ghc.cabal.in        | 2 +-
 ghc/ghc-bin.cabal.in         | 2 +-
 libraries/process            | 2 +-
 utils/ghc-pkg/ghc-pkg.cabal  | 2 +-
 utils/hsc2hs                 | 2 +-
 utils/runghc/runghc.cabal.in | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 45dcaa9..f5a3c55 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -46,7 +46,7 @@ Library
 
     Build-Depends: base       >= 4   && < 5,
                    directory  >= 1   && < 1.3,
-                   process    >= 1   && < 1.3,
+                   process    >= 1   && < 1.4,
                    bytestring >= 0.9 && < 0.11,
                    time                 < 1.6,
                    containers >= 0.5 && < 0.6,
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 30eb7a7..0c9998d 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -31,7 +31,7 @@ Executable ghc
                    array      >= 0.1 && < 0.6,
                    bytestring >= 0.9 && < 0.11,
                    directory  >= 1   && < 1.3,
-                   process    >= 1   && < 1.3,
+                   process    >= 1   && < 1.4,
                    filepath   >= 1   && < 1.5,
                    ghc
     if os(windows)
diff --git a/libraries/process b/libraries/process
index e0983fb..4853d8f 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit e0983fbbfa8a3d81c7b99e83a3169fc686caab62
+Subproject commit 4853d8f78a6831f4567ff0c2880298c9c70a5203
diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal
index 742e296..a2a0bdd 100644
--- a/utils/ghc-pkg/ghc-pkg.cabal
+++ b/utils/ghc-pkg/ghc-pkg.cabal
@@ -20,7 +20,7 @@ Executable ghc-pkg
 
     Build-Depends: base       >= 4   && < 5,
                    directory  >= 1   && < 1.3,
-                   process    >= 1   && < 1.3,
+                   process    >= 1   && < 1.4,
                    containers,
                    filepath,
                    Cabal,
diff --git a/utils/hsc2hs b/utils/hsc2hs
index 293f41c..ff34f78 160000
--- a/utils/hsc2hs
+++ b/utils/hsc2hs
@@ -1 +1 @@
-Subproject commit 293f41c78e956b78363ede463e7ff52eb6bc997d
+Subproject commit ff34f784abc868b22003717c1265d59af1c43a9f
diff --git a/utils/runghc/runghc.cabal.in b/utils/runghc/runghc.cabal.in
index 89f9e05..15ec2f6 100644
--- a/utils/runghc/runghc.cabal.in
+++ b/utils/runghc/runghc.cabal.in
@@ -18,5 +18,5 @@ Executable runghc
 
     Build-Depends: base       >= 3   && < 5,
                    directory  >= 1   && < 1.3,
-                   process    >= 1   && < 1.3,
+                   process    >= 1   && < 1.4,
                    filepath


From git at git.haskell.org  Sun Nov  1 11:00:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:00:47 +0000 (UTC)
Subject: [commit: ghc] master: Update hoopl submodule (32f92a3)
Message-ID: <20151101110047.2FCF83A300@ghc.haskell.org>

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

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

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

commit 32f92a33b786cd70222393726aeb08ba2b9d63db
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 10:49:00 2015 +0100

    Update hoopl submodule
    
    This is needed to prepare for #11026 as this update
    relaxes the upper bounds on `base` to allow for `base-4.9.0.0`


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

32f92a33b786cd70222393726aeb08ba2b9d63db
 libraries/hoopl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/hoopl b/libraries/hoopl
index b38e92f..84255f0 160000
--- a/libraries/hoopl
+++ b/libraries/hoopl
@@ -1 +1 @@
-Subproject commit b38e92f67cabfa0d0ed12ac93c2d431f2391de70
+Subproject commit 84255f0fe07f3fd1f5bc96e60b64c582394edcf1


From git at git.haskell.org  Sun Nov  1 11:00:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:00:49 +0000 (UTC)
Subject: [commit: ghc] master: Update unix submodule (3238ef7)
Message-ID: <20151101110049.C6C883A300@ghc.haskell.org>

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

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

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

commit 3238ef7f834ede18f076d4e8c72b9a119e4499b6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 10:36:33 2015 +0100

    Update unix submodule
    
    This is needed to prepare for #11026 as this update
    relaxes the upper bounds on `base` to allow for `base-4.9.0.0`


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

3238ef7f834ede18f076d4e8c72b9a119e4499b6
 libraries/unix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/unix b/libraries/unix
index 4260c25..137fa1b 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 4260c25687d3a4bc1ffacdacfbe7e47082ff2550
+Subproject commit 137fa1b06a79a9baa0d5fcf2ec11f964c3423f6a


From git at git.haskell.org  Sun Nov  1 11:06:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:06:44 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: Only apply WERROR to Stage2HcOpts and
 LibHcOpts (8199609)
Message-ID: <20151101110644.47BC03A300@ghc.haskell.org>

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/81996094fc5514c186681b37c6dbe0f47afa9237/ghc

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

commit 81996094fc5514c186681b37c6dbe0f47afa9237
Author: Ben Gamari <ben at well-typed.com>
Date:   Fri Oct 30 09:53:19 2015 -0500

    Only apply WERROR to Stage2HcOpts and LibHcOpts
    
    This prevents warnings from the bootstrap compiler from killing validation


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

81996094fc5514c186681b37c6dbe0f47afa9237
 mk/validate-settings.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 351ea83..7c75bd4 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -31,10 +31,10 @@ SRC_CC_WARNING_OPTS += -Wno-unknown-pragmas
 endif
 
 SRC_CC_OPTS     += $(WERROR) -Wall
-SRC_HC_OPTS     += $(WERROR) -Wall
-
+SRC_HC_OPTS     += -Wall
 GhcStage1HcOpts += -fwarn-tabs
-GhcStage2HcOpts += -fwarn-tabs
+GhcStage2HcOpts += -fwarn-tabs $(WERROR)
+GhcLibHcOpts    += $(WERROR)
 
 utils/hpc_dist-install_EXTRA_HC_OPTS += -fwarn-tabs
 


From git at git.haskell.org  Sun Nov  1 11:36:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 11:36:31 +0000 (UTC)
Subject: [commit: ghc] master: ghc-prim: add API delta as changelog (re
 #11043) (4b8b934)
Message-ID: <20151101113631.28A913A300@ghc.haskell.org>

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

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

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

commit 4b8b9347f19c6a260c9f93032447bc82f6457912
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 12:34:56 2015 +0100

    ghc-prim: add API delta as changelog (re #11043)
    
    [skip ci]


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

4b8b9347f19c6a260c9f93032447bc82f6457912
 libraries/ghc-prim/changelog.md   | 37 +++++++++++++++++++++++++++++++++++++
 libraries/ghc-prim/ghc-prim.cabal |  2 ++
 2 files changed, 39 insertions(+)

diff --git a/libraries/ghc-prim/changelog.md b/libraries/ghc-prim/changelog.md
new file mode 100644
index 0000000..2e42886
--- /dev/null
+++ b/libraries/ghc-prim/changelog.md
@@ -0,0 +1,37 @@
+## 0.5.0.0
+
+- `GHC.Classes`: new `class IP (a :: Symbol) b | a -> b`
+
+- `GHC.Prim`: changed type signatures from
+
+        check# :: (State# RealWorld -> (# State# RealWorld, a #)) -> State# RealWorld -> (# State# RealWorld, () #)
+        finalizeWeak# :: Weak# a -> State# RealWorld -> (# State# RealWorld, Int#, State# RealWorld -> (# State# RealWorld, () #) #)
+        mkWeak# :: a -> b -> c -> State# RealWorld -> (# State# RealWorld, Weak# b #)
+
+    to
+
+        check# :: (State# RealWorld -> (# State# RealWorld, a #)) -> State# RealWorld -> State# RealWorld
+        finalizeWeak# :: Weak# a -> State# RealWorld -> (# State# RealWorld, Int#, State# RealWorld -> (# State# RealWorld, b #) #)
+        mkWeak# :: a -> b -> (State# RealWorld -> (# State# RealWorld, c #)) -> State# RealWorld -> (# State# RealWorld, Weak# b #)
+
+- Removed from `GHC.Prim`:
+
+        parAt# :: b -> a -> Int# -> Int# -> Int# -> Int# -> c -> Int#
+        parAtAbs# :: a -> Int# -> Int# -> Int# -> Int# -> Int# -> b -> Int#
+        parAtForNow# :: b -> a -> Int# -> Int# -> Int# -> Int# -> c -> Int#
+        parAtRel# :: a -> Int# -> Int# -> Int# -> Int# -> Int# -> b -> Int#
+        parGlobal# :: a -> Int# -> Int# -> Int# -> Int# -> b -> Int#
+        parLocal# :: a -> Int# -> Int# -> Int# -> Int# -> b -> Int#
+
+- Added to `GHC.Prim`:
+
+        getSizeofMutableByteArray# :: MutableByteArray# d -> State# d -> (# State# d, Int# #)
+        subWordC# :: Word# -> Word# -> (# Word#, Int# #)
+
+- Added to `GHC.Types`:
+
+        data Module = Module TrName TrName
+        data Nat
+        data Symbol
+        data TrName = TrNameS Addr# | TrNameD [Char]
+        data TyCon = TyCon Word# Word# Module TrName
diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
index ab59a93..90841ca 100644
--- a/libraries/ghc-prim/ghc-prim.cabal
+++ b/libraries/ghc-prim/ghc-prim.cabal
@@ -12,6 +12,8 @@ build-type:     Custom
 description:
     GHC primitives.
 
+extra-source-files: changelog.md
+
 source-repository head
     type:     git
     location: http://git.haskell.org/ghc.git


From git at git.haskell.org  Sun Nov  1 12:17:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 12:17:26 +0000 (UTC)
Subject: [commit: ghc] master: Bump ghc-prim version to 0.5.0.0 (closes
 #11043) (84bf1eb)
Message-ID: <20151101121726.C44643A300@ghc.haskell.org>

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

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

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

commit 84bf1ebae75bff6c1e37382bc348850d17f3f2c0
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 12:38:42 2015 +0100

    Bump ghc-prim version to 0.5.0.0 (closes #11043)
    
    This also needs to update the primitive/vector submodules in order to
    relax upper bounds on ghc-prim.
    
    Like in f8ba4b55cc3a061458f5cfabf17de96128defbbb, a mass-rewrite in testsuite/ via
    
      sed -i s,ghc-prim-0.4.0.0,ghc-prim-0.5.0.0,g $(git grep -Fl 'ghc-prim-0.4.0.0')
    
    was performed.


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

84bf1ebae75bff6c1e37382bc348850d17f3f2c0
 libraries/base/base.cabal                                |  2 +-
 libraries/ghc-prim/ghc-prim.cabal                        |  4 ++--
 libraries/primitive                                      |  2 +-
 libraries/vector                                         |  2 +-
 testsuite/tests/ado/ado004.stderr                        |  2 +-
 .../tests/indexed-types/should_compile/T3017.stderr      |  2 +-
 testsuite/tests/partial-sigs/should_compile/ADT.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr1.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr2.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr3.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr4.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr5.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/AddAndOr6.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/BoolToBool.stderr  |  2 +-
 .../should_compile/DataFamilyInstanceLHS.stderr          |  2 +-
 .../partial-sigs/should_compile/Defaulting1MROn.stderr   |  2 +-
 .../partial-sigs/should_compile/Defaulting2MROff.stderr  |  2 +-
 .../partial-sigs/should_compile/Defaulting2MROn.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/Either.stderr      |  2 +-
 testsuite/tests/partial-sigs/should_compile/Every.stderr |  2 +-
 .../tests/partial-sigs/should_compile/EveryNamed.stderr  |  2 +-
 .../partial-sigs/should_compile/ExpressionSig.stderr     |  2 +-
 .../should_compile/ExpressionSigNamed.stderr             |  2 +-
 .../partial-sigs/should_compile/ExtraConstraints1.stderr |  2 +-
 .../partial-sigs/should_compile/ExtraConstraints2.stderr |  2 +-
 .../partial-sigs/should_compile/ExtraConstraints3.stderr |  2 +-
 .../partial-sigs/should_compile/ExtraNumAMROff.stderr    |  2 +-
 .../tests/partial-sigs/should_compile/Forall1.stderr     |  2 +-
 .../tests/partial-sigs/should_compile/GenNamed.stderr    |  2 +-
 .../tests/partial-sigs/should_compile/HigherRank1.stderr |  2 +-
 .../tests/partial-sigs/should_compile/HigherRank2.stderr |  2 +-
 .../should_compile/LocalDefinitionBug.stderr             |  2 +-
 .../tests/partial-sigs/should_compile/Meltdown.stderr    |  2 +-
 .../partial-sigs/should_compile/MonoLocalBinds.stderr    |  2 +-
 .../tests/partial-sigs/should_compile/NamedTyVar.stderr  |  2 +-
 .../should_compile/ParensAroundContext.stderr            |  2 +-
 .../tests/partial-sigs/should_compile/PatBind.stderr     |  2 +-
 .../tests/partial-sigs/should_compile/PatternSig.stderr  |  2 +-
 .../tests/partial-sigs/should_compile/Recursive.stderr   |  2 +-
 .../should_compile/ScopedNamedWildcards.stderr           |  2 +-
 .../should_compile/ScopedNamedWildcardsGood.stderr       |  2 +-
 .../tests/partial-sigs/should_compile/ShowNamed.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/SimpleGen.stderr   |  2 +-
 .../tests/partial-sigs/should_compile/SkipMany.stderr    |  2 +-
 .../partial-sigs/should_compile/SomethingShowable.stderr |  2 +-
 .../should_compile/TypeFamilyInstanceLHS.stderr          |  2 +-
 .../tests/partial-sigs/should_compile/Uncurry.stderr     |  2 +-
 .../partial-sigs/should_compile/UncurryNamed.stderr      |  2 +-
 .../should_compile/WarningWildcardInstantiations.stderr  |  2 +-
 testsuite/tests/roles/should_compile/Roles1.stderr       |  2 +-
 testsuite/tests/roles/should_compile/Roles14.stderr      |  2 +-
 testsuite/tests/roles/should_compile/Roles2.stderr       |  2 +-
 testsuite/tests/roles/should_compile/Roles3.stderr       |  2 +-
 testsuite/tests/roles/should_compile/Roles4.stderr       |  2 +-
 testsuite/tests/roles/should_compile/T8958.stderr        |  2 +-
 testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout | 16 ++++++++--------
 testsuite/tests/th/TH_Roles2.stderr                      |  2 +-
 testsuite/tests/typecheck/should_compile/tc231.stderr    |  2 +-
 58 files changed, 66 insertions(+), 66 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 84bf1ebae75bff6c1e37382bc348850d17f3f2c0

From git at git.haskell.org  Sun Nov  1 12:43:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 12:43:00 +0000 (UTC)
Subject: [commit: ghc] master: ApiAnnotations: BooleanFormula is not properly
 Located (f16827f)
Message-ID: <20151101124300.7C4E93A300@ghc.haskell.org>

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

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

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

commit f16827f84855bef94b1b69f49bd1734627946f02
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Nov 1 11:13:21 2015 +0100

    ApiAnnotations: BooleanFormula is not properly Located
    
    At the moment BooleanFormula is defined as
    
      data BooleanFormula a = Var a | And [BooleanFormula a]
                            | Or [BooleanFormula a]
           deriving (Eq, Data, Typeable, Functor, Foldable, Traversable)
    
    An API Annotation can only be attached to an item of the form Located a.
    
    Replace this with a properly Located version, and attach the appropriate
    API Annotations to it
    
    Updates haddock submodule.
    
    Test Plan: ./validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1384
    
    GHC Trac Issues: #11017


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

f16827f84855bef94b1b69f49bd1734627946f02
 compiler/hsSyn/HsBinds.hs                          |  8 +--
 compiler/parser/Parser.y                           | 27 +++++----
 compiler/rename/RnBinds.hs                         |  4 +-
 compiler/typecheck/TcClassDcl.hs                   |  6 +-
 compiler/utils/BooleanFormula.hs                   | 67 +++++++++++++---------
 .../tests/ghc-api/annotations/boolFormula.stdout   | 31 ++++++----
 utils/haddock                                      |  2 +-
 7 files changed, 82 insertions(+), 63 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f16827f84855bef94b1b69f49bd1734627946f02

From git at git.haskell.org  Sun Nov  1 12:43:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 12:43:03 +0000 (UTC)
Subject: [commit: ghc] master: keepCAFsForGHCi was broken (5a48180)
Message-ID: <20151101124303.345B03A300@ghc.haskell.org>

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

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

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

commit 5a4818039ff4419372744b395e6fc904b4bd9a1d
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Sun Nov 1 12:25:39 2015 +0100

    keepCAFsForGHCi was broken
    
    Buggy Makefile code meant it was always included, instead of being
    included only for the dyn ways.
    
    Test Plan: validate
    
    Reviewers: hvr, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1400


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

5a4818039ff4419372744b395e6fc904b4bd9a1d
 compiler/ghc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 26e22b4..e3ea52a 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -664,8 +664,8 @@ $(eval $(call build-package,compiler,stage3,2))
 define keepCAFsForGHCiDynOnly
 # $1 = stage
 # $2 = way
-ifeq "$$(findstring dyn, $1)" ""
-compiler_stage$1_$2_C_OBJS := $$(filter-out %/keepCAFsForGHCi.o,$$(compiler_stage$1_$2_C_OBJS))
+ifeq "$$(findstring dyn, $2)" ""
+compiler_stage$1_$2_C_OBJS := $$(filter-out %/keepCAFsForGHCi.$$($2_osuf),$$(compiler_stage$1_$2_C_OBJS))
 endif
 endef
 $(foreach w,$(compiler_stage1_WAYS),$(eval $(call keepCAFsForGHCiDynOnly,1,$w)))


From git at git.haskell.org  Sun Nov  1 12:43:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 12:43:05 +0000 (UTC)
Subject: [commit: ghc] master: DynFlags: -freverse-errors should be defFlag
 (677d768)
Message-ID: <20151101124305.CD3123A300@ghc.haskell.org>

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

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

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

commit 677d7687f26dae9ac7c054c030d32f59a1460c72
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Nov 1 12:28:10 2015 +0100

    DynFlags: -freverse-errors should be defFlag
    
    This flag works under both GHC and GHCi, as pointed out on D1367. Thanks
    to @thomie for pointing this out.


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

677d7687f26dae9ac7c054c030d32f59a1460c72
 compiler/main/DynFlags.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 0c1facc..fb6265c 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -2410,9 +2410,9 @@ dynamic_flags = [
                                      deprecate "Use -fno-force-recomp instead"))
   , defGhcFlag "no-recomp" (NoArg (do setGeneralFlag Opt_ForceRecomp
                                       deprecate "Use -fforce-recomp instead"))
-  , defGhcFlag "freverse-errors"
+  , defFlag "freverse-errors"
       (noArg (\d -> d {reverseErrors = True} ))
-  , defGhcFlag "fno-reverse-errors"
+  , defFlag "fno-reverse-errors"
       (noArg (\d -> d {reverseErrors = False} ))
 
         ------ HsCpp opts ---------------------------------------------------


From git at git.haskell.org  Sun Nov  1 13:06:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 13:06:08 +0000 (UTC)
Subject: [commit: ghc] master: Update Cabal submodule (3431ad6)
Message-ID: <20151101130608.B22A73A300@ghc.haskell.org>

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

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

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

commit 3431ad6faeb2b74e10c8ac4d42bdbc4521e07e33
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 14:03:44 2015 +0100

    Update Cabal submodule
    
    This allows us to remove 4 newly added language pragmas from the T4437
    test-case as they were recently added to Cabal 1.23


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

3431ad6faeb2b74e10c8ac4d42bdbc4521e07e33
 libraries/Cabal                 | 2 +-
 testsuite/tests/driver/T4437.hs | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index b083151..fada4c8 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit b083151f2a01ad7245f21502fd20f21189ab7665
+Subproject commit fada4c87bf76254b85703671fbb1f05bb73f0869
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 48ad93c..f345ce6 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -32,11 +32,7 @@ check title expected got
 expectedGhcOnlyExtensions :: [String]
 expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
-                             "AlternativeLayoutRuleTransitional",
-                             "DuplicateRecordFields",
-                             "StaticPointers",
-                             "StrictData",
-                             "ApplicativeDo"] -- TODO add this to Cabal
+                             "AlternativeLayoutRuleTransitional"]
 
 expectedCabalOnlyExtensions :: [String]
 expectedCabalOnlyExtensions = ["Generics",


From git at git.haskell.org  Sun Nov  1 14:20:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 14:20:47 +0000 (UTC)
Subject: [commit: ghc] master: StgStartup: Setup unwinding for stg_stop_thread
 (d9f8862)
Message-ID: <20151101142047.762593A300@ghc.haskell.org>

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

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

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

commit d9f886282c605e5f4b74126b3af8f23771ef03f1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Aug 30 14:11:56 2015 +0200

    StgStartup: Setup unwinding for stg_stop_thread
    
    This is a bit ugly as we need to assume the structure of the C stack as
    left by StgRun. Nevertheless, it allows us to unwind all the way back to
    `_start` on my machine.
    
    ```
    Stack trace:
        set_initial_registers (rts/Libdw.c:272.0)
        dwfl_thread_getframes
    
        dwfl_getthreads
        dwfl_getthread_frames
        libdw_get_backtrace (rts/Libdw.c:243.0)
        base_GHCziExecutionStack_getStackTrace1_info
    (libraries/base/GHC/ExecutionStack.hs:43.1)
        base_GHCziExecutionStack_showStackTrace1_info
    (libraries/base/GHC/ExecutionStack.hs:47.1)
        base_GHCziBase_bindIO1_info (libraries/base/GHC/Base.hs:1085.1)
        base_GHCziBase_thenIO1_info (libraries/base/GHC/Base.hs:1088.1)
        base_GHCziBase_thenIO1_info (libraries/base/GHC/Base.hs:1088.1)
        base_GHCziBase_thenIO1_info (libraries/base/GHC/Base.hs:1088.1)
        base_GHCziBase_thenIO1_info (libraries/base/GHC/Base.hs:1088.1)
        base_GHCziBase_thenIO1_info (libraries/base/GHC/Base.hs:1088.1)
        stg_catch_frame_info (rts/Exception.cmm:370.1)
        stg_stop_thread_info (rts/StgStartup.cmm:42.1)
        scheduleWaitThread (rts/Schedule.c:465.0)
        hs_main (rts/RtsMain.c:65.0)
    
        __libc_start_main (/tmp/buildd/glibc-2.19/csu/libc-start.c:321.0)
        _start
    ```


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

d9f886282c605e5f4b74126b3af8f23771ef03f1
 rts/StgCRun.c      |  2 ++
 rts/StgStartup.cmm | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index 6448509..0a010d4 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -159,6 +159,8 @@ StgWord8 *win32AllocStack(void)
  * stack isn't aligned, and calling exitWith from Haskell invokes
  * shutdownHaskellAndExit using a C call.
  *
+ * If you edit the sequence below be sure to update the unwinding information
+ * for stg_stop_thread in StgStartup.cmm.
  */
 
 static void GNUC3_ATTRIBUTE(used)
diff --git a/rts/StgStartup.cmm b/rts/StgStartup.cmm
index 2a245b0..aad4fab 100644
--- a/rts/StgStartup.cmm
+++ b/rts/StgStartup.cmm
@@ -62,6 +62,18 @@ INFO_TABLE_RET(stg_stop_thread, STOP_FRAME,
        be an info table on top of the stack).
     */
 
+    /*
+       Here we setup the stack unwinding annotation necessary to allow
+       debuggers to find their way back to the C stack.
+
+       This is a bit fiddly as we assume the layout of the stack prepared
+       for us by StgRun.
+     */
+#ifdef x86_64_HOST_ARCH
+    unwind MachSp = MachSp + RESERVED_C_STACK_BYTES + 0x38 + 8
+    unwind UnwindReturnReg = W_[MachSp + RESERVED_C_STACK_BYTES + 0x38]
+#endif
+
     Sp = Sp + SIZEOF_StgStopFrame - WDS(2);
     Sp(1) = R1;
     Sp(0) = stg_enter_info;


From git at git.haskell.org  Sun Nov  1 14:20:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 14:20:50 +0000 (UTC)
Subject: [commit: ghc] master: Dwarf.Types: Fix comment style (76611d7)
Message-ID: <20151101142050.1C4E93A300@ghc.haskell.org>

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

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

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

commit 76611d750247c1f6fd1323ef5564af16b97e8157
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Oct 30 21:02:07 2015 +0100

    Dwarf.Types: Fix comment style


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

76611d750247c1f6fd1323ef5564af16b97e8157
 compiler/nativeGen/Dwarf/Types.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/nativeGen/Dwarf/Types.hs b/compiler/nativeGen/Dwarf/Types.hs
index d558c2d..bd423b6 100644
--- a/compiler/nativeGen/Dwarf/Types.hs
+++ b/compiler/nativeGen/Dwarf/Types.hs
@@ -43,7 +43,7 @@ import Data.Char
 import CodeGen.Platform
 
 -- | Individual dwarf records. Each one will be encoded as an entry in
--- the .debug_info section.
+-- the @.debug_info@ section.
 data DwarfInfo
   = DwarfCompileUnit { dwChildren :: [DwarfInfo]
                      , dwName :: String
@@ -60,7 +60,7 @@ data DwarfInfo
                , dwMarker :: CLabel }
 
 -- | Abbreviation codes used for encoding above records in the
--- .debug_info section.
+-- @.debug_info@ section.
 data DwarfAbbrev
   = DwAbbrNull          -- ^ Pseudo, used for marking the end of lists
   | DwAbbrCompileUnit
@@ -218,7 +218,7 @@ data DwarfFrameBlock
     , dwFdeUnwind     :: UnwindTable
     }
 
--- | Header for the .debug_frame section. Here we emit the "Common
+-- | Header for the @.debug_frame@ section. Here we emit the "Common
 -- Information Entry" record that etablishes general call frame
 -- parameters and the default stack layout.
 pprDwarfFrame :: DwarfFrame -> SDoc
@@ -315,7 +315,7 @@ pprFrameBlock oldUws (DwarfFrameBlock blockLbl hasInfo uws)
        vcat (map (uncurry $ pprSetUnwind plat) changed) $$
        vcat (map (pprUndefUnwind plat . fst) died)
 
--- [Note: Info Offset]
+-- Note [Info Offset]
 --
 -- GDB was pretty much written with C-like programs in mind, and as a
 -- result they assume that once you have a return address, it is a
@@ -398,7 +398,7 @@ pprUnwindExpr spIsCFA expr
        ptext (sLit "1:")
 
 -- | Generate code for re-setting the unwind information for a
--- register to "undefined"
+-- register to @undefined@
 pprUndefUnwind :: Platform -> GlobalReg -> SDoc
 pprUndefUnwind _    Sp = panic "pprUndefUnwind Sp" -- should never happen
 pprUndefUnwind plat g  = pprByte dW_CFA_undefined $$


From git at git.haskell.org  Sun Nov  1 14:20:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 14:20:52 +0000 (UTC)
Subject: [commit: ghc] master: cmm: Expose machine's stack and return address
 register (159a1a2)
Message-ID: <20151101142052.BA7533A300@ghc.haskell.org>

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

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

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

commit 159a1a2b7501b149fadfc0cd1940fab6bf030691
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Aug 27 00:36:59 2015 +0200

    cmm: Expose machine's stack and return address register
    
    We will need to use these to setup proper unwinding information for the
    stg_stop_thread closure. This pokes a hole in the STG abstraction,
    exposing the machine's stack pointer register so that we can accomplish
    this. We also expose a dummy return address register, which corresponds
    to the register used to hold the DWARF return address.
    
    Differential Revision: https://phabricator.haskell.org/D1225


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

159a1a2b7501b149fadfc0cd1940fab6bf030691
 compiler/cmm/CmmExpr.hs              | 17 +++++++++++++++++
 compiler/cmm/CmmLex.x                |  2 ++
 compiler/cmm/PprCmmExpr.hs           |  2 ++
 compiler/codeGen/CgUtils.hs          |  2 ++
 compiler/llvmGen/LlvmCodeGen/Regs.hs |  1 +
 compiler/nativeGen/Dwarf/Types.hs    |  3 ++-
 includes/CodeGen.Platform.hs         |  3 +++
 includes/stg/MachRegs.h              |  2 ++
 8 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/compiler/cmm/CmmExpr.hs b/compiler/cmm/CmmExpr.hs
index 10d0874..8a86bb4 100644
--- a/compiler/cmm/CmmExpr.hs
+++ b/compiler/cmm/CmmExpr.hs
@@ -459,6 +459,15 @@ data GlobalReg
   -- (where necessary) in the native code generator.
   | BaseReg
 
+  -- The register used by the platform for the C stack pointer. This is
+  -- a break in the STG abstraction used exclusively to setup stack unwinding
+  -- information.
+  | MachSp
+
+  -- The is a dummy register used to indicate to the stack unwinder where
+  -- a routine would return to.
+  | UnwindReturnReg
+
   -- Base Register for PIC (position-independent code) calculations
   -- Only used inside the native code generator. It's exact meaning differs
   -- from platform to platform (see module PositionIndependentCode).
@@ -486,6 +495,8 @@ instance Eq GlobalReg where
    GCEnter1 == GCEnter1 = True
    GCFun == GCFun = True
    BaseReg == BaseReg = True
+   MachSp == MachSp = True
+   UnwindReturnReg == UnwindReturnReg = True
    PicBaseReg == PicBaseReg = True
    _r1 == _r2 = False
 
@@ -510,6 +521,8 @@ instance Ord GlobalReg where
    compare GCEnter1 GCEnter1 = EQ
    compare GCFun GCFun = EQ
    compare BaseReg BaseReg = EQ
+   compare MachSp MachSp = EQ
+   compare UnwindReturnReg UnwindReturnReg = EQ
    compare PicBaseReg PicBaseReg = EQ
    compare (VanillaReg _ _) _ = LT
    compare _ (VanillaReg _ _) = GT
@@ -547,6 +560,10 @@ instance Ord GlobalReg where
    compare _ GCFun = GT
    compare BaseReg _ = LT
    compare _ BaseReg = GT
+   compare MachSp _ = LT
+   compare _ MachSp = GT
+   compare UnwindReturnReg _ = LT
+   compare _ UnwindReturnReg = GT
    compare EagerBlackholeInfo _ = LT
    compare _ EagerBlackholeInfo = GT
 
diff --git a/compiler/cmm/CmmLex.x b/compiler/cmm/CmmLex.x
index a9ad3e5..175259a 100644
--- a/compiler/cmm/CmmLex.x
+++ b/compiler/cmm/CmmLex.x
@@ -110,6 +110,8 @@ $white_no_nl+           ;
   CurrentNursery        { global_reg CurrentNursery }
   HpAlloc               { global_reg HpAlloc }
   BaseReg               { global_reg BaseReg }
+  MachSp                { global_reg MachSp }
+  UnwindReturnReg       { global_reg UnwindReturnReg }
 
   $namebegin $namechar* { name }
 
diff --git a/compiler/cmm/PprCmmExpr.hs b/compiler/cmm/PprCmmExpr.hs
index 0bb79ac..1f1c7f8 100644
--- a/compiler/cmm/PprCmmExpr.hs
+++ b/compiler/cmm/PprCmmExpr.hs
@@ -262,6 +262,8 @@ pprGlobalReg gr
         SpLim          -> ptext (sLit "SpLim")
         Hp             -> ptext (sLit "Hp")
         HpLim          -> ptext (sLit "HpLim")
+        MachSp         -> ptext (sLit "MachSp")
+        UnwindReturnReg-> ptext (sLit "UnwindReturnReg")
         CCCS           -> ptext (sLit "CCCS")
         CurrentTSO     -> ptext (sLit "CurrentTSO")
         CurrentNursery -> ptext (sLit "CurrentNursery")
diff --git a/compiler/codeGen/CgUtils.hs b/compiler/codeGen/CgUtils.hs
index 51b8ed9..a197312 100644
--- a/compiler/codeGen/CgUtils.hs
+++ b/compiler/codeGen/CgUtils.hs
@@ -86,6 +86,8 @@ baseRegOffset dflags GCEnter1            = oFFSET_stgGCEnter1 dflags
 baseRegOffset dflags GCFun               = oFFSET_stgGCFun dflags
 baseRegOffset _      BaseReg             = panic "baseRegOffset:BaseReg"
 baseRegOffset _      PicBaseReg          = panic "baseRegOffset:PicBaseReg"
+baseRegOffset _      MachSp              = panic "baseRegOffset:MachSp"
+baseRegOffset _      UnwindReturnReg     = panic "baseRegOffset:UnwindReturnReg"
 
 
 -- -----------------------------------------------------------------------------
diff --git a/compiler/llvmGen/LlvmCodeGen/Regs.hs b/compiler/llvmGen/LlvmCodeGen/Regs.hs
index 0048659..8ac4153 100644
--- a/compiler/llvmGen/LlvmCodeGen/Regs.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Regs.hs
@@ -76,6 +76,7 @@ lmGlobalReg dflags suf reg
         ZmmReg 4       -> zmmGlobal $ "ZMM4" ++ suf
         ZmmReg 5       -> zmmGlobal $ "ZMM5" ++ suf
         ZmmReg 6       -> zmmGlobal $ "ZMM6" ++ suf
+        MachSp         -> wordGlobal $ "MachSp" ++ suf
         _other         -> panic $ "LlvmCodeGen.Reg: GlobalReg (" ++ (show reg)
                                 ++ ") not supported!"
         -- LongReg, HpLim, CCSS, CurrentTSO, CurrentNusery, HpAlloc
diff --git a/compiler/nativeGen/Dwarf/Types.hs b/compiler/nativeGen/Dwarf/Types.hs
index bd423b6..abded88 100644
--- a/compiler/nativeGen/Dwarf/Types.hs
+++ b/compiler/nativeGen/Dwarf/Types.hs
@@ -337,7 +337,8 @@ pprFrameBlock oldUws (DwarfFrameBlock blockLbl hasInfo uws)
 
 -- | Get DWARF register ID for a given GlobalReg
 dwarfGlobalRegNo :: Platform -> GlobalReg -> Word8
-dwarfGlobalRegNo p = maybe 0 (dwarfRegNo p . RegReal) . globalRegMaybe p
+dwarfGlobalRegNo p UnwindReturnReg = dwarfReturnRegNo p
+dwarfGlobalRegNo p reg = maybe 0 (dwarfRegNo p . RegReal) $ globalRegMaybe p reg
 
 -- | Generate code for setting the unwind information for a register,
 -- optimized using its known old value in the table. Note that "Sp" is
diff --git a/includes/CodeGen.Platform.hs b/includes/CodeGen.Platform.hs
index b41ad54..46550af 100644
--- a/includes/CodeGen.Platform.hs
+++ b/includes/CodeGen.Platform.hs
@@ -815,6 +815,9 @@ globalRegMaybe CurrentTSO               = Just (RealRegSingle REG_CurrentTSO)
 # ifdef REG_CurrentNursery
 globalRegMaybe CurrentNursery           = Just (RealRegSingle REG_CurrentNursery)
 # endif
+# ifdef REG_MachSp
+globalRegMaybe MachSp                   = Just (RealRegSingle REG_MachSp)
+# endif
 globalRegMaybe _                        = Nothing
 #elif MACHREGS_NO_REGS
 globalRegMaybe _ = Nothing
diff --git a/includes/stg/MachRegs.h b/includes/stg/MachRegs.h
index b709027..b1a0ef0 100644
--- a/includes/stg/MachRegs.h
+++ b/includes/stg/MachRegs.h
@@ -102,6 +102,7 @@
 #if STOLEN_X86_REGS >= 4
 # define REG_Hp     edi
 #endif
+#define REG_MachSp  esp
 
 #define REG_XMM1    xmm0
 #define REG_XMM2    xmm1
@@ -169,6 +170,7 @@
 #define REG_R5    r8
 #define REG_R6    r9
 #define REG_SpLim r15
+#define REG_MachSp  rsp
 
 /*
 Map both Fn and Dn to register xmmn so that we can pass a function any


From git at git.haskell.org  Sun Nov  1 14:20:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 14:20:55 +0000 (UTC)
Subject: [commit: ghc] master: Libdw: Remove special treatment for
 stg_stop_thread (bb446b2)
Message-ID: <20151101142055.603E73A300@ghc.haskell.org>

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

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

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

commit bb446b2636da7f3eda240863a0369396c4c2e419
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Sep 5 13:51:27 2015 +0200

    Libdw: Remove special treatment for stg_stop_thread
    
    This is no longer necessary since this symbol can be unwound through
    with its DWARF information.


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

bb446b2636da7f3eda240863a0369396c4c2e419
 rts/Libdw.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rts/Libdw.c b/rts/Libdw.c
index 70aee75..c8f945a 100644
--- a/rts/Libdw.c
+++ b/rts/Libdw.c
@@ -230,10 +230,7 @@ static int frame_cb(Dwfl_Frame *frame, void *arg) {
         backtrace_push(session->cur_bt, (StgPtr) pc);
     }
 
-    if ((void *) pc == &stg_stop_thread_info)
-        return DWARF_CB_ABORT;
-    else
-        return DWARF_CB_OK;
+    return DWARF_CB_OK;
 }
 
 Backtrace *libdw_get_backtrace(LibDwSession *session) {


From git at git.haskell.org  Sun Nov  1 14:20:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 14:20:58 +0000 (UTC)
Subject: [commit: ghc] master: Dwarf: Preserve stack pointer register (6fb0ba6)
Message-ID: <20151101142058.032C53A300@ghc.haskell.org>

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

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

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

commit 6fb0ba65d27602ae9a81fe142936b06d54b20b2e
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Oct 30 20:49:35 2015 +0100

    Dwarf: Preserve stack pointer register
    
    Here we add a `same_value $sp` instruction to our default unwinding
    rules to ensure that the implicit `$sp = CFA` rule (which `libdw`
    appears to exhibit on x86_64) doesn't overwrite it (necessary since we
    don't use $sp to track our call stack).
    
    See Phab Diff D1189 for details on how we arrived at this resolution.
    
    Reviewers: scpmw, austin, simonmar
    
    Reviewed By: austin, simonmar
    
    Subscribers: thomie, simonmar
    
    Differential Revision: https://phabricator.haskell.org/D1224


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

6fb0ba65d27602ae9a81fe142936b06d54b20b2e
 compiler/nativeGen/Dwarf/Types.hs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/compiler/nativeGen/Dwarf/Types.hs b/compiler/nativeGen/Dwarf/Types.hs
index a2d07b8..d558c2d 100644
--- a/compiler/nativeGen/Dwarf/Types.hs
+++ b/compiler/nativeGen/Dwarf/Types.hs
@@ -231,6 +231,13 @@ pprDwarfFrame DwarfFrame{dwCieLabel=cieLabel,dwCieInit=cieInit,dwCieProcs=procs}
         retReg      = dwarfReturnRegNo plat
         wordSize    = platformWordSize plat
         pprInit (g, uw) = pprSetUnwind plat g (Nothing, uw)
+
+        -- Preserve C stack pointer: This necessary to override that default
+        -- unwinding behavior of setting $sp = CFA.
+        preserveSp = case platformArch plat of
+          ArchX86    -> pprByte dW_CFA_same_value $$ pprLEBWord 4
+          ArchX86_64 -> pprByte dW_CFA_same_value $$ pprLEBWord 7
+          _          -> empty
     in vcat [ ppr cieLabel <> colon
             , pprData4' length -- Length of CIE
             , ppr cieStartLabel <> colon
@@ -250,8 +257,11 @@ pprDwarfFrame DwarfFrame{dwCieLabel=cieLabel,dwCieInit=cieInit,dwCieProcs=procs}
               pprByte (dW_CFA_offset+retReg)
             , pprByte 0
 
+              -- Preserve C stack pointer
+            , preserveSp
+
               -- Sp' = CFA
-              -- (we need to set this manually as our Sp register is
+              -- (we need to set this manually as our (STG) Sp register is
               -- often not the architecture's default stack register)
             , pprByte dW_CFA_val_offset
             , pprLEBWord (fromIntegral spReg)


From git at git.haskell.org  Sun Nov  1 14:21:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 14:21:00 +0000 (UTC)
Subject: [commit: ghc] master: Dwarf.Constants: Introduce Haddock sections
 (b8df858)
Message-ID: <20151101142100.A78E83A300@ghc.haskell.org>

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

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

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

commit b8df858301317fcdcbe4285cea748f7f1d4438c4
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Oct 30 21:22:17 2015 +0100

    Dwarf.Constants: Introduce Haddock sections


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

b8df858301317fcdcbe4285cea748f7f1d4438c4
 compiler/nativeGen/Dwarf/Constants.hs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/nativeGen/Dwarf/Constants.hs b/compiler/nativeGen/Dwarf/Constants.hs
index 9fe1297..a46d113 100644
--- a/compiler/nativeGen/Dwarf/Constants.hs
+++ b/compiler/nativeGen/Dwarf/Constants.hs
@@ -17,7 +17,7 @@ dW_LANG_Haskell :: Word
 dW_LANG_Haskell = 0x18
   -- Thanks to Nathan Howell for getting us our very own language ID!
 
--- | Dwarf tags
+-- * Dwarf tags
 dW_TAG_compile_unit, dW_TAG_subroutine_type,
   dW_TAG_file_type, dW_TAG_subprogram, dW_TAG_lexical_block,
   dW_TAG_base_type, dW_TAG_structure_type, dW_TAG_pointer_type,
@@ -38,7 +38,7 @@ dW_TAG_variable        = 52
 dW_TAG_auto_variable   = 256
 dW_TAG_arg_variable    = 257
 
--- | Dwarf attributes
+-- * Dwarf attributes
 dW_AT_name, dW_AT_stmt_list, dW_AT_low_pc, dW_AT_high_pc, dW_AT_language,
   dW_AT_comp_dir, dW_AT_producer, dW_AT_external, dW_AT_frame_base,
   dW_AT_use_UTF8, dW_AT_MIPS_linkage_name :: Word
@@ -54,7 +54,7 @@ dW_AT_frame_base        = 0x40
 dW_AT_use_UTF8          = 0x53
 dW_AT_MIPS_linkage_name = 0x2007
 
--- | Abbrev declaration
+-- * Abbrev declaration
 dW_CHILDREN_no, dW_CHILDREN_yes :: Word8
 dW_CHILDREN_no  = 0
 dW_CHILDREN_yes = 1
@@ -69,7 +69,7 @@ dW_FORM_block1 = 0x0a
 dW_FORM_ref4   = 0x13
 dW_FORM_flag_present = 0x19
 
--- | Dwarf native types
+-- * Dwarf native types
 dW_ATE_address, dW_ATE_boolean, dW_ATE_float, dW_ATE_signed,
   dW_ATE_signed_char, dW_ATE_unsigned, dW_ATE_unsigned_char :: Word
 dW_ATE_address       = 1
@@ -80,7 +80,7 @@ dW_ATE_signed_char   = 6
 dW_ATE_unsigned      = 7
 dW_ATE_unsigned_char = 8
 
--- | Call frame information
+-- * Call frame information
 dW_CFA_set_loc, dW_CFA_undefined, dW_CFA_same_value,
   dW_CFA_def_cfa, dW_CFA_def_cfa_offset, dW_CFA_def_cfa_expression,
   dW_CFA_expression, dW_CFA_offset_extended_sf, dW_CFA_def_cfa_offset_sf,
@@ -100,7 +100,7 @@ dW_CFA_val_offset         = 0x14
 dW_CFA_val_expression     = 0x16
 dW_CFA_offset             = 0x80
 
--- | Operations
+-- * Operations
 dW_OP_deref, dW_OP_consts,
   dW_OP_minus, dW_OP_mul, dW_OP_plus,
   dW_OP_lit0, dW_OP_breg0, dW_OP_call_frame_cfa :: Word8
@@ -113,7 +113,7 @@ dW_OP_lit0           = 0x30
 dW_OP_breg0          = 0x70
 dW_OP_call_frame_cfa = 0x9c
 
--- | Dwarf section declarations
+-- * Dwarf section declarations
 dwarfInfoSection, dwarfAbbrevSection, dwarfLineSection,
   dwarfFrameSection, dwarfGhcSection, dwarfARangesSection :: SDoc
 dwarfInfoSection    = dwarfSection "info"
@@ -133,7 +133,7 @@ dwarfSection name = sdocWithPlatform $ \plat -> ftext $ mkFastString $
        | otherwise
        -> "\t.section .debug_" ++ name ++ ",\"dr\""
 
--- | Dwarf section labels
+-- * Dwarf section labels
 dwarfInfoLabel, dwarfAbbrevLabel, dwarfLineLabel, dwarfFrameLabel :: LitString
 dwarfInfoLabel   = sLit ".Lsection_info"
 dwarfAbbrevLabel = sLit ".Lsection_abbrev"


From git at git.haskell.org  Sun Nov  1 16:51:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 16:51:21 +0000 (UTC)
Subject: [commit: ghc] master: Libdw: Fix symbol naming (52c6e3d)
Message-ID: <20151101165121.1FAB03A300@ghc.haskell.org>

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

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

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

commit 52c6e3d608ee3d010337d4405df86c2620d24887
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Nov 1 12:33:08 2015 +0100

    Libdw: Fix symbol naming
    
    RTS convention is to use camel-case.


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

52c6e3d608ee3d010337d4405df86c2620d24887
 includes/rts/Libdw.h |  4 ++--
 rts/Libdw.c          | 63 ++++++++++++++++++++++++++--------------------------
 rts/Libdw.h          | 20 ++++++++---------
 rts/posix/Signals.c  | 10 ++++-----
 4 files changed, 49 insertions(+), 48 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 52c6e3d608ee3d010337d4405df86c2620d24887

From git at git.haskell.org  Sun Nov  1 16:51:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 16:51:23 +0000 (UTC)
Subject: [commit: ghc] master: Minor simplification in unariser pass: (e9bfb3f)
Message-ID: <20151101165123.B47FD3A300@ghc.haskell.org>

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

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

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

commit e9bfb3fd4cb61621c28b51f0bf0e3d2c6f74e45f
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Sun Nov 1 17:14:58 2015 +0100

    Minor simplification in unariser pass:
    
    We don't need to update StgCase's AltType, because it's already set
    correctly in `CoreToStg.mkStgAltType`, so we can just remove extra
    argument passing and return values.
    
    (I think this is a useful refactoring because it makes it clear that we
    don't need to update AltTypes)
    
    Reviewers: austin, bgamari, simonpj
    
    Reviewed By: bgamari, simonpj
    
    Subscribers: simonpj, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1403


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

e9bfb3fd4cb61621c28b51f0bf0e3d2c6f74e45f
 compiler/simplStg/UnariseStg.hs | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/compiler/simplStg/UnariseStg.hs b/compiler/simplStg/UnariseStg.hs
index f3d592f..a1533ba 100644
--- a/compiler/simplStg/UnariseStg.hs
+++ b/compiler/simplStg/UnariseStg.hs
@@ -114,10 +114,10 @@ unariseExpr us rho (StgLam xs e)
 unariseExpr us rho (StgCase e case_lives alts_lives bndr srt alt_ty alts)
   = StgCase (unariseExpr us1 rho e) (unariseLives rho case_lives)
             (unariseLives rho alts_lives) bndr (unariseSRT rho srt)
-            alt_ty' alts'
+            alt_ty alts'
  where
     (us1, us2) = splitUniqSupply us
-    (alt_ty', alts') = unariseAlts us2 rho alt_ty bndr (repType (idType bndr)) alts
+    alts'      = unariseAlts us2 rho alt_ty bndr alts
 
 unariseExpr us rho (StgLet bind e)
   = StgLet (unariseBinding us1 rho bind) (unariseExpr us2 rho e)
@@ -134,27 +134,25 @@ unariseExpr us rho (StgTick tick e)
   = StgTick tick (unariseExpr us rho e)
 
 ------------------------
-unariseAlts :: UniqSupply -> UnariseEnv -> AltType -> Id -> RepType -> [StgAlt] -> (AltType, [StgAlt])
-unariseAlts us rho alt_ty _ (UnaryRep _) alts
-  = (alt_ty, zipWith (\us alt -> unariseAlt us rho alt) (listSplitUniqSupply us) alts)
-
-unariseAlts us rho _ bndr (UbxTupleRep tys) ((DEFAULT, [], [], e) : _)
-  = (UbxTupAlt n, [(DataAlt (tupleDataCon Unboxed n), ys, uses, unariseExpr us2' rho' e)])
+unariseAlts :: UniqSupply -> UnariseEnv -> AltType -> Id -> [StgAlt] -> [StgAlt]
+unariseAlts us rho (UbxTupAlt n) bndr [(DEFAULT, [], [], e)]
+  = [(DataAlt (tupleDataCon Unboxed n), ys, uses, unariseExpr us2' rho' e)]
   where
     (us2', rho', ys) = unariseIdBinder us rho bndr
     uses = replicate (length ys) (not (isDeadBinder bndr))
-    n = length tys
 
-unariseAlts us rho _ bndr (UbxTupleRep _) [(DataAlt _, ys, uses, e)]
-  = (UbxTupAlt n, [(DataAlt (tupleDataCon Unboxed n), ys', uses', unariseExpr us2' rho'' e)])
+unariseAlts us rho (UbxTupAlt n) bndr [(DataAlt _, ys, uses, e)]
+  = [(DataAlt (tupleDataCon Unboxed n), ys', uses', unariseExpr us2' rho'' e)]
   where
     (us2', rho', ys', uses') = unariseUsedIdBinders us rho ys uses
     rho'' = extendVarEnv rho' bndr ys'
-    n = length ys'
 
-unariseAlts _ _ _ _ (UbxTupleRep _) alts
+unariseAlts _ _ (UbxTupAlt _) _ alts
   = pprPanic "unariseExpr: strange unboxed tuple alts" (ppr alts)
 
+unariseAlts us rho _ _ alts
+  = zipWith (\us alt -> unariseAlt us rho alt) (listSplitUniqSupply us) alts
+
 --------------------------
 unariseAlt :: UniqSupply -> UnariseEnv -> StgAlt -> StgAlt
 unariseAlt us rho (con, xs, uses, e)


From git at git.haskell.org  Sun Nov  1 18:27:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 18:27:16 +0000 (UTC)
Subject: [commit: ghc] master: Change sphinx for documentation building on
 windows to the python3 version (65f3c4c)
Message-ID: <20151101182716.4AB0D3A300@ghc.haskell.org>

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

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

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

commit 65f3c4c0a1304b8d00b46dc0e77ad93fc566ffb1
Author: Tamar Christina <tamar at zhox.com>
Date:   Sun Nov 1 19:26:16 2015 +0100

    Change sphinx for documentation building on windows to the python3 version
    
    Summary:
    Python 3 seems to have fixed the long standing codepage issue with
    python on Windows. To be able to reliably build the documentation
    we should use the Python 3 version of Sphinx.
    
    See `https://docs.python.org/dev/whatsnew/3.3.html#codecs` and
    `https://bugs.python.org/issue13216`. Sphinx also supports Python 3.
    
    Oddly enough `python3-sphinx` is registered as `sphinx-build.exe`
    instead of `sphinx-build3.exe`, so the changes in `configure.ac` can
    be reverted.
    
    install with `pacman -S mingw-w64-$(uname -m)-python3-sphinx`
    
    Test Plan: ./validate
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: erikd
    
    Differential Revision: https://phabricator.haskell.org/D1417
    
    GHC Trac Issues: #11021


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

65f3c4c0a1304b8d00b46dc0e77ad93fc566ffb1
 configure.ac | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6bd2103..84f381e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -725,19 +725,11 @@ then
 fi
 
 dnl ** check for Sphinx toolchain
-if test "$HostOS" = "mingw32"
-then
-SphinxBin=sphinx-build2
-else
-SphinxBin=sphinx-build
-fi;
-
-AC_SUBST([SphinxBin])
-AC_PATH_PROG(SPHINXBUILD,${SphinxBin})
-AC_CACHE_CHECK([for version of ${SphinxBin}], fp_cv_sphinx_version,
+AC_PATH_PROG(SPHINXBUILD,sphinx-build)
+AC_CACHE_CHECK([for version of sphinx-build], fp_cv_sphinx_version,
 changequote(, )dnl
 [if test -n "$SPHINXBUILD"; then
-  fp_cv_sphinx_version=`"$SPHINXBUILD" --version 2>&1 | sed 's/Sphinx\( (sphinx-build[2]\?)\)\? v\?\([0-9]\.[0-9]\.[0-9]\)/\2/' | head -n1`;
+  fp_cv_sphinx_version=`"$SPHINXBUILD" --version 2>&1 | sed 's/Sphinx\( (sphinx-build)\)\? v\?\([0-9]\.[0-9]\.[0-9]\)/\2/' | head -n1`;
 fi;
 changequote([, ])dnl
 ])


From git at git.haskell.org  Sun Nov  1 18:35:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 18:35:02 +0000 (UTC)
Subject: [commit: ghc] master: EventLog: Loop fwrite if necessary during flush
 (f46f32b)
Message-ID: <20151101183502.387263A300@ghc.haskell.org>

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

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

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

commit f46f32b922d7ecbee2829937295521f5db1d7997
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Nov 1 19:06:09 2015 +0100

    EventLog: Loop fwrite if necessary during flush
    
    Previously the eventlog flush code would fail if `fwrite` wrote less
    than the requested amount. Like all Unix stream I/O operations, however,
    `fwrite` isn't guaranteed to write the entire buffer. Here we loop as
    long as `fwrite` succeeds in writing anything.
    
    Fixes #11041.
    
    Test Plan: Validate with eventlog
    
    Reviewers: austin, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1415
    
    GHC Trac Issues: #11041


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

f46f32b922d7ecbee2829937295521f5db1d7997
 rts/eventlog/EventLog.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/rts/eventlog/EventLog.c b/rts/eventlog/EventLog.c
index 2153942..db103a7 100644
--- a/rts/eventlog/EventLog.c
+++ b/rts/eventlog/EventLog.c
@@ -1100,20 +1100,22 @@ void postBlockMarker (EventsBuf *eb)
 
 void printAndClearEventBuf (EventsBuf *ebuf)
 {
-    StgWord64 numBytes = 0, written = 0;
-
     closeBlockMarker(ebuf);
 
     if (ebuf->begin != NULL && ebuf->pos != ebuf->begin)
     {
-        numBytes = ebuf->pos - ebuf->begin;
-
-        written = fwrite(ebuf->begin, 1, numBytes, event_log_file);
-        if (written != numBytes) {
-            debugBelch(
-                "printAndClearEventLog: fwrite() failed, written=%" FMT_Word64
-                " doesn't match numBytes=%" FMT_Word64, written, numBytes);
-            return;
+        StgInt8 *begin = ebuf->begin;
+        while (begin < ebuf->pos) {
+            StgWord64 remain = ebuf->pos - begin;
+            StgWord64 written = fwrite(begin, 1, remain, event_log_file);
+            if (written == 0) {
+                debugBelch(
+                    "printAndClearEventLog: fwrite() failed to write anything;"
+                    " tried to write numBytes=%" FMT_Word64, remain);
+                resetEventsBuf(ebuf);
+                return;
+            }
+            begin += written;
         }
 
         resetEventsBuf(ebuf);


From git at git.haskell.org  Sun Nov  1 20:53:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 20:53:52 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: configure.ac: AArch64 is now
 registerised (c1c333a)
Message-ID: <20151101205352.BFC253A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/c1c333a09c52362b97ddbf9c5731e4a9a58cb71a/ghc

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

commit c1c333a09c52362b97ddbf9c5731e4a9a58cb71a
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Jul 5 11:22:24 2015 +0000

    configure.ac: AArch64 is now registerised


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

c1c333a09c52362b97ddbf9c5731e4a9a58cb71a
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 84f381e..ce336dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,7 +240,7 @@ AC_SUBST(SOLARIS_BROKEN_SHLD)
 dnl ** Do an unregisterised build?
 dnl --------------------------------------------------------------
 case "$HostArch" in
-    i386|x86_64|powerpc|powerpc64|powerpc64le|arm)
+    i386|x86_64|powerpc|powerpc64|powerpc64le|arm|aarch64)
         UnregisterisedDefault=NO
         ;;
     *)


From git at git.haskell.org  Sun Nov  1 20:53:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 20:53:55 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: Implement AArch64 codegen in
 `mkJumpToAddr` (for GHCi). (c8d42fe)
Message-ID: <20151101205355.5C4593A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/c8d42fe36cbd642f8ccf3af81b5b14c843def1ce/ghc

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

commit c8d42fe36cbd642f8ccf3af81b5b14c843def1ce
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon Oct 12 15:17:30 2015 +1100

    Implement AArch64 codegen in `mkJumpToAddr` (for GHCi).


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

c8d42fe36cbd642f8ccf3af81b5b14c843def1ce
 compiler/ghci/ByteCodeItbls.hs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/compiler/ghci/ByteCodeItbls.hs b/compiler/ghci/ByteCodeItbls.hs
index a01fcd8..a97c79a 100644
--- a/compiler/ghci/ByteCodeItbls.hs
+++ b/compiler/ghci/ByteCodeItbls.hs
@@ -232,6 +232,23 @@ mkJumpToAddr dflags a = case platformArch (targetPlatform dflags) of
                 , 0x11, 0xff, 0x2f, 0xe1
                 , byte0 w32, byte1 w32, byte2 w32, byte3 w32]
 
+    ArchARM64 { } ->
+        -- Generates:
+        --
+        --      ldr     x1, label
+        --      br      x1
+        -- label:
+        --      .quad <addr>
+        --
+        -- which looks like:
+        --     0:       58000041        ldr     x1, <label>
+        --     4:       d61f0020        br      x1
+       let w64 = fromIntegral (funPtrToInt a) :: Word64
+       in Right [ 0x58000041
+                , 0xd61f0020
+                , fromIntegral w64
+                , fromIntegral (w64 `shiftR` 32) ]
+
     arch ->
         panic ("mkJumpToAddr not defined for " ++ show arch)
 


From git at git.haskell.org  Sun Nov  1 20:53:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 20:53:57 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: rts: Fix clobbered regs list for
 aarch64 StgRun (18fcc51)
Message-ID: <20151101205357.EFD7B3A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/18fcc51114d1476542ea35906fb2e5cd57bc7581/ghc

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

commit 18fcc51114d1476542ea35906fb2e5cd57bc7581
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Wed Jun 3 05:54:23 2015 +0000

    rts: Fix clobbered regs list for aarch64 StgRun


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

18fcc51114d1476542ea35906fb2e5cd57bc7581
 rts/StgCRun.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index 0a010d4..c9bbef0 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -829,8 +829,12 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
 
       : "=r" (r)
       : "r" (f), "r" (basereg), "i" (RESERVED_C_STACK_BYTES)
-        : "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25", "%x26", "%x27", "%x28",
-          "%x16", "%x17", "%x30"
+
+      : "%x16", "%x17", /* Exclude %r18 (platform/temporary register) */
+        "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25",
+        "%x26", "%x27", "%x28", /* Exclude %x29 (frame pointer) */
+        "%x30",
+        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14"
     );
     return r;
 }


From git at git.haskell.org  Sun Nov  1 20:54:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 20:54:00 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: rts/StgCRun.c: Add d15 to clobbered
 regs (4c0955a)
Message-ID: <20151101205400.9F8C73A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/4c0955a3a0c17061d270d6bd2444d20b0f26ebe2/ghc

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

commit 4c0955a3a0c17061d270d6bd2444d20b0f26ebe2
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Tue Oct 13 09:45:39 2015 +1100

    rts/StgCRun.c: Add d15 to clobbered regs


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

4c0955a3a0c17061d270d6bd2444d20b0f26ebe2
 rts/StgCRun.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index c9bbef0..9e80d02 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -834,7 +834,12 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
         "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25",
         "%x26", "%x27", "%x28", /* Exclude %x29 (frame pointer) */
         "%x30",
-        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14"
+        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14", "%d15"
+        /* Since all these registers listed as clobbered are being explicitly
+         * saved and restored, they should probably not be listed as
+         * clobbered. Leaving them as is for now while I debug other
+         * issues.
+         */
     );
     return r;
 }


From git at git.haskell.org  Sun Nov  1 20:54:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 20:54:03 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: Linker: WIP on supporting
 Arm64/AArch64 (00661a3)
Message-ID: <20151101205403.5F02C3A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/00661a31546722242f02995ba05f141fd38b9212/ghc

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

commit 00661a31546722242f02995ba05f141fd38b9212
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Fri Oct 23 14:35:20 2015 +1100

    Linker: WIP on supporting Arm64/AArch64


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

00661a31546722242f02995ba05f141fd38b9212
 rts/Linker.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index cd94561..9e03d59 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -3952,16 +3952,24 @@ ocRunInit_PEi386 ( ObjectCode *oc )
 #define FALSE 0
 #define TRUE  1
 
-#if defined(sparc_HOST_ARCH)
+#if sparc_HOST_ARCH
 #  define ELF_TARGET_SPARC  /* Used inside <elf.h> */
-#elif defined(i386_HOST_ARCH)
+#elif i386_HOST_ARCH
 #  define ELF_TARGET_386    /* Used inside <elf.h> */
-#elif defined(x86_64_HOST_ARCH)
+#elif x86_64_HOST_ARCH
 #  define ELF_TARGET_X64_64
 #  define ELF_64BIT
 #  define ELF_TARGET_AMD64 /* Used inside <elf.h> on Solaris 11 */
-#elif defined(powerpc64_HOST_ARCH)
+#elif powerpc64_HOST_ARCH
+#  define ELF_64BIT
+#elif aarch64_HOST_ARCH
 #  define ELF_64BIT
+#elif (arm_HOST_ARCH || arm_HOST_ARCH_PRE_ARMv7 || arm_HOST_ARCH_PRE_ARMv7 \
+		|| powerpc_HOST_ARCH)
+   /* Nothing here */
+#else
+	/* Need this so that new architectures get a compile error. */
+# error "Unknown HOST_ARCH"
 #endif
 
 #if !defined(openbsd_HOST_OS)
@@ -4287,6 +4295,10 @@ ocVerifyImage_ELF ( ObjectCode* oc )
 #elif defined(EM_AMD64)
       case EM_AMD64: IF_DEBUG(linker,debugBelch( "amd64" )); break;
 #endif
+#ifdef EM_AARCH64
+      case EM_AARCH64: IF_DEBUG(linker,debugBelch( "aarch64" )); break;
+#endif
+
       default:       IF_DEBUG(linker,debugBelch( "unknown" ));
                      errorBelch("%s: unknown architecture (e_machine == %d)"
                                 , oc->fileName, ehdr->e_machine);
@@ -5073,7 +5085,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
    int strtab_shndx = shdr[symtab_shndx].sh_link;
    int target_shndx = shdr[shnum].sh_info;
    Elf_Word* shndx_table = get_shndx_table((Elf_Ehdr*)ehdrC);
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(aarch64_HOST_ARCH)
    /* This #ifdef only serves to avoid unused-var warnings. */
    Elf_Addr targ = (Elf_Addr) oc->sections[target_shndx].start;
 #endif
@@ -5091,7 +5103,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
    }
 
    for (j = 0; j < nent; j++) {
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(aarch64_HOST_ARCH)
       /* This #ifdef only serves to avoid unused-var warnings. */
       Elf_Addr  offset = rtab[j].r_offset;
       Elf_Addr  P      = targ + offset;
@@ -5394,12 +5406,55 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
       }
 #endif
 
+	case R_AARCH64_ABS64:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ABS64");
+          *(Elf64_Xword *)P = S + A;
+          break;
+
+	case R_AARCH64_ADR_PREL_PG_HI21:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ADR_PREL_PG_HI21");
+          {
+            uint64_t final_address = (uint64_t) rtab + rtab[j].r_offset ;
+            // Operation: Page(S+A) - Page(P)
+            uint64_t result = ((S + A) & ~0xfffULL) - (final_address & ~0xfffULL);
+
+printf ("ehdrC: %p\nrtab : %p\n\n", ehdrC, rtab) ;
+
+printf ("rtab 0x%lx + 0x%lx -> 0x%lx\n", (uint64_t) rtab, (uint64_t) rtab[j].r_offset, final_address) ;
+printf ("S 0x%lx + A 0x%lx : 0x%lx\n", S, A, S + A) ;
+printf ("result 0x%lx\n", result) ;
+
+            // Check that -2^32 <= X < 2^32
+            if (result >> 32)
+                 barf ("%s: overflow check failed for relocation", oc->fileName);
+
+            *(Elf64_Xword *)P &= 0x9f00001fU;
+            // Immediate goes in bits 30:29 + 5:23 of ADRP instruction, taken
+            // from bits 32:12 of X.
+            *(Elf64_Xword *)P |= ((result & 0x3000U) << (29 - 12));
+            *(Elf64_Xword *)P |= ((result & 0x1ffffc000ULL) >> (14 - 5));
+          }
+          break;
+
+	case R_AARCH64_CALL26:
+	case R_AARCH64_JUMP26:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_CALL26/JUMP64");
+          {
+              // These two are handled in the same way.
+          }
+          break;
+
+	case R_AARCH64_ADD_ABS_LO12_NC:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ADD_ABS_LO12_NC");
+          {
+          }
+          break;
+
          default:
             errorBelch("%s: unhandled ELF relocation(RelA) type %" FMT_Word "\n",
                   oc->fileName, (W_)ELF_R_TYPE(info));
             return 0;
       }
-
    }
    return 1;
 }


From git at git.haskell.org  Sun Nov  1 20:54:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 20:54:06 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd's head updated: Linker: WIP on
 supporting Arm64/AArch64 (00661a3)
Message-ID: <20151101205406.12DC63A300@ghc.haskell.org>

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

Branch 'wip/aarch64-regd' now includes:

     fdb08e2 Add testcase for #10426
     0afba67 arclint: ReST doesn't need ArcanistMergeConflictLinter
     fd63ea5 base: Note platform dependence of registerFd
     7dae074 Verify minimum required version of sphinx-build
     67284a0 gitignore: Ignore sphinx doctrees directories
     2866dfb Fix broken .arclint
     4e40340 Support more sphinx-build versions in configure script
     ec14392 typo in comments: s/selectg/select/
     798d2e2 configure.ac: Fix autotool warnings
     7aea0cf use Proxy instead of undefined -- we already dropped support for 7.6
     ca12c24 Update example GHCi startup
     abc214b rts/Linker.c:  Split RTS symbols out into separate file
     3ed4b80 rts/Linker.c: Convert #if/#else to if/else
     898f34c rts/RtsSymbols.c: Fix Windows build
     43751b2 Provide a utility to check API Annotations
     c2fab84 Add testcase for #10370
     86e5eb9 Remove redundant typedef
     0b79aa1 base: Add Haddocks to GHC.RTS.Flags
     73c273a Fix a typo in the User's Guide ReST intro
     23e344b Remove cygwin32_HOST_OS #ifdefs
     499ce29 Add flag to reverse errors in GHC/GHCi
     a9c93bd Implement MIN_VERSION and VERSION macros natively in GHC.
     c10c01c Build system: comments only [skip ci]
     f86fb5e Add regression tests for #10045, #10999
     6831815 Comments only
     0ce858e Zonk properly when checkig pattern synonyms
     adc3d17 manpage: Mark as orphan document
     d1d8704 Use correct documentation flag for freverse-errors
     158d2a9 Make it possible to have different UniqSupply strategies
     079dd12 Fix "Use correct documentation flag for freverse-errors"
     dc13467 DynFlags: Fix more merge errors
     ffcdd84 Sort field labels before fingerprint hashing
     166c597 DynFlags: Yet one more fix
     31704ad Make worker-wrapper optional
     9efa56d Fix the DYNAMIC_GHC_PROGRAMS=NO build on Mac/Windows
     19354fb Make T10970a non-dependent on GCC version.
     7c2ab6f Testsuite: accept output for T10999 (#10999)
     d1ab6fc PrelNames: Fix duplicate unique
     9fc2d77 Build system: don't add ALL_HC_OPTS when linking
     04b0a73 Pattern synonyms: swap provided/required
     de27bed Update haskeline/terminfo submodules
     c1e1584 Update `deepseq` submodule
     776d55c rts/Linker.c: Drop support for legacy OS X dyn loading
     ce2416b Fix rts/T9579 tests on OS X
     08f5c4e Backpack documentation updates for component IDs [no-ci]
     032be43 Testsuite: report and error out on unfound tests
     a051788 Revert "Build system: don't add ALL_HC_OPTS when linking"
     2a74a64 Record pattern synonyms
     fa58731 Revert "Build system: don't create mk/are-validating.mk"
     e31113f Move mkDefaultMethodIds, mkRecSelBinds from TcTyClsDecls to TcTyDecls
     d25fa86 TcTyDecls: Remove redundant import of Applicative
     40e6214 DynFlags: Add (another) missing hunk from D1360
     bef2f03 Generate Typeable info at definition sites
     bbaf76f Revert "Generate Typeable info at definition sites"
     e272ab9 x86 codegen: don't generate location comments
     8ddf417 Linker: Fix type in m32_free_internal
     9b3a058 Swap prov/req in variable naming in Parser.y
     9376249 Fix unused-import stuff in a better way
     3e94842 Record usage information using GlobalRdrElt
     da58d15 Kill redundant import
     268aa9a integerConstantFolding: when(compiler_debugged(), expect_broken(#11006))
     0a16374 Disambiguate record selectors by type signature
     1f1c7c6 Build system: rename runghc.hs to Main.hs
     b05ab1a Build system: cleanup a few .cabal files
     314395e Build system: cabalise deriveConstants + genprimopcode
     2624298 Fix segfault due to reading non-existent memory
     42e8528 CmmParse: Expose popcnt operations
     3e2c227 Linker: Clean up USE_MMAP usage
     1c80db5 Insert an empty line between two STG definitions in dump output.
     56f9ef4 Unify: Add Outputable instance for UnifyResultM
     aa289d2 Move win32 tarball download logic to script
     f78b477 driver: use PROGBITS type for .debug-ghc-link-info section
     59e728b Testsuite: suggest quoting $(TEST_HC)
     91c6b1f Generate Typeable info at definition sites
     39b71e8 Reimplement shadowing on a per database basis.
     f5974c8 rts: Make MBLOCK_SPACE_SIZE dynamic
     fce758c Add failing test for #11039
     a5cb27f Make type-class dictionary let binds deterministic
     e03e22c testsuite: performGC requires SMP support for 'qg' option
     d9d201c testsuite: 'threaded2' tests require '-N' RTS option support
     e0071c3 unreg: handle CmmStack in C codegen (unbreaks '-g')
     8995865 Update primitive/vector submodules
     62f0fbc Update parallel submodule
     8160f42 Add subWordC# on x86ish
     7a48e6c Make ghc-cabal's `System.Directory` import more robust
     6bef55c Fix documentation build on windows
     e2a78ee Signals: Ensure libdw session is freed
     8f02baa Remove Data.List.NonEmpty.{words,unwords,lines,unlines}
     bc7cc25 disable large address space on OpenBSD
     da1a8da llvmGen: Fix build with Clang
     8fd5cff llvmGen: Really fix build with Clang
     3021cc0 Add rts/Linker support for more than 64k sections
     31bcf9b Apply WERROR only to stage2 HC options
     c3b0215 Provide a utility to check API Annotations docs
     4ad2a8f rts/posix: Reduce heap allocation amount on mmap failure
     c8e866a Enforce linkage with pthread library on OpenBSD
     184dfce Linker: More uint64_t to uintptr_t fixes
     9f0ecb4 ghc-prim: Fix hs_ctz64 for powerpc
     62e1b35 Update array/stm/hpc/haddock submodules
     d2a7fb9 Update directory submodule
     12abc77 Update filepath submodule
     de8443c Update process submodule
     3238ef7 Update unix submodule
     32f92a3 Update hoopl submodule
     f8ba4b5 Bump `base` version to 4.9.0.0 (closes #11026)
     4b8b934 ghc-prim: add API delta as changelog (re #11043)
     84bf1eb Bump ghc-prim version to 0.5.0.0 (closes #11043)
     f16827f ApiAnnotations: BooleanFormula is not properly Located
     5a48180 keepCAFsForGHCi was broken
     677d768 DynFlags: -freverse-errors should be defFlag
     3431ad6 Update Cabal submodule
     6fb0ba6 Dwarf: Preserve stack pointer register
     76611d7 Dwarf.Types: Fix comment style
     159a1a2 cmm: Expose machine's stack and return address register
     d9f8862 StgStartup: Setup unwinding for stg_stop_thread
     bb446b2 Libdw: Remove special treatment for stg_stop_thread
     b8df858 Dwarf.Constants: Introduce Haddock sections
     52c6e3d Libdw: Fix symbol naming
     e9bfb3f Minor simplification in unariser pass:
     65f3c4c Change sphinx for documentation building on windows to the python3 version
     f46f32b EventLog: Loop fwrite if necessary during flush
     18fcc51 rts: Fix clobbered regs list for aarch64 StgRun
     c1c333a configure.ac: AArch64 is now registerised
     c8d42fe Implement AArch64 codegen in `mkJumpToAddr` (for GHCi).
     4c0955a rts/StgCRun.c: Add d15 to clobbered regs
     00661a3 Linker: WIP on supporting Arm64/AArch64

From git at git.haskell.org  Sun Nov  1 21:53:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  1 Nov 2015 21:53:29 +0000 (UTC)
Subject: [commit: ghc] master: rts: Produce stack trace on fatal error
 (9fe5497)
Message-ID: <20151101215329.D92E73A300@ghc.haskell.org>

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

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

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

commit 9fe5497e26902139522b19be81d36ad178a6d611
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Nov 1 22:53:17 2015 +0100

    rts: Produce stack trace on fatal error
    
    Test Plan: Validate
    
    Reviewers: austin, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: simonmar, thomie, scpmw
    
    Differential Revision: https://phabricator.haskell.org/D1418


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

9fe5497e26902139522b19be81d36ad178a6d611
 rts/RtsMessages.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/rts/RtsMessages.c b/rts/RtsMessages.c
index c74e338..0440669 100644
--- a/rts/RtsMessages.c
+++ b/rts/RtsMessages.c
@@ -11,6 +11,10 @@
 
 #include "eventlog/EventLog.h"
 
+#if USE_LIBDW
+#include <Libdw.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -157,6 +161,14 @@ rtsFatalInternalErrorFn(const char *s, va_list ap)
        fprintf(stderr, "internal error: ");
      }
      vfprintf(stderr, s, ap);
+#if USE_LIBDW
+     fprintf(stderr, "\n");
+     fprintf(stderr, "Stack trace:");
+     LibdwSession *session = libdwInit();
+     Backtrace *bt = libdwGetBacktrace(session);
+     libdwPrintBacktrace(session, stderr, bt);
+     libdwFree(session);
+#endif
      fprintf(stderr, "\n");
      fprintf(stderr, "    (GHC version %s for %s)\n", ProjectVersion, xstr(HostPlatform_TYPE));
      fprintf(stderr, "    Please report this as a GHC bug:  http://www.haskell.org/ghc/reportabug\n");


From git at git.haskell.org  Mon Nov  2 06:23:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:09 +0000 (UTC)
Subject: [commit: packages/process] branch 'new-flags' created
Message-ID: <20151102062309.0E38E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

New branch : new-flags
Referencing: 52cad6528a01b7cca011ac1c4ef7d33b1f500532

From git at git.haskell.org  Mon Nov  2 06:23:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:11 +0000 (UTC)
Subject: [commit: packages/process] branch 'new-flags-no-f3df9d6' created
Message-ID: <20151102062311.0EFA73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

New branch : new-flags-no-f3df9d6
Referencing: 0ad09da8e194369e4704b46a1865bbbb2cba2cfb

From git at git.haskell.org  Mon Nov  2 06:23:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:13 +0000 (UTC)
Subject: [commit: packages/process] tag 'v1.4.0.0' created
Message-ID: <20151102062313.0F2303A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

New tag    : v1.4.0.0
Referencing: b99363824e0161b925fbfab61cde98d8a44535d5

From git at git.haskell.org  Mon Nov  2 06:23:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:15 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: add StdStream(NoStream) to have standard
 handles closed (a53e02f)
Message-ID: <20151102062315.167253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/a53e02fc9b847d54d19bbd035d4d84e8574e6409/process

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

commit a53e02fc9b847d54d19bbd035d4d84e8574e6409
Author: Vladimir Kirillov <proger at wilab.org.ua>
Date:   Wed Dec 31 17:24:17 2014 +0200

    add StdStream(NoStream) to have standard handles closed


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

a53e02fc9b847d54d19bbd035d4d84e8574e6409
 System/Process/Internals.hs |  2 ++
 cbits/runProcess.c          | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 90651d0..5ad4a47 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -223,6 +223,7 @@ data StdStream
                              -- @Handle@ will use the default encoding
                              -- and newline translation mode (just
                              -- like @Handle at s created by @openFile@).
+  | NoStream                 -- ^ No stream handle will be passed
 
 -- | This function is almost identical to
 -- 'System.Process.createProcess'. The only differences are:
@@ -491,6 +492,7 @@ fd_stderr = 2
 mbFd :: String -> FD -> StdStream -> IO FD
 mbFd _   _std CreatePipe      = return (-1)
 mbFd _fun std Inherit         = return std
+mbFd _fn _std NoStream        = return (-2)
 mbFd fun _std (UseHandle hdl) =
   withHandle fun hdl $ \Handle__{haDevice=dev,..} ->
     case cast dev of
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index 90bc2c9..c77d6e8 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -162,6 +162,8 @@ runInteractiveProcess (char *const args[],
                 close(fdStdInput[0]);
             }
             close(fdStdInput[1]);
+        } else if (fdStdIn == -2) {
+            close(STDIN_FILENO);
         } else {
             dup2(fdStdIn,  STDIN_FILENO);
         }
@@ -172,6 +174,8 @@ runInteractiveProcess (char *const args[],
                 close(fdStdOutput[1]);
             }
             close(fdStdOutput[0]);
+        } else if (fdStdOut == -2) {
+            close(STDOUT_FILENO);
         } else {
             dup2(fdStdOut,  STDOUT_FILENO);
         }
@@ -182,6 +186,8 @@ runInteractiveProcess (char *const args[],
                 close(fdStdError[1]);
             }
             close(fdStdError[0]);
+        } else if (fdStdErr == -2) {
+            close(STDERR_FILENO);
         } else {
             dup2(fdStdErr,  STDERR_FILENO);
         }
@@ -474,6 +480,8 @@ runInteractiveProcess (wchar_t *cmd, wchar_t *workingDirectory,
         if (!mkAnonPipe(&hStdInputRead,  TRUE, &hStdInputWrite,  FALSE))
             goto cleanup_err;
         sInfo.hStdInput = hStdInputRead;
+    } else if (fdStdIn == -2) {
+        sInfo.hStdInput = NULL;
     } else if (fdStdIn == 0) {
         // Don't duplicate stdin, as console handles cannot be
         // duplicated and inherited. urg.
@@ -494,6 +502,8 @@ runInteractiveProcess (wchar_t *cmd, wchar_t *workingDirectory,
         if (!mkAnonPipe(&hStdOutputRead,  FALSE, &hStdOutputWrite,  TRUE))
             goto cleanup_err;
         sInfo.hStdOutput = hStdOutputWrite;
+    } else if (fdStdOut == -2) {
+        sInfo.hStdOutput = NULL;
     } else if (fdStdOut == 1) {
         // Don't duplicate stdout, as console handles cannot be
         // duplicated and inherited. urg.
@@ -514,6 +524,8 @@ runInteractiveProcess (wchar_t *cmd, wchar_t *workingDirectory,
         if (!mkAnonPipe(&hStdErrorRead,  TRUE, &hStdErrorWrite,  TRUE))
             goto cleanup_err;
         sInfo.hStdError = hStdErrorWrite;
+    } else if (fdStdErr == -2) {
+        sInfo.hStdError = NULL;
     } else if (fdStdErr == 2) {
         // Don't duplicate stderr, as console handles cannot be
         // duplicated and inherited. urg.


From git at git.haskell.org  Mon Nov  2 06:23:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:17 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Fix broken link for "Parsing C Command-Line
 Arguments" (751d46a)
Message-ID: <20151102062317.1CA973A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/751d46a2f33d3ff43ab52b3b4d9dc92bd7f3e3b6/process

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

commit 751d46a2f33d3ff43ab52b3b4d9dc92bd7f3e3b6
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon May 18 23:11:07 2015 -0400

    Fix broken link for "Parsing C Command-Line Arguments"


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

751d46a2f33d3ff43ab52b3b4d9dc92bd7f3e3b6
 System/Process/Internals.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 9d2be0a..36265d4 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -634,7 +634,7 @@ passing a single command-line string (lpCommandLine) as its argument.
         traditional argument vector argv[0], argv[1], etc.  It does this
         using a complex and arcane set of rules which are described here:
 
-           http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccelng/htm/progs_12.asp
+           https://msdn.microsoft.com/en-us/library/a1y7w461.aspx
 
         (if this URL stops working, you might be able to find it by
         searching for "Parsing C Command-Line Arguments" on MSDN.  Also,


From git at git.haskell.org  Mon Nov  2 06:23:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:19 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Merge pull request #31 from Rufflewind/master
 (2c58983)
Message-ID: <20151102062319.226C83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/2c589831c1f0056b5b2ab923922421f3291f62fe/process

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

commit 2c589831c1f0056b5b2ab923922421f3291f62fe
Merge: 67efaf5 751d46a
Author: Michael Snoyman <michael at snoyman.com>
Date:   Tue May 19 06:43:57 2015 +0300

    Merge pull request #31 from Rufflewind/master
    
    Fix broken link for "Parsing C Command-Line Arguments"



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

2c589831c1f0056b5b2ab923922421f3291f62fe
 System/Process/Internals.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Mon Nov  2 06:23:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:21 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: (WIP,
 windows) allow DETACHED_PROCESS and CREATE_NO_WINDOW flags (3331eb5)
Message-ID: <20151102062321.28FD83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/3331eb574dcf3cedb34b1c665551e7ae37ac42c5/process

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

commit 3331eb574dcf3cedb34b1c665551e7ae37ac42c5
Author: Daniel Brooks <db48x at db48x.net>
Date:   Tue May 26 17:12:50 2015 -0700

    (WIP, windows) allow DETACHED_PROCESS and CREATE_NO_WINDOW flags
    
    not yet tested, needs comments on the new CreateProcess fields


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

3331eb574dcf3cedb34b1c665551e7ae37ac42c5
 System/Process.hsc          |  8 ++++++--
 System/Process/Internals.hs | 20 +++++++++++++++-----
 cbits/runProcess.c          |  6 ++++++
 include/processFlags.h      |  6 ++++--
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 32ad6af..9c36cce 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -124,7 +124,9 @@ proc cmd args = CreateProcess { cmdspec = RawCommand cmd args,
                                 std_err = Inherit,
                                 close_fds = False,
                                 create_group = False,
-                                delegate_ctlc = False}
+                                delegate_ctlc = False,
+                                without_window = False,
+                                run_detached = False }
 
 -- | Construct a 'CreateProcess' record for passing to 'createProcess',
 -- representing a command to be passed to the shell.
@@ -137,7 +139,9 @@ shell str = CreateProcess { cmdspec = ShellCommand str,
                             std_err = Inherit,
                             close_fds = False,
                             create_group = False,
-                            delegate_ctlc = False}
+                            delegate_ctlc = False,
+                            without_window = False,
+                            run_detached = False }
 
 {- |
 This is the most general way to spawn an external process.  The
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 36265d4..85f4118 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -177,11 +177,13 @@ data CreateProcess = CreateProcess{
   std_err      :: StdStream,               -- ^ How to determine stderr
   close_fds    :: Bool,                    -- ^ Close all file descriptors except stdin, stdout and stderr in the new process (on Windows, only works if std_in, std_out, and std_err are all Inherit)
   create_group :: Bool,                    -- ^ Create a new process group
-  delegate_ctlc:: Bool                     -- ^ Delegate control-C handling. Use this for interactive console processes to let them handle control-C themselves (see below for details).
+  delegate_ctlc:: Bool,                    -- ^ Delegate control-C handling. Use this for interactive console processes to let them handle control-C themselves (see below for details).
                                            --
                                            --   On Windows this has no effect.
                                            --
                                            --   /Since: 1.2.0.0/
+  without_window :: Bool,
+  run_detached   :: Bool
  }
 
 data CmdSpec
@@ -258,7 +260,9 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   std_err = mb_stderr,
                                   close_fds = mb_close_fds,
                                   create_group = mb_create_group,
-                                  delegate_ctlc = mb_delegate_ctlc }
+                                  delegate_ctlc = mb_delegate_ctlc,
+                                  without_window = mb_without_window,
+                                  run_detached = mb_run_detached }
  = do
   let (cmd,args) = commandToProcess cmdsp
   withFilePathException cmd $
@@ -288,7 +292,9 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 pfdStdInput pfdStdOutput pfdStdError
                                 (if mb_delegate_ctlc then 1 else 0)
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
-                                .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0))
+                                .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
+                                .|.(if mb_without_window then RUN_PROCESS_WITHOUT_WINDOW else 0)
+                                .|.(if mb_run_detached then RUN_PROCESS_DETACHED else 0))
                                 pFailedDoing
 
      when (proc_handle == -1) $ do
@@ -419,7 +425,9 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   std_err = mb_stderr,
                                   close_fds = mb_close_fds,
                                   create_group = mb_create_group,
-                                  delegate_ctlc = _ignored }
+                                  delegate_ctlc = _ignored,
+                                  without_window = mb_without_window,
+                                  run_detached = mb_run_detached }
  = do
   (cmd, cmdline) <- commandToProcess cmdsp
   withFilePathException cmd $
@@ -450,7 +458,9 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 fdin fdout fderr
                                 pfdStdInput pfdStdOutput pfdStdError
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
-                                .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0))
+                                .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
+                                .|.(if mb_without_window then RUN_PROCESS_WITHOUT_WINDOW else 0)
+                                .|.(if mb_run_detached then RUN_PROCESS_DETACHED else 0))
 
      hndStdInput  <- mbPipe mb_stdin  pfdStdInput  WriteMode
      hndStdOutput <- mbPipe mb_stdout pfdStdOutput ReadMode
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index f7828af..c0fd80f 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -553,6 +553,12 @@ runInteractiveProcess (wchar_t *cmd, wchar_t *workingDirectory,
     if ((flags & RUN_PROCESS_IN_NEW_GROUP) != 0) {
         dwFlags |= CREATE_NEW_PROCESS_GROUP;
     }
+    if ((flags & RUN_PROCESS_WITHOUT_WINDOW) != 0) {
+        dwFlags |= CREATE_NO_WINDOW;
+    }
+    if ((flags & RUN_PROCESS_DETACHED) != 0) {
+        dwFlags |= DETACHED_PROCESS;
+    }
 
     if (!CreateProcess(NULL, cmd, NULL, NULL, inherit, dwFlags, environment, workingDirectory, &sInfo, &pInfo))
     {
diff --git a/include/processFlags.h b/include/processFlags.h
index 06d598d..29acf97 100644
--- a/include/processFlags.h
+++ b/include/processFlags.h
@@ -4,5 +4,7 @@
    Flags used in runProcess.c and for System.Process.Internals
    ------------------------------------------------------------------------- */
 
-#define RUN_PROCESS_IN_CLOSE_FDS 0x1
-#define RUN_PROCESS_IN_NEW_GROUP 0x2
+#define RUN_PROCESS_IN_CLOSE_FDS   0x1
+#define RUN_PROCESS_IN_NEW_GROUP   0x2
+#define RUN_PROCESS_WITHOUT_WINDOW 0x4
+#define RUN_PROCESS_DETACHED       0x8


From git at git.haskell.org  Mon Nov  2 06:23:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:23 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: (WIP,
 posix) implement DETACHED_PROCESS using setsid(2) (f4fe233)
Message-ID: <20151102062323.2FD793A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/f4fe2332fe467b72b7341b9fa820a663e5c24e60/process

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

commit f4fe2332fe467b72b7341b9fa820a663e5c24e60
Author: Daniel Brooks <db48x at db48x.net>
Date:   Tue May 26 22:02:40 2015 -0700

    (WIP, posix) implement DETACHED_PROCESS using setsid(2)


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

f4fe2332fe467b72b7341b9fa820a663e5c24e60
 cbits/runProcess.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index c0fd80f..618b13e 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -217,6 +217,10 @@ runInteractiveProcess (char *const args[],
             (void)sigaction(SIGQUIT, &dfl, NULL);
         }
 
+        if ((flags & RUN_PROCESS_DETACHED)) {
+          setsid();
+        }
+
         /* the child */
         if (environment) {
             // XXX Check result


From git at git.haskell.org  Mon Nov  2 06:23:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:25 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: add detach_console flag (908c678)
Message-ID: <20151102062325.36DDE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/908c678945b65c71262e8b599b24145c91fcb79f/process

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

commit 908c678945b65c71262e8b599b24145c91fcb79f
Author: Joey Hess <joeyh at joeyh.name>
Date:   Wed May 27 14:20:00 2015 -0400

    add detach_console flag
    
    Based on Daniel Brooks's changes, but without adding a new flag
    for CREATE_NO_WINDOW, which turned out to not be necessary.
    And, on unix, setsid is called.
    
    Tested on Linux and Windows.
    
    Fixes #32.


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

908c678945b65c71262e8b599b24145c91fcb79f
 System/Process.hsc          |  6 ++++--
 System/Process/Internals.hs | 19 ++++++++++++++-----
 cbits/runProcess.c          |  6 ++++++
 include/processFlags.h      |  1 +
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 32ad6af..419f9f9 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -124,7 +124,8 @@ proc cmd args = CreateProcess { cmdspec = RawCommand cmd args,
                                 std_err = Inherit,
                                 close_fds = False,
                                 create_group = False,
-                                delegate_ctlc = False}
+                                delegate_ctlc = False,
+                                detach_console = False }
 
 -- | Construct a 'CreateProcess' record for passing to 'createProcess',
 -- representing a command to be passed to the shell.
@@ -137,7 +138,8 @@ shell str = CreateProcess { cmdspec = ShellCommand str,
                             std_err = Inherit,
                             close_fds = False,
                             create_group = False,
-                            delegate_ctlc = False}
+                            delegate_ctlc = False,
+                            detach_console = False }
 
 {- |
 This is the most general way to spawn an external process.  The
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 36265d4..152edd7 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -177,11 +177,16 @@ data CreateProcess = CreateProcess{
   std_err      :: StdStream,               -- ^ How to determine stderr
   close_fds    :: Bool,                    -- ^ Close all file descriptors except stdin, stdout and stderr in the new process (on Windows, only works if std_in, std_out, and std_err are all Inherit)
   create_group :: Bool,                    -- ^ Create a new process group
-  delegate_ctlc:: Bool                     -- ^ Delegate control-C handling. Use this for interactive console processes to let them handle control-C themselves (see below for details).
+  delegate_ctlc:: Bool,                    -- ^ Delegate control-C handling. Use this for interactive console processes to let them handle control-C themselves (see below for details).
                                            --
                                            --   On Windows this has no effect.
                                            --
                                            --   /Since: 1.2.0.0/
+  detach_console :: Bool                   -- ^ Detach the process from the console, so it has no controlling terminal.
+                                           --
+                                           --   On Unix, this uses setsid, while on Windows, it uses DETACHED_PROCESS.
+                                           --
+                                           --   /Since: 1.3.0.0/
  }
 
 data CmdSpec
@@ -258,7 +263,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   std_err = mb_stderr,
                                   close_fds = mb_close_fds,
                                   create_group = mb_create_group,
-                                  delegate_ctlc = mb_delegate_ctlc }
+                                  delegate_ctlc = mb_delegate_ctlc,
+                                  detach_console = mb_detach_console }
  = do
   let (cmd,args) = commandToProcess cmdsp
   withFilePathException cmd $
@@ -288,7 +294,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 pfdStdInput pfdStdOutput pfdStdError
                                 (if mb_delegate_ctlc then 1 else 0)
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
-                                .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0))
+                                .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
+                                .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0))
                                 pFailedDoing
 
      when (proc_handle == -1) $ do
@@ -419,7 +426,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   std_err = mb_stderr,
                                   close_fds = mb_close_fds,
                                   create_group = mb_create_group,
-                                  delegate_ctlc = _ignored }
+                                  delegate_ctlc = _ignored,
+                                  detach_console = mb_detach_console }
  = do
   (cmd, cmdline) <- commandToProcess cmdsp
   withFilePathException cmd $
@@ -450,7 +458,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 fdin fdout fderr
                                 pfdStdInput pfdStdOutput pfdStdError
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
-                                .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0))
+                                .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
+                                .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0))
 
      hndStdInput  <- mbPipe mb_stdin  pfdStdInput  WriteMode
      hndStdOutput <- mbPipe mb_stdout pfdStdOutput ReadMode
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index f7828af..7ca6be8 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -138,6 +138,9 @@ runInteractiveProcess (char *const args[],
         close(forkCommunicationFds[0]);
         fcntl(forkCommunicationFds[1], F_SETFD, FD_CLOEXEC);
 
+        if ((flags & RUN_PROCESS_DETACHED) != 0) {
+            setsid();
+        }
         if ((flags & RUN_PROCESS_IN_NEW_GROUP) != 0) {
             setpgid(0, 0);
         }
@@ -553,6 +556,9 @@ runInteractiveProcess (wchar_t *cmd, wchar_t *workingDirectory,
     if ((flags & RUN_PROCESS_IN_NEW_GROUP) != 0) {
         dwFlags |= CREATE_NEW_PROCESS_GROUP;
     }
+    if ((flags & RUN_PROCESS_DETACHED) != 0) {
+        dwFlags |= DETACHED_PROCESS;
+    }
 
     if (!CreateProcess(NULL, cmd, NULL, NULL, inherit, dwFlags, environment, workingDirectory, &sInfo, &pInfo))
     {
diff --git a/include/processFlags.h b/include/processFlags.h
index 06d598d..3b984d3 100644
--- a/include/processFlags.h
+++ b/include/processFlags.h
@@ -6,3 +6,4 @@
 
 #define RUN_PROCESS_IN_CLOSE_FDS 0x1
 #define RUN_PROCESS_IN_NEW_GROUP 0x2
+#define RUN_PROCESS_DETACHED     0x4


From git at git.haskell.org  Mon Nov  2 06:23:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:27 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Windows: delete redundant import in
 System/Process.hsc (7162555)
Message-ID: <20151102062327.3DB5C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/7162555febc7b8e1f60958c3c3864a40fdadc21c/process

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

commit 7162555febc7b8e1f60958c3c3864a40fdadc21c
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Jun 11 00:44:42 2015 +0200

    Windows: delete redundant import in System/Process.hsc
    
    Building GHC on Windows shows the following warning:
    
      libraries/process/System/Process.hsc:94:1: warning:
          The import of ?Foreign.C.Types? is redundant
            except perhaps to import instances from ?Foreign.C.Types?
          To import instances alone, use: import Foreign.C.Types()


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

7162555febc7b8e1f60958c3c3864a40fdadc21c
 System/Process.hsc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 32ad6af..953732b 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -91,7 +91,6 @@ import System.IO.Error (mkIOError, ioeSetErrorString)
 # include <io.h>        /* for _close and _pipe */
 # include <fcntl.h>     /* for _O_BINARY */
 import Control.Exception (onException)
-import Foreign.C.Types (CInt(..), CUInt(..))
 #else
 import System.Posix.Process (getProcessGroupIDOf)
 import qualified System.Posix.IO as Posix


From git at git.haskell.org  Mon Nov  2 06:23:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:29 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Merge pull request #34 from thomie/master
 (e0983fb)
Message-ID: <20151102062329.444DF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/e0983fbbfa8a3d81c7b99e83a3169fc686caab62/process

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

commit e0983fbbfa8a3d81c7b99e83a3169fc686caab62
Merge: 2c58983 7162555
Author: Michael Snoyman <michael at snoyman.com>
Date:   Thu Jun 11 07:50:48 2015 +0300

    Merge pull request #34 from thomie/master
    
    Windows: delete redundant import in System/Process.hsc



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

e0983fbbfa8a3d81c7b99e83a3169fc686caab62
 System/Process.hsc | 1 -
 1 file changed, 1 deletion(-)


From git at git.haskell.org  Mon Nov  2 06:23:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:31 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Merge pull request #13 from
 proger/stdstream-nostream (729656e)
Message-ID: <20151102062331.4D8A13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/729656e7b663644e37252b18951aafab840bfb66/process

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

commit 729656e7b663644e37252b18951aafab840bfb66
Merge: e0983fb a53e02f
Author: Michael Snoyman <michael at snoyman.com>
Date:   Sun Jun 14 14:56:16 2015 +0300

    Merge pull request #13 from proger/stdstream-nostream
    
    Add StdStream(NoStream) to have standard handles closed.



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

729656e7b663644e37252b18951aafab840bfb66
 System/Process/Internals.hs |  2 ++
 cbits/runProcess.c          | 12 ++++++++++++
 2 files changed, 14 insertions(+)



From git at git.haskell.org  Mon Nov  2 06:23:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:33 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Major version bump for #13 (bb01985)
Message-ID: <20151102062333.533D93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/bb01985dc8c787cec5e33664f6254ea03ad3fe28/process

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

commit bb01985dc8c787cec5e33664f6254ea03ad3fe28
Author: Michael Snoyman <michael at snoyman.com>
Date:   Sun Jun 14 14:57:40 2015 +0300

    Major version bump for #13


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

bb01985dc8c787cec5e33664f6254ea03ad3fe28
 changelog.md  | 4 ++++
 process.cabal | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 25f19ab..31e3ddf 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog for [`process` package](http://hackage.haskell.org/package/process)
 
+## 1.3.0.0 (unreleased)
+
+* Add StdStream(NoStream) to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)
+
 ## 1.2.3.0 *March 2015*
 
   * [Meaningful error message when exe not found on close\_fds is
diff --git a/process.cabal b/process.cabal
index 9898648..82b4d1c 100644
--- a/process.cabal
+++ b/process.cabal
@@ -1,5 +1,5 @@
 name:          process
-version:       1.2.3.0
+version:       1.3.0.0
 -- NOTE: Don't forget to update ./changelog.md
 license:       BSD3
 license-file:  LICENSE


From git at git.haskell.org  Mon Nov  2 06:23:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:35 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Merge remote-tracking branch 'db48x/detached'
 into HEAD (b153d31)
Message-ID: <20151102062335.593EF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/b153d317097dbb9f495b1b46c53a6d271caef338/process

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

commit b153d317097dbb9f495b1b46c53a6d271caef338
Merge: 908c678 f4fe233
Author: Daniel Brooks <db48x at db48x.net>
Date:   Tue Aug 18 05:43:01 2015 -0700

    Merge remote-tracking branch 'db48x/detached' into HEAD



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

b153d317097dbb9f495b1b46c53a6d271caef338


From git at git.haskell.org  Mon Nov  2 06:23:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:37 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: split the detached_console flag into two
 (58d7e5b)
Message-ID: <20151102062337.602123A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/58d7e5b92063873142231b78c456dc890660d725/process

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

commit 58d7e5b92063873142231b78c456dc890660d725
Author: Daniel Brooks <db48x at db48x.net>
Date:   Tue Aug 18 05:59:49 2015 -0700

    split the detached_console flag into two
    
    the new flag new_session is unix-only and causes it to call setsid,
    leaving detached_console to be windows only
    
    Fixes #32


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

58d7e5b92063873142231b78c456dc890660d725
 System/Process.hsc          |  6 ++++--
 System/Process/Internals.hs | 15 ++++++++++-----
 cbits/runProcess.c          |  2 +-
 include/processFlags.h      |  1 +
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 419f9f9..6c589df 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -125,7 +125,8 @@ proc cmd args = CreateProcess { cmdspec = RawCommand cmd args,
                                 close_fds = False,
                                 create_group = False,
                                 delegate_ctlc = False,
-                                detach_console = False }
+                                detach_console = False,
+                                new_session = False }
 
 -- | Construct a 'CreateProcess' record for passing to 'createProcess',
 -- representing a command to be passed to the shell.
@@ -139,7 +140,8 @@ shell str = CreateProcess { cmdspec = ShellCommand str,
                             close_fds = False,
                             create_group = False,
                             delegate_ctlc = False,
-                            detach_console = False }
+                            detach_console = False,
+                            new_session = False }
 
 {- |
 This is the most general way to spawn an external process.  The
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 152edd7..d57fc8c 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -182,9 +182,10 @@ data CreateProcess = CreateProcess{
                                            --   On Windows this has no effect.
                                            --
                                            --   /Since: 1.2.0.0/
-  detach_console :: Bool                   -- ^ Detach the process from the console, so it has no controlling terminal.
+  detach_console :: Bool,                  -- ^ Use the windows DETACHED_PROCESS flag when creating the process; does nothing on other platforms.
                                            --
-                                           --   On Unix, this uses setsid, while on Windows, it uses DETACHED_PROCESS.
+                                           --   /Since: 1.3.0.0/
+  new_session :: Bool                      -- ^ Use posix setsid to start the new process in a new session; does nothing on other platforms.
                                            --
                                            --   /Since: 1.3.0.0/
  }
@@ -264,7 +265,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   close_fds = mb_close_fds,
                                   create_group = mb_create_group,
                                   delegate_ctlc = mb_delegate_ctlc,
-                                  detach_console = mb_detach_console }
+                                  detach_console = mb_detach_console,
+                                  new_session = mb_new_session }
  = do
   let (cmd,args) = commandToProcess cmdsp
   withFilePathException cmd $
@@ -295,7 +297,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 (if mb_delegate_ctlc then 1 else 0)
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
-                                .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0))
+                                .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0)
+                                .|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
                                 pFailedDoing
 
      when (proc_handle == -1) $ do
@@ -427,7 +430,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   close_fds = mb_close_fds,
                                   create_group = mb_create_group,
                                   delegate_ctlc = _ignored,
-                                  detach_console = mb_detach_console }
+                                  detach_console = mb_detach_console,
+                                  new_session = mb_new_session }
  = do
   (cmd, cmdline) <- commandToProcess cmdsp
   withFilePathException cmd $
@@ -460,6 +464,7 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
                                 .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0))
+                                .|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
 
      hndStdInput  <- mbPipe mb_stdin  pfdStdInput  WriteMode
      hndStdOutput <- mbPipe mb_stdout pfdStdOutput ReadMode
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index 7ca6be8..0c09419 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -138,7 +138,7 @@ runInteractiveProcess (char *const args[],
         close(forkCommunicationFds[0]);
         fcntl(forkCommunicationFds[1], F_SETFD, FD_CLOEXEC);
 
-        if ((flags & RUN_PROCESS_DETACHED) != 0) {
+        if ((flags & RUN_PROCESS_NEW_SESSION) != 0) {
             setsid();
         }
         if ((flags & RUN_PROCESS_IN_NEW_GROUP) != 0) {
diff --git a/include/processFlags.h b/include/processFlags.h
index 3b984d3..9de6a10 100644
--- a/include/processFlags.h
+++ b/include/processFlags.h
@@ -7,3 +7,4 @@
 #define RUN_PROCESS_IN_CLOSE_FDS 0x1
 #define RUN_PROCESS_IN_NEW_GROUP 0x2
 #define RUN_PROCESS_DETACHED     0x4
+#define RUN_PROCESS_NEW_SESSION  0x8


From git at git.haskell.org  Mon Nov  2 06:23:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:39 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Merge remote-tracking branch 'haskell/master'
 into HEAD (9a4983b)
Message-ID: <20151102062339.684333A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/9a4983bdd82bf131644e234431203a2c34881eaa/process

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

commit 9a4983bdd82bf131644e234431203a2c34881eaa
Merge: 58d7e5b bb01985
Author: Daniel Brooks <db48x at db48x.net>
Date:   Tue Aug 18 06:21:00 2015 -0700

    Merge remote-tracking branch 'haskell/master' into HEAD



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

9a4983bdd82bf131644e234431203a2c34881eaa
 System/Process.hsc          |  1 -
 System/Process/Internals.hs |  2 ++
 cbits/runProcess.c          | 12 ++++++++++++
 changelog.md                |  4 ++++
 process.cabal               |  2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)



From git at git.haskell.org  Mon Nov  2 06:23:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:41 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Update changelog for #32 (7368ab4)
Message-ID: <20151102062341.6ED703A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/7368ab4ff2332994eb7af9e30d72a3d0cff0f721/process

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

commit 7368ab4ff2332994eb7af9e30d72a3d0cff0f721
Author: Michael Snoyman <michael at snoyman.com>
Date:   Wed Aug 19 10:22:25 2015 +0300

    Update changelog for #32


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

7368ab4ff2332994eb7af9e30d72a3d0cff0f721
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index 31e3ddf..4b7c32f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 ## 1.3.0.0 (unreleased)
 
 * Add StdStream(NoStream) to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)
+* Support for Windows `DETACHED_PROCESS` and `setsid` [#32](https://github.com/haskell/process/issues/32)
 
 ## 1.2.3.0 *March 2015*
 


From git at git.haskell.org  Mon Nov  2 06:23:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:43 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Added GHC 7.10.2 to Travis matrix (48b9e77)
Message-ID: <20151102062343.748333A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/48b9e7707d4daf4f4725263d6990e21f7cc81dda/process

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

commit 48b9e7707d4daf4f4725263d6990e21f7cc81dda
Author: Michael Snoyman <michael at snoyman.com>
Date:   Wed Aug 19 10:23:32 2015 +0300

    Added GHC 7.10.2 to Travis matrix


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

48b9e7707d4daf4f4725263d6990e21f7cc81dda
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ee93e6f..ef55c45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ env:
  - GHCVER=7.6.3 CABALVER=1.16
  - GHCVER=7.8.4 CABALVER=1.18
  - GHCVER=7.10.1 CABALVER=1.22
+ - GHCVER=7.10.2 CABALVER=1.22
  - GHCVER=head  CABALVER=head
 
 matrix:


From git at git.haskell.org  Mon Nov  2 06:23:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:45 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Support for CREATE_NEW_CONSOLE (fixes #38)
 (f3df9d6)
Message-ID: <20151102062345.7B6553A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/f3df9d6507a2f1d4fcee0b9af784cb7e20bd0b50/process

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

commit f3df9d6507a2f1d4fcee0b9af784cb7e20bd0b50
Author: Michael Snoyman <michael at snoyman.com>
Date:   Wed Aug 19 10:31:35 2015 +0300

    Support for CREATE_NEW_CONSOLE (fixes #38)


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

f3df9d6507a2f1d4fcee0b9af784cb7e20bd0b50
 System/Process.hsc          | 2 ++
 System/Process/Internals.hs | 9 +++++++++
 cbits/runProcess.c          | 3 +++
 changelog.md                | 1 +
 include/processFlags.h      | 1 +
 5 files changed, 16 insertions(+)

diff --git a/System/Process.hsc b/System/Process.hsc
index 1d1bcd9..144daf8 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -125,6 +125,7 @@ proc cmd args = CreateProcess { cmdspec = RawCommand cmd args,
                                 create_group = False,
                                 delegate_ctlc = False,
                                 detach_console = False,
+                                create_new_console = False,
                                 new_session = False }
 
 -- | Construct a 'CreateProcess' record for passing to 'createProcess',
@@ -140,6 +141,7 @@ shell str = CreateProcess { cmdspec = ShellCommand str,
                             create_group = False,
                             delegate_ctlc = False,
                             detach_console = False,
+                            create_new_console = False,
                             new_session = False }
 
 {- |
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 65403ea..f8a02b4 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -185,6 +185,11 @@ data CreateProcess = CreateProcess{
   detach_console :: Bool,                  -- ^ Use the windows DETACHED_PROCESS flag when creating the process; does nothing on other platforms.
                                            --
                                            --   /Since: 1.3.0.0/
+  create_new_console :: Bool,              -- ^ Use the windows CREATE_NEW_CONSOLE flag when creating the process; does nothing on other platforms.
+                                           --
+                                           --   Default: @False@
+                                           --
+                                           --   /Since: 1.3.0.0/
   new_session :: Bool                      -- ^ Use posix setsid to start the new process in a new session; does nothing on other platforms.
                                            --
                                            --   /Since: 1.3.0.0/
@@ -267,6 +272,7 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   create_group = mb_create_group,
                                   delegate_ctlc = mb_delegate_ctlc,
                                   detach_console = mb_detach_console,
+                                  create_new_console = mb_create_new_console,
                                   new_session = mb_new_session }
  = do
   let (cmd,args) = commandToProcess cmdsp
@@ -299,6 +305,7 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
                                 .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0)
+                                .|.(if mb_create_new_console then RUN_PROCESS_NEW_CONSOLE else 0)
                                 .|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
                                 pFailedDoing
 
@@ -432,6 +439,7 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   create_group = mb_create_group,
                                   delegate_ctlc = _ignored,
                                   detach_console = mb_detach_console,
+                                  create_new_console = mb_create_new_console,
                                   new_session = mb_new_session }
  = do
   (cmd, cmdline) <- commandToProcess cmdsp
@@ -465,6 +473,7 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
                                 .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0))
+                                .|.(if mb_create_new_console then RUN_PROCESS_NEW_CONSOLE else 0))
                                 .|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
 
      hndStdInput  <- mbPipe mb_stdin  pfdStdInput  WriteMode
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index 61fdd58..8019605 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -571,6 +571,9 @@ runInteractiveProcess (wchar_t *cmd, wchar_t *workingDirectory,
     if ((flags & RUN_PROCESS_DETACHED) != 0) {
         dwFlags |= DETACHED_PROCESS;
     }
+    if ((flags & RUN_PROCESS_NEW_CONSOLE) != 0) {
+        dwFlags |= CREATE_NEW_CONSOLE;
+    }
 
     if (!CreateProcess(NULL, cmd, NULL, NULL, inherit, dwFlags, environment, workingDirectory, &sInfo, &pInfo))
     {
diff --git a/changelog.md b/changelog.md
index 4b7c32f..d19ee0b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,7 @@
 
 * Add StdStream(NoStream) to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)
 * Support for Windows `DETACHED_PROCESS` and `setsid` [#32](https://github.com/haskell/process/issues/32)
+* Support for Windows `CREATE_NEW_CONSOLE` [#38](https://github.com/haskell/process/issues/38)
 
 ## 1.2.3.0 *March 2015*
 
diff --git a/include/processFlags.h b/include/processFlags.h
index 9de6a10..b0cd1ec 100644
--- a/include/processFlags.h
+++ b/include/processFlags.h
@@ -8,3 +8,4 @@
 #define RUN_PROCESS_IN_NEW_GROUP 0x2
 #define RUN_PROCESS_DETACHED     0x4
 #define RUN_PROCESS_NEW_SESSION  0x8
+#define RUN_PROCESS_NEW_CONSOLE  0x16


From git at git.haskell.org  Mon Nov  2 06:23:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:47 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Include some sanity checks for new flags
 (431379b)
Message-ID: <20151102062347.816DA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/431379b80234618c2642667928aa21f543d9c4e6/process

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

commit 431379b80234618c2642667928aa21f543d9c4e6
Author: Michael Snoyman <michael at snoyman.com>
Date:   Wed Aug 19 11:02:21 2015 +0300

    Include some sanity checks for new flags


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

431379b80234618c2642667928aa21f543d9c4e6
 test/main.hs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/main.hs b/test/main.hs
index 2d415ce..40558b2 100644
--- a/test/main.hs
+++ b/test/main.hs
@@ -1,4 +1,5 @@
 import Control.Exception
+import System.Exit
 import System.IO.Error
 import System.Process
 
@@ -12,3 +13,18 @@ main = do
     case res of
         Left True -> return ()
         _ -> error $ show res
+
+    let test name modifier = do
+            putStrLn $ "Running test: " ++ name
+            (_, _, _, ph) <- createProcess
+                $ modifier $ proc "echo" ["hello", "world"]
+            ec <- waitForProcess ph
+            if ec == ExitSuccess
+                then putStrLn $ "Success running: " ++ name
+                else error $ "echo returned: " ++ show ec
+
+    test "detach_console" $ \cp -> cp { detach_console = True }
+    test "create_new_console" $ \cp -> cp { create_new_console = True }
+    test "new_session" $ \cp -> cp { new_session = True }
+
+    putStrLn "Tests passed successfully"


From git at git.haskell.org  Mon Nov  2 06:23:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:49 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: Fix compilation error (4c18877)
Message-ID: <20151102062349.8895B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/4c18877ecbdbf7b76e5bc2bc3a58de36ec903702/process

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

commit 4c18877ecbdbf7b76e5bc2bc3a58de36ec903702
Author: Michael Snoyman <michael at snoyman.com>
Date:   Wed Aug 19 11:02:32 2015 +0300

    Fix compilation error


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

4c18877ecbdbf7b76e5bc2bc3a58de36ec903702
 System/Process/Internals.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index f8a02b4..cfe34ef 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -472,8 +472,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 pfdStdInput pfdStdOutput pfdStdError
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
-                                .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0))
-                                .|.(if mb_create_new_console then RUN_PROCESS_NEW_CONSOLE else 0))
+                                .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0)
+                                .|.(if mb_create_new_console then RUN_PROCESS_NEW_CONSOLE else 0)
                                 .|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
 
      hndStdInput  <- mbPipe mb_stdin  pfdStdInput  WriteMode


From git at git.haskell.org  Mon Nov  2 06:23:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:51 +0000 (UTC)
Subject: [commit: packages/process] master, new-flags,
 new-flags-no-f3df9d6: stack (2fc5dd9)
Message-ID: <20151102062351.8F4713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags,new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/2fc5dd9a983effdcb31653bb934401d12736fdef/process

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

commit 2fc5dd9a983effdcb31653bb934401d12736fdef
Author: Michael Snoyman <michael at snoyman.com>
Date:   Wed Aug 19 11:09:55 2015 +0300

    stack


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

2fc5dd9a983effdcb31653bb934401d12736fdef
 .gitignore | 1 +
 stack.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3934cb6..63b58e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /dist/
+/.stack-work/
 
 # Specific generated files
 GNUmakefile
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
index 0000000..eed5796
--- /dev/null
+++ b/stack.yaml
@@ -0,0 +1 @@
+resolver: ghc-7.10.2


From git at git.haskell.org  Mon Nov  2 06:23:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:53 +0000 (UTC)
Subject: [commit: packages/process] new-flags-no-f3df9d6: Revert f3df9d6
 (0ad09da)
Message-ID: <20151102062353.95EBC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : new-flags-no-f3df9d6
Link       : http://ghc.haskell.org/trac/ghc/changeset/0ad09da8e194369e4704b46a1865bbbb2cba2cfb/process

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

commit 0ad09da8e194369e4704b46a1865bbbb2cba2cfb
Author: Michael Snoyman <michael at snoyman.com>
Date:   Mon Aug 24 20:07:25 2015 +0300

    Revert f3df9d6


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

0ad09da8e194369e4704b46a1865bbbb2cba2cfb
 System/Process.hsc          | 2 --
 System/Process/Internals.hs | 9 ---------
 cbits/runProcess.c          | 3 ---
 changelog.md                | 1 -
 include/processFlags.h      | 1 -
 test/main.hs                | 1 -
 6 files changed, 17 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 144daf8..1d1bcd9 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -125,7 +125,6 @@ proc cmd args = CreateProcess { cmdspec = RawCommand cmd args,
                                 create_group = False,
                                 delegate_ctlc = False,
                                 detach_console = False,
-                                create_new_console = False,
                                 new_session = False }
 
 -- | Construct a 'CreateProcess' record for passing to 'createProcess',
@@ -141,7 +140,6 @@ shell str = CreateProcess { cmdspec = ShellCommand str,
                             create_group = False,
                             delegate_ctlc = False,
                             detach_console = False,
-                            create_new_console = False,
                             new_session = False }
 
 {- |
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index cfe34ef..aeb8425 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -185,11 +185,6 @@ data CreateProcess = CreateProcess{
   detach_console :: Bool,                  -- ^ Use the windows DETACHED_PROCESS flag when creating the process; does nothing on other platforms.
                                            --
                                            --   /Since: 1.3.0.0/
-  create_new_console :: Bool,              -- ^ Use the windows CREATE_NEW_CONSOLE flag when creating the process; does nothing on other platforms.
-                                           --
-                                           --   Default: @False@
-                                           --
-                                           --   /Since: 1.3.0.0/
   new_session :: Bool                      -- ^ Use posix setsid to start the new process in a new session; does nothing on other platforms.
                                            --
                                            --   /Since: 1.3.0.0/
@@ -272,7 +267,6 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   create_group = mb_create_group,
                                   delegate_ctlc = mb_delegate_ctlc,
                                   detach_console = mb_detach_console,
-                                  create_new_console = mb_create_new_console,
                                   new_session = mb_new_session }
  = do
   let (cmd,args) = commandToProcess cmdsp
@@ -305,7 +299,6 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
                                 .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0)
-                                .|.(if mb_create_new_console then RUN_PROCESS_NEW_CONSOLE else 0)
                                 .|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
                                 pFailedDoing
 
@@ -439,7 +432,6 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   create_group = mb_create_group,
                                   delegate_ctlc = _ignored,
                                   detach_console = mb_detach_console,
-                                  create_new_console = mb_create_new_console,
                                   new_session = mb_new_session }
  = do
   (cmd, cmdline) <- commandToProcess cmdsp
@@ -473,7 +465,6 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
                                 .|.(if mb_detach_console then RUN_PROCESS_DETACHED else 0)
-                                .|.(if mb_create_new_console then RUN_PROCESS_NEW_CONSOLE else 0)
                                 .|.(if mb_new_session then RUN_PROCESS_NEW_SESSION else 0))
 
      hndStdInput  <- mbPipe mb_stdin  pfdStdInput  WriteMode
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index 8019605..61fdd58 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -571,9 +571,6 @@ runInteractiveProcess (wchar_t *cmd, wchar_t *workingDirectory,
     if ((flags & RUN_PROCESS_DETACHED) != 0) {
         dwFlags |= DETACHED_PROCESS;
     }
-    if ((flags & RUN_PROCESS_NEW_CONSOLE) != 0) {
-        dwFlags |= CREATE_NEW_CONSOLE;
-    }
 
     if (!CreateProcess(NULL, cmd, NULL, NULL, inherit, dwFlags, environment, workingDirectory, &sInfo, &pInfo))
     {
diff --git a/changelog.md b/changelog.md
index d19ee0b..4b7c32f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,7 +4,6 @@
 
 * Add StdStream(NoStream) to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)
 * Support for Windows `DETACHED_PROCESS` and `setsid` [#32](https://github.com/haskell/process/issues/32)
-* Support for Windows `CREATE_NEW_CONSOLE` [#38](https://github.com/haskell/process/issues/38)
 
 ## 1.2.3.0 *March 2015*
 
diff --git a/include/processFlags.h b/include/processFlags.h
index b0cd1ec..9de6a10 100644
--- a/include/processFlags.h
+++ b/include/processFlags.h
@@ -8,4 +8,3 @@
 #define RUN_PROCESS_IN_NEW_GROUP 0x2
 #define RUN_PROCESS_DETACHED     0x4
 #define RUN_PROCESS_NEW_SESSION  0x8
-#define RUN_PROCESS_NEW_CONSOLE  0x16
diff --git a/test/main.hs b/test/main.hs
index 40558b2..f89a3ec 100644
--- a/test/main.hs
+++ b/test/main.hs
@@ -24,7 +24,6 @@ main = do
                 else error $ "echo returned: " ++ show ec
 
     test "detach_console" $ \cp -> cp { detach_console = True }
-    test "create_new_console" $ \cp -> cp { create_new_console = True }
     test "new_session" $ \cp -> cp { new_session = True }
 
     putStrLn "Tests passed successfully"


From git at git.haskell.org  Mon Nov  2 06:23:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:55 +0000 (UTC)
Subject: [commit: packages/process] master,new-flags: Fix bitmask (52cad65)
Message-ID: <20151102062355.9C9C63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: master,new-flags
Link       : http://ghc.haskell.org/trac/ghc/changeset/52cad6528a01b7cca011ac1c4ef7d33b1f500532/process

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

commit 52cad6528a01b7cca011ac1c4ef7d33b1f500532
Author: Michael Snoyman <michael at snoyman.com>
Date:   Mon Aug 24 21:05:20 2015 +0300

    Fix bitmask


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

52cad6528a01b7cca011ac1c4ef7d33b1f500532
 include/processFlags.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/processFlags.h b/include/processFlags.h
index b0cd1ec..a2c4b95 100644
--- a/include/processFlags.h
+++ b/include/processFlags.h
@@ -8,4 +8,4 @@
 #define RUN_PROCESS_IN_NEW_GROUP 0x2
 #define RUN_PROCESS_DETACHED     0x4
 #define RUN_PROCESS_NEW_SESSION  0x8
-#define RUN_PROCESS_NEW_CONSOLE  0x16
+#define RUN_PROCESS_NEW_CONSOLE  0x10


From git at git.haskell.org  Mon Nov  2 06:23:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:57 +0000 (UTC)
Subject: [commit: packages/process] master: Fix some doc markup (thanks @hvr)
 (780768a)
Message-ID: <20151102062357.A36163A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/780768a7699f63ea602dcf9d19e214a624c297e1/process

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

commit 780768a7699f63ea602dcf9d19e214a624c297e1
Author: Michael Snoyman <michael at snoyman.com>
Date:   Tue Aug 25 23:54:37 2015 +0300

    Fix some doc markup (thanks @hvr)


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

780768a7699f63ea602dcf9d19e214a624c297e1
 System/Process.hsc          | 14 +++++++-------
 System/Process/Internals.hs | 12 ++++++------
 changelog.md                |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 144daf8..297a311 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -274,7 +274,7 @@ cleanupProcess (mb_stdin, mb_stdout, mb_stderr,
 -- arguments. It does not wait for the program to finish, but returns the
 -- 'ProcessHandle'.
 --
--- /Since: 1.2.0.0/
+-- @since 1.2.0.0
 spawnProcess :: FilePath -> [String] -> IO ProcessHandle
 spawnProcess cmd args = do
     (_,_,_,p) <- createProcess_ "spawnProcess" (proc cmd args)
@@ -283,7 +283,7 @@ spawnProcess cmd args = do
 -- | Creates a new process to run the specified shell command.
 -- It does not wait for the program to finish, but returns the 'ProcessHandle'.
 --
--- /Since: 1.2.0.0/
+-- @since 1.2.0.0
 spawnCommand :: String -> IO ProcessHandle
 spawnCommand cmd = do
     (_,_,_,p) <- createProcess_ "spawnCommand" (shell cmd)
@@ -302,7 +302,7 @@ spawnCommand cmd = do
 -- @callProcess@ will wait (block) until the process has been
 -- terminated.
 --
--- /Since: 1.2.0.0/
+-- @since 1.2.0.0
 callProcess :: FilePath -> [String] -> IO ()
 callProcess cmd args = do
     exit_code <- withCreateProcess_ "callProcess"
@@ -320,7 +320,7 @@ callProcess cmd args = do
 -- @callCommand@ will wait (block) until the process has been
 -- terminated.
 --
--- /Since: 1.2.0.0/
+-- @since 1.2.0.0
 callCommand :: String -> IO ()
 callCommand cmd = do
     exit_code <- withCreateProcess_ "callCommand"
@@ -430,7 +430,7 @@ readProcess cmd args = readCreateProcess $ proc cmd args
 --
 -- Note that @Handle at s provided for @std_in@ or @std_out@ via the CreateProcess
 -- record will be ignored.
--- /Since: 1.2.3.0/
+-- @since 1.2.3.0
 
 readCreateProcess
     :: CreateProcess
@@ -499,7 +499,7 @@ readProcessWithExitCode cmd args =
 -- Note that @Handle at s provided for @std_in@, @std_out@, or @std_err@ via the CreateProcess
 -- record will be ignored.
 --
--- /Since: 1.2.3.0/
+-- @since 1.2.3.0
 readCreateProcessWithExitCode
     :: CreateProcess
     -> String                      -- ^ standard input
@@ -934,7 +934,7 @@ rawSystem cmd args = system (showCommandForUser cmd args)
 -- | Create a pipe for interprocess communication and return a
 -- @(readEnd, writeEnd)@ `Handle` pair.
 --
--- /Since: 1.2.1.0/
+-- @since 1.2.1.0
 createPipe :: IO (Handle, Handle)
 #if !mingw32_HOST_OS
 createPipe = do
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index cfe34ef..40f2f92 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -181,18 +181,18 @@ data CreateProcess = CreateProcess{
                                            --
                                            --   On Windows this has no effect.
                                            --
-                                           --   /Since: 1.2.0.0/
+                                           --   @since 1.2.0.0
   detach_console :: Bool,                  -- ^ Use the windows DETACHED_PROCESS flag when creating the process; does nothing on other platforms.
                                            --
-                                           --   /Since: 1.3.0.0/
+                                           --   @since 1.3.0.0
   create_new_console :: Bool,              -- ^ Use the windows CREATE_NEW_CONSOLE flag when creating the process; does nothing on other platforms.
                                            --
                                            --   Default: @False@
                                            --
-                                           --   /Since: 1.3.0.0/
+                                           --   @since 1.3.0.0
   new_session :: Bool                      -- ^ Use posix setsid to start the new process in a new session; does nothing on other platforms.
                                            --
-                                           --   /Since: 1.3.0.0/
+                                           --   @since 1.3.0.0
  }
 
 data CmdSpec
@@ -224,7 +224,7 @@ data CmdSpec
 
 -- | construct a `ShellCommand` from a string literal
 --
--- /Since: 1.2.1.0/
+-- @since 1.2.1.0
 instance IsString CmdSpec where
   fromString = ShellCommand
 
@@ -249,7 +249,7 @@ data StdStream
 -- for some time, and is part of the "System.Process" module since version
 -- 1.2.1.0.
 --
--- /Since: 1.2.1.0/
+-- @since 1.2.1.0
 createProcess_
   :: String                     -- ^ function name (for error messages)
   -> CreateProcess
diff --git a/changelog.md b/changelog.md
index d19ee0b..264a405 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,7 @@
 
 ## 1.3.0.0 (unreleased)
 
-* Add StdStream(NoStream) to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)
+* Add `StdStream(NoStream)` to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)
 * Support for Windows `DETACHED_PROCESS` and `setsid` [#32](https://github.com/haskell/process/issues/32)
 * Support for Windows `CREATE_NEW_CONSOLE` [#38](https://github.com/haskell/process/issues/38)
 


From git at git.haskell.org  Mon Nov  2 06:23:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:23:59 +0000 (UTC)
Subject: [commit: packages/process] master: 1.3 changelog: unreleased ->
 August 2015 (c6becbc)
Message-ID: <20151102062359.A9A103A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

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

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

commit c6becbcddd35df8233a690c853e0c277c9e198cb
Author: R?mi Vion <vion.remi at gmail.com>
Date:   Tue Aug 25 23:58:53 2015 +0200

    1.3 changelog: unreleased -> August 2015


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

c6becbcddd35df8233a690c853e0c277c9e198cb
 changelog.md  | 2 +-
 process.cabal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 264a405..f4daf20 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,6 @@
 # Changelog for [`process` package](http://hackage.haskell.org/package/process)
 
-## 1.3.0.0 (unreleased)
+## 1.3.0.0 *August 2015*
 
 * Add `StdStream(NoStream)` to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)
 * Support for Windows `DETACHED_PROCESS` and `setsid` [#32](https://github.com/haskell/process/issues/32)
diff --git a/process.cabal b/process.cabal
index 82b4d1c..6adeb49 100644
--- a/process.cabal
+++ b/process.cabal
@@ -1,5 +1,5 @@
 name:          process
-version:       1.3.0.0
+version:       1.3.0.1
 -- NOTE: Don't forget to update ./changelog.md
 license:       BSD3
 license-file:  LICENSE


From git at git.haskell.org  Mon Nov  2 06:24:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:01 +0000 (UTC)
Subject: [commit: packages/process] master: Merge pull request #39 from
 rvion/tweak-changelog (32ffd7c)
Message-ID: <20151102062401.B24A33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/32ffd7cfce2a99a31c69a1d7bd4b65fbda68654b/process

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

commit 32ffd7cfce2a99a31c69a1d7bd4b65fbda68654b
Merge: 780768a c6becbc
Author: Michael Snoyman <michael at snoyman.com>
Date:   Wed Aug 26 01:03:39 2015 +0300

    Merge pull request #39 from rvion/tweak-changelog
    
    1.3 changelog: unreleased -> August 2015



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

32ffd7cfce2a99a31c69a1d7bd4b65fbda68654b
 changelog.md  | 2 +-
 process.cabal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


From git at git.haskell.org  Mon Nov  2 06:24:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:03 +0000 (UTC)
Subject: [commit: packages/process] master: Add blank comment before "@since
 1.2.3.0" (2f7ff65)
Message-ID: <20151102062403.B8C183A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2f7ff65b95e43f1f12e6d1a9da26ac470383217c/process

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

commit 2f7ff65b95e43f1f12e6d1a9da26ac470383217c
Author: kraai <kraai at ftbfs.org>
Date:   Sat Sep 19 13:57:08 2015 +0000

    Add blank comment before "@since 1.2.3.0"
    
    "@since 1.2.3.0" is included verbatim in the last paragraph of readCreateProcess's documentation.  I think this occurs because there isn't a blank comment separating it from the last paragraph.


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

2f7ff65b95e43f1f12e6d1a9da26ac470383217c
 System/Process.hsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/System/Process.hsc b/System/Process.hsc
index 297a311..53d745d 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -430,6 +430,7 @@ readProcess cmd args = readCreateProcess $ proc cmd args
 --
 -- Note that @Handle at s provided for @std_in@ or @std_out@ via the CreateProcess
 -- record will be ignored.
+--
 -- @since 1.2.3.0
 
 readCreateProcess


From git at git.haskell.org  Mon Nov  2 06:24:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:05 +0000 (UTC)
Subject: [commit: packages/process] master: Merge pull request #41 from
 kraai/patch-1 (810258d)
Message-ID: <20151102062405.C13883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/810258d50f3eee40748681ce5fbf09929ed2be41/process

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

commit 810258d50f3eee40748681ce5fbf09929ed2be41
Merge: 32ffd7c 2f7ff65
Author: Michael Snoyman <michael at snoyman.com>
Date:   Sun Sep 20 08:38:24 2015 +0300

    Merge pull request #41 from kraai/patch-1
    
    Add blank comment before "@since 1.2.3.0"



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

810258d50f3eee40748681ce5fbf09929ed2be41
 System/Process.hsc | 1 +
 1 file changed, 1 insertion(+)


From git at git.haskell.org  Mon Nov  2 06:24:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:07 +0000 (UTC)
Subject: [commit: packages/process] master: Join sentence fragments (4fa1d18)
Message-ID: <20151102062407.C71DB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4fa1d1891eeff4c848518ca23df33ba1ab2c563b/process

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

commit 4fa1d1891eeff4c848518ca23df33ba1ab2c563b
Author: kraai <kraai at ftbfs.org>
Date:   Mon Sep 28 21:38:16 2015 +0000

    Join sentence fragments


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

4fa1d1891eeff4c848518ca23df33ba1ab2c563b
 System/Process.hsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 53d745d..ec637ee 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -298,7 +298,7 @@ spawnCommand cmd = do
 -- exit code, an exception is raised.
 --
 -- If an asynchronous exception is thrown to the thread executing
--- @callProcess at . The forked process will be terminated and
+-- @callProcess@, the forked process will be terminated and
 -- @callProcess@ will wait (block) until the process has been
 -- terminated.
 --


From git at git.haskell.org  Mon Nov  2 06:24:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:09 +0000 (UTC)
Subject: [commit: packages/process] master: Merge pull request #42 from
 kraai/patch-2 (6d0359f)
Message-ID: <20151102062409.CD9943A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6d0359f8616d6e796be712e1969111dd222586f3/process

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

commit 6d0359f8616d6e796be712e1969111dd222586f3
Merge: 810258d 4fa1d18
Author: Michael Snoyman <michael at snoyman.com>
Date:   Tue Sep 29 07:28:55 2015 +0300

    Merge pull request #42 from kraai/patch-2
    
    Join sentence fragments



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

6d0359f8616d6e796be712e1969111dd222586f3
 System/Process.hsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Mon Nov  2 06:24:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:11 +0000 (UTC)
Subject: [commit: packages/process] master: Join more sentence fragments
 (eecce68)
Message-ID: <20151102062411.D529D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

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

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

commit eecce6875c8b797272a2227e88a93a071cf9c178
Author: kraai <kraai at ftbfs.org>
Date:   Tue Sep 29 22:44:50 2015 +0000

    Join more sentence fragments


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

eecce6875c8b797272a2227e88a93a071cf9c178
 System/Process.hsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index ec637ee..4de9a26 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -316,7 +316,7 @@ callProcess cmd args = do
 -- command returns a non-zero exit code, an exception is raised.
 --
 -- If an asynchronous exception is thrown to the thread executing
--- @callCommand at . The forked process will be terminated and
+-- @callCommand@, the forked process will be terminated and
 -- @callCommand@ will wait (block) until the process has been
 -- terminated.
 --


From git at git.haskell.org  Mon Nov  2 06:24:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:13 +0000 (UTC)
Subject: [commit: packages/process] master: Merge pull request #43 from
 kraai/patch-3 (bc5ef16)
Message-ID: <20151102062413.DAD263A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

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

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

commit bc5ef16cd63f9d7c8cdc2948299b27fb17ef53e1
Merge: 6d0359f eecce68
Author: Michael Snoyman <michael at snoyman.com>
Date:   Wed Sep 30 06:28:00 2015 +0300

    Merge pull request #43 from kraai/patch-3
    
    Join more sentence fragments



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

bc5ef16cd63f9d7c8cdc2948299b27fb17ef53e1
 System/Process.hsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Mon Nov  2 06:24:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:15 +0000 (UTC)
Subject: [commit: packages/process] master: Added child_user and child_group
 to CreateProcess for unix. (bc4e5e6)
Message-ID: <20151102062415.E1E7B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

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

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

commit bc4e5e6c2ec3d23020d977117a70717f543674e8
Author: jprider63 <jp at jamesparker.me>
Date:   Tue Oct 13 22:43:21 2015 -0400

    Added child_user and child_group to CreateProcess for unix.


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

bc4e5e6c2ec3d23020d977117a70717f543674e8
 System/Process.hsc          |  8 ++++++--
 System/Process/Internals.hs | 21 +++++++++++++++++++--
 cbits/runProcess.c          | 24 ++++++++++++++++++++++++
 include/runProcess.h        |  2 ++
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 4de9a26..a390c74 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -126,7 +126,9 @@ proc cmd args = CreateProcess { cmdspec = RawCommand cmd args,
                                 delegate_ctlc = False,
                                 detach_console = False,
                                 create_new_console = False,
-                                new_session = False }
+                                new_session = False,
+                                child_group = Nothing,
+                                child_user = Nothing }
 
 -- | Construct a 'CreateProcess' record for passing to 'createProcess',
 -- representing a command to be passed to the shell.
@@ -142,7 +144,9 @@ shell str = CreateProcess { cmdspec = ShellCommand str,
                             delegate_ctlc = False,
                             detach_console = False,
                             create_new_console = False,
-                            new_session = False }
+                            new_session = False,
+                            child_group = Nothing,
+                            child_user = Nothing }
 
 {- |
 This is the most general way to spawn an external process.  The
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 40f2f92..7d65546 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -190,9 +190,19 @@ data CreateProcess = CreateProcess{
                                            --   Default: @False@
                                            --
                                            --   @since 1.3.0.0
-  new_session :: Bool                      -- ^ Use posix setsid to start the new process in a new session; does nothing on other platforms.
+  new_session :: Bool,                     -- ^ Use posix setsid to start the new process in a new session; does nothing on other platforms.
                                            --
                                            --   @since 1.3.0.0
+  child_group :: Maybe GroupID,            -- ^ Use posix setgid to set child process's group id; does nothing on other platforms.
+                                           --
+                                           --   Default: @Nothing@
+                                           --
+                                           --   @since X.X.X.X
+  child_user :: Maybe UserID               -- ^ Use posix setuid to set child process's user id; does nothing on other platforms.
+                                           --
+                                           --   Default: @Nothing@
+                                           --
+                                           --   @since X.X.X.X
  }
 
 data CmdSpec
@@ -273,7 +283,9 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                                   delegate_ctlc = mb_delegate_ctlc,
                                   detach_console = mb_detach_console,
                                   create_new_console = mb_create_new_console,
-                                  new_session = mb_new_session }
+                                  new_session = mb_new_session,
+                                  child_group = mb_child_group,
+                                  child_user = mb_child_user }
  = do
   let (cmd,args) = commandToProcess cmdsp
   withFilePathException cmd $
@@ -283,6 +295,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
    alloca $ \ pFailedDoing ->
    maybeWith withCEnvironment mb_env $ \pEnv ->
    maybeWith withFilePath mb_cwd $ \pWorkDir ->
+   maybeWith with mb_child_group $ \pChildGroup ->
+   maybeWith with mb_child_user $ \pChildUser ->
    withMany withFilePath (cmd:args) $ \cstrs ->
    withArray0 nullPtr cstrs $ \pargs -> do
 
@@ -301,6 +315,7 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                          c_runInteractiveProcess pargs pWorkDir pEnv
                                 fdin fdout fderr
                                 pfdStdInput pfdStdOutput pfdStdError
+                                pChildGroup pChildUser
                                 (if mb_delegate_ctlc then 1 else 0)
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
@@ -414,6 +429,8 @@ foreign import ccall unsafe "runInteractiveProcess"
         -> Ptr FD
         -> Ptr FD
         -> Ptr FD
+        -> Ptr CGid
+        -> Ptr CUid
         -> CInt                         -- reset child's SIGINT & SIGQUIT handlers
         -> CInt                         -- flags
         -> Ptr CString
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index 8019605..950635d 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -40,6 +40,10 @@ extern void unblockUserSignals(void);
 #define forkChdirFailed 126
 #define forkExecFailed  127
 
+// These are arbitrarily chosen -- JP
+#define forkSetgidFailed 124
+#define forkSetuidFailed 125
+
 __attribute__((__noreturn__))
 static void childFailed(int pipe, int failCode) {
     int err;
@@ -57,6 +61,7 @@ runInteractiveProcess (char *const args[],
                        char *workingDirectory, char **environment,
                        int fdStdIn, int fdStdOut, int fdStdErr,
                        int *pfdStdInput, int *pfdStdOutput, int *pfdStdError,
+                       gid_t *childGroup, uid_t *childUser,
                        int reset_int_quit_handlers,
                        int flags,
                        char **failed_doing)
@@ -145,6 +150,20 @@ runInteractiveProcess (char *const args[],
             setpgid(0, 0);
         }
         
+        if ( childGroup) {
+            if ( setgid( *childGroup) != 0) {
+                // ERROR
+                childFailed(forkCommunicationFds[1], forkSetgidFailed);
+            }
+        }
+
+        if ( childUser) {
+            if ( setuid( *childUser) != 0) {
+                // ERROR
+                childFailed(forkCommunicationFds[1], forkSetuidFailed);
+            }
+        }
+
         unblockUserSignals();
 
         if (workingDirectory) {
@@ -281,6 +300,11 @@ runInteractiveProcess (char *const args[],
         case forkExecFailed:
             *failed_doing = "runInteractiveProcess: exec";
             break;
+        case forkSetgidFailed:
+            *failed_doing = "runInteractiveProcess: setgid";
+            break;
+        case forkSetuidFailed:
+            *failed_doing = "runInteractiveProcess: setuid";
         default:
             *failed_doing = "runInteractiveProcess: unknown";
             break;
diff --git a/include/runProcess.h b/include/runProcess.h
index 63f1f23..d35e3e4 100644
--- a/include/runProcess.h
+++ b/include/runProcess.h
@@ -62,6 +62,8 @@ extern ProcHandle runInteractiveProcess( char *const args[],
                                          int *pfdStdInput, 
                                          int *pfdStdOutput, 
                                          int *pfdStdError,
+                                         gid_t *childGroup,
+                                         uid_t *childUser,
                                          int reset_int_quit_handlers,
                                          int flags,
                                          char **failed_doing);


From git at git.haskell.org  Mon Nov  2 06:24:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:17 +0000 (UTC)
Subject: [commit: packages/process] master: Addresses comments from #45. Feel
 free to squash. (932fe34)
Message-ID: <20151102062417.E8FDD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/932fe345925950da9c9f6afd254d494257f2fa2b/process

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

commit 932fe345925950da9c9f6afd254d494257f2fa2b
Author: jprider63 <jp at jamesparker.me>
Date:   Wed Oct 14 08:26:53 2015 -0400

    Addresses comments from #45. Feel free to squash.


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

932fe345925950da9c9f6afd254d494257f2fa2b
 System/Process/Internals.hs | 14 +++++++-------
 cbits/runProcess.c          | 10 +++++-----
 include/runProcess.h        |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 7d65546..f9a5800 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -197,12 +197,12 @@ data CreateProcess = CreateProcess{
                                            --
                                            --   Default: @Nothing@
                                            --
-                                           --   @since X.X.X.X
+                                           --   @since 1.4.0.0
   child_user :: Maybe UserID               -- ^ Use posix setuid to set child process's user id; does nothing on other platforms.
                                            --
                                            --   Default: @Nothing@
                                            --
-                                           --   @since X.X.X.X
+                                           --   @since 1.4.0.0
  }
 
 data CmdSpec
@@ -295,8 +295,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
    alloca $ \ pFailedDoing ->
    maybeWith withCEnvironment mb_env $ \pEnv ->
    maybeWith withFilePath mb_cwd $ \pWorkDir ->
-   maybeWith with mb_child_group $ \pChildGroup ->
-   maybeWith with mb_child_user $ \pChildUser ->
+   let childGroup = maybe (-1) id mb_child_group in
+   let childUser = maybe (-1) id mb_child_user in
    withMany withFilePath (cmd:args) $ \cstrs ->
    withArray0 nullPtr cstrs $ \pargs -> do
 
@@ -315,7 +315,7 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                          c_runInteractiveProcess pargs pWorkDir pEnv
                                 fdin fdout fderr
                                 pfdStdInput pfdStdOutput pfdStdError
-                                pChildGroup pChildUser
+                                childGroup childUser
                                 (if mb_delegate_ctlc then 1 else 0)
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
@@ -429,8 +429,8 @@ foreign import ccall unsafe "runInteractiveProcess"
         -> Ptr FD
         -> Ptr FD
         -> Ptr FD
-        -> Ptr CGid
-        -> Ptr CUid
+        -> CGid
+        -> CUid
         -> CInt                         -- reset child's SIGINT & SIGQUIT handlers
         -> CInt                         -- flags
         -> Ptr CString
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index 950635d..9059004 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -61,7 +61,7 @@ runInteractiveProcess (char *const args[],
                        char *workingDirectory, char **environment,
                        int fdStdIn, int fdStdOut, int fdStdErr,
                        int *pfdStdInput, int *pfdStdOutput, int *pfdStdError,
-                       gid_t *childGroup, uid_t *childUser,
+                       gid_t childGroup, uid_t childUser,
                        int reset_int_quit_handlers,
                        int flags,
                        char **failed_doing)
@@ -150,15 +150,15 @@ runInteractiveProcess (char *const args[],
             setpgid(0, 0);
         }
         
-        if ( childGroup) {
-            if ( setgid( *childGroup) != 0) {
+        if ( childGroup != -1) {
+            if ( setgid( childGroup) != 0) {
                 // ERROR
                 childFailed(forkCommunicationFds[1], forkSetgidFailed);
             }
         }
 
-        if ( childUser) {
-            if ( setuid( *childUser) != 0) {
+        if ( childUser  != -1) {
+            if ( setuid( childUser) != 0) {
                 // ERROR
                 childFailed(forkCommunicationFds[1], forkSetuidFailed);
             }
diff --git a/include/runProcess.h b/include/runProcess.h
index d35e3e4..da27593 100644
--- a/include/runProcess.h
+++ b/include/runProcess.h
@@ -62,8 +62,8 @@ extern ProcHandle runInteractiveProcess( char *const args[],
                                          int *pfdStdInput, 
                                          int *pfdStdOutput, 
                                          int *pfdStdError,
-                                         gid_t *childGroup,
-                                         uid_t *childUser,
+                                         gid_t childGroup,
+                                         uid_t childUser,
                                          int reset_int_quit_handlers,
                                          int flags,
                                          char **failed_doing);


From git at git.haskell.org  Mon Nov  2 06:24:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:19 +0000 (UTC)
Subject: [commit: packages/process] master: Revert "Addresses comments from
 #45. Feel free to squash." (296535e)
Message-ID: <20151102062419.F0AC33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/296535ef2d1b0d6051a1db8adf402549acd87557/process

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

commit 296535ef2d1b0d6051a1db8adf402549acd87557
Author: jprider63 <jp at jamesparker.me>
Date:   Wed Oct 14 10:20:51 2015 -0400

    Revert "Addresses comments from #45. Feel free to squash."
    
    This reverts commit 932fe345925950da9c9f6afd254d494257f2fa2b.


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

296535ef2d1b0d6051a1db8adf402549acd87557
 System/Process/Internals.hs | 14 +++++++-------
 cbits/runProcess.c          | 10 +++++-----
 include/runProcess.h        |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index f9a5800..7d65546 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -197,12 +197,12 @@ data CreateProcess = CreateProcess{
                                            --
                                            --   Default: @Nothing@
                                            --
-                                           --   @since 1.4.0.0
+                                           --   @since X.X.X.X
   child_user :: Maybe UserID               -- ^ Use posix setuid to set child process's user id; does nothing on other platforms.
                                            --
                                            --   Default: @Nothing@
                                            --
-                                           --   @since 1.4.0.0
+                                           --   @since X.X.X.X
  }
 
 data CmdSpec
@@ -295,8 +295,8 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
    alloca $ \ pFailedDoing ->
    maybeWith withCEnvironment mb_env $ \pEnv ->
    maybeWith withFilePath mb_cwd $ \pWorkDir ->
-   let childGroup = maybe (-1) id mb_child_group in
-   let childUser = maybe (-1) id mb_child_user in
+   maybeWith with mb_child_group $ \pChildGroup ->
+   maybeWith with mb_child_user $ \pChildUser ->
    withMany withFilePath (cmd:args) $ \cstrs ->
    withArray0 nullPtr cstrs $ \pargs -> do
 
@@ -315,7 +315,7 @@ createProcess_ fun CreateProcess{ cmdspec = cmdsp,
                          c_runInteractiveProcess pargs pWorkDir pEnv
                                 fdin fdout fderr
                                 pfdStdInput pfdStdOutput pfdStdError
-                                childGroup childUser
+                                pChildGroup pChildUser
                                 (if mb_delegate_ctlc then 1 else 0)
                                 ((if mb_close_fds then RUN_PROCESS_IN_CLOSE_FDS else 0)
                                 .|.(if mb_create_group then RUN_PROCESS_IN_NEW_GROUP else 0)
@@ -429,8 +429,8 @@ foreign import ccall unsafe "runInteractiveProcess"
         -> Ptr FD
         -> Ptr FD
         -> Ptr FD
-        -> CGid
-        -> CUid
+        -> Ptr CGid
+        -> Ptr CUid
         -> CInt                         -- reset child's SIGINT & SIGQUIT handlers
         -> CInt                         -- flags
         -> Ptr CString
diff --git a/cbits/runProcess.c b/cbits/runProcess.c
index 9059004..950635d 100644
--- a/cbits/runProcess.c
+++ b/cbits/runProcess.c
@@ -61,7 +61,7 @@ runInteractiveProcess (char *const args[],
                        char *workingDirectory, char **environment,
                        int fdStdIn, int fdStdOut, int fdStdErr,
                        int *pfdStdInput, int *pfdStdOutput, int *pfdStdError,
-                       gid_t childGroup, uid_t childUser,
+                       gid_t *childGroup, uid_t *childUser,
                        int reset_int_quit_handlers,
                        int flags,
                        char **failed_doing)
@@ -150,15 +150,15 @@ runInteractiveProcess (char *const args[],
             setpgid(0, 0);
         }
         
-        if ( childGroup != -1) {
-            if ( setgid( childGroup) != 0) {
+        if ( childGroup) {
+            if ( setgid( *childGroup) != 0) {
                 // ERROR
                 childFailed(forkCommunicationFds[1], forkSetgidFailed);
             }
         }
 
-        if ( childUser  != -1) {
-            if ( setuid( childUser) != 0) {
+        if ( childUser) {
+            if ( setuid( *childUser) != 0) {
                 // ERROR
                 childFailed(forkCommunicationFds[1], forkSetuidFailed);
             }
diff --git a/include/runProcess.h b/include/runProcess.h
index da27593..d35e3e4 100644
--- a/include/runProcess.h
+++ b/include/runProcess.h
@@ -62,8 +62,8 @@ extern ProcHandle runInteractiveProcess( char *const args[],
                                          int *pfdStdInput, 
                                          int *pfdStdOutput, 
                                          int *pfdStdError,
-                                         gid_t childGroup,
-                                         uid_t childUser,
+                                         gid_t *childGroup,
+                                         uid_t *childUser,
                                          int reset_int_quit_handlers,
                                          int flags,
                                          char **failed_doing);


From git at git.haskell.org  Mon Nov  2 06:24:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:22 +0000 (UTC)
Subject: [commit: packages/process] master: Updated `CreateProcess`
 documentation after revert. (2397d4f)
Message-ID: <20151102062422.02CE43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2397d4f63417776fffde61b62ba5d6518a1cb8f5/process

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

commit 2397d4f63417776fffde61b62ba5d6518a1cb8f5
Author: jprider63 <jp at jamesparker.me>
Date:   Wed Oct 14 10:22:11 2015 -0400

    Updated `CreateProcess` documentation after revert.


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

2397d4f63417776fffde61b62ba5d6518a1cb8f5
 System/Process/Internals.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 7d65546..bbf6e37 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -197,12 +197,12 @@ data CreateProcess = CreateProcess{
                                            --
                                            --   Default: @Nothing@
                                            --
-                                           --   @since X.X.X.X
+                                           --   @since 1.4.0.0
   child_user :: Maybe UserID               -- ^ Use posix setuid to set child process's user id; does nothing on other platforms.
                                            --
                                            --   Default: @Nothing@
                                            --
-                                           --   @since X.X.X.X
+                                           --   @since 1.4.0.0
  }
 
 data CmdSpec


From git at git.haskell.org  Mon Nov  2 06:24:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:24 +0000 (UTC)
Subject: [commit: packages/process] master: Update changelog for #45 (ada43e5)
Message-ID: <20151102062424.08B803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

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

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

commit ada43e58b7795757b4f56c7a0ba5b09d17a81bd1
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Thu Oct 15 04:52:15 2015 +0000

    Update changelog for #45


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

ada43e58b7795757b4f56c7a0ba5b09d17a81bd1
 changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelog.md b/changelog.md
index f4daf20..a593d8a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog for [`process` package](http://hackage.haskell.org/package/process)
 
+## 1.4.0.0 *unreleased*
+
+* Added `child_user` and `child_group` to `CreateProcess` for unix. [#45](https://github.com/haskell/process/pull/45)
+
 ## 1.3.0.0 *August 2015*
 
 * Add `StdStream(NoStream)` to have standard handles closed. [#13](https://github.com/haskell/process/pull/13)


From git at git.haskell.org  Mon Nov  2 06:24:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:26 +0000 (UTC)
Subject: [commit: packages/process] master: Define compatibility types for
 Windows (2e5219f)
Message-ID: <20151102062426.101D63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2e5219f58e8f54b30acdab9fa26dc51e5de19244/process

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

commit 2e5219f58e8f54b30acdab9fa26dc51e5de19244
Author: Michael Snoyman <michael at snoyman.com>
Date:   Thu Oct 15 08:03:45 2015 +0300

    Define compatibility types for Windows


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

2e5219f58e8f54b30acdab9fa26dc51e5de19244
 System/Process/Internals.hs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index bbf6e37..5575ac4 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -59,6 +59,8 @@ import Data.Char
 import System.IO
 import System.Posix.Process.Internals ( pPrPr_disableITimers, c_execvpe )
 import System.Posix.Types
+#else
+import Data.Word (Word32)
 #endif
 
 #ifdef __GLASGOW_HASKELL__
@@ -99,6 +101,13 @@ import System.FilePath
 # endif
 #endif
 
+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
+-- Define some missing types for Windows compatibility
+newtype CGid = CGid Word32
+type GroupID = CGid
+type UserID = CGid
+#endif
+
 -- ----------------------------------------------------------------------------
 -- ProcessHandle type
 


From git at git.haskell.org  Mon Nov  2 06:24:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:28 +0000 (UTC)
Subject: [commit: packages/process] master: Relax upper bound on `base` to
 allow base-4.9 (4853d8f)
Message-ID: <20151102062428.154963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4853d8f78a6831f4567ff0c2880298c9c70a5203/process

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

commit 4853d8f78a6831f4567ff0c2880298c9c70a5203
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Oct 31 11:10:04 2015 +0100

    Relax upper bound on `base` to allow base-4.9
    
    GHC 8.0 will ship with base-4.9.0.0


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

4853d8f78a6831f4567ff0c2880298c9c70a5203
 process.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process.cabal b/process.cabal
index 6adeb49..933f275 100644
--- a/process.cabal
+++ b/process.cabal
@@ -59,7 +59,7 @@ library
 
     ghc-options: -Wall
 
-    build-depends: base      >= 4.4 && < 4.9,
+    build-depends: base      >= 4.4 && < 4.10,
                    directory >= 1.1 && < 1.3,
                    filepath  >= 1.2 && < 1.5,
                    deepseq   >= 1.1 && < 1.5


From git at git.haskell.org  Mon Nov  2 06:24:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:24:30 +0000 (UTC)
Subject: [commit: packages/process] master: Version bump (7428b61)
Message-ID: <20151102062430.1B4793A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7428b614841e6b6416e501453546b0af19a0cd1f/process

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

commit 7428b614841e6b6416e501453546b0af19a0cd1f
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Sun Nov 1 19:42:54 2015 +0000

    Version bump


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

7428b614841e6b6416e501453546b0af19a0cd1f
 changelog.md  | 2 +-
 process.cabal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index a593d8a..6507bf8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,6 @@
 # Changelog for [`process` package](http://hackage.haskell.org/package/process)
 
-## 1.4.0.0 *unreleased*
+## 1.4.0.0 *November 2015*
 
 * Added `child_user` and `child_group` to `CreateProcess` for unix. [#45](https://github.com/haskell/process/pull/45)
 
diff --git a/process.cabal b/process.cabal
index 933f275..f24cdf5 100644
--- a/process.cabal
+++ b/process.cabal
@@ -1,5 +1,5 @@
 name:          process
-version:       1.3.0.1
+version:       1.4.0.0
 -- NOTE: Don't forget to update ./changelog.md
 license:       BSD3
 license-file:  LICENSE


From git at git.haskell.org  Mon Nov  2 06:40:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 06:40:42 +0000 (UTC)
Subject: [commit: hsc2hs] master: Relax `process` upper bound once more
 (bb205d8)
Message-ID: <20151102064042.831833A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hsc2hs

On branch  : master
Link       : http://git.haskell.org/hsc2hs.git/commitdiff/bb205d806c1368e483edde288cbf8ed2cfca2ba6

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

commit bb205d806c1368e483edde288cbf8ed2cfca2ba6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 2 07:39:46 2015 +0100

    Relax `process` upper bound once more
    
    to allow for process-1.4 which was just released


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

bb205d806c1368e483edde288cbf8ed2cfca2ba6
 hsc2hs.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hsc2hs.cabal b/hsc2hs.cabal
index 3da739b..a6c74f3 100644
--- a/hsc2hs.cabal
+++ b/hsc2hs.cabal
@@ -40,5 +40,5 @@ Executable hsc2hs
                    containers >= 0.2 && < 0.6,
                    directory  >= 1   && < 1.3,
                    filepath   >= 1   && < 1.5,
-                   process    >= 1.1 && < 1.4
+                   process    >= 1.1 && < 1.5
 


From git at git.haskell.org  Mon Nov  2 07:11:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 07:11:20 +0000 (UTC)
Subject: [commit: ghc] master: Update process submodule to process-1.4 release
 (1e2259b)
Message-ID: <20151102071120.7280F3A300@ghc.haskell.org>

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

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

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

commit 1e2259b37af17c951d9f8266b240db0cdcc833e3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 2 07:41:16 2015 +0100

    Update process submodule to process-1.4 release
    
    We already used a process-1.4 snapshot with non-bumped version,
    so this commit is mostly a `.cabal` file upper-bound relaxation change.


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

1e2259b37af17c951d9f8266b240db0cdcc833e3
 compiler/ghc.cabal.in        | 2 +-
 ghc/ghc-bin.cabal.in         | 2 +-
 libraries/Cabal              | 2 +-
 libraries/process            | 2 +-
 utils/ghc-pkg/ghc-pkg.cabal  | 2 +-
 utils/hsc2hs                 | 2 +-
 utils/runghc/runghc.cabal.in | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index f5a3c55..badb90e 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -46,7 +46,7 @@ Library
 
     Build-Depends: base       >= 4   && < 5,
                    directory  >= 1   && < 1.3,
-                   process    >= 1   && < 1.4,
+                   process    >= 1   && < 1.5,
                    bytestring >= 0.9 && < 0.11,
                    time                 < 1.6,
                    containers >= 0.5 && < 0.6,
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 0c9998d..4f67e47 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -31,7 +31,7 @@ Executable ghc
                    array      >= 0.1 && < 0.6,
                    bytestring >= 0.9 && < 0.11,
                    directory  >= 1   && < 1.3,
-                   process    >= 1   && < 1.4,
+                   process    >= 1   && < 1.5,
                    filepath   >= 1   && < 1.5,
                    ghc
     if os(windows)
diff --git a/libraries/Cabal b/libraries/Cabal
index fada4c8..75d2807 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit fada4c87bf76254b85703671fbb1f05bb73f0869
+Subproject commit 75d2807a2bb11762f4db70540d2cc9049e9c7968
diff --git a/libraries/process b/libraries/process
index 4853d8f..7428b61 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 4853d8f78a6831f4567ff0c2880298c9c70a5203
+Subproject commit 7428b614841e6b6416e501453546b0af19a0cd1f
diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal
index a2a0bdd..aca0783 100644
--- a/utils/ghc-pkg/ghc-pkg.cabal
+++ b/utils/ghc-pkg/ghc-pkg.cabal
@@ -20,7 +20,7 @@ Executable ghc-pkg
 
     Build-Depends: base       >= 4   && < 5,
                    directory  >= 1   && < 1.3,
-                   process    >= 1   && < 1.4,
+                   process    >= 1   && < 1.5,
                    containers,
                    filepath,
                    Cabal,
diff --git a/utils/hsc2hs b/utils/hsc2hs
index ff34f78..bb205d8 160000
--- a/utils/hsc2hs
+++ b/utils/hsc2hs
@@ -1 +1 @@
-Subproject commit ff34f784abc868b22003717c1265d59af1c43a9f
+Subproject commit bb205d806c1368e483edde288cbf8ed2cfca2ba6
diff --git a/utils/runghc/runghc.cabal.in b/utils/runghc/runghc.cabal.in
index 15ec2f6..47fb83d 100644
--- a/utils/runghc/runghc.cabal.in
+++ b/utils/runghc/runghc.cabal.in
@@ -18,5 +18,5 @@ Executable runghc
 
     Build-Depends: base       >= 3   && < 5,
                    directory  >= 1   && < 1.3,
-                   process    >= 1   && < 1.4,
+                   process    >= 1   && < 1.5,
                    filepath


From git at git.haskell.org  Mon Nov  2 07:20:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 07:20:57 +0000 (UTC)
Subject: [commit: ghc] master: get rid of Elf32/Elf64_Section as this is a
 non-portable Linux-ism. (c00c5e5)
Message-ID: <20151102072057.2B1603A300@ghc.haskell.org>

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

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

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

commit c00c5e5ba61935bbb04ccdb1c2c2899782d42937
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Sun Nov 1 22:10:15 2015 +0100

    get rid of Elf32/Elf64_Section as this is a non-portable Linux-ism.
    
    Summary:
    D1357 introduces usage of Elf32_Section/Elf64_Section in RTS linker
    code. Unfortunately this is a non-portable Linux-ism and such types are not
    defined anywhere except the Linux-land probably. I've checked Solaris 11.2,
    Solaris 11.3, FreeBSD 10.1, NetBSD 6.1.5 and OpenBSD current. The fix
    is easy to use `unsigned short' as this is also an underlying type
    of those Elf*_Section defines in Linux.
    
    Reviewers: olsner, austin, bgamari, erikd
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1419


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

c00c5e5ba61935bbb04ccdb1c2c2899782d42937
 rts/Linker.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index cd94561..2308275 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4030,7 +4030,6 @@ ocRunInit_PEi386 ( ObjectCode *oc )
 #define Elf_Ehdr    Elf64_Ehdr
 #define Elf_Phdr    Elf64_Phdr
 #define Elf_Shdr    Elf64_Shdr
-#define Elf_Section Elf64_Section
 #define Elf_Sym     Elf64_Sym
 #define Elf_Rel     Elf64_Rel
 #define Elf_Rela    Elf64_Rela
@@ -4055,7 +4054,6 @@ ocRunInit_PEi386 ( ObjectCode *oc )
 #define Elf_Ehdr    Elf32_Ehdr
 #define Elf_Phdr    Elf32_Phdr
 #define Elf_Shdr    Elf32_Shdr
-#define Elf_Section Elf32_Section
 #define Elf_Sym     Elf32_Sym
 #define Elf_Rel     Elf32_Rel
 #define Elf_Rela    Elf32_Rela
@@ -4629,7 +4627,7 @@ ocGetNames_ELF ( ObjectCode* oc )
          HsBool isWeak = HS_BOOL_FALSE;
          char* ad      = NULL;
          char* nm      = strtab + stab[j].st_name;
-         Elf_Section shndx = stab[j].st_shndx;
+         unsigned short shndx = stab[j].st_shndx;
          Elf_Word secno;
 
          /* See Note [Many ELF Sections] */


From git at git.haskell.org  Mon Nov  2 12:20:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 12:20:17 +0000 (UTC)
Subject: [commit: ghc] master: Update filepath submodule for proper version
 (130ca3e)
Message-ID: <20151102122017.6949A3A300@ghc.haskell.org>

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

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

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

commit 130ca3eb64e98d7c944ae9997b87740be75dc70b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 2 13:13:28 2015 +0100

    Update filepath submodule for proper version
    
    This pulls in a minor version bump to v1.4.1, this way
    GHC HEAD nightly builds report a proper version number.


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

130ca3eb64e98d7c944ae9997b87740be75dc70b
 libraries/filepath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/filepath b/libraries/filepath
index 32e8dba..564c5a7 160000
--- a/libraries/filepath
+++ b/libraries/filepath
@@ -1 +1 @@
-Subproject commit 32e8dba40bd2ff3ae0b1c16ea2c0db05c5d4b63c
+Subproject commit 564c5a78d028ebde6a27f61ff9f686fce490c809


From git at git.haskell.org  Mon Nov  2 13:28:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 13:28:15 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: rts/win32: Add missing definition for
 EH_UNWINDING (5028a37)
Message-ID: <20151102132816.004263A300@ghc.haskell.org>

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/5028a37ec9bafb4d43215bd05822b3430ed596b4/ghc

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

commit 5028a37ec9bafb4d43215bd05822b3430ed596b4
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 2 14:24:41 2015 +0100

    rts/win32: Add missing definition for EH_UNWINDING
    
    This was taken from 5200bdeb26c5ec98739b14b10fc8907296bceeb9 on master.


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

5028a37ec9bafb4d43215bd05822b3430ed596b4
 rts/win32/seh_excn.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rts/win32/seh_excn.c b/rts/win32/seh_excn.c
index da5f64d..273ba56 100644
--- a/rts/win32/seh_excn.c
+++ b/rts/win32/seh_excn.c
@@ -1,6 +1,11 @@
 #include "ghcconfig.h"
 #include "seh_excn.h"
 
+// this should be in <excpt.h>, but it's been removed from MinGW distributions
+#ifndef EH_UNWINDING
+#define EH_UNWINDING   0x02
+#endif /* EH_UNWINDING */
+
 /*
  * Exception / signal handlers.
  */


From git at git.haskell.org  Mon Nov  2 14:42:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 14:42:07 +0000 (UTC)
Subject: [commit: ghc] master: base: Update `@since 4.8.2` annotations (re
 #11026) (5065cf4)
Message-ID: <20151102144207.8EB9C3A300@ghc.haskell.org>

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

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

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

commit 5065cf490ccdf03dda1e148afb979b8838e6c32e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 2 15:39:28 2015 +0100

    base: Update `@since 4.8.2` annotations (re #11026)
    
    This missed to perform in f8ba4b55cc3a061458f5cfabf17de96128defbbb


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

5065cf490ccdf03dda1e148afb979b8838e6c32e
 libraries/base/Data/List/NonEmpty.hs     |  4 ++--
 libraries/base/Data/Semigroup.hs         |  4 ++--
 libraries/base/GHC/Exception.hs          |  6 +++---
 libraries/base/GHC/IO.hs                 |  2 +-
 libraries/base/GHC/IO/Encoding/Latin1.hs |  4 ++--
 libraries/base/GHC/RTS/Flags.hsc         | 12 ++++++------
 libraries/base/GHC/Stack/Types.hs        |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/libraries/base/Data/List/NonEmpty.hs b/libraries/base/Data/List/NonEmpty.hs
index 9bcdcbf..a66ea8f 100644
--- a/libraries/base/Data/List/NonEmpty.hs
+++ b/libraries/base/Data/List/NonEmpty.hs
@@ -19,7 +19,7 @@
 -- and in terms of API. You will almost certainly want to import this
 -- module @qualified at .
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 ----------------------------------------------------------------------------
 
 module Data.List.NonEmpty (
@@ -118,7 +118,7 @@ infixr 5 :|, <|
 
 -- | Non-empty (and non-strict) list type.
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 data NonEmpty a = a :| [a]
   deriving ( Eq, Ord, Show, Read, Data, Generic, Generic1 )
 
diff --git a/libraries/base/Data/Semigroup.hs b/libraries/base/Data/Semigroup.hs
index f3f9f0b..6c92df9 100644
--- a/libraries/base/Data/Semigroup.hs
+++ b/libraries/base/Data/Semigroup.hs
@@ -31,7 +31,7 @@
 --
 -- > import Data.Semigroup
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 ----------------------------------------------------------------------------
 module Data.Semigroup (
     Semigroup(..)
@@ -86,7 +86,7 @@ infixr 6 <>
 
 -- | The class of semigroups (types with an associative binary operation).
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 class Semigroup a where
   -- | An associative operation.
   --
diff --git a/libraries/base/GHC/Exception.hs b/libraries/base/GHC/Exception.hs
index 02c6cfa..20b487c 100644
--- a/libraries/base/GHC/Exception.hs
+++ b/libraries/base/GHC/Exception.hs
@@ -186,7 +186,7 @@ errorCallWithCallStackException s stk
 
 -- | Pretty print 'SrcLoc'
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 showSrcLoc :: SrcLoc -> String
 showSrcLoc SrcLoc {..}
   = foldr (++) ""
@@ -198,7 +198,7 @@ showSrcLoc SrcLoc {..}
 
 -- | Pretty print 'CallStack'
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 showCallStack :: CallStack -> String
 showCallStack (CallStack stk@(_:_))
   = unlines ("CallStack:" : map (indent . showCallSite) stk)
@@ -214,7 +214,7 @@ showCallStack _ = error "CallStack cannot be empty!"
 
 -- | Remove the most recent callsite from the 'CallStack'
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 popCallStack :: CallStack -> CallStack
 popCallStack (CallStack (_:rest)) = CallStack rest
 popCallStack _ = error "CallStack cannot be empty!"
diff --git a/libraries/base/GHC/IO.hs b/libraries/base/GHC/IO.hs
index e41a35d..9fa0aff 100644
--- a/libraries/base/GHC/IO.hs
+++ b/libraries/base/GHC/IO.hs
@@ -348,7 +348,7 @@ unsafeUnmask (IO io) = IO $ unmaskAsyncExceptions# io
 -- When called outside 'mask', or inside 'uninterruptibleMask', this
 -- function has no effect.
 --
--- /Since: 4.8.2.0/
+-- @since 4.9.0.0
 interruptible :: IO a -> IO a
 interruptible act = do
   st <- getMaskingState
diff --git a/libraries/base/GHC/IO/Encoding/Latin1.hs b/libraries/base/GHC/IO/Encoding/Latin1.hs
index d24fcdf..efef240 100644
--- a/libraries/base/GHC/IO/Encoding/Latin1.hs
+++ b/libraries/base/GHC/IO/Encoding/Latin1.hs
@@ -96,11 +96,11 @@ latin1_checked_EF cfm =
 -- -----------------------------------------------------------------------------
 -- ASCII
 
--- | @since 4.8.2.0
+-- | @since 4.9.0.0
 ascii :: TextEncoding
 ascii = mkAscii ErrorOnCodingFailure
 
--- | @since 4.8.2.0
+-- | @since 4.9.0.0
 mkAscii :: CodingFailureMode -> TextEncoding
 mkAscii cfm = TextEncoding { textEncodingName = "ASCII",
                              mkTextDecoder = ascii_DF cfm,
diff --git a/libraries/base/GHC/RTS/Flags.hsc b/libraries/base/GHC/RTS/Flags.hsc
index 62e720f..3708331 100644
--- a/libraries/base/GHC/RTS/Flags.hsc
+++ b/libraries/base/GHC/RTS/Flags.hsc
@@ -55,18 +55,18 @@ import GHC.Word
 
 -- | @'Time'@ is defined as a @'StgWord64'@ in @stg/Types.h@
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 type RtsTime = Word64
 
 -- | @'nat'@ defined in @rts/Types.h@
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 type RtsNat = #{type unsigned int}
 
 -- | Should we produce a summary of the garbage collector statistics after the
 -- program has exited?
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 data GiveGCStats
     = NoGCStats
     | CollectGCStats
@@ -164,7 +164,7 @@ data DebugFlags = DebugFlags
 
 -- | Should the RTS produce a cost-center summary?
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 data DoCostCentres
     = CostCentresNone
     | CostCentresSummary
@@ -198,7 +198,7 @@ data CCFlags = CCFlags
 
 -- | What sort of heap profile are we collecting?
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 data DoHeapProfile
     = NoHeapProfiling
     | HeapByCCS
@@ -252,7 +252,7 @@ data ProfFlags = ProfFlags
 
 -- | Is event tracing enabled?
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 data DoTrace
     = TraceNone      -- ^ no tracing
     | TraceEventLog  -- ^ send tracing events to the event log
diff --git a/libraries/base/GHC/Stack/Types.hs b/libraries/base/GHC/Stack/Types.hs
index d3ea1d2..a43fe9a 100644
--- a/libraries/base/GHC/Stack/Types.hs
+++ b/libraries/base/GHC/Stack/Types.hs
@@ -71,13 +71,13 @@ import GHC.Integer ()
 -- function that was called, the 'SrcLoc' is the call-site. The list is
 -- ordered with the most recently called function at the head.
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 data CallStack = CallStack { getCallStack :: [([Char], SrcLoc)] }
   -- See Note [Overview of implicit CallStacks]
 
 -- | A single location in the source code.
 --
--- @since 4.8.2.0
+-- @since 4.9.0.0
 data SrcLoc = SrcLoc
   { srcLocPackage   :: [Char]
   , srcLocModule    :: [Char]


From git at git.haskell.org  Mon Nov  2 16:15:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 16:15:08 +0000 (UTC)
Subject: [commit: ghc] master: base: GHC.RTS.Flags symbols really were
 introduced in 4.8.2 (0bc8c6a)
Message-ID: <20151102161508.96C6B3A300@ghc.haskell.org>

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

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

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

commit 0bc8c6ac2a38a06a9d87c3ddd64a1ef11ecc3f35
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 2 17:13:30 2015 +0100

    base: GHC.RTS.Flags symbols really were introduced in 4.8.2


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

0bc8c6ac2a38a06a9d87c3ddd64a1ef11ecc3f35
 libraries/base/GHC/RTS/Flags.hsc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/base/GHC/RTS/Flags.hsc b/libraries/base/GHC/RTS/Flags.hsc
index 3708331..62e720f 100644
--- a/libraries/base/GHC/RTS/Flags.hsc
+++ b/libraries/base/GHC/RTS/Flags.hsc
@@ -55,18 +55,18 @@ import GHC.Word
 
 -- | @'Time'@ is defined as a @'StgWord64'@ in @stg/Types.h@
 --
--- @since 4.9.0.0
+-- @since 4.8.2.0
 type RtsTime = Word64
 
 -- | @'nat'@ defined in @rts/Types.h@
 --
--- @since 4.9.0.0
+-- @since 4.8.2.0
 type RtsNat = #{type unsigned int}
 
 -- | Should we produce a summary of the garbage collector statistics after the
 -- program has exited?
 --
--- @since 4.9.0.0
+-- @since 4.8.2.0
 data GiveGCStats
     = NoGCStats
     | CollectGCStats
@@ -164,7 +164,7 @@ data DebugFlags = DebugFlags
 
 -- | Should the RTS produce a cost-center summary?
 --
--- @since 4.9.0.0
+-- @since 4.8.2.0
 data DoCostCentres
     = CostCentresNone
     | CostCentresSummary
@@ -198,7 +198,7 @@ data CCFlags = CCFlags
 
 -- | What sort of heap profile are we collecting?
 --
--- @since 4.9.0.0
+-- @since 4.8.2.0
 data DoHeapProfile
     = NoHeapProfiling
     | HeapByCCS
@@ -252,7 +252,7 @@ data ProfFlags = ProfFlags
 
 -- | Is event tracing enabled?
 --
--- @since 4.9.0.0
+-- @since 4.8.2.0
 data DoTrace
     = TraceNone      -- ^ no tracing
     | TraceEventLog  -- ^ send tracing events to the event log


From git at git.haskell.org  Mon Nov  2 16:15:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  2 Nov 2015 16:15:11 +0000 (UTC)
Subject: [commit: ghc] master: base: Add changelog entry for 4.8.2.0 (83fd2ba)
Message-ID: <20151102161511.377AB3A300@ghc.haskell.org>

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

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

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

commit 83fd2bafe1e9eb33323290ac251da51c09a7deb1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 2 17:14:52 2015 +0100

    base: Add changelog entry for 4.8.2.0


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

83fd2bafe1e9eb33323290ac251da51c09a7deb1
 libraries/base/changelog.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index e62f019..de687c6 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -82,6 +82,16 @@
 
   * The `MINIMAL` definition of `ArrowChoice` is now `left OR (+++)`.
 
+## 4.8.2.0  *Oct 2015*
+
+  * Bundled with GHC 7.10.3
+
+  * The restore operation provided by `mask` and `uninterruptibleMask` now
+    restores the previous masking state whatever the current masking state is.
+
+  * Exported `GiveGCStats`, `DoCostCentres`, `DoHeapProfile`, `DoTrace`,
+    `RtsTime`, and `RtsNat` from `GHC.RTS.Flags`
+
 ## 4.8.1.0  *Jul 2015*
 
   * Bundled with GHC 7.10.2


From git at git.haskell.org  Tue Nov  3 16:44:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  3 Nov 2015 16:44:18 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: More progress (93a97a6)
Message-ID: <20151103164418.BFC463A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/93a97a631f3ee3b979ee4f61f6ded4c1fd0e6146/ghc

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

commit 93a97a631f3ee3b979ee4f61f6ded4c1fd0e6146
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Nov 3 16:43:33 2015 +0000

    More progress


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

93a97a631f3ee3b979ee4f61f6ded4c1fd0e6146
 compiler/deSugar/DsArrows.hs                       |  2 +-
 compiler/deSugar/DsExpr.hs                         |  2 +-
 compiler/hsSyn/HsExpr.hs                           | 32 +++-----
 compiler/hsSyn/HsPat.hs                            |  2 +
 compiler/hsSyn/HsTypes.hs                          | 57 ++++++++++++--
 compiler/hsSyn/HsUtils.hs                          | 19 ++---
 compiler/rename/RnTypes.hs                         |  5 +-
 compiler/typecheck/TcArrows.hs                     |  2 +-
 compiler/typecheck/TcBinds.hs                      | 91 +++++++++++++---------
 compiler/typecheck/TcEvidence.hs                   | 25 +++---
 compiler/typecheck/TcExpr.hs                       | 60 +++++++-------
 compiler/typecheck/TcMatches.hs                    |  2 +-
 compiler/typecheck/TcPat.hs                        | 19 +++--
 compiler/typecheck/TcPatSyn.hs                     |  2 +-
 compiler/typecheck/TcUnify.hs                      |  4 +-
 .../tests/indexed-types/should_compile/Records.hs  | 13 +---
 .../should_compile/Defaulting2MROn.stderr          |  2 +-
 .../partial-sigs/should_compile/ExprSigLocal.hs    | 12 +++
 .../should_compile/ExprSigLocal.stderr             | 19 +++++
 .../tests/partial-sigs/should_compile/T10403.hs    |  1 +
 .../partial-sigs/should_compile/T10403.stderr      | 61 +++++++++++----
 .../ExtraConstraintsWildcardNotPresent.stderr      |  7 +-
 .../should_fail/NamedWildcardsNotInMonotype.stderr |  2 +-
 testsuite/tests/partial-sigs/should_fail/T10999.hs |  2 +-
 .../tests/partial-sigs/should_fail/T10999.stderr   | 16 ++--
 .../partial-sigs/should_fail/Trac10045.stderr      |  5 +-
 .../tests/typecheck/should_compile/tc168.stderr    |  2 +-
 .../tests/typecheck/should_fail/T10351.stderr      |  2 +-
 .../tests/typecheck/should_fail/T1897a.stderr      |  2 +-
 testsuite/tests/typecheck/should_fail/T6022.stderr |  2 +-
 testsuite/tests/typecheck/should_fail/T8883.stderr |  2 +-
 .../tests/typecheck/should_fail/tcfail080.stderr   |  2 +-
 32 files changed, 304 insertions(+), 172 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 93a97a631f3ee3b979ee4f61f6ded4c1fd0e6146

From git at git.haskell.org  Tue Nov  3 21:45:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  3 Nov 2015 21:45:33 +0000 (UTC)
Subject: [commit: ghc] master: base: Add new Control.Monad.Fail module (re
 #10751) (8c80dcc)
Message-ID: <20151103214533.E0ADF3A300@ghc.haskell.org>

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

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

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

commit 8c80dcc166e4a083086d8b240d84563d0c4c4c50
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 3 22:40:52 2015 +0100

    base: Add new Control.Monad.Fail module (re #10751)
    
    This is based on David's initial patch augmented by more extensive
    Haddock comments.
    
    This has been broken out of D1248 to reduce its size
    by splitting the patch into smaller logical pieces.
    
    On its own, this new module does nothing interesting yet.
    Later patches will add support for a different desugaring of
    `do`-blocks, at which point the new `MonadFail` class will
    become more useful.
    
    Reviewed By: ekmett, austin
    
    Differential Revision: https://phabricator.haskell.org/D1424


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

8c80dcc166e4a083086d8b240d84563d0c4c4c50
 libraries/base/Control/Monad/Fail.hs | 77 ++++++++++++++++++++++++++++++++++++
 libraries/base/GHC/Base.hs           |  5 +++
 libraries/base/base.cabal            |  1 +
 libraries/base/changelog.md          |  3 ++
 4 files changed, 86 insertions(+)

diff --git a/libraries/base/Control/Monad/Fail.hs b/libraries/base/Control/Monad/Fail.hs
new file mode 100644
index 0000000..0bbe65b
--- /dev/null
+++ b/libraries/base/Control/Monad/Fail.hs
@@ -0,0 +1,77 @@
+{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
+-- |
+-- Module      :  Control.Monad.Fail
+-- Copyright   :  (C) 2015 David Luposchainsky,
+--                (C) 2015 Herbert Valerio Riedel
+-- License     :  BSD-style (see the file LICENSE)
+--
+-- Maintainer  :  libraries at haskell.org
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- Transitional module providing the 'MonadFail' class and primitive
+-- instances.
+--
+-- This module can be imported for defining forward compatible
+-- 'MonadFail' instances:
+--
+-- @
+-- import qualified Control.Monad.Fail as Fail
+--
+-- instance Monad Foo where
+--   (>>=) = {- ...bind impl... -}
+--
+--   -- Provide legacy 'fail' implementation for when
+--   -- new-style MonadFail desugaring is not enabled.
+--   fail = Fail.fail
+--
+-- instance Fail.MonadFail Foo where
+--   fail = {- ...fail implementation... -}
+-- @
+--
+-- See <https://wiki.haskell.org/MonadFail_Proposal> for more details.
+--
+-- @since 4.9.0.0
+--
+module Control.Monad.Fail ( MonadFail(fail) ) where
+
+import GHC.Base (String, Monad(), Maybe(Nothing), IO())
+import {-# SOURCE #-} GHC.IO (failIO)
+
+-- | When a value is bound in @do at -notation, the pattern on the left
+-- hand side of @<-@ might not match. In this case, this class
+-- provides a function to recover.
+--
+-- A 'Monad' without a 'MonadFail' instance may only be used in conjunction
+-- with pattern that always match, such as newtypes, tuples, data types with
+-- only a single data constructor, and irrefutable patterns (@~pat@).
+--
+-- Instances of 'MonadFail' should satisfy the following law: @fail s@ should
+-- be a left zero for '>>=',
+--
+-- @
+-- fail s >>= f  =  fail s
+-- @
+--
+-- If your 'Monad' is also 'MonadPlus', a popular definition is
+--
+-- @
+-- fail _ = mzero
+-- @
+--
+-- @since 4.9.0.0
+class Monad m => MonadFail m where
+    fail :: String -> m a
+
+
+instance MonadFail Maybe where
+    fail _ = Nothing
+
+instance MonadFail [] where
+    {-# INLINE fail #-}
+    fail _ = []
+
+instance MonadFail IO where
+    fail = failIO
diff --git a/libraries/base/GHC/Base.hs b/libraries/base/GHC/Base.hs
index 273950b..619acac 100644
--- a/libraries/base/GHC/Base.hs
+++ b/libraries/base/GHC/Base.hs
@@ -479,6 +479,11 @@ class Applicative m => Monad m where
     -- | Fail with a message.  This operation is not part of the
     -- mathematical definition of a monad, but is invoked on pattern-match
     -- failure in a @do@ expression.
+    --
+    -- As part of the MonadFail proposal (MFP), this function is moved
+    -- to its own class 'MonadFail' (see "Control.Monad.Fail" for more
+    -- details). The definition here will be removed in a future
+    -- release.
     fail        :: String -> m a
     fail s      = error s
 
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 9354d04..d98e7bf 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -113,6 +113,7 @@ Library
         Control.Exception
         Control.Exception.Base
         Control.Monad
+        Control.Monad.Fail
         Control.Monad.Fix
         Control.Monad.Instances
         Control.Monad.IO.Class
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index de687c6..fe65399 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -62,6 +62,9 @@
   * New module `Control.Monad.IO.Class` (previously provided by `transformers`
     package). (#10773)
 
+  * New module `Control.Monad.Fail` providing new `MonadFail(fail)`
+    class (#10751)
+
   * The `Generic` instance for `Proxy` is now poly-kinded (#10775)
 
   * add `Data.List.NonEmpty` and `Data.Semigroup` (to become


From git at git.haskell.org  Tue Nov  3 22:15:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  3 Nov 2015 22:15:58 +0000 (UTC)
Subject: [commit: ghc] master: Add `MonadPlus IO` and `Alternative IO`
 instances (b62605e)
Message-ID: <20151103221558.4E5193A300@ghc.haskell.org>

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

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

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

commit b62605e53c167719b3bf8842eba628061cf22dd1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 3 16:12:18 2015 -0600

    Add `MonadPlus IO` and `Alternative IO` instances
    
    This requires adding a new primitive `mplusIO` to `GHC.IO`
    
    Update transformers submodule to accomodate extant orphan instances.
    
    Reviewed By: austin, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1148
    
    GHC Trac Issues: #10755


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

b62605e53c167719b3bf8842eba628061cf22dd1
 libraries/base/GHC/Base.hs    |  8 +++++++-
 libraries/base/GHC/IO.hs      | 10 ++++++++--
 libraries/base/GHC/IO.hs-boot |  2 +-
 libraries/base/changelog.md   |  3 +++
 libraries/transformers        |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/libraries/base/GHC/Base.hs b/libraries/base/GHC/Base.hs
index 619acac..189e480 100644
--- a/libraries/base/GHC/Base.hs
+++ b/libraries/base/GHC/Base.hs
@@ -111,7 +111,7 @@ import GHC.CString
 import GHC.Magic
 import GHC.Prim
 import GHC.Err
-import {-# SOURCE #-} GHC.IO (failIO)
+import {-# SOURCE #-} GHC.IO (failIO,mplusIO)
 
 import GHC.Tuple ()     -- Note [Depend on GHC.Tuple]
 import GHC.Integer ()   -- Note [Depend on GHC.Integer]
@@ -1079,6 +1079,12 @@ instance  Monad IO  where
     (>>=)     = bindIO
     fail s    = failIO s
 
+instance Alternative IO where
+    empty = failIO "mzero"
+    (<|>) = mplusIO
+
+instance MonadPlus IO
+
 returnIO :: a -> IO a
 returnIO x = IO $ \ s -> (# s, x #)
 
diff --git a/libraries/base/GHC/IO.hs b/libraries/base/GHC/IO.hs
index 9fa0aff..1e8c74e 100644
--- a/libraries/base/GHC/IO.hs
+++ b/libraries/base/GHC/IO.hs
@@ -23,7 +23,7 @@
 -----------------------------------------------------------------------------
 
 module GHC.IO (
-        IO(..), unIO, failIO, liftIO,
+        IO(..), unIO, failIO, liftIO, mplusIO,
         unsafePerformIO, unsafeInterleaveIO,
         unsafeDupablePerformIO, unsafeDupableInterleaveIO,
         noDuplicate,
@@ -45,7 +45,7 @@ import GHC.ST
 import GHC.Exception
 import GHC.Show
 
-import {-# SOURCE #-} GHC.IO.Exception ( userError )
+import {-# SOURCE #-} GHC.IO.Exception ( userError, IOError )
 
 -- ---------------------------------------------------------------------------
 -- The IO Monad
@@ -292,6 +292,12 @@ catchAny :: IO a -> (forall e . Exception e => e -> IO a) -> IO a
 catchAny (IO io) handler = IO $ catch# io handler'
     where handler' (SomeException e) = unIO (handler e)
 
+
+mplusIO :: IO a -> IO a -> IO a
+mplusIO m n = m `catchIOError` \ _ -> n
+    where catchIOError :: IO a -> (IOError -> IO a) -> IO a
+          catchIOError = catchException
+
 -- | A variant of 'throw' that can only be used within the 'IO' monad.
 --
 -- Although 'throwIO' has a type that is an instance of the type of 'throw', the
diff --git a/libraries/base/GHC/IO.hs-boot b/libraries/base/GHC/IO.hs-boot
index fb0dd96..88b09aa 100644
--- a/libraries/base/GHC/IO.hs-boot
+++ b/libraries/base/GHC/IO.hs-boot
@@ -6,4 +6,4 @@ module GHC.IO where
 import GHC.Types
 
 failIO :: [Char] -> IO a
-
+mplusIO :: IO a -> IO a -> IO a
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index fe65399..7fb4d78 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -85,6 +85,9 @@
 
   * The `MINIMAL` definition of `ArrowChoice` is now `left OR (+++)`.
 
+  * Add `MonadPlus IO` and `Alternative IO` instances
+    (previously orphans in `transformers`) (#10755)
+
 ## 4.8.2.0  *Oct 2015*
 
   * Bundled with GHC 7.10.3
diff --git a/libraries/transformers b/libraries/transformers
index 0c7207e..5ccb747 160000
--- a/libraries/transformers
+++ b/libraries/transformers
@@ -1 +1 @@
-Subproject commit 0c7207e9702afb5344cc33892eb6da9126a85cf3
+Subproject commit 5ccb747e67d579e3f212fd3526469c35282e532e


From git at git.haskell.org  Tue Nov  3 22:16:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  3 Nov 2015 22:16:51 +0000 (UTC)
Subject: [commit: ghc] master: rts/Hash: Constify HashTable* in
 lookupHashTable (334fe45)
Message-ID: <20151103221651.C0F633A300@ghc.haskell.org>

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

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

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

commit 334fe4500c234e83f250f74679f7bbe20208abba
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Nov 3 16:16:27 2015 -0600

    rts/Hash: Constify HashTable* in lookupHashTable
    
    This seems like an obvious place to apply `const`
    
    Reviewed By: simonmar, austin
    
    Differential Revision: https://phabricator.haskell.org/D1416


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

334fe4500c234e83f250f74679f7bbe20208abba
 rts/FileLock.c | 2 +-
 rts/Hash.c     | 6 +++---
 rts/Hash.h     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rts/FileLock.c b/rts/FileLock.c
index cd2dc1d..f8e11ee 100644
--- a/rts/FileLock.c
+++ b/rts/FileLock.c
@@ -41,7 +41,7 @@ static int cmpLocks(StgWord w1, StgWord w2)
     return (l1->device == l2->device && l1->inode == l2->inode);
 }
 
-static int hashLock(HashTable *table, StgWord w)
+static int hashLock(const HashTable *table, StgWord w)
 {
     Lock *l = (Lock *)w;
     StgWord key = l->inode ^ (l->inode >> 32) ^ l->device ^ (l->device >> 32);
diff --git a/rts/Hash.c b/rts/Hash.c
index aab3b23..b0939c4 100644
--- a/rts/Hash.c
+++ b/rts/Hash.c
@@ -58,7 +58,7 @@ struct hashtable {
  * -------------------------------------------------------------------------- */
 
 int
-hashWord(HashTable *table, StgWord key)
+hashWord(const HashTable *table, StgWord key)
 {
     int bucket;
 
@@ -76,7 +76,7 @@ hashWord(HashTable *table, StgWord key)
 }
 
 int
-hashStr(HashTable *table, char *key)
+hashStr(const HashTable *table, char *key)
 {
     int h, bucket;
     char *s;
@@ -187,7 +187,7 @@ expand(HashTable *table)
 }
 
 void *
-lookupHashTable(HashTable *table, StgWord key)
+lookupHashTable(const HashTable *table, StgWord key)
 {
     int bucket;
     int segment;
diff --git a/rts/Hash.h b/rts/Hash.h
index 136f94a..c2dfc26 100644
--- a/rts/Hash.h
+++ b/rts/Hash.h
@@ -15,7 +15,7 @@ typedef struct hashtable HashTable; /* abstract */
 
 /* Hash table access where the keys are StgWords */
 HashTable * allocHashTable    ( void );
-void *      lookupHashTable ( HashTable *table, StgWord key );
+void *      lookupHashTable ( const HashTable *table, StgWord key );
 void        insertHashTable ( HashTable *table, StgWord key, void *data );
 void *      removeHashTable ( HashTable *table, StgWord key, void *data );
 
@@ -44,11 +44,11 @@ HashTable * allocStrHashTable ( void );
    (removeHashTable(table, (StgWord)key, data))
 
 /* Hash tables for arbitrary keys */
-typedef int HashFunction(HashTable *table, StgWord key);
+typedef int HashFunction(const HashTable *table, StgWord key);
 typedef int CompareFunction(StgWord key1, StgWord key2);
 HashTable * allocHashTable_(HashFunction *hash, CompareFunction *compare);
-int hashWord(HashTable *table, StgWord key);
-int hashStr(HashTable *table, char *key);
+int hashWord(const HashTable *table, StgWord key);
+int hashStr(const HashTable *table, char *key);
 
 /* Freeing hash tables
  */


From git at git.haskell.org  Tue Nov  3 22:18:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  3 Nov 2015 22:18:05 +0000 (UTC)
Subject: [commit: ghc] master: Build system: renable -Wall on validate (base)
 (987d542)
Message-ID: <20151103221805.A60BD3A300@ghc.haskell.org>

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

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

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

commit 987d542749be3b53d8461fa5abb770f0b9d8ba5e
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Nov 3 16:17:35 2015 -0600

    Build system: renable -Wall on validate (base)
    
    Problem: 'SRC_HC_OPTS += -Wall' in 'mk/warnings.mk' was getting
    overwritten by 'SRC_HC_OPTS = ...' in 'mk/flavours/*.mk'.
    
    It didn't affect the compiler or most other libraries, because most
    .cabal files define 'ghc-options: -Wall'.
    
    Bug introduced in commit
    2c24fd707f8650205bb574ffac5f376239af3723, when moving validate settings
    from 'mk/validate-settings.mk' to 'mk/flavours/validate.mk'.
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1425


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

987d542749be3b53d8461fa5abb770f0b9d8ba5e
 ghc.mk                           | 8 ++++++++
 libraries/base/Data/Semigroup.hs | 1 -
 libraries/base/GHC/Enum.hs       | 2 +-
 libraries/base/GHC/GHCi.hs       | 2 +-
 mk/warnings.mk                   | 3 ---
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 07e1edc..aaf7d00 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -142,6 +142,14 @@ include mk/warnings.mk
 
 # (Optional) build-specific configuration
 include mk/custom-settings.mk
+SRC_CC_OPTS     += -Wall
+SRC_HC_OPTS     += -Wall
+# Don't add -Werror to GhcStage1HcOpts, because otherwise validate may
+# unnecessarily fail during the stage1 build when booting with an older
+# compiler.
+# It would be better to only exclude certain warnings from becoming errors
+# (e.g. '-Werror -Wno-error=unused-imports -Wno-error=...'), but -Wno-error
+# isn't supported yet (https://ghc.haskell.org/trac/ghc/wiki/Design/Warnings).
 SRC_CC_OPTS     += $(WERROR)
 GhcStage2HcOpts += $(WERROR)
 GhcLibHcOpts    += $(WERROR)
diff --git a/libraries/base/Data/Semigroup.hs b/libraries/base/Data/Semigroup.hs
index 6c92df9..0cd556d 100644
--- a/libraries/base/Data/Semigroup.hs
+++ b/libraries/base/Data/Semigroup.hs
@@ -78,7 +78,6 @@ import           Data.Monoid         (All (..), Any (..), Dual (..), Endo (..),
                                       Product (..), Sum (..))
 import           Data.Monoid         (Alt (..))
 import qualified Data.Monoid         as Monoid
-import           Data.Proxy
 import           Data.Void
 import           GHC.Generics
 
diff --git a/libraries/base/GHC/Enum.hs b/libraries/base/GHC/Enum.hs
index 0d91cc7..dcda47b 100644
--- a/libraries/base/GHC/Enum.hs
+++ b/libraries/base/GHC/Enum.hs
@@ -704,7 +704,7 @@ the special case varies more from the general case, due to the issue of overflow
 
 {-# NOINLINE [0] enumDeltaIntegerFB #-}
 enumDeltaIntegerFB :: (Integer -> b -> b) -> Integer -> Integer -> b
-enumDeltaIntegerFB c x d = go x
+enumDeltaIntegerFB c x0 d = go x0
   where go x = x `seq` (x `c` go (x+d))
 
 {-# NOINLINE [1] enumDeltaInteger #-}
diff --git a/libraries/base/GHC/GHCi.hs b/libraries/base/GHC/GHCi.hs
index 56874a5..514a33c 100644
--- a/libraries/base/GHC/GHCi.hs
+++ b/libraries/base/GHC/GHCi.hs
@@ -21,7 +21,7 @@ module GHC.GHCi {-# WARNING "This is an unstable interface." #-} (
         GHCiSandboxIO(..), NoIO()
     ) where
 
-import GHC.Base (IO(), Monad, Functor(fmap), Applicative(..), (>>=), return, id, (.), ap)
+import GHC.Base (IO(), Monad, Functor(fmap), Applicative(..), (>>=), id, (.), ap)
 
 -- | A monad that can execute GHCi statements by lifting them out of
 -- m into the IO monad. (e.g state monads)
diff --git a/mk/warnings.mk b/mk/warnings.mk
index 2e82428..267aef6 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -25,9 +25,6 @@ SRC_CC_WARNING_OPTS += -Wno-unknown-pragmas
 
 endif
 
-SRC_CC_OPTS     += -Wall
-SRC_HC_OPTS     += -Wall
-
 GhcStage1HcOpts += -fwarn-tabs
 GhcStage2HcOpts += -fwarn-tabs
 


From git at git.haskell.org  Tue Nov  3 22:18:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  3 Nov 2015 22:18:53 +0000 (UTC)
Subject: [commit: ghc] master: Cabal-level sanity check to enforce Cabal
 flag-invariant (0e21678)
Message-ID: <20151103221853.7F6333A300@ghc.haskell.org>

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

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

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

commit 0e21678677894ed7cb236499ec6f2041efae22a2
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 3 16:18:30 2015 -0600

    Cabal-level sanity check to enforce Cabal flag-invariant
    
    This helps catch cabal-flag misconfiguration early on during `cabal
    configure`, rather than much later in the build-process during
    compilation.
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1423


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

0e21678677894ed7cb236499ec6f2041efae22a2
 libraries/base/base.cabal | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index d98e7bf..e94d389 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -94,6 +94,11 @@ Library
         Unsafe
 
     build-depends: rts == 1.0.*, ghc-prim == 0.5.*
+
+    -- sanity-check to ensure exactly one flag is set
+    if !((flag(integer-gmp) && !flag(integer-simple)) || (!flag(integer-gmp) && flag(integer-simple)))
+        build-depends: invalid-cabal-flag-settings<0
+
     if flag(integer-simple)
         build-depends: integer-simple >= 0.1.1 && < 0.2
 


From git at git.haskell.org  Wed Nov  4 04:20:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  4 Nov 2015 04:20:41 +0000 (UTC)
Subject: [commit: ghc] master: Tweak settings for LLVM tests (22fcf9c)
Message-ID: <20151104042041.84EEE3A300@ghc.haskell.org>

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

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

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

commit 22fcf9c1c8418d2a91fd7b784e7e345c23dff373
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon Nov 2 18:14:08 2015 +1100

    Tweak settings for LLVM tests
    
    * The LLVM backend does not currently work on PowerPC so disable it.
    * Only run LLVM tests if the needed LLVM tools have been detected at
      configure time.
    
    Test Plan: Run LLVM tests on x86_64 and powerpc
    
    Reviewers: austin, bgamari, hvr, thomie
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1421


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

22fcf9c1c8418d2a91fd7b784e7e345c23dff373
 testsuite/mk/test.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index e20a522..013d67f 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -149,11 +149,11 @@ endif
 
 ifeq "$(LLC)" ""
 RUNTEST_OPTS += -e ghc_with_llvm=0
+else ifeq "$(TargetARCH_CPP)" "powerpc"
+RUNTEST_OPTS += -e ghc_with_llvm=0
 else ifneq "$(LLC)" "llc"
 # If we have a real detected value for LLVM, then it really ought to work
 RUNTEST_OPTS += -e ghc_with_llvm=1
-else ifneq "$(shell $(SHELL) -c 'llc --version | grep version' 2> /dev/null)" ""
-RUNTEST_OPTS += -e ghc_with_llvm=1
 else
 RUNTEST_OPTS += -e ghc_with_llvm=0
 endif


From git at git.haskell.org  Wed Nov  4 04:20:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  4 Nov 2015 04:20:44 +0000 (UTC)
Subject: [commit: ghc] master: Use full name of LLVM program in error message
 (e547954)
Message-ID: <20151104042044.26DE53A300@ghc.haskell.org>

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

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

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

commit e5479541599eec6237e3a3d784290d76fe01e5bc
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon Nov 2 11:45:14 2015 +1100

    Use full name of LLVM program in error message
    
    Previously something like `/usr/bin/opt-3.7` was being shortened to
    `opt-3` using the `takeBaseName` function. This shortened form is
    actually not correct. We should use `takeFileName` instead.
    
    Reviewers: bgamari, austin, hvr
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1420


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

e5479541599eec6237e3a3d784290d76fe01e5bc
 compiler/main/SysTools.hs                 | 2 +-
 testsuite/tests/driver/T8602/T8602.stderr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 108aba7..5e9646d 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -1329,7 +1329,7 @@ handleProc pgm phase_name proc = do
     case rc of
       ExitSuccess{} -> return r
       ExitFailure n -> throwGhcExceptionIO (
-            ProgramError ("`" ++ takeBaseName pgm ++ "'" ++
+            ProgramError ("`" ++ takeFileName pgm ++ "'" ++
                           " failed in phase `" ++ phase_name ++ "'." ++
                           " (Exit code: " ++ show n ++ ")"))
   where
diff --git a/testsuite/tests/driver/T8602/T8602.stderr b/testsuite/tests/driver/T8602/T8602.stderr
index f3bb7e1..eb28842 100644
--- a/testsuite/tests/driver/T8602/T8602.stderr
+++ b/testsuite/tests/driver/T8602/T8602.stderr
@@ -1,2 +1,2 @@
 A B C
-`t8602' failed in phase `Haskell pre-processor'. (Exit code: 1)
+`t8602.sh' failed in phase `Haskell pre-processor'. (Exit code: 1)


From git at git.haskell.org  Wed Nov  4 19:33:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  4 Nov 2015 19:33:50 +0000 (UTC)
Subject: [commit: ghc] master: Linker: #ifdef cleanup (10647d4)
Message-ID: <20151104193350.3B3483A300@ghc.haskell.org>

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

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

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

commit 10647d4e2e8e3b5eb5486bd6aafbe17cda139577
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Tue Nov 3 17:10:12 2015 +1100

    Linker: #ifdef cleanup
    
    Test Plan:
     - Run tests on x86_64/linux and powerpc/linux
     - Cross compile rts/Linker.c with the i686-w64-mingw32-gcc and
       x86_64-w64-mingw32-gcc Linux to Windows cross-compilers.
    
    Reviewers: bgamari, austin, hvr, Phyx
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1429


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

10647d4e2e8e3b5eb5486bd6aafbe17cda139577
 rts/Linker.c          | 51 +++++++++++----------------------------------------
 rts/LinkerInternals.h |  2 --
 2 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 2308275..fb76539 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -161,10 +161,8 @@ typedef void (*init_t) (int argc, char **argv, char **env);
 static HsInt isAlreadyLoaded( pathchar *path );
 static HsInt loadOc( ObjectCode* oc );
 static ObjectCode* mkOc( pathchar *path, char *image, int imageSize,
-                         rtsBool mapped, char *archiveMemberName
-#if (USE_MMAP == 0) && defined (darwin_HOST_OS)
-                       , int misalignment
-#endif
+                         rtsBool mapped, char *archiveMemberName,
+                         int misalignment
                        );
 
 // Use wchar_t for pathnames on Windows (#5697)
@@ -1475,11 +1473,7 @@ void freeObjectCode (ObjectCode *oc)
 
 static ObjectCode*
 mkOc( pathchar *path, char *image, int imageSize,
-      rtsBool mapped, char *archiveMemberName
-#if (USE_MMAP == 0) && defined (darwin_HOST_OS)
-    , int misalignment
-#endif
-    ) {
+      rtsBool mapped, char *archiveMemberName, int misalignment ) {
    ObjectCode* oc;
 
    IF_DEBUG(linker, debugBelch("mkOc: start\n"));
@@ -1518,9 +1512,7 @@ mkOc( pathchar *path, char *image, int imageSize,
 #endif
    oc->imageMapped       = mapped;
 
-#if (USE_MMAP == 0) && defined (darwin_HOST_OS)
-   oc->misalignment = misalignment;
-#endif
+   oc->misalignment      = misalignment;
 
    /* chain it onto the list of objects */
    oc->next              = NULL;
@@ -1578,10 +1570,8 @@ static HsInt loadArchive_ (pathchar *path)
 #else
 #error Unknown Darwin architecture
 #endif
-#if (USE_MMAP == 0)
-    int misalignment;
-#endif
 #endif
+    int misalignment = 0;
 
     /* TODO: don't call barf() on error, instead return an error code, freeing
      * all resources correctly.  This function is pretty complex, so it needs
@@ -1929,10 +1919,7 @@ static HsInt loadArchive_ (pathchar *path)
                     path, (int)thisFileNameSize, fileName);
 
             oc = mkOc(path, image, memberSize, rtsFalse, archiveMemberName
-#if (USE_MMAP == 0) && defined(darwin_HOST_OS)
-                     , misalignment
-#endif
-                     );
+                     , misalignment);
 
             stgFree(archiveMemberName);
 
@@ -2030,9 +2017,7 @@ preloadObjectFile (pathchar *path)
    int r;
    void *image;
    ObjectCode *oc;
-#if (USE_MMAP == 0) && defined(darwin_HOST_OS)
-   int misalignment;
-#endif
+   int misalignment = 0;
 
    r = pathstat(path, &st);
    if (r == -1) {
@@ -2120,11 +2105,7 @@ preloadObjectFile (pathchar *path)
 
 #endif /* USE_MMAP */
 
-   oc = mkOc(path, image, fileSize, rtsTrue, NULL
-#if (USE_MMAP == 0) && defined(darwin_HOST_OS)
-            , misalignment
-#endif
-            );
+   oc = mkOc(path, image, fileSize, rtsTrue, NULL, misalignment);
 
    return oc;
 }
@@ -2466,12 +2447,6 @@ addSection (Section *s, SectionKind kind, SectionAlloc alloc,
 static int ocAllocateSymbolExtras( ObjectCode* oc, int count, int first )
 {
   StgWord n;
-#if (USE_MMAP == 0)
-  int misalignment = 0;
-#ifdef darwin_HOST_OS
-  int aligned;
-#endif
-#endif
 
 #if USE_MMAP
   if (USE_CONTIGUOUS_MMAP)
@@ -2510,9 +2485,9 @@ static int ocAllocateSymbolExtras( ObjectCode* oc, int count, int first )
     if (oc->symbol_extras == NULL) return 0;
 #else
     // round up to the nearest 4
-    aligned = (oc->fileSize + 3) & ~3;
+    int aligned = (oc->fileSize + 3) & ~3;
 
-    misalignment = oc->misalignment;
+    int misalignment = oc->misalignment;
 
     oc->image -= misalignment;
     oc->image = stgReallocBytes( oc->image,
@@ -2696,11 +2671,7 @@ static void
 ocFlushInstructionCache( ObjectCode *oc )
 {
     /* The main object code */
-    ocFlushInstructionCacheFrom(oc->image
-#ifdef darwin_HOST_OS
-            + oc->misalignment
-#endif
-            , oc->fileSize);
+    ocFlushInstructionCacheFrom(oc->image + oc->misalignment, oc->fileSize);
 
     /* Jump Islands */
     ocFlushInstructionCacheFrom(oc->symbol_extras, sizeof(SymbolExtra) * oc->n_symbol_extras);
diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h
index f5f17d2..c972fa2 100644
--- a/rts/LinkerInternals.h
+++ b/rts/LinkerInternals.h
@@ -122,11 +122,9 @@ typedef struct _ObjectCode {
     /* flag used when deciding whether to unload an object file */
     int        referenced;
 
-#ifdef darwin_HOST_OS
     /* record by how much image has been deliberately misaligned
        after allocation, so that we can use realloc */
     int        misalignment;
-#endif
 
     /* The section-kind entries for this object module.  Linked
        list. */


From git at git.haskell.org  Thu Nov  5 10:54:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  5 Nov 2015 10:54:45 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: Remove pprTrace from Richard (525ada5)
Message-ID: <20151105105445.8370E3A300@ghc.haskell.org>

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/525ada5aba10a5b8ecf73de9f19f2be7f44ed0f9/ghc

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

commit 525ada5aba10a5b8ecf73de9f19f2be7f44ed0f9
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 4 14:23:49 2015 +0100

    Remove pprTrace from Richard


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

525ada5aba10a5b8ecf73de9f19f2be7f44ed0f9
 compiler/typecheck/TcErrors.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcErrors.hs b/compiler/typecheck/TcErrors.hs
index f5fc2ea..63ad847 100644
--- a/compiler/typecheck/TcErrors.hs
+++ b/compiler/typecheck/TcErrors.hs
@@ -815,9 +815,7 @@ mkTyVarEqErr dflags ctxt extra ct oriented tv1 ty2
                             -- be oriented the other way round;
                             -- see TcCanonical.canEqTyVarTyVar
   || isSigTyVar tv1 && not (isTyVarTy ty2)
-  || pprTrace "RAE1" (ppr ct $$ ppr tv1 $$ ppr ty2 $$
-                      ppr (isTyVarUnderDatatype tv1 ty2))
-     (ctEqRel ct == ReprEq && not (isTyVarUnderDatatype tv1 ty2))
+  || ctEqRel ct == ReprEq && not (isTyVarUnderDatatype tv1 ty2)
      -- the cases below don't really apply to ReprEq (except occurs check)
   = mkErrorMsg ctxt ct (vcat [ misMatchOrCND ctxt ct oriented ty1 ty2
                              , extraTyVarInfo ctxt tv1 ty2


From git at git.haskell.org  Thu Nov  5 10:54:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  5 Nov 2015 10:54:48 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: aclocal.m4: Do not check for readelf on
 darwin (7f8fc1c)
Message-ID: <20151105105448.1D3133A300@ghc.haskell.org>

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/7f8fc1c9db5bef2dea05e001488d5bc7c8b38575/ghc

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

commit 7f8fc1c9db5bef2dea05e001488d5bc7c8b38575
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Thu Nov 5 21:13:30 2015 +1100

    aclocal.m4: Do not check for readelf on darwin
    
    Tested on darwin and linux. Not tested on mingw32.


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

7f8fc1c9db5bef2dea05e001488d5bc7c8b38575
 aclocal.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 6ca3986..874e190 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2213,7 +2213,8 @@ AC_DEFUN([FIND_GCC],[
 # $1 = the variable to set
 #
 AC_DEFUN([FIND_READELF],[
-    if test "$HostOS" != "mingw32"; then
+    if test "$HostOS" != "mingw32" &&
+       test "$HostOS" != "darwin" ; then
         FP_ARG_WITH_PATH_GNU_PROG([READELF], [readelf], [readelf])
         if test -z "$READELF"; then
             AC_MSG_ERROR([cannot identify readelf tool])


From git at git.haskell.org  Fri Nov  6 14:38:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:38:39 +0000 (UTC)
Subject: [commit: ghc] master: Call Arity: In "e x",
 the result of "x" is not shared (a58eeb7)
Message-ID: <20151106143839.33C823A300@ghc.haskell.org>

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

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

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

commit a58eeb7febd67c93dab82de7049ef1dcdecd34e9
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Nov 6 14:04:08 2015 +0100

    Call Arity: In "e x", the result of "x" is not shared
    
    in contrast to "e (f x)", where CorePrep will turn it into "let y = f x
    in e x". So in
      let f = ...
      in e (f x)
    we know that f is called at most once, but in
      let f = ...
      in e f
    we do not know that.
    
    Previously Call Arity would assume that in "e x", "x" is evaluated at
    most once. This rarely would make a difference (the argument "x" is
    analized with an incoming arity of 0, so no eta-expansion would be done
    anyways), but of course this should still be fixed.
    
    This fixes #11064.
    
    Note the corresponding code dmdTransformThunkDmd in DmdAnal.


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

a58eeb7febd67c93dab82de7049ef1dcdecd34e9
 compiler/simplCore/CallArity.hs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/compiler/simplCore/CallArity.hs b/compiler/simplCore/CallArity.hs
index c2a5ad0..bd997c3 100644
--- a/compiler/simplCore/CallArity.hs
+++ b/compiler/simplCore/CallArity.hs
@@ -15,7 +15,7 @@ import BasicTypes
 import CoreSyn
 import Id
 import CoreArity ( typeArity )
-import CoreUtils ( exprIsHNF )
+import CoreUtils ( exprIsHNF, exprIsTrivial )
 --import Outputable
 import UnVarGraph
 import Demand
@@ -149,10 +149,15 @@ The interesting cases of the analysis:
  * Case alternatives alt?,alt?,...:
    Only one can be execuded, so
    Return (alt? ? alt? ?...)
- * App e? e? (and analogously Case scrut alts):
-   We get the results from both sides. Additionally, anything called by e? can
-   possibly be called with anything from e?.
+ * App e? e? (and analogously Case scrut alts), with non-trivial e?:
+   We get the results from both sides, with the argument evaluted at most once.
+   Additionally, anything called by e? can possibly be called with anything
+   from e?.
    Return: C(e?) ? C(e?) ? (fv e?) ? (fv e?)
+ * App e? x:
+   As this is already in A-normal form, CorePrep will not separately lambda
+   bind (and hence share) x. So we conservatively assume multiple calls to x here
+   Return: C(e?) ? (fv e?) ? {x} ? {(x,x)}
  * Let v = rhs in body:
    In addition to the results from the subexpressions, add all co-calls from
    everything that the body calls together with v to everthing that is called
@@ -472,7 +477,12 @@ callArityAnal arity int (App e1 e2)
   where
     (ae1, e1') = callArityAnal (arity + 1) int e1
     (ae2, e2') = callArityAnal 0           int e2
-    final_ae = ae1 `both` ae2
+    -- If the argument is trivial (e.g. a variable), then it will _not_ be
+    -- let-bound in the Core to STG transformation (CorePrep actually),
+    -- so no sharing will happen here, and we have to assume many calls.
+    ae2' | exprIsTrivial e2 = calledMultipleTimes ae2
+         | otherwise        = ae2
+    final_ae = ae1 `both` ae2'
 
 -- Case expression.
 callArityAnal arity int (Case scrut bndr ty alts)


From git at git.haskell.org  Fri Nov  6 14:51:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:51:45 +0000 (UTC)
Subject: [commit: ghc] wip/T10918: Run Call Arity after the last floating
 again (432adaa)
Message-ID: <20151106145146.006D73A300@ghc.haskell.org>

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

On branch  : wip/T10918
Link       : http://ghc.haskell.org/trac/ghc/changeset/432adaa4512227e109b1ff4f30272a0ddd5d4455/ghc

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

commit 432adaa4512227e109b1ff4f30272a0ddd5d4455
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Oct 7 10:53:53 2015 +0200

    Run Call Arity after the last floating again


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

432adaa4512227e109b1ff4f30272a0ddd5d4455
 compiler/simplCore/SimplCore.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compiler/simplCore/SimplCore.hs b/compiler/simplCore/SimplCore.hs
index 9207cf4..efe3baf 100644
--- a/compiler/simplCore/SimplCore.hs
+++ b/compiler/simplCore/SimplCore.hs
@@ -298,6 +298,11 @@ getCoreToDo dflags
 
         maybe_rule_check (Phase 0),
 
+        runWhen call_arity $ CoreDoPasses
+            [ CoreDoCallArity
+            , simpl_phase 0 ["post-late-call-arity"] max_iter
+            ],
+
                 -- Case-liberation for -O2.  This should be after
                 -- strictness analysis and the simplification which follows it.
         runWhen liberate_case (CoreDoPasses [


From git at git.haskell.org  Fri Nov  6 14:51:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:51:48 +0000 (UTC)
Subject: [commit: ghc] wip/T10918: First stab at #10918 (0f6dc41)
Message-ID: <20151106145148.99CA03A300@ghc.haskell.org>

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

On branch  : wip/T10918
Link       : http://ghc.haskell.org/trac/ghc/changeset/0f6dc41746adf9a80dfd4c3984e85a9c1bcddb8d/ghc

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

commit 0f6dc41746adf9a80dfd4c3984e85a9c1bcddb8d
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Oct 1 23:22:19 2015 +0200

    First stab at #10918


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

0f6dc41746adf9a80dfd4c3984e85a9c1bcddb8d
 compiler/simplCore/CallArity.hs  | 7 +++++--
 compiler/simplCore/SimplUtils.hs | 2 +-
 libraries/Cabal                  | 2 +-
 libraries/array                  | 2 +-
 libraries/deepseq                | 2 +-
 libraries/directory              | 2 +-
 libraries/filepath               | 2 +-
 libraries/haskeline              | 2 +-
 libraries/hoopl                  | 2 +-
 libraries/hpc                    | 2 +-
 libraries/parallel               | 2 +-
 libraries/primitive              | 2 +-
 libraries/process                | 2 +-
 libraries/stm                    | 2 +-
 libraries/terminfo               | 2 +-
 libraries/transformers           | 2 +-
 libraries/unix                   | 2 +-
 libraries/vector                 | 2 +-
 utils/haddock                    | 2 +-
 utils/hsc2hs                     | 2 +-
 20 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/compiler/simplCore/CallArity.hs b/compiler/simplCore/CallArity.hs
index bd997c3..9a59c22 100644
--- a/compiler/simplCore/CallArity.hs
+++ b/compiler/simplCore/CallArity.hs
@@ -510,7 +510,7 @@ callArityAnal arity int (Let bind e)
 -- Which bindings should we look at?
 -- See Note [Which variables are interesting]
 isInteresting :: Var -> Bool
-isInteresting v = 0 < length (typeArity (idType v))
+isInteresting v = True -- 0 < length (typeArity (idType v))
 
 interestingBinds :: CoreBind -> [Var]
 interestingBinds = filter isInteresting . bindersOf
@@ -531,7 +531,7 @@ callArityBind boring_vars ae_body int (NonRec v rhs)
   | otherwise
   = -- pprTrace "callArityBind:NonRec"
     --          (vcat [ppr v, ppr ae_body, ppr int, ppr ae_rhs, ppr safe_arity])
-    (final_ae, NonRec v' rhs')
+    (final_ae, NonRec v'' rhs')
   where
     is_thunk = not (exprIsHNF rhs)
     -- If v is boring, we will not find it in ae_body, but always assume (0, False)
@@ -562,6 +562,9 @@ callArityBind boring_vars ae_body int (NonRec v rhs)
 
     v' = v `setIdCallArity` trimmed_arity
 
+    v'' | called_once = v' `setIdDemandInfo` oneifyDmd (idDemandInfo v')
+        | otherwise   = v'
+
 
 -- Recursive let. See Note [Recursion and fixpointing]
 callArityBind boring_vars ae_body int b@(Rec binds)
diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs
index 1577efd..aa82ea4 100644
--- a/compiler/simplCore/SimplUtils.hs
+++ b/compiler/simplCore/SimplUtils.hs
@@ -1039,7 +1039,7 @@ preInlineUnconditionally dflags env top_lvl bndr rhs
     act = idInlineActivation bndr
     try_once in_lam int_cxt     -- There's one textual occurrence
         | not in_lam = isNotTopLevel top_lvl || early_phase
-        | otherwise  = int_cxt && canInlineInLam rhs
+        | otherwise  = (int_cxt && canInlineInLam rhs) || isSingleUsed (idDemandInfo bndr)
 
 -- Be very careful before inlining inside a lambda, because (a) we must not
 -- invalidate occurrence information, and (b) we want to avoid pushing a
diff --git a/libraries/Cabal b/libraries/Cabal
index 75d2807..e6304ff 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 75d2807a2bb11762f4db70540d2cc9049e9c7968
+Subproject commit e6304ff660ca629b1b664f0848a601959e31cb31
diff --git a/libraries/array b/libraries/array
index dd75c73..2f5b772 160000
--- a/libraries/array
+++ b/libraries/array
@@ -1 +1 @@
-Subproject commit dd75c73d191b3f07209c38f78ebe9dcc26fc5ed4
+Subproject commit 2f5b772f4475d70a68c6f9d10390ac9812afdb7d
diff --git a/libraries/deepseq b/libraries/deepseq
index 36bfcd2..c6cb196 160000
--- a/libraries/deepseq
+++ b/libraries/deepseq
@@ -1 +1 @@
-Subproject commit 36bfcd2a6236f2e019de76c256b05ee670492373
+Subproject commit c6cb196fb1bd5f16bb5945add2d6ece3f7910e90
diff --git a/libraries/directory b/libraries/directory
index a7a5b0b..7233248 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit a7a5b0b738aad432a9cad512a26d7564120ef0e8
+Subproject commit 7233248952648ed4dd213f91ed52af2317a3f23b
diff --git a/libraries/filepath b/libraries/filepath
index 564c5a7..81375ae 160000
--- a/libraries/filepath
+++ b/libraries/filepath
@@ -1 +1 @@
-Subproject commit 564c5a78d028ebde6a27f61ff9f686fce490c809
+Subproject commit 81375ae0c892b5951f2c1184c655a8f3a5193c9c
diff --git a/libraries/haskeline b/libraries/haskeline
index fb5b288..7a72748 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit fb5b2884dd00843f6d2fbbeca87b241822088b83
+Subproject commit 7a72748b3898e68c99e3d5ae7d06c58dd190b149
diff --git a/libraries/hoopl b/libraries/hoopl
index 84255f0..b38e92f 160000
--- a/libraries/hoopl
+++ b/libraries/hoopl
@@ -1 +1 @@
-Subproject commit 84255f0fe07f3fd1f5bc96e60b64c582394edcf1
+Subproject commit b38e92f67cabfa0d0ed12ac93c2d431f2391de70
diff --git a/libraries/hpc b/libraries/hpc
index e20c61c..886429b 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit e20c61c358e749ea62f6687089ad2a878d5d1a66
+Subproject commit 886429bf84097bbc16cdb6602b60ba1b9156cf6a
diff --git a/libraries/parallel b/libraries/parallel
index ec04d05..f606922 160000
--- a/libraries/parallel
+++ b/libraries/parallel
@@ -1 +1 @@
-Subproject commit ec04d059b13fc348789d87adfbabb9351f8574db
+Subproject commit f6069229df73045770fe4521991b9d22fd58e680
diff --git a/libraries/primitive b/libraries/primitive
index 83d3d23..29cb0db 160000
--- a/libraries/primitive
+++ b/libraries/primitive
@@ -1 +1 @@
-Subproject commit 83d3d23d2fa1583ecd1b59464cc889924e1b5fff
+Subproject commit 29cb0db59803c9d9181f7c4ce35ef1c6cbc6ccfb
diff --git a/libraries/process b/libraries/process
index 7428b61..e0983fb 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 7428b614841e6b6416e501453546b0af19a0cd1f
+Subproject commit e0983fbbfa8a3d81c7b99e83a3169fc686caab62
diff --git a/libraries/stm b/libraries/stm
index e917b59..f7db2c3d 160000
--- a/libraries/stm
+++ b/libraries/stm
@@ -1 +1 @@
-Subproject commit e917b5944ce0a5b4e32dcc8f00eaddbec1256e98
+Subproject commit f7db2c3df86ec644e5e06baa8090a1cb525754e2
diff --git a/libraries/terminfo b/libraries/terminfo
index 68e88c4..1b5ab01 160000
--- a/libraries/terminfo
+++ b/libraries/terminfo
@@ -1 +1 @@
-Subproject commit 68e88c453237763084f5032d133ee7347980f8b2
+Subproject commit 1b5ab01452eaa6c21de7174ad4312a017a13d0ab
diff --git a/libraries/transformers b/libraries/transformers
index 5ccb747..078c7da 160000
--- a/libraries/transformers
+++ b/libraries/transformers
@@ -1 +1 @@
-Subproject commit 5ccb747e67d579e3f212fd3526469c35282e532e
+Subproject commit 078c7daf36ea1fa1ecb63b04dbe667a443e13044
diff --git a/libraries/unix b/libraries/unix
index 137fa1b..4260c25 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 137fa1b06a79a9baa0d5fcf2ec11f964c3423f6a
+Subproject commit 4260c25687d3a4bc1ffacdacfbe7e47082ff2550
diff --git a/libraries/vector b/libraries/vector
index 6c17dd6..c0308f1 160000
--- a/libraries/vector
+++ b/libraries/vector
@@ -1 +1 @@
-Subproject commit 6c17dd6fadc5e7e3e09f7892380ce1339f296efd
+Subproject commit c0308f1c4f57859d9a8b10d504afe56eebbb27c5
diff --git a/utils/haddock b/utils/haddock
index 7f4519f..e083daa 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 7f4519f0bb2a490fd9c1b42d37ae4f14390551b4
+Subproject commit e083daa4a46ae2f9a244b6bcedc5951b3a78f260
diff --git a/utils/hsc2hs b/utils/hsc2hs
index bb205d8..293f41c 160000
--- a/utils/hsc2hs
+++ b/utils/hsc2hs
@@ -1 +1 @@
-Subproject commit bb205d806c1368e483edde288cbf8ed2cfca2ba6
+Subproject commit 293f41c78e956b78363ede463e7ff52eb6bc997d


From git at git.haskell.org  Fri Nov  6 14:51:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:51:51 +0000 (UTC)
Subject: [commit: ghc] wip/T10918: Ticket #10918: Inline singly used things
 even more aggressively (b730b4e)
Message-ID: <20151106145151.43BB53A300@ghc.haskell.org>

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

On branch  : wip/T10918
Link       : http://ghc.haskell.org/trac/ghc/changeset/b730b4e5672442ed7afedf24f5a67fb203b738db/ghc

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

commit b730b4e5672442ed7afedf24f5a67fb203b738db
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Oct 7 16:45:39 2015 +0200

    Ticket #10918: Inline singly used things even more aggressively


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

b730b4e5672442ed7afedf24f5a67fb203b738db
 compiler/simplCore/SimplUtils.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs
index aa82ea4..e3a737e 100644
--- a/compiler/simplCore/SimplUtils.hs
+++ b/compiler/simplCore/SimplUtils.hs
@@ -1038,8 +1038,9 @@ preInlineUnconditionally dflags env top_lvl bndr rhs
              -- See Note [pre/postInlineUnconditionally in gentle mode]
     act = idInlineActivation bndr
     try_once in_lam int_cxt     -- There's one textual occurrence
+        | isSingleUsed (idDemandInfo bndr) = isNotTopLevel top_lvl
         | not in_lam = isNotTopLevel top_lvl || early_phase
-        | otherwise  = (int_cxt && canInlineInLam rhs) || isSingleUsed (idDemandInfo bndr)
+        | otherwise  = int_cxt && canInlineInLam rhs
 
 -- Be very careful before inlining inside a lambda, because (a) we must not
 -- invalidate occurrence information, and (b) we want to avoid pushing a


From git at git.haskell.org  Fri Nov  6 14:51:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:51:54 +0000 (UTC)
Subject: [commit: ghc] wip/T10918: Make Call Arity aggressive only in the
 second run (5cb6c7c)
Message-ID: <20151106145154.07DAB3A300@ghc.haskell.org>

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

On branch  : wip/T10918
Link       : http://ghc.haskell.org/trac/ghc/changeset/5cb6c7c79da461b0fcee1fb4e45eb3f08d6eab24/ghc

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

commit 5cb6c7c79da461b0fcee1fb4e45eb3f08d6eab24
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Oct 8 14:07:02 2015 +0200

    Make Call Arity aggressive only in the second run
    
    not that I believe that this is a viable solution, but it should be a
    way to work around
    https://ghc.haskell.org/trac/ghc/ticket/10918#comment:10
    and hopefully tell me whether the whole thing is actually useful.


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

5cb6c7c79da461b0fcee1fb4e45eb3f08d6eab24
 compiler/coreSyn/CoreLint.hs    |   2 +-
 compiler/simplCore/CallArity.hs | 106 ++++++++++++++++++++--------------------
 compiler/simplCore/CoreMonad.hs |   4 +-
 compiler/simplCore/SimplCore.hs |   8 +--
 4 files changed, 61 insertions(+), 59 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5cb6c7c79da461b0fcee1fb4e45eb3f08d6eab24

From git at git.haskell.org  Fri Nov  6 14:51:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:51:57 +0000 (UTC)
Subject: [commit: ghc] wip/T10918's head updated: Make Call Arity aggressive
 only in the second run (5cb6c7c)
Message-ID: <20151106145157.3AA153A300@ghc.haskell.org>

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

Branch 'wip/T10918' now includes:

     36811bf AsmCodeGen: Ensure LLVM .line directives are sorted
     ea4df12 Ensure shiftL/shiftR arguments aren't negative
     7b443bb Improve error messages for ambiguous type variables
     69a6e42 Allow non-operator infix pattern synonyms
     e2b579e Parser: revert some error messages to what they were before 7.10
     f64f7c3 Tests for #10945 and #10946
     931d0a7 Move orphan instance/rule warnings to typechecker/desugarer.
     e99e6db Extra files to ignore from the new Restructured documentation.
     0ead0ca Disable man building for most quick build styles.
     c7ab799 Ignore __pycache__.
     e5baf62 Simplify type of ms_srcimps and ms_textual_imps.
     5dc3db7 Switch to LLVM version 3.7
     80602af Revert "Switch to LLVM version 3.7"
     e331392 Fix error msg: ghci can't be used with -prof or -static (#10936)
     5d84110 Add short library names support to Windows linker
     182c44d Keep `shift{L,R}` on `Integer` from segfaulting
     840df33 Rename SpecInfo to RuleInfo (upon SPJ's advice).
     fa5eabe sphinx: Don't share doctrees between targets
     614ce4b Testsuite: T3333 still fails on non-linux statically linked ghci (#3333)
     bbad4f6 Delete ShPackageKey for now.
     f002340 compiler/nativeGen/PPC/Ppr.hs: Whitespace
     4bd58c1 PPC: Fix right shift by 32 bits #10870
     e737a51 base: MRP-refactoring of AMP instances
     6b7bad9 Test Trac #10931
     f8fbf38 Reinstate monomorphism-restriction warnings
     dcc3428 Don't inline/apply other rules when simplifying a rule RHS.
     330ba6a testsuite: attempt fixing T10935 output
     94ef79a Slightly wibble TcSimplify documentation
     d2f9972 Make dataToQa aware of Data instances which use functions to implement toConstr
     1818b48 Fix incorrect import warnings when methods with identical names are imported
     e5bfd70 docs: overhaul Derive{Functor,Foldable,Traversable} notes
     dec5cd4 base: Add forkOSWithUnmask
     e8c8173 Allow arr ? (first ? (***)) as minimal definition of Arrow instance
     29310b6 Switch to LLVM version 3.7
     7756161 travis: use LLVM 3.7
     933adc0 Fix GHCi on Arm (#10375).
     729bf08 User should use -package-id flag if value in question is IPID.
     5b0191f Update Cabal to HEAD, IPID renamed to Component ID.
     b92a51f Rename package key to unit ID, and installed package ID to component ID.
     6338a1c Rename PACKAGE_KEY and LIB_NAME in build system.
     20e30d5 Minor stylistic update.
     04e8366 ELF/x86_64: map object file sections separately into the low 2GB
     78c9dea Fix windows build after D975
     4d6844a rts/Linker.c : Fix armhf build (#10977)
     808bbdf Remove dead function patSynTyDetails
     b1884b0 Implement DuplicateRecordFields
     75492e7 Add typed holes support in Template Haskell.
     6a8ca65 Allow left ? (+++) as minimal definition of ArrowChoice instance
     e7c076d base: changelog entries for Arrow/ArrowChoice
     324e0ac base: MINIMAL pragmas for Arrow/ArrowChoice
     3340fe0 Build system: fix `make -j1` (#10973)
     603a369 Silence the linker on Windows so tests pass
     fff0254 Move Control.Monad.IO.Class to base from transformers
     a6a3dab Libdw: Add libdw-based stack unwinding
     40cbf9a Signals: Print backtrace on SIGUSR2
     e8ed213 Make Monad/Applicative instances MRP-friendly
     6638bfd CmmParse: Clarify description of calling convention
     d990b5f Signals: Always install SIGUSR2 handler
     75c7cda ghc-pkg: Express return-method in terms of pure
     c6781a5 template-haskell: MRP-refactor Applicative/Monad instances
     1e34f62 MRP-refactor `GHCi` Applicative/Monad instance
     d6d421c template-haskell: set explicit return=pure
     40235c3 fix RTS linker compilation failure on Solaris
     7bbb61b Driver: `ghci -e` should behave like `ghc -e` (#9360)
     2b25a58 base: Have the argument of mask restore the state.
     96dc041 Systools.hs: Improve detection of GCC and Clang
     ae4acbd Testsuite Windows: don't use forward slashes in topdir path
     1750ebc Reject top-level typed TH splices. Fixes #10945
     bb7e93c Extended default rules now specialize Foldable, Traversable to [] (#10971)
     68a084f Testsuite: add test for #10997
     2bc6efc Fix caching of pagesize
     7855afb Fix breakage in the GHCi debugger
     e3e5a96 Remove old trace statement
     d77c404 Stop the pipeline when it doesn't need to be run.
     c633f71 Add another test for #10549
     1e8d1f1 Suggest enabling PatternSynonyms (#10943)
     9ec5996 rts/Schedule.c: remove unused variable
     0499aa7 Add missing stderr file
     9cb192c Make stronglyConnCompFromEdgedVertices deterministic
     0ae6a43 Suggest chmod 755 instead of 644
     fa7d582 Quote GHC path in configure so we can deal with multiple spaces.
     8f5ad1a Quote GHC_PKG in Makefile.
     fdb08e2 Add testcase for #10426
     0afba67 arclint: ReST doesn't need ArcanistMergeConflictLinter
     fd63ea5 base: Note platform dependence of registerFd
     7dae074 Verify minimum required version of sphinx-build
     67284a0 gitignore: Ignore sphinx doctrees directories
     2866dfb Fix broken .arclint
     4e40340 Support more sphinx-build versions in configure script
     ec14392 typo in comments: s/selectg/select/
     798d2e2 configure.ac: Fix autotool warnings
     7aea0cf use Proxy instead of undefined -- we already dropped support for 7.6
     ca12c24 Update example GHCi startup
     abc214b rts/Linker.c:  Split RTS symbols out into separate file
     3ed4b80 rts/Linker.c: Convert #if/#else to if/else
     898f34c rts/RtsSymbols.c: Fix Windows build
     43751b2 Provide a utility to check API Annotations
     c2fab84 Add testcase for #10370
     86e5eb9 Remove redundant typedef
     0b79aa1 base: Add Haddocks to GHC.RTS.Flags
     73c273a Fix a typo in the User's Guide ReST intro
     23e344b Remove cygwin32_HOST_OS #ifdefs
     499ce29 Add flag to reverse errors in GHC/GHCi
     a9c93bd Implement MIN_VERSION and VERSION macros natively in GHC.
     c10c01c Build system: comments only [skip ci]
     f86fb5e Add regression tests for #10045, #10999
     6831815 Comments only
     0ce858e Zonk properly when checkig pattern synonyms
     adc3d17 manpage: Mark as orphan document
     d1d8704 Use correct documentation flag for freverse-errors
     158d2a9 Make it possible to have different UniqSupply strategies
     079dd12 Fix "Use correct documentation flag for freverse-errors"
     dc13467 DynFlags: Fix more merge errors
     ffcdd84 Sort field labels before fingerprint hashing
     166c597 DynFlags: Yet one more fix
     31704ad Make worker-wrapper optional
     9efa56d Fix the DYNAMIC_GHC_PROGRAMS=NO build on Mac/Windows
     19354fb Make T10970a non-dependent on GCC version.
     7c2ab6f Testsuite: accept output for T10999 (#10999)
     d1ab6fc PrelNames: Fix duplicate unique
     9fc2d77 Build system: don't add ALL_HC_OPTS when linking
     04b0a73 Pattern synonyms: swap provided/required
     de27bed Update haskeline/terminfo submodules
     c1e1584 Update `deepseq` submodule
     776d55c rts/Linker.c: Drop support for legacy OS X dyn loading
     ce2416b Fix rts/T9579 tests on OS X
     08f5c4e Backpack documentation updates for component IDs [no-ci]
     032be43 Testsuite: report and error out on unfound tests
     a051788 Revert "Build system: don't add ALL_HC_OPTS when linking"
     2a74a64 Record pattern synonyms
     fa58731 Revert "Build system: don't create mk/are-validating.mk"
     e31113f Move mkDefaultMethodIds, mkRecSelBinds from TcTyClsDecls to TcTyDecls
     d25fa86 TcTyDecls: Remove redundant import of Applicative
     40e6214 DynFlags: Add (another) missing hunk from D1360
     bef2f03 Generate Typeable info at definition sites
     bbaf76f Revert "Generate Typeable info at definition sites"
     e272ab9 x86 codegen: don't generate location comments
     8ddf417 Linker: Fix type in m32_free_internal
     9b3a058 Swap prov/req in variable naming in Parser.y
     9376249 Fix unused-import stuff in a better way
     3e94842 Record usage information using GlobalRdrElt
     da58d15 Kill redundant import
     268aa9a integerConstantFolding: when(compiler_debugged(), expect_broken(#11006))
     0a16374 Disambiguate record selectors by type signature
     1f1c7c6 Build system: rename runghc.hs to Main.hs
     b05ab1a Build system: cleanup a few .cabal files
     314395e Build system: cabalise deriveConstants + genprimopcode
     2624298 Fix segfault due to reading non-existent memory
     42e8528 CmmParse: Expose popcnt operations
     3e2c227 Linker: Clean up USE_MMAP usage
     1c80db5 Insert an empty line between two STG definitions in dump output.
     56f9ef4 Unify: Add Outputable instance for UnifyResultM
     aa289d2 Move win32 tarball download logic to script
     f78b477 driver: use PROGBITS type for .debug-ghc-link-info section
     59e728b Testsuite: suggest quoting $(TEST_HC)
     91c6b1f Generate Typeable info at definition sites
     39b71e8 Reimplement shadowing on a per database basis.
     f5974c8 rts: Make MBLOCK_SPACE_SIZE dynamic
     fce758c Add failing test for #11039
     a5cb27f Make type-class dictionary let binds deterministic
     e03e22c testsuite: performGC requires SMP support for 'qg' option
     d9d201c testsuite: 'threaded2' tests require '-N' RTS option support
     e0071c3 unreg: handle CmmStack in C codegen (unbreaks '-g')
     8995865 Update primitive/vector submodules
     62f0fbc Update parallel submodule
     8160f42 Add subWordC# on x86ish
     7a48e6c Make ghc-cabal's `System.Directory` import more robust
     6bef55c Fix documentation build on windows
     e2a78ee Signals: Ensure libdw session is freed
     8f02baa Remove Data.List.NonEmpty.{words,unwords,lines,unlines}
     bc7cc25 disable large address space on OpenBSD
     da1a8da llvmGen: Fix build with Clang
     8fd5cff llvmGen: Really fix build with Clang
     3021cc0 Add rts/Linker support for more than 64k sections
     31bcf9b Apply WERROR only to stage2 HC options
     c3b0215 Provide a utility to check API Annotations docs
     4ad2a8f rts/posix: Reduce heap allocation amount on mmap failure
     c8e866a Enforce linkage with pthread library on OpenBSD
     184dfce Linker: More uint64_t to uintptr_t fixes
     9f0ecb4 ghc-prim: Fix hs_ctz64 for powerpc
     62e1b35 Update array/stm/hpc/haddock submodules
     d2a7fb9 Update directory submodule
     12abc77 Update filepath submodule
     de8443c Update process submodule
     3238ef7 Update unix submodule
     32f92a3 Update hoopl submodule
     f8ba4b5 Bump `base` version to 4.9.0.0 (closes #11026)
     4b8b934 ghc-prim: add API delta as changelog (re #11043)
     84bf1eb Bump ghc-prim version to 0.5.0.0 (closes #11043)
     f16827f ApiAnnotations: BooleanFormula is not properly Located
     5a48180 keepCAFsForGHCi was broken
     677d768 DynFlags: -freverse-errors should be defFlag
     3431ad6 Update Cabal submodule
     6fb0ba6 Dwarf: Preserve stack pointer register
     76611d7 Dwarf.Types: Fix comment style
     159a1a2 cmm: Expose machine's stack and return address register
     d9f8862 StgStartup: Setup unwinding for stg_stop_thread
     bb446b2 Libdw: Remove special treatment for stg_stop_thread
     b8df858 Dwarf.Constants: Introduce Haddock sections
     52c6e3d Libdw: Fix symbol naming
     e9bfb3f Minor simplification in unariser pass:
     65f3c4c Change sphinx for documentation building on windows to the python3 version
     f46f32b EventLog: Loop fwrite if necessary during flush
     9fe5497 rts: Produce stack trace on fatal error
     1e2259b Update process submodule to process-1.4 release
     c00c5e5 get rid of Elf32/Elf64_Section as this is a non-portable Linux-ism.
     130ca3e Update filepath submodule for proper version
     5065cf4 base: Update `@since 4.8.2` annotations (re #11026)
     0bc8c6a base: GHC.RTS.Flags symbols really were introduced in 4.8.2
     83fd2ba base: Add changelog entry for 4.8.2.0
     8c80dcc base: Add new Control.Monad.Fail module (re #10751)
     b62605e Add `MonadPlus IO` and `Alternative IO` instances
     334fe45 rts/Hash: Constify HashTable* in lookupHashTable
     987d542 Build system: renable -Wall on validate (base)
     0e21678 Cabal-level sanity check to enforce Cabal flag-invariant
     22fcf9c Tweak settings for LLVM tests
     e547954 Use full name of LLVM program in error message
     10647d4 Linker: #ifdef cleanup
     a58eeb7 Call Arity: In "e x", the result of "x" is not shared
     0f6dc41 First stab at #10918
     432adaa Run Call Arity after the last floating again
     b730b4e Ticket #10918: Inline singly used things even more aggressively
     5cb6c7c Make Call Arity aggressive only in the second run

From git at git.haskell.org  Fri Nov  6 14:55:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:55:25 +0000 (UTC)
Subject: [commit: ghc] wip/T10918: First stab at #10918 (02c6765)
Message-ID: <20151106145525.D41683A300@ghc.haskell.org>

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

On branch  : wip/T10918
Link       : http://ghc.haskell.org/trac/ghc/changeset/02c6765facb2003272b03e6b8d9a33d9e1cee4c2/ghc

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

commit 02c6765facb2003272b03e6b8d9a33d9e1cee4c2
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Oct 1 23:22:19 2015 +0200

    First stab at #10918


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

02c6765facb2003272b03e6b8d9a33d9e1cee4c2
 compiler/simplCore/CallArity.hs  | 7 +++++--
 compiler/simplCore/SimplUtils.hs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/simplCore/CallArity.hs b/compiler/simplCore/CallArity.hs
index bd997c3..9a59c22 100644
--- a/compiler/simplCore/CallArity.hs
+++ b/compiler/simplCore/CallArity.hs
@@ -510,7 +510,7 @@ callArityAnal arity int (Let bind e)
 -- Which bindings should we look at?
 -- See Note [Which variables are interesting]
 isInteresting :: Var -> Bool
-isInteresting v = 0 < length (typeArity (idType v))
+isInteresting v = True -- 0 < length (typeArity (idType v))
 
 interestingBinds :: CoreBind -> [Var]
 interestingBinds = filter isInteresting . bindersOf
@@ -531,7 +531,7 @@ callArityBind boring_vars ae_body int (NonRec v rhs)
   | otherwise
   = -- pprTrace "callArityBind:NonRec"
     --          (vcat [ppr v, ppr ae_body, ppr int, ppr ae_rhs, ppr safe_arity])
-    (final_ae, NonRec v' rhs')
+    (final_ae, NonRec v'' rhs')
   where
     is_thunk = not (exprIsHNF rhs)
     -- If v is boring, we will not find it in ae_body, but always assume (0, False)
@@ -562,6 +562,9 @@ callArityBind boring_vars ae_body int (NonRec v rhs)
 
     v' = v `setIdCallArity` trimmed_arity
 
+    v'' | called_once = v' `setIdDemandInfo` oneifyDmd (idDemandInfo v')
+        | otherwise   = v'
+
 
 -- Recursive let. See Note [Recursion and fixpointing]
 callArityBind boring_vars ae_body int b@(Rec binds)
diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs
index 1577efd..aa82ea4 100644
--- a/compiler/simplCore/SimplUtils.hs
+++ b/compiler/simplCore/SimplUtils.hs
@@ -1039,7 +1039,7 @@ preInlineUnconditionally dflags env top_lvl bndr rhs
     act = idInlineActivation bndr
     try_once in_lam int_cxt     -- There's one textual occurrence
         | not in_lam = isNotTopLevel top_lvl || early_phase
-        | otherwise  = int_cxt && canInlineInLam rhs
+        | otherwise  = (int_cxt && canInlineInLam rhs) || isSingleUsed (idDemandInfo bndr)
 
 -- Be very careful before inlining inside a lambda, because (a) we must not
 -- invalidate occurrence information, and (b) we want to avoid pushing a


From git at git.haskell.org  Fri Nov  6 14:55:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:55:28 +0000 (UTC)
Subject: [commit: ghc] wip/T10918: Run Call Arity after the last floating
 again (137d360)
Message-ID: <20151106145528.6F8903A300@ghc.haskell.org>

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

On branch  : wip/T10918
Link       : http://ghc.haskell.org/trac/ghc/changeset/137d360268a7778567bb24cafa3129c3f1e16f59/ghc

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

commit 137d360268a7778567bb24cafa3129c3f1e16f59
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Oct 7 10:53:53 2015 +0200

    Run Call Arity after the last floating again


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

137d360268a7778567bb24cafa3129c3f1e16f59
 compiler/simplCore/SimplCore.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compiler/simplCore/SimplCore.hs b/compiler/simplCore/SimplCore.hs
index 9207cf4..efe3baf 100644
--- a/compiler/simplCore/SimplCore.hs
+++ b/compiler/simplCore/SimplCore.hs
@@ -298,6 +298,11 @@ getCoreToDo dflags
 
         maybe_rule_check (Phase 0),
 
+        runWhen call_arity $ CoreDoPasses
+            [ CoreDoCallArity
+            , simpl_phase 0 ["post-late-call-arity"] max_iter
+            ],
+
                 -- Case-liberation for -O2.  This should be after
                 -- strictness analysis and the simplification which follows it.
         runWhen liberate_case (CoreDoPasses [


From git at git.haskell.org  Fri Nov  6 14:55:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:55:31 +0000 (UTC)
Subject: [commit: ghc] wip/T10918: Ticket #10918: Inline singly used things
 even more aggressively (5d3221a)
Message-ID: <20151106145531.137F33A300@ghc.haskell.org>

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

On branch  : wip/T10918
Link       : http://ghc.haskell.org/trac/ghc/changeset/5d3221aeefd3fab8c7ded74110997571805ab2ec/ghc

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

commit 5d3221aeefd3fab8c7ded74110997571805ab2ec
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Oct 7 16:45:39 2015 +0200

    Ticket #10918: Inline singly used things even more aggressively


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

5d3221aeefd3fab8c7ded74110997571805ab2ec
 compiler/simplCore/SimplUtils.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs
index aa82ea4..e3a737e 100644
--- a/compiler/simplCore/SimplUtils.hs
+++ b/compiler/simplCore/SimplUtils.hs
@@ -1038,8 +1038,9 @@ preInlineUnconditionally dflags env top_lvl bndr rhs
              -- See Note [pre/postInlineUnconditionally in gentle mode]
     act = idInlineActivation bndr
     try_once in_lam int_cxt     -- There's one textual occurrence
+        | isSingleUsed (idDemandInfo bndr) = isNotTopLevel top_lvl
         | not in_lam = isNotTopLevel top_lvl || early_phase
-        | otherwise  = (int_cxt && canInlineInLam rhs) || isSingleUsed (idDemandInfo bndr)
+        | otherwise  = int_cxt && canInlineInLam rhs
 
 -- Be very careful before inlining inside a lambda, because (a) we must not
 -- invalidate occurrence information, and (b) we want to avoid pushing a


From git at git.haskell.org  Fri Nov  6 14:55:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  6 Nov 2015 14:55:33 +0000 (UTC)
Subject: [commit: ghc] wip/T10918: Make Call Arity aggressive only in the
 second run (761639c)
Message-ID: <20151106145533.B43F13A300@ghc.haskell.org>

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

On branch  : wip/T10918
Link       : http://ghc.haskell.org/trac/ghc/changeset/761639c60d80273b2036de72c56b7dfa26cd5be8/ghc

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

commit 761639c60d80273b2036de72c56b7dfa26cd5be8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Oct 8 14:07:02 2015 +0200

    Make Call Arity aggressive only in the second run
    
    not that I believe that this is a viable solution, but it should be a
    way to work around
    https://ghc.haskell.org/trac/ghc/ticket/10918#comment:10
    and hopefully tell me whether the whole thing is actually useful.


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

761639c60d80273b2036de72c56b7dfa26cd5be8
 compiler/coreSyn/CoreLint.hs    |   2 +-
 compiler/simplCore/CallArity.hs | 106 ++++++++++++++++++++--------------------
 compiler/simplCore/CoreMonad.hs |   4 +-
 compiler/simplCore/SimplCore.hs |   8 +--
 4 files changed, 61 insertions(+), 59 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 761639c60d80273b2036de72c56b7dfa26cd5be8

From git at git.haskell.org  Sat Nov  7 09:39:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 09:39:06 +0000 (UTC)
Subject: [commit: ghc] master: Make GHCi & TH work when the compiler is built
 with -prof (ce1f160)
Message-ID: <20151107093906.C13F43A300@ghc.haskell.org>

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

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

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

commit ce1f1607ed7f8fedd2f63c8610cafefd59baaf32
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Sat Nov 7 09:39:05 2015 +0000

    Make GHCi & TH work when the compiler is built with -prof
    
    Summary:
    Amazingly, there were zero changes to the byte code generator and very
    few changes to the interpreter - mainly because we've used good
    abstractions that hide the differences between profiling and
    non-profiling.  So that bit was pleasantly straightforward, but there
    were a pile of other wibbles to get the whole test suite through.
    
    Note that a compiler built with -prof is now like one built with
    -dynamic, in that to use TH you have to build the code the same way.
    For dynamic, we automatically enable -dynamic-too when TH is required,
    but we don't have anything equivalent for profiling, so you have to
    explicitly use -prof when building code that uses TH with a profiled
    compiler.  For this reason Cabal won't work with TH.  We don't expect
    to ship a profiled compiler, so I think that's OK.
    
    Test Plan: validate with GhcProfiled=YES in validate.mk
    
    Reviewers: goldfire, bgamari, rwbarton, austin, hvr, erikd, ezyang
    
    Reviewed By: ezyang
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1407
    
    GHC Trac Issues: #4837, #545


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

ce1f1607ed7f8fedd2f63c8610cafefd59baaf32
 compiler/cmm/CmmInfo.hs                            |  4 ++
 compiler/codeGen/StgCmmProf.hs                     | 13 ++--
 compiler/ghci/ByteCodeItbls.hs                     | 18 ++++--
 compiler/ghci/Linker.hs                            | 74 ++++++++++++----------
 compiler/ghci/RtClosureInspect.hs                  | 15 +++--
 compiler/main/DynFlags.hs                          | 21 ++++--
 compiler/main/HscMain.hs                           |  5 --
 ghc/InteractiveUI.hs                               | 10 ---
 includes/rts/prof/CCS.h                            |  2 +
 includes/rts/storage/InfoTables.h                  | 28 --------
 rts/Interpreter.c                                  | 14 ++--
 rts/Linker.c                                       | 19 +++++-
 rts/PrimOps.cmm                                    |  2 -
 rts/ProfHeap.c                                     |  2 +-
 rts/Profiling.c                                    | 47 +++++++-------
 rts/Profiling.h                                    |  2 +-
 rts/RtsStartup.c                                   |  6 +-
 rts/RtsSymbols.c                                   | 15 +++++
 testsuite/config/ghc                               |  6 +-
 testsuite/mk/boilerplate.mk                        |  4 ++
 testsuite/mk/ghc-config.hs                         |  1 +
 testsuite/tests/annotations/should_compile/all.T   |  3 -
 .../tests/annotations/should_compile/th/Makefile   | 10 +--
 .../tests/annotations/should_compile/th/all.T      |  2 -
 .../tests/annotations/should_compile/th/annth.hs   |  2 +
 testsuite/tests/annotations/should_run/all.T       |  1 -
 testsuite/tests/cabal/cabal04/Makefile             |  2 +-
 testsuite/tests/cabal/cabal04/all.T                |  2 +-
 testsuite/tests/ghc-e/should_fail/all.T            |  2 -
 testsuite/tests/ghc-e/should_run/all.T             |  2 -
 testsuite/tests/ghci.debugger/scripts/all.T        |  1 -
 .../tests/ghci.debugger/scripts/break022/all.T     |  1 -
 .../tests/ghci.debugger/scripts/break023/all.T     |  1 -
 testsuite/tests/ghci/scripts/all.T                 |  2 -
 testsuite/tests/ghci/should_fail/all.T             |  2 -
 testsuite/tests/ghci/should_run/all.T              |  2 -
 testsuite/tests/layout/all.T                       |  3 +-
 testsuite/tests/overloadedrecflds/ghci/all.T       |  2 -
 testsuite/tests/partial-sigs/should_compile/all.T  |  4 +-
 testsuite/tests/partial-sigs/should_fail/all.T     |  6 +-
 testsuite/tests/plugins/annotation-plugin/Makefile |  2 +-
 .../tests/plugins/rule-defining-plugin/Makefile    |  2 +-
 testsuite/tests/plugins/simple-plugin/Makefile     |  2 +-
 .../tests/profiling/should_run/ioprof.prof.sample  | 62 ++++++++++--------
 testsuite/tests/profiling/should_run/ioprof.stderr |  2 +
 testsuite/tests/quasiquotation/qq007/Makefile      |  2 +-
 testsuite/tests/quasiquotation/qq007/test.T        |  2 +-
 testsuite/tests/quasiquotation/qq008/Makefile      |  2 +-
 testsuite/tests/quasiquotation/qq008/test.T        |  2 +-
 testsuite/tests/quasiquotation/qq009/Makefile      |  2 +-
 testsuite/tests/quasiquotation/qq009/test.T        |  2 +-
 testsuite/tests/runghc/all.T                       |  3 -
 testsuite/tests/th/Makefile                        |  2 +-
 testsuite/tests/th/T2014/all.T                     |  2 -
 testsuite/tests/th/T4255.hs                        |  5 --
 testsuite/tests/th/T4255.stderr                    |  2 -
 testsuite/tests/th/TH_import_loop/TH_import_loop.T |  2 -
 testsuite/tests/th/all.T                           | 14 ++--
 58 files changed, 235 insertions(+), 235 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ce1f1607ed7f8fedd2f63c8610cafefd59baaf32

From git at git.haskell.org  Sat Nov  7 13:00:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 13:00:04 +0000 (UTC)
Subject: [commit: ghc] master: Allow the GHCi Linker to resolve related
 dependencies when loading DLLs (6e6438e)
Message-ID: <20151107130004.2E2FC3A300@ghc.haskell.org>

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

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

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

commit 6e6438e15f33cb94ad6338e950e693f59d046385
Author: Tamar Christina <tamar at zhox.com>
Date:   Sat Nov 7 03:51:43 2015 -0500

    Allow the GHCi Linker to resolve related dependencies when loading DLLs
    
    Summary:
    GHCi does not correctly tell the Windows Loader how to handle dependencies to DLL's
    that are not on the standard Windows load path:
    
    1. The directory from which the application loaded.
    2. The current directory.
    3. The system directory. Use the GetSystemDirectory function to get the path of this directory.
    4. The 16-bit system directory. There is no function that obtains the path of this directory,
       but it is searched.
    5. The Windows directory. Use the GetWindowsDirectory function to get the path of this directory.
    6. The directories that are listed in the PATH environment variable.
       Note that this does not include the per-application path specified by the
       AppPaths registry key. The App Paths key is not used when computing the DLL search path.
    
    So what this means is given two DLLs `A` and `B` and `B` depending on `A`.
    If we put both DLLs into a new folder bin and then call GHC with:
    
    `ghc -L$(PWD)/bin -lB`
    
    the loading will fail as the Windows loader will try to load the dependency of `B` and fail
    since it cannot find `A`.
    
    *IMPORTANT* this patch drops XP Support.
    The  APIs being used were natively added to Windows 8+ and backported to Windows 7 and Vista
    via a mandatory security patch (in 2011). This means that there is a chance that KB2533623 has
    not been installed on certain machines. For those machines I display a warning and
    temporarily expand the `PATH` to allow it to load.
    
    This patch will make sure that paths provided by the user with `-L` *and* the folder in which a
    DLL is found are added to the search path. It does so using one of two methods depending upon how
    new of a Windows version we are running on:
    
    - If the APIs are available it will use `addDllDirectory` and `removeDllDirectory`.
       The order of which these directories are searched is nondeterministic.
    - If the APIs are not available it means that we're running on a pretty old unpatched machine.
      But if it's being used in an environment with no internet access it may be the case.
      So if the APIs are not available we temporarily extend the `PATH` with the directories.
      A warning is also displayed to the user informing them that the linking may fail,
      and if it does, install the needed patch. The `PATH` variable has limitations.
    
    Test Plan:
    ./validate
    
    Added two new test T10955 and T10955dyn
    
    Reviewers: erikd, bgamari, thomie, hvr, austin
    
    Reviewed By: erikd, thomie
    
    Subscribers: #ghc_windows_task_force
    
    Differential Revision: https://phabricator.haskell.org/D1340
    
    GHC Trac Issues: #10955


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

6e6438e15f33cb94ad6338e950e693f59d046385
 compiler/ghci/Linker.hs                            |  86 +++++----
 compiler/ghci/ObjLink.hs                           |  47 +++--
 includes/rts/Linker.h                              |  11 ++
 rts/Linker.c                                       | 199 +++++++++++++++++++--
 rts/RtsSymbols.c                                   |   4 +-
 rts/ghc.mk                                         |  15 +-
 testsuite/tests/ghci/linking/dyn/B.c               |  21 +++
 testsuite/tests/ghci/linking/dyn/Makefile          |  45 ++++-
 testsuite/tests/ghci/linking/dyn/T10955.script     |   5 +
 .../linking/dyn/T10955.stdout}                     |   0
 testsuite/tests/ghci/linking/dyn/T10955dyn.hs      |   7 +
 .../linking/dyn/T10955dyn.stdout}                  |   0
 testsuite/tests/ghci/linking/dyn/all.T             |  26 ++-
 13 files changed, 384 insertions(+), 82 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6e6438e15f33cb94ad6338e950e693f59d046385

From git at git.haskell.org  Sat Nov  7 22:31:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 22:31:05 +0000 (UTC)
Subject: [commit: ghc] branch 'arcpatch-D1448' created
Message-ID: <20151107223105.ABA9F3A300@ghc.haskell.org>

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

New branch : arcpatch-D1448
Referencing: be8858570274821546ccabf75fe01c3dad80e337

From git at git.haskell.org  Sat Nov  7 22:31:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 22:31:08 +0000 (UTC)
Subject: [commit: ghc] arcpatch-D1448: fix #10734 by adding braces to
 pretty-printing of let inside do (be88585)
Message-ID: <20151107223108.F3D203A300@ghc.haskell.org>

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

On branch  : arcpatch-D1448
Link       : http://ghc.haskell.org/trac/ghc/changeset/be8858570274821546ccabf75fe01c3dad80e337/ghc

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

commit be8858570274821546ccabf75fe01c3dad80e337
Author: John Leo <leo at halfaya.org>
Date:   Sat Nov 7 17:28:37 2015 -0500

    fix #10734 by adding braces to pretty-printing of let inside do
    
    Test Plan: validate
    
    Reviewers: bgamari, austin, goldfire
    
    Reviewed By: goldfire
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1448
    
    GHC Trac Issues: #10734


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

be8858570274821546ccabf75fe01c3dad80e337
 libraries/template-haskell/Language/Haskell/TH/Ppr.hs |  2 +-
 testsuite/tests/th/T10734.hs                          | 10 ++++++++++
 testsuite/tests/th/T10734.stdout                      |  3 +++
 testsuite/tests/th/all.T                              |  2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/libraries/template-haskell/Language/Haskell/TH/Ppr.hs b/libraries/template-haskell/Language/Haskell/TH/Ppr.hs
index 1768b15..2231373 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Ppr.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Ppr.hs
@@ -184,7 +184,7 @@ pprMaybeExp i (Just e) = pprExp i e
 ------------------------------
 instance Ppr Stmt where
     ppr (BindS p e) = ppr p <+> text "<-" <+> ppr e
-    ppr (LetS ds) = text "let" <+> ppr ds
+    ppr (LetS ds) = text "let" <+> (braces $ sep $ punctuate semi $ map ppr ds)
     ppr (NoBindS e) = ppr e
     ppr (ParS sss) = sep $ punctuate (text "|")
                          $ map (sep . punctuate comma . map ppr) sss
diff --git a/testsuite/tests/th/T10734.hs b/testsuite/tests/th/T10734.hs
new file mode 100644
index 0000000..05aef86
--- /dev/null
+++ b/testsuite/tests/th/T10734.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE TemplateHaskell #-}
+module Main where
+
+import Language.Haskell.TH
+
+main :: IO ()
+main = do
+  pprint <$> runQ [| do { let { }; return (); } |]             >>= putStrLn
+  pprint <$> runQ [| do { let { x = 5 }; return x; } |]        >>= putStrLn
+  pprint <$> runQ [| do { let { x = 5; y = 3 }; return x; } |] >>= putStrLn
diff --git a/testsuite/tests/th/T10734.stdout b/testsuite/tests/th/T10734.stdout
new file mode 100644
index 0000000..4a8b39a
--- /dev/null
+++ b/testsuite/tests/th/T10734.stdout
@@ -0,0 +1,3 @@
+do {let {}; GHC.Base.return GHC.Tuple.()}
+do {let {x_0 = 5}; GHC.Base.return x_0}
+do {let {x_0 = 5; y_1 = 3}; GHC.Base.return x_0}
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 2a040f2..5e8e611 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -364,3 +364,5 @@ test('T10810', normal, compile, ['-v0'])
 test('T10891', normal, compile, ['-v0'])
 test('T10945', normal, compile_fail, ['-v0'])
 test('T10946', expect_broken(10946), compile, ['-v0'])
+test('T10734', normal, compile_and_run, ['-v0'])
+


From git at git.haskell.org  Sat Nov  7 22:32:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 22:32:51 +0000 (UTC)
Subject: [commit: ghc] master's head updated: fix #10734 by adding braces to
 pretty-printing of let inside do (be88585)
Message-ID: <20151107223251.E416E3A300@ghc.haskell.org>

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

Branch 'master' now includes:

     be88585 fix #10734 by adding braces to pretty-printing of let inside do

From git at git.haskell.org  Sat Nov  7 23:50:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 23:50:23 +0000 (UTC)
Subject: [commit: ghc] master: Remove PatSynBuilderId (2208011)
Message-ID: <20151107235023.DD7BF3A300@ghc.haskell.org>

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

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

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

commit 22080113f02f6644e2a0e3ce8adb1502346ab3b4
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Sat Nov 7 23:46:03 2015 +0000

    Remove PatSynBuilderId
    
    Summary:
    It was only used to pass field labels between the typechecker and
    desugarer. Instead we add an extra field the RecordCon to carry this
    information.
    
    Reviewers: austin, goldfire, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1443
    
    GHC Trac Issues: #11057


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

22080113f02f6644e2a0e3ce8adb1502346ab3b4
 compiler/basicTypes/Id.hs      | 11 +----------
 compiler/basicTypes/IdInfo.hs  |  3 ---
 compiler/deSugar/Coverage.hs   |  5 +++--
 compiler/deSugar/DsExpr.hs     |  4 +---
 compiler/deSugar/DsMeta.hs     |  2 +-
 compiler/hsSyn/Convert.hs      |  4 +++-
 compiler/hsSyn/HsExpr.hs       |  4 +++-
 compiler/hsSyn/PlaceHolder.hs  |  2 ++
 compiler/parser/RdrHsSyn.hs    |  4 ++--
 compiler/rename/RnExpr.hs      |  6 +++---
 compiler/typecheck/TcExpr.hs   |  5 +++--
 compiler/typecheck/TcHsSyn.hs  |  4 ++--
 compiler/typecheck/TcPatSyn.hs | 14 ++++++--------
 13 files changed, 30 insertions(+), 38 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 22080113f02f6644e2a0e3ce8adb1502346ab3b4

From git at git.haskell.org  Sat Nov  7 23:54:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 23:54:21 +0000 (UTC)
Subject: [commit: ghc] master: Add pprSTrace for debugging with call stacks
 (80d7ce8)
Message-ID: <20151107235421.B03553A301@ghc.haskell.org>

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

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

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

commit 80d7ce8038a100f6797a89755c893c6f67f18a30
Author: Bartosz Nitka <bnitka at fb.com>
Date:   Sun Nov 8 00:21:11 2015 +0100

    Add pprSTrace for debugging with call stacks
    
    I've spent quite a bit of time giving unique labels to my `pprTrace`
    calls and then trying to intuit where the function is called from.
    Thanks to the new implicit parameter CallStack functionality I don't
    have to do that anymore.
    
    Test Plan: harbormaster
    
    Reviewers: austin, simonmar, bgamari
    
    Reviewed By: simonmar, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1440


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

80d7ce8038a100f6797a89755c893c6f67f18a30
 compiler/utils/Outputable.hs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/compiler/utils/Outputable.hs b/compiler/utils/Outputable.hs
index 23fa37d..c74f738 100644
--- a/compiler/utils/Outputable.hs
+++ b/compiler/utils/Outputable.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP, ImplicitParams #-}
 {-
 (c) The University of Glasgow 2006-2012
 (c) The GRASP Project, Glasgow University, 1992-1998
@@ -73,7 +74,7 @@ module Outputable (
 
         -- * Error handling and debugging utilities
         pprPanic, pprSorry, assertPprPanic, pprPgmError,
-        pprTrace, warnPprTrace,
+        pprTrace, warnPprTrace, pprSTrace,
         trace, pgmError, panic, sorry, assertPanic,
         pprDebugAndThen,
     ) where
@@ -109,6 +110,8 @@ import Data.Graph (SCC(..))
 
 import GHC.Fingerprint
 import GHC.Show         ( showMultiLineString )
+import GHC.Stack
+import GHC.Exception
 
 {-
 ************************************************************************
@@ -1030,6 +1033,17 @@ pprTrace str doc x
    | opt_NoDebugOutput = x
    | otherwise         = pprDebugAndThen unsafeGlobalDynFlags trace (text str) doc x
 
+
+-- | If debug output is on, show some 'SDoc' on the screen along
+-- with a call stack when available.
+#if __GLASGOW_HASKELL__ >= 710
+pprSTrace :: (?location :: CallStack) => SDoc -> a -> a
+pprSTrace = pprTrace (showCallStack ?location)
+#else
+pprSTrace :: SDoc -> a -> a
+pprSTrace = pprTrace "no callstack info"
+#endif
+
 warnPprTrace :: Bool -> String -> Int -> SDoc -> a -> a
 -- ^ Just warn about an assertion failure, recording the given file and line number.
 -- Should typically be accessed with the WARN macros


From git at git.haskell.org  Sat Nov  7 23:54:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 23:54:19 +0000 (UTC)
Subject: [commit: ghc] master: Replace freeVarsOf scrut with scrut_fvs to
 avoid repetition (932d503)
Message-ID: <20151107235419.160FD3A300@ghc.haskell.org>

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

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

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

commit 932d50364912087e2051505290acde7a16532b4d
Author: Bartosz Nitka <bnitka at fb.com>
Date:   Sun Nov 8 00:20:34 2015 +0100

    Replace freeVarsOf scrut with scrut_fvs to avoid repetition
    
    Test Plan: harbormaster
    
    Reviewers: bgamari, simonmar, austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1439


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

932d50364912087e2051505290acde7a16532b4d
 compiler/simplCore/FloatIn.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/simplCore/FloatIn.hs b/compiler/simplCore/FloatIn.hs
index 412125a..8b2a84d 100644
--- a/compiler/simplCore/FloatIn.hs
+++ b/compiler/simplCore/FloatIn.hs
@@ -391,7 +391,7 @@ fiExpr dflags to_drop (_, AnnCase scrut case_bndr _ [(con,alt_bndrs,rhs)])
                     (FloatCase scrut' case_bndr con alt_bndrs)
     scrut' = fiExpr dflags scrut_binds scrut
     [shared_binds, scrut_binds, rhs_binds]
-       = sepBindsByDropPoint dflags False [freeVarsOf scrut, rhs_fvs] to_drop
+       = sepBindsByDropPoint dflags False [scrut_fvs, rhs_fvs] to_drop
     rhs_fvs   = freeVarsOf rhs `delVarSetList` (case_bndr : alt_bndrs)
     scrut_fvs = freeVarsOf scrut
 


From git at git.haskell.org  Sat Nov  7 23:54:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 23:54:24 +0000 (UTC)
Subject: [commit: ghc] master: Parser: allow empty multi-line deprecation
 warnings (8262c95)
Message-ID: <20151107235424.5A62C3A300@ghc.haskell.org>

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

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

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

commit 8262c954ac3084f0dfcb6d5fa6e6172afd22eae7
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sun Nov 8 00:20:15 2015 +0100

    Parser: allow empty multi-line deprecation warnings
    
    This should work,
    
        {-# DEPRECATED someFunction [] #-}
    
    Test Plan: parser/should_compile/T3303
    
    Reviewers: bgamari, austin
    
    Reviewed By: austin
    
    Subscribers: mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1433
    
    GHC Trac Issues: #11044


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

8262c954ac3084f0dfcb6d5fa6e6172afd22eae7
 compiler/parser/Parser.y                           | 1 +
 testsuite/tests/parser/should_compile/T3303.hs     | 2 ++
 testsuite/tests/parser/should_compile/T3303.stderr | 5 ++++-
 testsuite/tests/parser/should_compile/T3303A.hs    | 5 +++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 62d1114..d72f50d 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -1422,6 +1422,7 @@ stringlist :: { Located (OrdList (Located StringLiteral)) }
                                return (sLL $1 $> (unLoc $1 `snocOL`
                                                   (L (gl $3) (getStringLiteral $3)))) }
     | STRING                { sLL $1 $> (unitOL (L (gl $1) (getStringLiteral $1))) }
+    | {- empty -}           { noLoc nilOL }
 
 -----------------------------------------------------------------------------
 -- Annotations
diff --git a/testsuite/tests/parser/should_compile/T3303.hs b/testsuite/tests/parser/should_compile/T3303.hs
index 08de52e..7d9bfbd 100644
--- a/testsuite/tests/parser/should_compile/T3303.hs
+++ b/testsuite/tests/parser/should_compile/T3303.hs
@@ -6,3 +6,5 @@ import T3303A
 bar :: Int
 bar = foo
 
+bar2 :: Int
+bar2 = foo2
diff --git a/testsuite/tests/parser/should_compile/T3303.stderr b/testsuite/tests/parser/should_compile/T3303.stderr
index df227f4..a8d2f63 100644
--- a/testsuite/tests/parser/should_compile/T3303.stderr
+++ b/testsuite/tests/parser/should_compile/T3303.stderr
@@ -1,6 +1,9 @@
 
-T3303.hs:7:7: Warning:
+T3303.hs:7:7: warning:
     In the use of ?foo? (imported from T3303A):
     Deprecated: "This is a multi-line
                  deprecation message
                  for foo"
+
+T3303.hs:10:8: warning:
+    In the use of ?foo2? (imported from T3303A): Deprecated: ""
diff --git a/testsuite/tests/parser/should_compile/T3303A.hs b/testsuite/tests/parser/should_compile/T3303A.hs
index daa4bfb..07a2eb8 100644
--- a/testsuite/tests/parser/should_compile/T3303A.hs
+++ b/testsuite/tests/parser/should_compile/T3303A.hs
@@ -8,3 +8,8 @@ module T3303A where
 foo :: Int
 foo = 4
 
+-- Empty list should work too (#11044).
+{-# DEPRECATED foo2 [] #-}
+
+foo2 :: Int
+foo2 = 4


From git at git.haskell.org  Sat Nov  7 23:54:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 23:54:26 +0000 (UTC)
Subject: [commit: ghc] master: minor: use unless instead of (when . not)
 (bd69f6f)
Message-ID: <20151107235426.F0C943A300@ghc.haskell.org>

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

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

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

commit bd69f6f4b5b334c5e98aba665bcff63587a5d38d
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Sun Nov 8 00:20:26 2015 +0100

    minor: use unless instead of (when . not)
    
    Reviewers: bgamari, austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1438


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

bd69f6f4b5b334c5e98aba665bcff63587a5d38d
 compiler/codeGen/StgCmmExpr.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/codeGen/StgCmmExpr.hs b/compiler/codeGen/StgCmmExpr.hs
index 29db20a..de23443 100644
--- a/compiler/codeGen/StgCmmExpr.hs
+++ b/compiler/codeGen/StgCmmExpr.hs
@@ -47,7 +47,7 @@ import Util
 import FastString
 import Outputable
 
-import Control.Monad (when,void)
+import Control.Monad (unless,void)
 import Control.Arrow (first)
 
 #if __GLASGOW_HASKELL__ >= 709
@@ -295,7 +295,7 @@ cgCase (StgOpApp (StgPrimOp op) args _) bndr (AlgAlt tycon) alts
 
        -- If the binder is not dead, convert the tag to a constructor
        -- and assign it.
-       ; when (not (isDeadBinder bndr)) $ do
+       ; unless (isDeadBinder bndr) $ do
             { dflags <- getDynFlags
             ; tmp_reg <- bindArgToReg (NonVoid bndr)
             ; emitAssign (CmmLocal tmp_reg)
@@ -401,7 +401,7 @@ cgCase (StgApp v []) bndr alt_type@(PrimAlt _) alts
   || reps_compatible
   = -- assignment suffices for unlifted types
     do { dflags <- getDynFlags
-       ; when (not reps_compatible) $
+       ; unless reps_compatible $
            panic "cgCase: reps do not match, perhaps a dodgy unsafeCoerce?"
        ; v_info <- getCgIdInfo v
        ; emitAssign (CmmLocal (idToReg dflags (NonVoid bndr)))


From git at git.haskell.org  Sat Nov  7 23:54:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 23:54:29 +0000 (UTC)
Subject: [commit: ghc] master: Build system: use stage0 to build dll-split
 (d9c1450)
Message-ID: <20151107235429.9439D3A300@ghc.haskell.org>

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

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

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

commit d9c1450a8e2f4af6a8347f64ba2cee98304dbe27
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sun Nov 8 00:19:55 2015 +0100

    Build system: use stage0 to build dll-split
    
    When cross-compiling ghc itself, this prevents:
    
      "dll-split: cannot execute binary file: Exec format error"
    
    Test Plan:
       * ./configure --target=arm-linux-gnueabihf
       * DYNAMIC_GHC_PROGRAMS=YES
       * Stage1Only=NO
    
    Reviewers: rwbarton, bgamari, austin
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1430


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

d9c1450a8e2f4af6a8347f64ba2cee98304dbe27
 ghc.mk                 | 1 -
 utils/dll-split/ghc.mk | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index aaf7d00..5e74b7b 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -524,7 +524,6 @@ $(foreach pkg,$(PACKAGES_STAGE1),$(eval $(call fixed_pkg_dep,$(pkg),dist-install
 # eachother, so we can configure them in parallel.
 utils/ghc-pwd/dist-install/package-data.mk: $(fixed_pkg_prev)
 utils/ghc-cabal/dist-install/package-data.mk: $(fixed_pkg_prev)
-utils/dll-split/dist-install/package-data.mk: $(fixed_pkg_prev)
 utils/hpc/dist-install/package-data.mk: $(fixed_pkg_prev)
 utils/ghc-pkg/dist-install/package-data.mk: $(fixed_pkg_prev)
 utils/hsc2hs/dist-install/package-data.mk: $(fixed_pkg_prev)
diff --git a/utils/dll-split/ghc.mk b/utils/dll-split/ghc.mk
index 3d3e9da..27e11bd 100644
--- a/utils/dll-split/ghc.mk
+++ b/utils/dll-split/ghc.mk
@@ -15,4 +15,9 @@ utils/dll-split_PACKAGE                      = dll-split
 utils/dll-split_dist-install_PROGNAME        = dll-split
 utils/dll-split_dist-install_INSTALL         = NO
 utils/dll-split_dist-install_INSTALL_INPLACE = YES
-$(eval $(call build-prog,utils/dll-split,dist-install,1))
+# Use the stage0 instead of the stage1 compiler to build dll-split, to
+# prevent: "dll-split: cannot execute binary file: Exec format error".
+# Programs built with the stage1 compiler can only run on TARGET
+# architecture, whereas dll-split is used during the GHC build process (see
+# rules/build-package-way.mk) on the BUILD (=HOST) architectue.
+$(eval $(call build-prog,utils/dll-split,dist-install,0))


From git at git.haskell.org  Sat Nov  7 23:54:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 23:54:32 +0000 (UTC)
Subject: [commit: ghc] master: Add OpenBSD specific RTS symbols (2b7d9c2)
Message-ID: <20151107235432.34E023A300@ghc.haskell.org>

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

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

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

commit 2b7d9c2b96eb9da3cce7826df4a91c3426095528
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Sun Nov 8 00:21:36 2015 +0100

    Add OpenBSD specific RTS symbols
    
    This patch adds OpenBSD specific RTS symbols.  The patch is taken from
    the OpenBSD ports tree, provided by the OpenBSD community.
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1445


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

2b7d9c2b96eb9da3cce7826df4a91c3426095528
 rts/RtsSymbols.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index 0d15140..709c5bf 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -444,6 +444,13 @@
 #define RTS_DARWIN_ONLY_SYMBOLS
 #endif
 
+#if defined(openbsd_HOST_OS)
+#define RTS_OPENBSD_ONLY_SYMBOLS                            \
+     SymE_NeedsProto(__guard_local)
+#else
+#define RTS_OPENBSD_ONLY_SYMBOLS
+#endif
+
 #ifndef SMP
 # define MAIN_CAP_SYM SymI_HasProto(MainCapability)
 #else
@@ -1076,6 +1083,7 @@ RTS_RET_SYMBOLS
 RTS_POSIX_ONLY_SYMBOLS
 RTS_MINGW_ONLY_SYMBOLS
 RTS_DARWIN_ONLY_SYMBOLS
+RTS_OPENBSD_ONLY_SYMBOLS
 RTS_LIBGCC_SYMBOLS
 RTS_LIBFFI_SYMBOLS
 #undef SymI_NeedsProto
@@ -1113,6 +1121,7 @@ RtsSymbolVal rtsSyms[] = {
       RTS_POSIX_ONLY_SYMBOLS
       RTS_MINGW_ONLY_SYMBOLS
       RTS_DARWIN_ONLY_SYMBOLS
+      RTS_OPENBSD_ONLY_SYMBOLS
       RTS_LIBGCC_SYMBOLS
       RTS_LIBFFI_SYMBOLS
 #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)


From git at git.haskell.org  Sat Nov  7 23:54:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  7 Nov 2015 23:54:34 +0000 (UTC)
Subject: [commit: ghc] master: Quote file paths in linker scripts (0e40c01)
Message-ID: <20151107235434.D0FAB3A300@ghc.haskell.org>

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

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

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

commit 0e40c01db99680902fda4b7a84d7f15a92502730
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Nov 8 00:21:19 2015 +0100

    Quote file paths in linker scripts
    
    Reviewers: bgamari, austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1442
    
    GHC Trac Issues: #11063


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

0e40c01db99680902fda4b7a84d7f15a92502730
 compiler/main/DriverPipeline.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 60897a3..3a027c2 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -2191,7 +2191,7 @@ joinObjectFiles dflags o_files output_fn = do
      then do
           script <- newTempName dflags "ldscript"
           cwd <- getCurrentDirectory
-          let o_files_abs = map (cwd </>) o_files
+          let o_files_abs = map (\x -> "\"" ++ (cwd </> x) ++ "\"") o_files
           writeFile script $ "INPUT(" ++ unwords o_files_abs ++ ")"
           ld_r [SysTools.FileOption "" script] ccInfo
      else if sLdSupportsFilelist mySettings


From git at git.haskell.org  Sun Nov  8 18:23:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  8 Nov 2015 18:23:36 +0000 (UTC)
Subject: [commit: ghc] master: Fix sporadic failing ghci/Linker/Dyn tests
 (f405632)
Message-ID: <20151108182336.03A103A300@ghc.haskell.org>

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

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

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

commit f4056324ea30b31f9cec7bf9bafa72bb695f6951
Author: Tamar Christina <tamar at zhox.com>
Date:   Sun Nov 8 14:21:30 2015 +0100

    Fix sporadic failing ghci/Linker/Dyn tests
    
    Summary:
    Multiple tests use the same source C file.
    GHC was previously writing the resulting .o files
    in the same folder as the source. When these tests
    are run in parallel, sometimes one of the calls would
    use the partial .o file and throw an error.
    
    The .o files are moved into different folders with this
    change.
    
    Test Plan: make test -C testsuite/tests/ghci/linking/dyn
    
    Reviewers: thomie, austin, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1449


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

f4056324ea30b31f9cec7bf9bafa72bb695f6951
 testsuite/tests/ghci/linking/dyn/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/ghci/linking/dyn/Makefile b/testsuite/tests/ghci/linking/dyn/Makefile
index cb3a564..8eb4aad 100644
--- a/testsuite/tests/ghci/linking/dyn/Makefile
+++ b/testsuite/tests/ghci/linking/dyn/Makefile
@@ -30,7 +30,7 @@ MY_TEST_HC_OPTS = $(filter-out -rtsopts,$(TEST_HC_OPTS)) $(CFLAGS)
 load_short_name:
 	rm -rf bin_short
 	mkdir bin_short
-	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -shared A.c -o "bin_short/$(call DLL,A)"
+	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -odir "bin_short" -shared A.c -o "bin_short/$(call DLL,A)"
 	rm -f bin_short/*.a
 	echo ":q" | "$(TEST_HC)" --interactive -L"./bin_short" -lA -v0
 
@@ -43,16 +43,16 @@ compile_libAS:
 compile_libAB_dep:
 	rm -rf bin_dep
 	mkdir bin_dep
-	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -shared A.c -o "bin_dep/$(call DLL,A)"
-	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -shared B.c -o "bin_dep/$(call DLL,B)" -lA -L"./bin_dep"
+	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -odir "bin_dep" -shared A.c -o "bin_dep/$(call DLL,A)"
+	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -odir "bin_dep" -shared B.c -o "bin_dep/$(call DLL,B)" -lA -L"./bin_dep"
 	rm -f bin_dep/*.a
 
 .PHONY: compile_libAB_dyn
 compile_libAB_dyn:
 	rm -rf bin_dyn
 	mkdir bin_dyn
-	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -shared A.c -o "bin_dyn/$(call DLL,A)"
-	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -shared B.c -o "bin_dyn/$(call DLL,B)" -lA -L"./bin_dyn"
+	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -odir "bin_dyn" -shared A.c -o "bin_dyn/$(call DLL,A)"
+	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -odir "bin_dyn" -shared B.c -o "bin_dyn/$(call DLL,B)" -lA -L"./bin_dyn"
 	rm -f bin_dyn/*.a
 	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -v0 -o "bin_dyn/$(call EXE,T10955dyn)" -L./bin_dyn -lB -lA T10955dyn.hs -v0
 	LD_LIBRARY_PATH=./bin_dyn ./bin_dyn/$(call EXE,T10955dyn)


From git at git.haskell.org  Tue Nov 10 06:39:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 10 Nov 2015 06:39:01 +0000 (UTC)
Subject: [commit: ghc] master: Abstract TFs can have injectivity information
 (3cfe60a)
Message-ID: <20151110063901.879E53A300@ghc.haskell.org>

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

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

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

commit 3cfe60aebb9de2a1d897a111f779eacb6614b7cc
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Mon Nov 9 15:44:47 2015 +0100

    Abstract TFs can have injectivity information
    
    Summary:
    For abstract type families we incorrectly rejected their injectivity
    annotation.  Fixes #11007.
    
    Test Plan: #6018
    
    Reviewers: goldfire, austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1453
    
    GHC Trac Issues: #11007


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

3cfe60aebb9de2a1d897a111f779eacb6614b7cc
 compiler/typecheck/TcTyClsDecls.hs                     | 7 +++----
 testsuite/tests/typecheck/should_compile/T6018.hs-boot | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index d1a6c76..c21baf0 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -699,10 +699,9 @@ tcFamDecl1 parent
          -- If Nothing, this is an abstract family in a hs-boot file;
          -- but eqns might be empty in the Just case as well
        ; case mb_eqns of
-           Nothing   ->
-               return [ATyCon $ buildFamilyTyCon tc_name tvs' Nothing
-                                     AbstractClosedSynFamilyTyCon kind parent
-                                     NotInjective ]
+           Nothing   -> return
+               [ ATyCon $ buildFamilyTyCon tc_name tvs' (resultVariableName sig)
+                                 AbstractClosedSynFamilyTyCon kind parent inj' ]
            Just eqns -> do {
 
          -- Process the equations, creating CoAxBranches
diff --git a/testsuite/tests/typecheck/should_compile/T6018.hs-boot b/testsuite/tests/typecheck/should_compile/T6018.hs-boot
index 8ac5ce9..e31903a 100644
--- a/testsuite/tests/typecheck/should_compile/T6018.hs-boot
+++ b/testsuite/tests/typecheck/should_compile/T6018.hs-boot
@@ -2,6 +2,9 @@
 
 module T6018 where
 
--- this declaration uses different type variables than the one in the source
--- file but it should be accepted nevertheless
+-- these declarations use different type variables than the ones in the source
+-- file but they should be accepted nevertheless
+
 type family F d e f = (r :: k) | r -> d e f
+
+type family FClosed (d :: *) (e :: *) (f :: *) = (r :: *) | r -> d e f where ..


From git at git.haskell.org  Wed Nov 11 09:53:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 09:53:29 +0000 (UTC)
Subject: [commit: ghc] master: Associate pattern synonyms with types in module
 exports (96621b1)
Message-ID: <20151111095329.438DF3A300@ghc.haskell.org>

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

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

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

commit 96621b1b4979f449e873513e9de8d806257c9493
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Wed Nov 11 10:49:44 2015 +0100

    Associate pattern synonyms with types in module exports
    
    This patch implements #10653.
    
    It adds the ability to bundle pattern synonyms with type constructors in
    export lists so that users can treat pattern synonyms more like data
    constructors.
    
    Updates haddock submodule.
    
    Test Plan: ./validate
    
    Reviewers: goldfire, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: simonpj, gridaphobe, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1258
    
    GHC Trac Issues: #10653


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

96621b1b4979f449e873513e9de8d806257c9493
 compiler/basicTypes/Avail.hs                       |  41 ++++--
 compiler/basicTypes/RdrName.hs                     |  13 +-
 compiler/hsSyn/HsImpExp.hs                         |  41 ++++--
 compiler/iface/LoadIface.hs                        |   2 +-
 compiler/iface/MkIface.hs                          |   2 +-
 compiler/main/HscTypes.hs                          |   2 +-
 compiler/parser/Parser.y                           |  52 +++++---
 compiler/parser/RdrHsSyn.hs                        |  54 +++++++-
 compiler/prelude/PrelInfo.hs                       |   4 +-
 compiler/rename/RnEnv.hs                           |   4 +-
 compiler/rename/RnNames.hs                         | 120 +++++++++++------
 compiler/rename/RnPat.hs                           |   1 +
 compiler/rename/RnSource.hs                        |   4 +-
 compiler/typecheck/TcDeriv.hs                      |   2 +-
 compiler/typecheck/TcRnDriver.hs                   | 142 ++++++++++++++++++++-
 compiler/typecheck/TcRnTypes.hs                    |   2 +
 compiler/types/TyCon.hs                            |  16 +++
 .../tests/ghc-api/annotations/BundleExport.hs      |   9 ++
 testsuite/tests/ghc-api/annotations/Makefile       |   4 +
 testsuite/tests/ghc-api/annotations/all.T          |   1 +
 .../tests/ghc-api/annotations/bundle-export.stdout |  31 +++++
 .../tests/patsyn/should_compile/Associated.hs      |   9 ++
 .../tests/patsyn/should_compile/Associated1.hs     |   9 ++
 .../patsyn/should_compile/AssociatedInternal.hs    |   8 ++
 .../patsyn/should_compile/AssociatedInternal1.hs   |   8 ++
 .../tests/patsyn/should_compile/ExportSyntax.hs    |  17 +++
 .../patsyn/should_compile/ExportSyntaxImport.hs    |   7 +
 .../tests/patsyn/should_compile/TransAssociated.hs |   9 ++
 testsuite/tests/patsyn/should_compile/all.T        |  12 ++
 .../should_compile/export-record-selector.hs       |   8 ++
 .../patsyn/should_compile/export-super-class.hs    |  22 ++++
 .../tests/patsyn/should_compile/multi-export.hs    |  11 ++
 .../tests/patsyn/should_compile/poly-export.hs     |  17 +++
 .../tests/patsyn/should_compile/poly-export2.hs    |  11 ++
 .../tests/patsyn/should_compile/poly-export3.hs    |  10 ++
 testsuite/tests/patsyn/should_fail/all.T           |   8 ++
 testsuite/tests/patsyn/should_fail/export-class.hs |   8 ++
 .../tests/patsyn/should_fail/export-class.stderr   |   4 +
 .../tests/patsyn/should_fail/export-ps-rec-sel.hs  |   8 ++
 .../patsyn/should_fail/export-ps-rec-sel.stderr    |  12 ++
 .../patsyn/should_fail/export-super-class-fail.hs  |  24 ++++
 .../tests/patsyn/should_fail/export-syntax.hs      |   3 +
 .../tests/patsyn/should_fail/export-syntax.stderr  |   3 +
 .../patsyn/should_fail/export-type-synonym.hs      |  11 ++
 .../patsyn/should_fail/export-type-synonym.stderr  |   6 +
 testsuite/tests/patsyn/should_fail/export-type.hs  |  15 +++
 .../tests/patsyn/should_fail/export-type.stderr    |  18 +++
 .../tests/patsyn/should_fail/import-syntax.hs      |   4 +
 .../tests/patsyn/should_fail/import-syntax.stderr  |   3 +
 .../tests/patsyn/should_fail/poly-export-fail2.hs  |   9 ++
 .../patsyn/should_fail/poly-export-fail2.stderr    |   7 +
 utils/haddock                                      |   2 +-
 52 files changed, 755 insertions(+), 95 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 96621b1b4979f449e873513e9de8d806257c9493

From git at git.haskell.org  Wed Nov 11 11:02:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 11:02:22 +0000 (UTC)
Subject: [commit: ghc] master: Fix link in documentation (5eb56ed)
Message-ID: <20151111110222.19C933A300@ghc.haskell.org>

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

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

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

commit 5eb56eddaaa7bef3da864f6cd297bad39d6bf76c
Author: Siddhanathan Shanmugam <siddhanathan at gmail.com>
Date:   Wed Nov 11 10:55:33 2015 +0100

    Fix link in documentation
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: mpickering, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1456


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

5eb56eddaaa7bef3da864f6cd297bad39d6bf76c
 docs/users_guide/glasgow_exts.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 872eb64..ec02694 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -5668,10 +5668,8 @@ defaults to ``*`` if omitted. An example is
     data family Array e
 
 Named arguments can also be given explicit kind signatures if needed.
-Just as with
-[http://www.haskell.org/ghc/docs/latest/html/users\_guide/gadt.html GADT
-declarations] named arguments are entirely optional, so that we can
-declare ``Array`` alternatively with
+Just as with :ref:`GADT declarations <gadt>` named arguments are
+entirely optional, so that we can declare ``Array`` alternatively with
 
 ::
 


From git at git.haskell.org  Wed Nov 11 11:02:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 11:02:25 +0000 (UTC)
Subject: [commit: ghc] master: OPTIONS_GHC compiler flags may contain spaces
 (#4931) (fbc2537)
Message-ID: <20151111110225.2D6F93A300@ghc.haskell.org>

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

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

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

commit fbc2537c0b2cbe947684bb39669643f1ef9d96c0
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Wed Nov 11 11:05:16 2015 +0100

    OPTIONS_GHC compiler flags may contain spaces (#4931)
    
    When a .hsc contains `#define FOO "bar baz"`, hsc2hs emits:
    
        {-# OPTIONS_GHC -optc-DFOO="bar baz" #-}
    
    Make sure GHC can compile this, by tweaking `HeaderInfo.getOptions` a
    bit.
    
    Test Plan: driver/T4931
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1452
    
    GHC Trac Issues: #4931


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

fbc2537c0b2cbe947684bb39669643f1ef9d96c0
 compiler/main/HeaderInfo.hs         |  5 +++--
 compiler/utils/Util.hs              | 41 ++++++++++++++++++++++++-------------
 testsuite/tests/driver/T4931.hs     |  8 ++++++++
 testsuite/tests/driver/T4931.stdout |  1 +
 testsuite/tests/driver/all.T        |  1 +
 5 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index b4c3f81..08c7619 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -236,8 +236,9 @@ getOptions' dflags toks
           parseToks (open:close:xs)
               | IToptions_prag str <- getToken open
               , ITclose_prag       <- getToken close
-              = map (L (getLoc open)) (words str) ++
-                parseToks xs
+              = case toArgs str of
+                  Left err -> panic ("getOptions'.parseToks: " ++ err)
+                  Right args -> map (L (getLoc open)) args ++ parseToks xs
           parseToks (open:close:xs)
               | ITinclude_prag str <- getToken open
               , ITclose_prag       <- getToken close
diff --git a/compiler/utils/Util.hs b/compiler/utils/Util.hs
index e9b9d3f..7139eea 100644
--- a/compiler/utils/Util.hs
+++ b/compiler/utils/Util.hs
@@ -872,22 +872,35 @@ toArgs str
                        Left ("Couldn't read " ++ show str ++ "as [String]")
       s -> toArgs' s
  where
+  toArgs' :: String -> Either String [String]
+  -- Remove outer quotes:
+  -- > toArgs' "\"foo\" \"bar baz\""
+  -- Right ["foo", "bar baz"]
+  --
+  -- Keep inner quotes:
+  -- > toArgs' "-DFOO=\"bar baz\""
+  -- Right ["-DFOO=\"bar baz\""]
   toArgs' s = case dropWhile isSpace s of
               [] -> Right []
-              ('"' : _) -> case reads s of
-                           [(arg, rest)]
-                              -- rest must either be [] or start with a space
-                            | all isSpace (take 1 rest) ->
-                               case toArgs' rest of
-                               Left err -> Left err
-                               Right args -> Right (arg : args)
-                           _ ->
-                               Left ("Couldn't read " ++ show s ++ "as String")
-              s' -> case break isSpace s' of
-                    (arg, s'') -> case toArgs' s'' of
-                                  Left err -> Left err
-                                  Right args -> Right (arg : args)
-
+              ('"' : _) -> do
+                    -- readAsString removes outer quotes
+                    (arg, rest) <- readAsString s
+                    (arg:) `fmap` toArgs' rest
+              s' -> case break (isSpace <||> (== '"')) s' of
+                    (argPart1, s''@('"':_)) -> do
+                        (argPart2, rest) <- readAsString s''
+                        -- show argPart2 to keep inner quotes
+                        ((argPart1 ++ show argPart2):) `fmap` toArgs' rest
+                    (arg, s'') -> (arg:) `fmap` toArgs' s''
+
+  readAsString :: String -> Either String (String, String)
+  readAsString s = case reads s of
+                [(arg, rest)]
+                    -- rest must either be [] or start with a space
+                    | all isSpace (take 1 rest) ->
+                    Right (arg, rest)
+                _ ->
+                    Left ("Couldn't read " ++ show s ++ "as String")
 {-
 -- -----------------------------------------------------------------------------
 -- Floats
diff --git a/testsuite/tests/driver/T4931.hs b/testsuite/tests/driver/T4931.hs
new file mode 100644
index 0000000..08b583a
--- /dev/null
+++ b/testsuite/tests/driver/T4931.hs
@@ -0,0 +1,8 @@
+{-# LANGUAGE CPP #-}
+{-# OPTIONS_GHC -DFOO="bar baz" #-}
+main = print FOO
+
+-- Test that GHC can compile option pragmas containing spaces.
+-- When a .hsc contains `#define FOO "bar baz"`, hsc2hs emits:
+--
+--     {-# OPTIONS_GHC -optc-DFOO="bar baz" #-}
diff --git a/testsuite/tests/driver/T4931.stdout b/testsuite/tests/driver/T4931.stdout
new file mode 100644
index 0000000..447cd7a
--- /dev/null
+++ b/testsuite/tests/driver/T4931.stdout
@@ -0,0 +1 @@
+"bar baz"
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index 7c74cb6..5c0de6e 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -459,3 +459,4 @@ test('T9360b', normal, run_command, ['{compiler} -e "" --interactive'])
 
 test('T10970', normal, compile_and_run, ['-hide-all-packages -package base -package containers'])
 test('T10970a', normal, compile_and_run, [''])
+test('T4931', normal, compile_and_run, [''])


From git at git.haskell.org  Wed Nov 11 11:02:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 11:02:27 +0000 (UTC)
Subject: [commit: ghc] master: Remove unused field in ConDecl (ea8c116)
Message-ID: <20151111110227.C97233A300@ghc.haskell.org>

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

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

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

commit ea8c116ac9eb916fdb6360a01c285bc8698dfaf9
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Wed Nov 11 11:34:48 2015 +0100

    Remove unused field in ConDecl
    
    We no longer parse old-style GADT syntax but there was some left-over
    code for emitting deprecation warnings.
    
    Updates haddock submodule.
    
    Test Plan: ./validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1460


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

ea8c116ac9eb916fdb6360a01c285bc8698dfaf9
 compiler/hsSyn/HsDecls.hs   |  6 ------
 compiler/parser/RdrHsSyn.hs |  6 ++----
 compiler/rename/RnSource.hs | 10 +---------
 utils/haddock               |  2 +-
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/compiler/hsSyn/HsDecls.hs b/compiler/hsSyn/HsDecls.hs
index 7e01bc3..ec46d0e 100644
--- a/compiler/hsSyn/HsDecls.hs
+++ b/compiler/hsSyn/HsDecls.hs
@@ -1045,12 +1045,6 @@ data ConDecl name
 
     , con_doc       :: Maybe LHsDocString
         -- ^ A possible Haddock comment.
-
-    , con_old_rec :: Bool
-        -- ^ TEMPORARY field; True <=> user has employed now-deprecated syntax for
-        --                             GADT-style record decl   C { blah } :: T a b
-        -- Remove this when we no longer parse this stuff, and hence do not
-        -- need to report decprecated use
     } deriving (Typeable)
 deriving instance (DataId name) => Data (ConDecl name)
 
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index b24ba09..5aa91ec 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -487,8 +487,7 @@ mkSimpleConDecl :: Located RdrName -> [LHsTyVarBndr RdrName]
                 -> ConDecl RdrName
 
 mkSimpleConDecl name qvars cxt details
-  = ConDecl { con_old_rec  = False
-            , con_names    = [name]
+  = ConDecl { con_names    = [name]
             , con_explicit = Explicit
             , con_qvars    = mkHsQTvs qvars
             , con_cxt      = cxt
@@ -523,8 +522,7 @@ mkGadtDecl' names (L ls (HsForAllTy imp _ qvars cxt tau))
           _other                                    -> (PrefixCon [], tau)
 
     mk_gadt_con names
-       = ConDecl { con_old_rec  = False
-                 , con_names    = names
+       = ConDecl { con_names    = names
                  , con_explicit = imp
                  , con_qvars    = qvars
                  , con_cxt      = cxt
diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index 4e3359f..0bd96ec 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1444,9 +1444,8 @@ rnConDecl :: ConDecl RdrName -> RnM (ConDecl Name, FreeVars)
 rnConDecl decl@(ConDecl { con_names = names, con_qvars = tvs
                         , con_cxt = lcxt@(L loc cxt), con_details = details
                         , con_res = res_ty, con_doc = mb_doc
-                        , con_old_rec = old_rec, con_explicit = expl })
+                        , con_explicit = expl })
   = do  { mapM_ (addLocM checkConName) names
-        ; when old_rec (addWarn (deprecRecSyntax decl))
         ; new_names <- mapM lookupLocatedTopBndrRn names
 
            -- For H98 syntax, the tvs are the existential ones
@@ -1530,13 +1529,6 @@ rnConDeclDetails con doc (RecCon (L l fields))
         ; return (RecCon (L l new_fields), fvs) }
 
 -------------------------------------------------
-deprecRecSyntax :: ConDecl RdrName -> SDoc
-deprecRecSyntax decl
-  = vcat [ ptext (sLit "Declaration of") <+> quotes (ppr (con_names decl))
-                 <+> ptext (sLit "uses deprecated syntax")
-         , ptext (sLit "Instead, use the form")
-         , nest 2 (ppr decl) ]   -- Pretty printer uses new form
-
 badRecResTy :: SDoc -> SDoc
 badRecResTy doc = ptext (sLit "Malformed constructor signature") $$ doc
 
diff --git a/utils/haddock b/utils/haddock
index 52c963e..83a9e9d 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 52c963e0b19783c4ca59cd0e8cfe1366dbfa1624
+Subproject commit 83a9e9d2c7f0debec9d56e8b3b7cc8a8eb73361e


From git at git.haskell.org  Wed Nov 11 11:27:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 11:27:01 +0000 (UTC)
Subject: [commit: ghc] master: Remove fun_infix from Funbind,
 as it is now in Match (f0f9365)
Message-ID: <20151111112701.34CA93A300@ghc.haskell.org>

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

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

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

commit f0f9365fd7fe1a4c06926f390a6183449c3c6332
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed Nov 11 12:03:18 2015 +0100

    Remove fun_infix from Funbind, as it is now in Match
    
    One of the changes D538 introduced is to add `m_fun_id_infix` to `Match`
    
    ```lang=hs
    data Match id body
      = Match {
            m_fun_id_infix :: (Maybe (Located id,Bool)),
              -- fun_id and fun_infix for functions with multiple equations
              -- only present for a RdrName. See note [fun_id in Match]
            m_pats :: [LPat id], -- The patterns
            m_type :: (Maybe (LHsType id)),
                                     -- A type signature for the result of the match
                                     -- Nothing after typechecking
            m_grhss :: (GRHSs id body)
      } deriving (Typeable)
    ```
    
    This was done to track the individual locations and fixity of the
    `fun_id` for each of the defining equations for a function when there
    are more than one.
    
    For example, the function `(&&&)` is defined with some prefix and some
    infix equations below.
    
    ```lang=hs
        (&&&  ) [] [] =  []
        xs    &&&   [] =  xs
        (  &&&  ) [] ys =  ys
    ```
    
    This means that the fun_infix is now superfluous in the `FunBind`. This
    has not been removed as a potentially risky change just before 7.10 RC2,
    and so must be done after.
    
    This ticket captures that task, which includes processing these fields
    through the renamer and beyond.
    
    Ticket #9988 introduced these fields into `Match` through renaming, this
    ticket it to continue through type checking and then remove it from
    `FunBind` completely.
    
    The split happened so that #9988 could land in 7.10
    
    Trac ticket : #10061
    
    Test Plan: ./validate
    
    Reviewers: goldfire, austin, simonpj, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: simonpj, thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1285
    
    GHC Trac Issues: #10061


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

f0f9365fd7fe1a4c06926f390a6183449c3c6332
 compiler/deSugar/DsBinds.hs          |  5 ++--
 compiler/deSugar/DsExpr.hs           |  4 +--
 compiler/deSugar/Match.hs            |  4 +--
 compiler/hsSyn/Convert.hs            |  4 +--
 compiler/hsSyn/HsBinds.hs            | 18 +++++------
 compiler/hsSyn/HsExpr.hs             | 58 ++++++++++++++++++++++--------------
 compiler/hsSyn/HsExpr.hs-boot        |  2 +-
 compiler/hsSyn/HsUtils.hs            | 19 +++++++++---
 compiler/parser/Parser.y             |  6 ++--
 compiler/parser/RdrHsSyn.hs          | 34 +++++++++++----------
 compiler/rename/RnBinds.hs           | 15 +++++-----
 compiler/typecheck/TcArrows.hs       |  2 +-
 compiler/typecheck/TcBinds.hs        | 22 +++++++-------
 compiler/typecheck/TcMatches.hs      |  8 ++---
 compiler/typecheck/TcMatches.hs-boot |  2 +-
 compiler/typecheck/TcPatSyn.hs       |  6 ++--
 16 files changed, 116 insertions(+), 93 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f0f9365fd7fe1a4c06926f390a6183449c3c6332

From git at git.haskell.org  Wed Nov 11 12:04:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:27 +0000 (UTC)
Subject: [commit: ghc] master: Systools: read ELF section without calling
 readelf (109d7ce)
Message-ID: <20151111120427.233E33A300@ghc.haskell.org>

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

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

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

commit 109d7ce85aadbd9fb7a322a0a83548e5d4e83926
Author: Sylvain HENRY <hsyl20 at gmail.com>
Date:   Wed Nov 11 12:31:31 2015 +0100

    Systools: read ELF section without calling readelf
    
    This patch tackles two issues:
    
    1) GHC stores a "link info" string into a ELF section. Initially a
    section with type "note" was used but GHC didn't follow the ELF
    specification which specifies a record-based format for these sections.
    With D1375 we switched to a "progbits" section type for which there
    isn't any format constraint. This is an issue for D1242 which use GCC's
    --gc-sections which collects "unused" sections, such as our section
    containing link info... In this patch, we fall back to a section with
    type "note" but we respect the specified format.
    
    2) Reading back the ELF section was done by parsing the result of a
    call to "readelf". Calling readelf is problematic because the program
    may not be available or it may be renamed on some platforms (see
    D1326). Moreover we have no garanty that its output layout will stay
    the same in future releases of readelf. Finally we would need to fix
    the parsing to support  "note" sections because of 1. Instead, this
    patch proposes to use Data.Binary.Get to directly read the "link info"
    note into its section. ELF has a specification, hence it should work on
    every conforming platform.
    
    This patch "reverts" D1375, hence it supersedes D1432. It makes D1326
    not necessary anymore.
    
    Test Plan:
    - recomp011 should pass (test that relinking is avoided when both "link
    info" match)
    - we should add a test for ELF objects with more than 0xff00 sections
    => added test "recomp015"
    - we should check that GAS generates 32-bit words with .int on every
    supported platform using ELF (or find a place where this is
    documented). harbomaster and I (@hsyl20) only tested on x86-64. On
    platforms where it is not true, it should make recomp011 fail. =>
    tested to work on Linux/amd64, Solaris/i386 and OpenBSD/amd64
    
    Reviewers: olsner, ony, thomie, kgardas, austin, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: kgardas, rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1381
    
    GHC Trac Issues: #10974, #11022


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

109d7ce85aadbd9fb7a322a0a83548e5d4e83926
 compiler/ghc.cabal.in                              |   2 +
 compiler/main/DriverPipeline.hs                    |  61 ++-
 compiler/main/Elf.hs                               | 471 +++++++++++++++++++++
 compiler/main/SysTools.hs                          |  29 +-
 testsuite/tests/driver/recomp015/Generate.hs       |   7 +
 testsuite/tests/driver/recomp015/Makefile          |  39 ++
 testsuite/tests/driver/recomp015/all.T             |   7 +
 .../tests/driver/recomp015/recomp015.stderr        |   0
 testsuite/tests/driver/recomp015/recomp015.stdout  |   6 +
 9 files changed, 560 insertions(+), 62 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 109d7ce85aadbd9fb7a322a0a83548e5d4e83926

From git at git.haskell.org  Wed Nov 11 12:04:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:29 +0000 (UTC)
Subject: [commit: ghc] master: Improve documentation of Data.List.lines:
 (fa61edd)
Message-ID: <20151111120429.BA6E93A300@ghc.haskell.org>

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

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

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

commit fa61eddebf6f3ad5671c81f8bf0494e81332c4ec
Author: Eric Mertens <emertens at gmail.com>
Date:   Wed Nov 11 12:31:45 2015 +0100

    Improve documentation of Data.List.lines:
    
    - Document behavior on some inputs.
    - Add some examples.
    
    Reviewers: bgamari, osa1, hvr, dolio, #core_libraries_committee,
    nomeata, austin
    
    Reviewed By: bgamari, dolio, #core_libraries_committee, nomeata, austin
    
    Subscribers: dolio, glguy, nomeata, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1450


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

fa61eddebf6f3ad5671c81f8bf0494e81332c4ec
 libraries/base/Data/OldList.hs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/libraries/base/Data/OldList.hs b/libraries/base/Data/OldList.hs
index a377b4f..be894c0 100644
--- a/libraries/base/Data/OldList.hs
+++ b/libraries/base/Data/OldList.hs
@@ -1044,6 +1044,20 @@ unfoldr f b0 = build (\c n ->
 
 -- | 'lines' breaks a string up into a list of strings at newline
 -- characters.  The resulting strings do not contain newlines.
+--
+-- Note that after splitting the string at newline characters, the
+-- last part of the string is considered a line even if it doesn't end
+-- with a newline. For example,
+--
+-- > lines "" == []
+-- > lines "\n" == [""]
+-- > lines "one" == ["one"]
+-- > lines "one\n" == ["one"]
+-- > lines "one\n\n" == ["one",""]
+-- > lines "one\ntwo" == ["one","two"]
+-- > lines "one\ntwo\n" == ["one","two"]
+--
+-- Thus @'lines' s@ contains at least as many elements as newlines in @s at .
 lines                   :: String -> [String]
 lines ""                =  []
 -- Somehow GHC doesn't detect the selector thunks in the below code,


From git at git.haskell.org  Wed Nov 11 12:04:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:33 +0000 (UTC)
Subject: [commit: ghc] master: Put kind variables before type variables when
 specializing (0f49508)
Message-ID: <20151111120433.415F43A300@ghc.haskell.org>

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

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

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

commit 0f49508399a1fc145e17950ea1591da7f0de4f2a
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Wed Nov 11 12:31:55 2015 +0100

    Put kind variables before type variables when specializing
    
    When you reverse the order of uniques you get the core lint
    error from the testcase. The testcase is copied from
    tests/simplCore/should_compile/T10689a.hs.
    
    The problem is that we would put type and kind variables ordered by
    unique order, which happened to be the right order for this testcase to
    pass under normal conditions.
    
    I think it's enough to sort them with `sortQuantVars`, but I'm not
    really sure if some more sophisticated dependency analysis isn't needed.
    
    Test Plan: added a new testcase
    
    Reviewers: simonpj, goldfire, simonmar, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1457


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

0f49508399a1fc145e17950ea1591da7f0de4f2a
 compiler/specialise/SpecConstr.hs                  |  11 +-
 .../should_compile/Makefile                        |   0
 testsuite/tests/determinism/should_compile/all.T   |   1 +
 .../tests/determinism/should_compile/determ004.hs  | 311 +++++++++++++++++++++
 4 files changed, 318 insertions(+), 5 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 0f49508399a1fc145e17950ea1591da7f0de4f2a

From git at git.haskell.org  Wed Nov 11 12:04:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:36 +0000 (UTC)
Subject: [commit: ghc] master: Detect invalid foreign imports in bytecode
 compiler (badf5d5)
Message-ID: <20151111120436.8EA6F3A300@ghc.haskell.org>

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

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

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

commit badf5d54907a5a5e9224c44310f991a52379b4c1
Author: Sylvain HENRY <hsyl20 at gmail.com>
Date:   Wed Nov 11 12:32:08 2015 +0100

    Detect invalid foreign imports in bytecode compiler
    
    The bytecode compiler doesn't handle every foreign import calling
    convention. Instead of crashing during the generation of the foreign
    call, we display an error.
    
    Fix lint warnings
    
    Test Plan: prog014 ghci test added
    
    Reviewers: austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1458
    
    GHC Trac Issues: #10462


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

badf5d54907a5a5e9224c44310f991a52379b4c1
 compiler/ghci/ByteCodeGen.hs                       | 31 ++++++++++++++++------
 testsuite/tests/ghci/prog014/Makefile              | 11 ++++++++
 testsuite/tests/ghci/prog014/Primop.hs             | 10 +++++++
 testsuite/tests/ghci/prog014/dummy.c               |  5 ++++
 testsuite/tests/ghci/prog014/prog014.T             |  8 ++++++
 testsuite/tests/ghci/prog014/prog014.script        |  2 ++
 testsuite/tests/ghci/prog014/prog014.stderr        |  2 ++
 .../tests/ghci/prog014/prog014.stdout              |  0
 8 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/compiler/ghci/ByteCodeGen.hs b/compiler/ghci/ByteCodeGen.hs
index b06d1a4..11a8c6d 100644
--- a/compiler/ghci/ByteCodeGen.hs
+++ b/compiler/ghci/ByteCodeGen.hs
@@ -598,7 +598,10 @@ schemeT d s p app
 
    -- Case 1
    | Just (CCall ccall_spec) <- isFCallId_maybe fn
-   = generateCCall d s p ccall_spec fn args_r_to_l
+   = if isSupportedCConv ccall_spec
+      then generateCCall d s p ccall_spec fn args_r_to_l
+      else unsupportedCConvException
+
 
    -- Case 2: Constructor application
    | Just con <- maybe_saturated_dcon,
@@ -1508,13 +1511,25 @@ bcIdUnaryType x = case repType (idType x) of
 
 -- See bug #1257
 unboxedTupleException :: a
-unboxedTupleException
-   = throwGhcException
-        (ProgramError
-           ("Error: bytecode compiler can't handle unboxed tuples.\n"++
-            "  Possibly due to foreign import/export decls in source.\n"++
-            "  Workaround: use -fobject-code, or compile this module to .o separately."))
-
+unboxedTupleException = throwGhcException (ProgramError
+  ("Error: bytecode compiler can't handle unboxed tuples.\n"++
+   "  Possibly due to foreign import/export decls in source.\n"++
+   "  Workaround: use -fobject-code, or compile this module to .o separately."))
+
+-- | Indicate if the calling convention is supported
+isSupportedCConv :: CCallSpec -> Bool
+isSupportedCConv (CCallSpec _ cconv _) = case cconv of
+   CCallConv            -> True     -- we explicitly pattern match on every
+   StdCallConv          -> True     -- convention to ensure that a warning
+   PrimCallConv         -> False    -- is triggered when a new one is added
+   JavaScriptCallConv   -> False
+   CApiConv             -> False
+
+-- See bug #10462
+unsupportedCConvException :: a
+unsupportedCConvException = throwGhcException (ProgramError
+  ("Error: bytecode compiler can't handle some foreign calling conventions\n"++
+   "  Workaround: use -fobject-code, or compile this module to .o separately."))
 
 mkSLIDE :: Word16 -> Word -> OrdList BCInstr
 mkSLIDE n d
diff --git a/testsuite/tests/ghci/prog014/Makefile b/testsuite/tests/ghci/prog014/Makefile
new file mode 100644
index 0000000..e053c15
--- /dev/null
+++ b/testsuite/tests/ghci/prog014/Makefile
@@ -0,0 +1,11 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -f *.o *.hi
+
+prog014: clean
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c dummy.c
+
+.PHONY: clean prog014
diff --git a/testsuite/tests/ghci/prog014/Primop.hs b/testsuite/tests/ghci/prog014/Primop.hs
new file mode 100644
index 0000000..40c1ade
--- /dev/null
+++ b/testsuite/tests/ghci/prog014/Primop.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE GHCForeignImportPrim, MagicHash,
+             UnliftedFFITypes, UnboxedTuples #-}
+
+import GHC.Exts
+
+foreign import prim "dummy"
+   dummy :: Word# -> Word#
+
+foreign import prim "dummy2"
+   dummy2 :: Any -> State# RealWorld -> (# State# RealWorld, Word# #)
diff --git a/testsuite/tests/ghci/prog014/dummy.c b/testsuite/tests/ghci/prog014/dummy.c
new file mode 100644
index 0000000..b118cc8
--- /dev/null
+++ b/testsuite/tests/ghci/prog014/dummy.c
@@ -0,0 +1,5 @@
+void dummy() {
+}
+
+void dummy2() {
+}
diff --git a/testsuite/tests/ghci/prog014/prog014.T b/testsuite/tests/ghci/prog014/prog014.T
new file mode 100644
index 0000000..506c8b7
--- /dev/null
+++ b/testsuite/tests/ghci/prog014/prog014.T
@@ -0,0 +1,8 @@
+test('prog014',
+   [ extra_run_opts('dummy.o')
+   , pre_cmd('$MAKE -s --no-print-directory prog014')
+   , clean_cmd('rm -f dummy.o')
+   ],
+   ghci_script,
+   ['prog014.script'])
+
diff --git a/testsuite/tests/ghci/prog014/prog014.script b/testsuite/tests/ghci/prog014/prog014.script
new file mode 100644
index 0000000..0c8d96e
--- /dev/null
+++ b/testsuite/tests/ghci/prog014/prog014.script
@@ -0,0 +1,2 @@
+:set editor echo
+:l Primop.hs
diff --git a/testsuite/tests/ghci/prog014/prog014.stderr b/testsuite/tests/ghci/prog014/prog014.stderr
new file mode 100644
index 0000000..6d7b7fb
--- /dev/null
+++ b/testsuite/tests/ghci/prog014/prog014.stderr
@@ -0,0 +1,2 @@
+Error: bytecode compiler can't handle some foreign calling conventions
+  Workaround: use -fobject-code, or compile this module to .o separately.
diff --git a/libraries/base/tests/IO/misc001.stdout b/testsuite/tests/ghci/prog014/prog014.stdout
similarity index 100%
copy from libraries/base/tests/IO/misc001.stdout
copy to testsuite/tests/ghci/prog014/prog014.stdout


From git at git.haskell.org  Wed Nov 11 12:04:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:39 +0000 (UTC)
Subject: [commit: ghc] master: nativeGen.PPC: Fix shift arith. right > 31 bits
 (fb0d512)
Message-ID: <20151111120439.38B913A300@ghc.haskell.org>

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

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

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

commit fb0d5120d383324c6934144b938525378e3ade75
Author: Peter Trommler <ptrommler at acm.org>
Date:   Wed Nov 11 12:32:19 2015 +0100

    nativeGen.PPC: Fix shift arith. right > 31 bits
    
    Arithmetic right shifts of more than 31 bits set all bits to
    the sign bit on PowerPC. iThe assembler does not allow shift
    amounts larger than 32 so do an arithemetic right shift of 31
    bit instead.
    
    Fixes #10870
    
    Test Plan: validate (especially on powerpc)
    
    Reviewers: austin, erikd, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1459
    
    GHC Trac Issues: #10870


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

fb0d5120d383324c6934144b938525378e3ade75
 compiler/nativeGen/PPC/Ppr.hs                    | 11 ++++++++---
 testsuite/tests/codeGen/should_run/T10870.hs     |  1 +
 testsuite/tests/codeGen/should_run/T10870.stdout |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs
index e514779..99f9ab7 100644
--- a/compiler/nativeGen/PPC/Ppr.hs
+++ b/compiler/nativeGen/PPC/Ppr.hs
@@ -718,12 +718,17 @@ pprInstr (SR II32 reg1 reg2 (RIImm (ImmInt i))) | i < 0  || i > 31 =
     pprInstr (XOR reg1 reg2 (RIReg reg2))
 
 pprInstr (SL II32 reg1 reg2 (RIImm (ImmInt i))) | i < 0  || i > 31 =
-    -- As aboce for SR, but for left shifts.
+    -- As above for SR, but for left shifts.
     -- Fixes ticket http://ghc.haskell.org/trac/ghc/ticket/10870
     pprInstr (XOR reg1 reg2 (RIReg reg2))
 
-pprInstr (SRA II32 reg1 reg2 (RIImm (ImmInt i))) | i < 0  || i > 31 =
-    pprInstr (XOR reg1 reg2 (RIReg reg2))
+pprInstr (SRA II32 reg1 reg2 (RIImm (ImmInt i))) | i > 31 =
+    -- PT: I don't know what to do for negative shift amounts:
+    -- For now just panic.
+    --
+    -- For shift amounts greater than 31 set all bit to the
+    -- value of the sign bit, this also what sraw does.
+    pprInstr (SRA II32 reg1 reg2 (RIImm (ImmInt 31)))
 
 pprInstr (SL fmt reg1 reg2 ri) =
          let op = case fmt of
diff --git a/testsuite/tests/codeGen/should_run/T10870.hs b/testsuite/tests/codeGen/should_run/T10870.hs
index 642ef2c..255f578 100644
--- a/testsuite/tests/codeGen/should_run/T10870.hs
+++ b/testsuite/tests/codeGen/should_run/T10870.hs
@@ -8,4 +8,5 @@ unsafeShift32R x = unsafeShiftR x 32
 main :: IO ()
 main = do
     print $ map unsafeShift32R [ 123456, 0x7fffffff :: Int ]
+    print $ map unsafeShift32R [ -123456, -0x80000000 :: Int ]
     print $ map unsafeShift32R [ 123456, 0xffffffff :: Word ]
diff --git a/testsuite/tests/codeGen/should_run/T10870.stdout b/testsuite/tests/codeGen/should_run/T10870.stdout
index 945f244..54b015c 100644
--- a/testsuite/tests/codeGen/should_run/T10870.stdout
+++ b/testsuite/tests/codeGen/should_run/T10870.stdout
@@ -1,2 +1,3 @@
 [0,0]
+[-1,-1]
 [0,0]


From git at git.haskell.org  Wed Nov 11 12:04:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:45 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11071' created
Message-ID: <20151111120445.134873A300@ghc.haskell.org>

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

New branch : wip/T11071
Referencing: 4d5d9f8695df16c938a405e54fbadcc396ae99e8

From git at git.haskell.org  Wed Nov 11 12:04:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:50 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Turn ImportedModsVal into a data type
 (9a9364e)
Message-ID: <20151111120450.E6E953A301@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/9a9364e2a729aa95673c738aa7330e3036dea871/ghc

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

commit 9a9364e2a729aa95673c738aa7330e3036dea871
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 11 12:55:22 2015 +0100

    Turn ImportedModsVal into a data type
    
    it was a 4-tuple before my patch, and a 6-tuple afterwards. Clearly a
    record type is in order here!


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

9a9364e2a729aa95673c738aa7330e3036dea871
 compiler/iface/MkIface.hs       |  6 +++---
 compiler/main/HscMain.hs        | 12 ++++++------
 compiler/main/HscTypes.hs       | 15 ++++++++++++---
 compiler/rename/RnEnv.hs        | 42 ++++++++++++++++++-----------------------
 compiler/rename/RnNames.hs      | 19 ++++++++++++-------
 compiler/typecheck/TcRnTypes.hs |  5 +++--
 utils/haddock                   |  2 +-
 7 files changed, 55 insertions(+), 46 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9a9364e2a729aa95673c738aa7330e3036dea871

From git at git.haskell.org  Wed Nov 11 12:04:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:48 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Give helpful advice when a fully qualified
 name is not in scope (ed92f63)
Message-ID: <20151111120448.472713A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/ed92f63e6305d9f8b82e0f2fe11ed4c9827b97d2/ghc

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

commit ed92f63e6305d9f8b82e0f2fe11ed4c9827b97d2
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 10 17:07:10 2015 +0100

    Give helpful advice when a fully qualified name is not in scope
    
    This implements #11071. It needs to thread through a GlobalRdrEnv
    corresponding to the export list of the module if its exports were not
    restricted.
    
    A refactoring of ImportedModsVal into a proper data type follows.
    
    Differential Revision: https://phabricator.haskell.org/D1462


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

ed92f63e6305d9f8b82e0f2fe11ed4c9827b97d2
 compiler/iface/MkIface.hs                          |   6 +-
 compiler/main/HscMain.hs                           |   4 +-
 compiler/main/HscTypes.hs                          |   2 +-
 compiler/rename/RnEnv.hs                           | 108 ++++++++++++++++++++-
 compiler/rename/RnNames.hs                         |  16 +--
 compiler/typecheck/TcRnTypes.hs                    |   4 +-
 compiler/utils/Outputable.hs                       |   8 +-
 testsuite/tests/ghc-api/annotations/T10313.stderr  |  12 ++-
 testsuite/tests/ghc-api/annotations/T10399.stderr  |  12 ++-
 testsuite/tests/ghci/scripts/T2452.stderr          |   4 +-
 testsuite/tests/ghci/scripts/T8639.stderr          |   3 +-
 testsuite/tests/ghci/scripts/ghci036.stderr        |   4 +-
 testsuite/tests/module/mod134.stderr               |   4 +-
 testsuite/tests/module/mod62.stderr                |   5 +-
 testsuite/tests/module/mod73.stderr                |   3 +-
 testsuite/tests/module/mod74.stderr                |   4 +-
 testsuite/tests/module/mod88.stderr                |   5 +-
 .../tests/rename/prog002/rename.prog002.stderr     |   5 +-
 testsuite/tests/rename/should_fail/T10781.stderr   |   4 +-
 testsuite/tests/rename/should_fail/T11071.hs       |  28 ++++++
 testsuite/tests/rename/should_fail/T11071.stderr   |  53 ++++++++++
 testsuite/tests/rename/should_fail/T2901.stderr    |   7 +-
 testsuite/tests/rename/should_fail/T5657.stderr    |   6 +-
 testsuite/tests/rename/should_fail/T5892b.stderr   |   4 +-
 testsuite/tests/rename/should_fail/all.T           |   1 +
 .../tests/rename/should_fail/rnfail030.stderr      |   5 +-
 .../tests/rename/should_fail/rnfail031.stderr      |   5 +-
 .../tests/rename/should_fail/rnfail032.stderr      |   4 +-
 .../tests/rename/should_fail/rnfail033.stderr      |   4 +-
 .../tests/rename/should_fail/rnfail034.stderr      |   5 +-
 testsuite/tests/safeHaskell/ghci/p4.stderr         |   1 +
 31 files changed, 292 insertions(+), 44 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ed92f63e6305d9f8b82e0f2fe11ed4c9827b97d2

From git at git.haskell.org  Wed Nov 11 12:04:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:04:53 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Remove imv_empty from ImportedModsVal
 (4d5d9f8)
Message-ID: <20151111120453.864783A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/4d5d9f8695df16c938a405e54fbadcc396ae99e8/ghc

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

commit 4d5d9f8695df16c938a405e54fbadcc396ae99e8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 11 12:58:40 2015 +0100

    Remove imv_empty from ImportedModsVal
    
    it seems that this field is never used.


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

4d5d9f8695df16c938a405e54fbadcc396ae99e8
 compiler/main/HscTypes.hs       |  1 -
 compiler/rename/RnNames.hs      |  7 ++-----
 compiler/typecheck/TcRnTypes.hs | 23 ++---------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs
index 31fe778..849c803 100644
--- a/compiler/main/HscTypes.hs
+++ b/compiler/main/HscTypes.hs
@@ -1033,7 +1033,6 @@ type ImportedMods = ModuleEnv [ImportedModsVal]
 data ImportedModsVal
  = ImportedModsVal {
         imv_name :: ModuleName,         -- ^ The name the module is imported with
-        imv_empty :: Bool,              -- ^ whether it is an "import Foo ()" import
         imv_span :: SrcSpan,            -- ^ the source span of the whole import
         imv_is_safe :: IsSafeImport,    -- ^ whether this is a safe import
         imv_is_hiding :: Bool,          -- ^ whether this is an "hiding" import
diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs
index 44c7c17..8d4986e 100644
--- a/compiler/rename/RnNames.hs
+++ b/compiler/rename/RnNames.hs
@@ -270,10 +270,8 @@ rnImportDecl this_mod
 
     let gbl_env = mkGlobalRdrEnv gres
 
-        -- import_all == True <=> import M ()
-        (is_hiding, import_all) = case imp_details of
-                        Just (is_hiding, L _ ls) -> (is_hiding, not is_hiding && null ls)
-                        _                        -> (False, False)
+        is_hiding | Just (True,_) <- imp_details = True
+                  | otherwise                    = False
 
         -- should the import be safe?
         mod_safe' = mod_safe
@@ -282,7 +280,6 @@ rnImportDecl this_mod
 
     let imv = ImportedModsVal
             { imv_name        = qual_mod_name
-            , imv_empty       = import_all
             , imv_span        = loc
             , imv_is_safe     = mod_safe'
             , imv_is_hiding   = is_hiding
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 5c3727e..06ab9c2 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -969,27 +969,8 @@ data ImportAvails
           --      = ModuleEnv [ImportedModsVal],
           -- ^ Domain is all directly-imported modules
           --
-          -- 'imv_name' is what the module was imported as, e.g. in
-          -- @
-          --     import Foo as Bar
-          -- @
-          -- it is @Bar at .
-          --
-          -- The first 'Bool' means:
-          --
-          --  - @True@ => import was @import Foo ()@
-          --
-          --  - @False@ => import was some other form
-          --
-          -- Used
-          --
-          --   (a) to help construct the usage information in the interface
-          --       file; if we import something we need to recompile if the
-          --       export version changes
-          --
-          --   (b) to specify what child modules to initialise
-          --
-          -- The second 'Bool' means that the module is safe (see rnImportDecl)
+          -- See the documentaion on ImportedModsVal in HscTypes for the
+          -- meaning of the fields.
           --
           -- We need a full ModuleEnv rather than a ModuleNameEnv here,
           -- because we might be importing modules of the same name from


From git at git.haskell.org  Wed Nov 11 12:19:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:19:07 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Give helpful advice when a fully qualified
 name is not in scope (d35eef3)
Message-ID: <20151111121907.37D353A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/d35eef375781366b5f1a5ba8c122dc6e8b6a8f1a/ghc

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

commit d35eef375781366b5f1a5ba8c122dc6e8b6a8f1a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 10 17:07:10 2015 +0100

    Give helpful advice when a fully qualified name is not in scope
    
    This implements #11071. It needs to thread through a GlobalRdrEnv
    corresponding to the export list of the module if its exports were not
    restricted.
    
    A refactoring of ImportedModsVal into a proper data type follows.
    
    Differential Revision: https://phabricator.haskell.org/D1462


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

d35eef375781366b5f1a5ba8c122dc6e8b6a8f1a
 compiler/iface/MkIface.hs                          |   6 +-
 compiler/main/HscMain.hs                           |   4 +-
 compiler/main/HscTypes.hs                          |   2 +-
 compiler/rename/RnEnv.hs                           | 108 ++++++++++++++++++++-
 compiler/rename/RnNames.hs                         |  16 +--
 compiler/typecheck/TcRnTypes.hs                    |   4 +-
 compiler/utils/Outputable.hs                       |   8 +-
 testsuite/tests/ghc-api/annotations/T10313.stderr  |  12 ++-
 testsuite/tests/ghc-api/annotations/T10399.stderr  |  12 ++-
 testsuite/tests/ghci/scripts/T2452.stderr          |   4 +-
 testsuite/tests/ghci/scripts/T8639.stderr          |   3 +-
 testsuite/tests/ghci/scripts/ghci036.stderr        |   4 +-
 testsuite/tests/module/mod134.stderr               |   4 +-
 testsuite/tests/module/mod62.stderr                |   5 +-
 testsuite/tests/module/mod73.stderr                |   3 +-
 testsuite/tests/module/mod74.stderr                |   4 +-
 testsuite/tests/module/mod88.stderr                |   5 +-
 .../tests/rename/prog002/rename.prog002.stderr     |   5 +-
 testsuite/tests/rename/should_fail/T10781.stderr   |   4 +-
 testsuite/tests/rename/should_fail/T11071.hs       |  28 ++++++
 testsuite/tests/rename/should_fail/T11071.stderr   |  53 ++++++++++
 testsuite/tests/rename/should_fail/T2901.stderr    |   7 +-
 testsuite/tests/rename/should_fail/T5657.stderr    |   6 +-
 testsuite/tests/rename/should_fail/T5892b.stderr   |   4 +-
 testsuite/tests/rename/should_fail/all.T           |   1 +
 .../tests/rename/should_fail/rnfail030.stderr      |   5 +-
 .../tests/rename/should_fail/rnfail031.stderr      |   5 +-
 .../tests/rename/should_fail/rnfail032.stderr      |   4 +-
 .../tests/rename/should_fail/rnfail033.stderr      |   4 +-
 .../tests/rename/should_fail/rnfail034.stderr      |   5 +-
 testsuite/tests/safeHaskell/ghci/p4.stderr         |   1 +
 31 files changed, 292 insertions(+), 44 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d35eef375781366b5f1a5ba8c122dc6e8b6a8f1a

From git at git.haskell.org  Wed Nov 11 12:19:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:19:09 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Turn ImportedModsVal into a data type
 (c3147f0)
Message-ID: <20151111121909.DC13A3A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/c3147f056f52bba5b2f15e1c277b0604e6a3e6f7/ghc

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

commit c3147f056f52bba5b2f15e1c277b0604e6a3e6f7
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 11 12:55:22 2015 +0100

    Turn ImportedModsVal into a data type
    
    it was a 4-tuple before my patch, and a 6-tuple afterwards. Clearly a
    record type is in order here!


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

c3147f056f52bba5b2f15e1c277b0604e6a3e6f7
 compiler/iface/MkIface.hs       |  6 +++---
 compiler/main/HscMain.hs        | 12 ++++++------
 compiler/main/HscTypes.hs       | 15 ++++++++++++---
 compiler/rename/RnEnv.hs        | 42 ++++++++++++++++++-----------------------
 compiler/rename/RnNames.hs      | 19 ++++++++++++-------
 compiler/typecheck/TcRnTypes.hs |  5 +++--
 6 files changed, 54 insertions(+), 45 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c3147f056f52bba5b2f15e1c277b0604e6a3e6f7

From git at git.haskell.org  Wed Nov 11 12:19:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:19:12 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Remove imv_empty from ImportedModsVal
 (dadb50d)
Message-ID: <20151111121912.8262F3A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/dadb50d509bb1e490b68901d9b6eab75ff559522/ghc

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

commit dadb50d509bb1e490b68901d9b6eab75ff559522
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 11 12:58:40 2015 +0100

    Remove imv_empty from ImportedModsVal
    
    it seems that this field is never used.


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

dadb50d509bb1e490b68901d9b6eab75ff559522
 compiler/main/HscTypes.hs       |  1 -
 compiler/rename/RnNames.hs      |  7 ++-----
 compiler/typecheck/TcRnTypes.hs | 23 ++---------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs
index 31fe778..849c803 100644
--- a/compiler/main/HscTypes.hs
+++ b/compiler/main/HscTypes.hs
@@ -1033,7 +1033,6 @@ type ImportedMods = ModuleEnv [ImportedModsVal]
 data ImportedModsVal
  = ImportedModsVal {
         imv_name :: ModuleName,         -- ^ The name the module is imported with
-        imv_empty :: Bool,              -- ^ whether it is an "import Foo ()" import
         imv_span :: SrcSpan,            -- ^ the source span of the whole import
         imv_is_safe :: IsSafeImport,    -- ^ whether this is a safe import
         imv_is_hiding :: Bool,          -- ^ whether this is an "hiding" import
diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs
index 44c7c17..8d4986e 100644
--- a/compiler/rename/RnNames.hs
+++ b/compiler/rename/RnNames.hs
@@ -270,10 +270,8 @@ rnImportDecl this_mod
 
     let gbl_env = mkGlobalRdrEnv gres
 
-        -- import_all == True <=> import M ()
-        (is_hiding, import_all) = case imp_details of
-                        Just (is_hiding, L _ ls) -> (is_hiding, not is_hiding && null ls)
-                        _                        -> (False, False)
+        is_hiding | Just (True,_) <- imp_details = True
+                  | otherwise                    = False
 
         -- should the import be safe?
         mod_safe' = mod_safe
@@ -282,7 +280,6 @@ rnImportDecl this_mod
 
     let imv = ImportedModsVal
             { imv_name        = qual_mod_name
-            , imv_empty       = import_all
             , imv_span        = loc
             , imv_is_safe     = mod_safe'
             , imv_is_hiding   = is_hiding
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 5c3727e..06ab9c2 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -969,27 +969,8 @@ data ImportAvails
           --      = ModuleEnv [ImportedModsVal],
           -- ^ Domain is all directly-imported modules
           --
-          -- 'imv_name' is what the module was imported as, e.g. in
-          -- @
-          --     import Foo as Bar
-          -- @
-          -- it is @Bar at .
-          --
-          -- The first 'Bool' means:
-          --
-          --  - @True@ => import was @import Foo ()@
-          --
-          --  - @False@ => import was some other form
-          --
-          -- Used
-          --
-          --   (a) to help construct the usage information in the interface
-          --       file; if we import something we need to recompile if the
-          --       export version changes
-          --
-          --   (b) to specify what child modules to initialise
-          --
-          -- The second 'Bool' means that the module is safe (see rnImportDecl)
+          -- See the documentaion on ImportedModsVal in HscTypes for the
+          -- meaning of the fields.
           --
           -- We need a full ModuleEnv rather than a ModuleNameEnv here,
           -- because we might be importing modules of the same name from


From git at git.haskell.org  Wed Nov 11 12:19:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:19:14 +0000 (UTC)
Subject: [commit: ghc] wip/T11071's head updated: Remove imv_empty from
 ImportedModsVal (dadb50d)
Message-ID: <20151111121914.AD7253A300@ghc.haskell.org>

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

Branch 'wip/T11071' now includes:

     109d7ce Systools: read ELF section without calling readelf
     fa61edd Improve documentation of Data.List.lines:
     0f49508 Put kind variables before type variables when specializing
     badf5d5 Detect invalid foreign imports in bytecode compiler
     fb0d512 nativeGen.PPC: Fix shift arith. right > 31 bits
     d35eef3 Give helpful advice when a fully qualified name is not in scope
     c3147f0 Turn ImportedModsVal into a data type
     dadb50d Remove imv_empty from ImportedModsVal

From git at git.haskell.org  Wed Nov 11 12:22:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:22:13 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: Call Arity: In "e x",
 the result of "x" is not shared (1b1fab8)
Message-ID: <20151111122213.D3DD83A300@ghc.haskell.org>

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/1b1fab88483c4863ebb6944a3ffe10abdcf109a5/ghc

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

commit 1b1fab88483c4863ebb6944a3ffe10abdcf109a5
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Nov 6 14:04:08 2015 +0100

    Call Arity: In "e x", the result of "x" is not shared
    
    in contrast to "e (f x)", where CorePrep will turn it into "let y = f x
    in e x". So in
      let f = ...
      in e (f x)
    we know that f is called at most once, but in
      let f = ...
      in e f
    we do not know that.
    
    Previously Call Arity would assume that in "e x", "x" is evaluated at
    most once. This rarely would make a difference (the argument "x" is
    analized with an incoming arity of 0, so no eta-expansion would be done
    anyways), but of course this should still be fixed.
    
    This fixes #11064.
    
    Note the corresponding code dmdTransformThunkDmd in DmdAnal.


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

1b1fab88483c4863ebb6944a3ffe10abdcf109a5
 compiler/simplCore/CallArity.hs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/compiler/simplCore/CallArity.hs b/compiler/simplCore/CallArity.hs
index c606ece..1601dad 100644
--- a/compiler/simplCore/CallArity.hs
+++ b/compiler/simplCore/CallArity.hs
@@ -15,7 +15,7 @@ import BasicTypes
 import CoreSyn
 import Id
 import CoreArity ( typeArity )
-import CoreUtils ( exprIsHNF )
+import CoreUtils ( exprIsHNF, exprIsTrivial )
 --import Outputable
 import UnVarGraph
 import Demand
@@ -149,10 +149,15 @@ The interesting cases of the analysis:
  * Case alternatives alt?,alt?,...:
    Only one can be execuded, so
    Return (alt? ? alt? ?...)
- * App e? e? (and analogously Case scrut alts):
-   We get the results from both sides. Additionally, anything called by e? can
-   possibly called with anything from e?.
+ * App e? e? (and analogously Case scrut alts), with non-trivial e?:
+   We get the results from both sides, with the argument evaluted at most once.
+   Additionally, anything called by e? can possibly be called with anything
+   from e?.
    Return: C(e?) ? C(e?) ? (fv e?) ? (fv e?)
+ * App e? x:
+   As this is already in A-normal form, CorePrep will not separately lambda
+   bind (and hence share) x. So we conservatively assume multiple calls to x here
+   Return: C(e?) ? (fv e?) ? {x} ? {(x,x)}
  * Let v = rhs in body:
    In addition to the results from the subexpressions, add all co-calls from
    everything that the body calls together with v to everthing that is called
@@ -355,7 +360,7 @@ t1) in the follwing code:
       t2 = if ... then go 1 else ...
   in go 0
 
-Detecting this would reqiure finding out what variables are only ever called
+Detecting this would require finding out what variables are only ever called
 from thunks. While this is certainly possible, we yet have to see this to be
 relevant in the wild.
 
@@ -472,8 +477,12 @@ callArityAnal arity int (App e1 e2)
   where
     (ae1, e1') = callArityAnal (arity + 1) int e1
     (ae2, e2') = callArityAnal 0           int e2
-    -- See Note [Case and App: Which side to take?]
-    final_ae = ae1 `both` ae2
+    -- If the argument is trivial (e.g. a variable), then it will _not_ be
+    -- let-bound in the Core to STG transformation (CorePrep actually),
+    -- so no sharing will happen here, and we have to assume many calls.
+    ae2' | exprIsTrivial e2 = calledMultipleTimes ae2
+         | otherwise        = ae2
+    final_ae = ae1 `both` ae2'
 
 -- Case expression.
 callArityAnal arity int (Case scrut bndr ty alts)


From git at git.haskell.org  Wed Nov 11 12:22:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:22:16 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: PPC nativeGen: fix shift right arithmetic >
 31 bit (9c8e7f8)
Message-ID: <20151111122216.7637C3A300@ghc.haskell.org>

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/9c8e7f81f250f4977013d7f16e853c4b75ac97d9/ghc

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

commit 9c8e7f81f250f4977013d7f16e853c4b75ac97d9
Author: Peter Trommler <ptrommler at acm.org>
Date:   Mon Nov 9 15:59:36 2015 +0100

    PPC nativeGen: fix shift right arithmetic > 31 bit
    
    Arithmetic shift right of more than 31 bits yields
    zero for positive Int and -1 for negative Int. On
    PowerPC immediates greater than 31 are not allowed,
    so replace with a shift by 31 bits which gives the
    correct result.
    
    Fixes #10870


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

9c8e7f81f250f4977013d7f16e853c4b75ac97d9
 compiler/nativeGen/PPC/Ppr.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs
index 4ae32c9..876b11b 100644
--- a/compiler/nativeGen/PPC/Ppr.hs
+++ b/compiler/nativeGen/PPC/Ppr.hs
@@ -637,6 +637,8 @@ pprInstr (SLW reg1 reg2 (RIImm (ImmInt i))) | i < 0  || i > 31 =
     -- Fixes ticket http://ghc.haskell.org/trac/ghc/ticket/10870
     pprInstr (XOR reg1 reg2 (RIReg reg2))
 
+pprInstr (SRAW reg1 reg2 (RIImm (ImmInt i))) | i > 31 =
+    pprInstr (SRAW reg1 reg2 (RIImm (ImmInt 31)))
 
 pprInstr (SLW reg1 reg2 ri) = pprLogic (sLit "slw") reg1 reg2 (limitShiftRI ri)
 


From git at git.haskell.org  Wed Nov 11 12:55:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:55:42 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Turn ImportedModsVal into a data type
 (a26c3be)
Message-ID: <20151111125542.8480B3A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/a26c3bebf4a2814f7d0946d285e7ca30a944ffd2/ghc

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

commit a26c3bebf4a2814f7d0946d285e7ca30a944ffd2
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 11 12:55:22 2015 +0100

    Turn ImportedModsVal into a data type
    
    it was a 4-tuple before my patch, and a 6-tuple afterwards. Clearly a
    record type is in order here!


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

a26c3bebf4a2814f7d0946d285e7ca30a944ffd2
 compiler/iface/MkIface.hs       |  6 +++---
 compiler/main/HscMain.hs        | 12 ++++++------
 compiler/main/HscTypes.hs       | 15 ++++++++++++---
 compiler/rename/RnEnv.hs        | 42 ++++++++++++++++++-----------------------
 compiler/rename/RnNames.hs      | 19 ++++++++++++-------
 compiler/typecheck/TcRnTypes.hs |  5 +++--
 6 files changed, 54 insertions(+), 45 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc a26c3bebf4a2814f7d0946d285e7ca30a944ffd2

From git at git.haskell.org  Wed Nov 11 12:55:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:55:45 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Give helpful advice when a fully qualified
 name is not in scope (7733a0b)
Message-ID: <20151111125545.A9EB33A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/7733a0bb4349e20094013dbbc82a40a8006b75f0/ghc

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

commit 7733a0bb4349e20094013dbbc82a40a8006b75f0
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 10 17:07:10 2015 +0100

    Give helpful advice when a fully qualified name is not in scope
    
    This implements #11071. It needs to thread through a GlobalRdrEnv
    corresponding to the export list of the module if its exports were not
    restricted.
    
    A refactoring of ImportedModsVal into a proper data type follows.
    
    Differential Revision: https://phabricator.haskell.org/D1462


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

7733a0bb4349e20094013dbbc82a40a8006b75f0
 compiler/iface/MkIface.hs                          |   6 +-
 compiler/main/HscMain.hs                           |   4 +-
 compiler/main/HscTypes.hs                          |   2 +-
 compiler/rename/RnEnv.hs                           | 111 ++++++++++++++++++++-
 compiler/rename/RnNames.hs                         |  16 +--
 compiler/typecheck/TcRnTypes.hs                    |   4 +-
 compiler/utils/Outputable.hs                       |   8 +-
 testsuite/tests/ghc-api/annotations/T10313.stderr  |  12 ++-
 testsuite/tests/ghc-api/annotations/T10399.stderr  |  12 ++-
 testsuite/tests/ghci/scripts/T2452.stderr          |   4 +-
 testsuite/tests/ghci/scripts/T8639.stderr          |   3 +-
 testsuite/tests/ghci/scripts/ghci036.stderr        |   4 +-
 testsuite/tests/module/mod134.stderr               |   4 +-
 testsuite/tests/module/mod62.stderr                |   5 +-
 testsuite/tests/module/mod73.stderr                |   3 +-
 testsuite/tests/module/mod74.stderr                |   4 +-
 testsuite/tests/module/mod88.stderr                |   5 +-
 .../tests/rename/prog002/rename.prog002.stderr     |   5 +-
 testsuite/tests/rename/should_fail/T10781.stderr   |   4 +-
 testsuite/tests/rename/should_fail/T11071.hs       |  28 ++++++
 testsuite/tests/rename/should_fail/T11071.stderr   |  53 ++++++++++
 testsuite/tests/rename/should_fail/T2901.stderr    |   7 +-
 testsuite/tests/rename/should_fail/T5657.stderr    |   6 +-
 testsuite/tests/rename/should_fail/T5892b.stderr   |   4 +-
 testsuite/tests/rename/should_fail/all.T           |   1 +
 .../tests/rename/should_fail/rnfail030.stderr      |   5 +-
 .../tests/rename/should_fail/rnfail031.stderr      |   5 +-
 .../tests/rename/should_fail/rnfail032.stderr      |   4 +-
 .../tests/rename/should_fail/rnfail033.stderr      |   4 +-
 .../tests/rename/should_fail/rnfail034.stderr      |   5 +-
 testsuite/tests/safeHaskell/ghci/p4.stderr         |   1 +
 31 files changed, 293 insertions(+), 46 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 7733a0bb4349e20094013dbbc82a40a8006b75f0

From git at git.haskell.org  Wed Nov 11 12:55:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 12:55:48 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: Remove imv_empty from ImportedModsVal
 (717a05b)
Message-ID: <20151111125548.506513A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/717a05b0eb289bf59d4d4ea6ff6c990cef1ba4f0/ghc

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

commit 717a05b0eb289bf59d4d4ea6ff6c990cef1ba4f0
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 11 12:58:40 2015 +0100

    Remove imv_empty from ImportedModsVal
    
    it seems that this field is never used.


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

717a05b0eb289bf59d4d4ea6ff6c990cef1ba4f0
 compiler/main/HscTypes.hs       |  1 -
 compiler/rename/RnNames.hs      |  7 ++-----
 compiler/typecheck/TcRnTypes.hs | 23 ++---------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs
index 31fe778..849c803 100644
--- a/compiler/main/HscTypes.hs
+++ b/compiler/main/HscTypes.hs
@@ -1033,7 +1033,6 @@ type ImportedMods = ModuleEnv [ImportedModsVal]
 data ImportedModsVal
  = ImportedModsVal {
         imv_name :: ModuleName,         -- ^ The name the module is imported with
-        imv_empty :: Bool,              -- ^ whether it is an "import Foo ()" import
         imv_span :: SrcSpan,            -- ^ the source span of the whole import
         imv_is_safe :: IsSafeImport,    -- ^ whether this is a safe import
         imv_is_hiding :: Bool,          -- ^ whether this is an "hiding" import
diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs
index 44c7c17..8d4986e 100644
--- a/compiler/rename/RnNames.hs
+++ b/compiler/rename/RnNames.hs
@@ -270,10 +270,8 @@ rnImportDecl this_mod
 
     let gbl_env = mkGlobalRdrEnv gres
 
-        -- import_all == True <=> import M ()
-        (is_hiding, import_all) = case imp_details of
-                        Just (is_hiding, L _ ls) -> (is_hiding, not is_hiding && null ls)
-                        _                        -> (False, False)
+        is_hiding | Just (True,_) <- imp_details = True
+                  | otherwise                    = False
 
         -- should the import be safe?
         mod_safe' = mod_safe
@@ -282,7 +280,6 @@ rnImportDecl this_mod
 
     let imv = ImportedModsVal
             { imv_name        = qual_mod_name
-            , imv_empty       = import_all
             , imv_span        = loc
             , imv_is_safe     = mod_safe'
             , imv_is_hiding   = is_hiding
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 5c3727e..06ab9c2 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -969,27 +969,8 @@ data ImportAvails
           --      = ModuleEnv [ImportedModsVal],
           -- ^ Domain is all directly-imported modules
           --
-          -- 'imv_name' is what the module was imported as, e.g. in
-          -- @
-          --     import Foo as Bar
-          -- @
-          -- it is @Bar at .
-          --
-          -- The first 'Bool' means:
-          --
-          --  - @True@ => import was @import Foo ()@
-          --
-          --  - @False@ => import was some other form
-          --
-          -- Used
-          --
-          --   (a) to help construct the usage information in the interface
-          --       file; if we import something we need to recompile if the
-          --       export version changes
-          --
-          --   (b) to specify what child modules to initialise
-          --
-          -- The second 'Bool' means that the module is safe (see rnImportDecl)
+          -- See the documentaion on ImportedModsVal in HscTypes for the
+          -- meaning of the fields.
           --
           -- We need a full ModuleEnv rather than a ModuleNameEnv here,
           -- because we might be importing modules of the same name from


From git at git.haskell.org  Wed Nov 11 13:27:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 13:27:23 +0000 (UTC)
Subject: [commit: ghc] master: mkGadtDecl no longer in P monad (afbd30b)
Message-ID: <20151111132723.BC14A3A300@ghc.haskell.org>

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

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

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

commit afbd30b6cc486378dd556f738a5337e126bf65a7
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Wed Nov 11 13:28:01 2015 +0100

    mkGadtDecl no longer in P monad
    
    Since `mkGadtDecl` does not use any of the functions specific to the `P`
    monad we can extract it from that monad and reuse in other parts of the
    compiler.
    
    Test Plan: ./validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1461


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

afbd30b6cc486378dd556f738a5337e126bf65a7
 compiler/parser/Parser.y    |  2 +-
 compiler/parser/RdrHsSyn.hs | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 479fc28..40481e5 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -1874,7 +1874,7 @@ gadt_constr :: { LConDecl RdrName }
     -- see Note [Difference in parsing GADT and data constructors]
     -- Returns a list because of:   C,D :: ty
         : con_list '::' sigtype
-                {% do { (anns,gadtDecl) <- mkGadtDecl (unLoc $1) $3
+                {% do { let { (anns, gadtDecl) = mkGadtDecl (unLoc $1) $3 }
                       ; ams (sLL $1 $> gadtDecl)
                             (mj AnnDcolon $2:anns) } }
 
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 2a5faff..f804e44 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -498,29 +498,27 @@ mkSimpleConDecl name qvars cxt details
 
 mkGadtDecl :: [Located RdrName]
            -> LHsType RdrName     -- Always a HsForAllTy
-           -> P ([AddAnn], ConDecl RdrName)
-mkGadtDecl names (L l ty) = do
-  let
-    (anns,ty') = flattenHsForAllTyKeepAnns ty
-  gadt <- mkGadtDecl' names (L l ty')
-  return (anns,gadt)
+           -> ([AddAnn], ConDecl RdrName)
+mkGadtDecl names (L l ty) =
+  let (anns, ty') = flattenHsForAllTyKeepAnns ty
+      gadt        = mkGadtDecl' names (L l ty')
+  in (anns, gadt)
 
 mkGadtDecl' :: [Located RdrName]
-           -> LHsType RdrName     -- Always a HsForAllTy
-           -> P (ConDecl RdrName)
-
+            ->  LHsType RdrName     -- Always a HsForAllTy
+            -> (ConDecl RdrName)
 -- We allow C,D :: ty
 -- and expand it as if it had been
 --    C :: ty; D :: ty
 -- (Just like type signatures in general.)
 mkGadtDecl' names (L ls (HsForAllTy imp _ qvars cxt tau))
-  = return $ mk_gadt_con names
+  = mk_gadt_con names
   where
     (details, res_ty)           -- See Note [Sorting out the result type]
       = case tau of
           L _ (HsFunTy (L l (HsRecTy flds)) res_ty)
                                             -> (RecCon (L l flds), res_ty)
-          _other                                    -> (PrefixCon [], tau)
+          _other                            -> (PrefixCon [], tau)
 
     mk_gadt_con names
        = ConDecl { con_names    = names


From git at git.haskell.org  Wed Nov 11 15:56:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 15:56:45 +0000 (UTC)
Subject: [commit: ghc] master: Rename bundled pattern synonym tests to reflect
 new terminology (63cad5d)
Message-ID: <20151111155645.94FD33A300@ghc.haskell.org>

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

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

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

commit 63cad5d440899615f393353e6262221731701003
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Wed Nov 11 15:37:43 2015 +0000

    Rename bundled pattern synonym tests to reflect new terminology
    
    This also fixes a bug which causes intermittent test failures due to
    interdependent tests.


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

63cad5d440899615f393353e6262221731701003
 testsuite/tests/patsyn/should_compile/Associated.hs              | 9 ---------
 testsuite/tests/patsyn/should_compile/Bundle.hs                  | 9 +++++++++
 .../tests/patsyn/should_compile/{Associated1.hs => Bundle1.hs}   | 2 +-
 .../should_compile/{AssociatedInternal.hs => BundleInternal.hs}  | 2 +-
 .../{AssociatedInternal1.hs => BundleInternal1.hs}               | 2 +-
 .../patsyn/should_compile/{TransAssociated.hs => TransBundle.hs} | 2 +-
 testsuite/tests/patsyn/should_compile/all.T                      | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/testsuite/tests/patsyn/should_compile/Associated.hs b/testsuite/tests/patsyn/should_compile/Associated.hs
deleted file mode 100644
index b4ea949..0000000
--- a/testsuite/tests/patsyn/should_compile/Associated.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-module Associated(A(..)) where
-
-import AssociatedInternal (A(..))
-
-foo = MkA 5
-baz = NoA
-
-qux (MkA x) = x
-qux NoA = 0
diff --git a/testsuite/tests/patsyn/should_compile/Bundle.hs b/testsuite/tests/patsyn/should_compile/Bundle.hs
new file mode 100644
index 0000000..1a30410
--- /dev/null
+++ b/testsuite/tests/patsyn/should_compile/Bundle.hs
@@ -0,0 +1,9 @@
+module Bundle(A(..)) where
+
+import BundleInternal (A(..))
+
+foo = MkA 5
+baz = NoA
+
+qux (MkA x) = x
+qux NoA = 0
diff --git a/testsuite/tests/patsyn/should_compile/Associated1.hs b/testsuite/tests/patsyn/should_compile/Bundle1.hs
similarity index 70%
rename from testsuite/tests/patsyn/should_compile/Associated1.hs
rename to testsuite/tests/patsyn/should_compile/Bundle1.hs
index fce00b3..256f2fa 100644
--- a/testsuite/tests/patsyn/should_compile/Associated1.hs
+++ b/testsuite/tests/patsyn/should_compile/Bundle1.hs
@@ -1,6 +1,6 @@
 module Associated1(A(..)) where
 
-import AssociatedInternal1 (A(..))
+import BundleInternal1 (A(..))
 
 foo = MkA 5
 baz = NoA
diff --git a/testsuite/tests/patsyn/should_compile/AssociatedInternal.hs b/testsuite/tests/patsyn/should_compile/BundleInternal.hs
similarity index 70%
rename from testsuite/tests/patsyn/should_compile/AssociatedInternal.hs
rename to testsuite/tests/patsyn/should_compile/BundleInternal.hs
index b3e6506..6a79811 100644
--- a/testsuite/tests/patsyn/should_compile/AssociatedInternal.hs
+++ b/testsuite/tests/patsyn/should_compile/BundleInternal.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE PatternSynonyms #-}
-module AssociatedInternal (A(NewA,MkA, NoA)) where
+module BundleInternal (A(NewA,MkA, NoA)) where
 
 newtype A = NewA (Maybe Int)
 
diff --git a/testsuite/tests/patsyn/should_compile/AssociatedInternal1.hs b/testsuite/tests/patsyn/should_compile/BundleInternal1.hs
similarity index 70%
rename from testsuite/tests/patsyn/should_compile/AssociatedInternal1.hs
rename to testsuite/tests/patsyn/should_compile/BundleInternal1.hs
index 7997d1d..9eee273 100644
--- a/testsuite/tests/patsyn/should_compile/AssociatedInternal1.hs
+++ b/testsuite/tests/patsyn/should_compile/BundleInternal1.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE PatternSynonyms #-}
-module AssociatedInternal1 (A(NewA,MkA, NoA)) where
+module BundleInternal1 (A(NewA,MkA, NoA)) where
 
 newtype A = NewA (Maybe Int)
 
diff --git a/testsuite/tests/patsyn/should_compile/TransAssociated.hs b/testsuite/tests/patsyn/should_compile/TransBundle.hs
similarity index 77%
rename from testsuite/tests/patsyn/should_compile/TransAssociated.hs
rename to testsuite/tests/patsyn/should_compile/TransBundle.hs
index a5fbe0c..9aceb79 100644
--- a/testsuite/tests/patsyn/should_compile/TransAssociated.hs
+++ b/testsuite/tests/patsyn/should_compile/TransBundle.hs
@@ -1,6 +1,6 @@
 module TransAssociated(A(..)) where
 
-import Associated (A(..))
+import Bundle (A(..))
 
 foo = MkA 5
 baz = NoA
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index 7160a81..8000d23 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -33,8 +33,8 @@ test('records-poly', normal, compile, [''])
 test('records-req', normal, compile, [''])
 test('records-prov-req', normal, compile, [''])
 test('records-req-only', normal, compile, [''])
-test('Associated', [extra_clean(['AssociatedInternal1.hi', 'AssociatedInternal1.o'])], multimod_compile, ['Associated1', '-v0'])
-test('TransAssociated', [extra_clean(['Associated.hi', 'Associated.o', 'AssociatedInternal.hi', 'AssociatedInternal.o'])], multimod_compile, ['TransAssociated', '-v0'])
+test('pat-syn-bundle', [extra_clean(['BundleInternal1.hi', 'BundleInternal1.o'])], multimod_compile, ['Bundle1', '-v0'])
+test('pat-syn-trans-bundle', [extra_clean(['Bundle.hi', 'Bundle.o', 'BundleInternal.hi', 'BundleInternal.o'])], multimod_compile, ['TransBundle', '-v0'])
 test('ExportSyntax', normal, compile, [''])
 test('ExportSyntaxImport', [extra_clean(['ExportSyntax.hi', 'ExportSyntax.o'])], multimod_compile, ['ExportSyntaxImport', '-v0'])
 test('poly-export', normal, compile, [''])


From git at git.haskell.org  Wed Nov 11 15:56:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 15:56:48 +0000 (UTC)
Subject: [commit: ghc] master: Remove redundant test. (a038b72)
Message-ID: <20151111155648.416533A300@ghc.haskell.org>

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

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

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

commit a038b724a862cec63ed254a90c6df7f6b873ee45
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Wed Nov 11 15:44:56 2015 +0000

    Remove redundant test.
    
    ExportSyntaxImport will fail if this test would have ever failed.


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

a038b724a862cec63ed254a90c6df7f6b873ee45
 testsuite/tests/patsyn/should_compile/all.T | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index 8000d23..b35fd38 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -35,7 +35,6 @@ test('records-prov-req', normal, compile, [''])
 test('records-req-only', normal, compile, [''])
 test('pat-syn-bundle', [extra_clean(['BundleInternal1.hi', 'BundleInternal1.o'])], multimod_compile, ['Bundle1', '-v0'])
 test('pat-syn-trans-bundle', [extra_clean(['Bundle.hi', 'Bundle.o', 'BundleInternal.hi', 'BundleInternal.o'])], multimod_compile, ['TransBundle', '-v0'])
-test('ExportSyntax', normal, compile, [''])
 test('ExportSyntaxImport', [extra_clean(['ExportSyntax.hi', 'ExportSyntax.o'])], multimod_compile, ['ExportSyntaxImport', '-v0'])
 test('poly-export', normal, compile, [''])
 test('poly-export2', normal, compile, [''])


From git at git.haskell.org  Wed Nov 11 21:22:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 21:22:10 +0000 (UTC)
Subject: [commit: ghc] master: fix RTS Linker on platforms without SHN_XINDEX
 support (9bea234)
Message-ID: <20151111212210.DDF3D3A300@ghc.haskell.org>

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

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

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

commit 9bea234dbe3b36957acc42f74f0d54ddc05ad139
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Wed Nov 11 22:21:50 2015 +0100

    fix RTS Linker on platforms without SHN_XINDEX support
    
    Summary:
    This patch fixes RTS Linker compilation issues on platforms
    where SHN_XINDEX is not defined. Tested on OpenBSD. When SHN_XINDEX
    is not defined, the code reverts to the old behavior, that means
    behavior of the Linker before D1357 which added SHN_XINDEX based
    functionality.
    
    Reviewers: bgamari, austin, erikd
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1446


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

9bea234dbe3b36957acc42f74f0d54ddc05ad139
 rts/Linker.c | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 35227c8..9cab5f2 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4350,9 +4350,16 @@ static Elf_Word elf_shstrndx(Elf_Ehdr* ehdr)
 {
    Elf_Shdr* shdr = (Elf_Shdr*) ((char*)ehdr + ehdr->e_shoff);
    Elf_Half shstrndx = ehdr->e_shstrndx;
+#if defined(SHN_XINDEX)
    return shstrndx != SHN_XINDEX ? shstrndx : shdr[0].sh_link;
+#else
+   // some OSes do not support SHN_XINDEX yet, let's revert to
+   // old way
+   return shstrndx;
+#endif
 }
 
+#if defined(SHN_XINDEX)
 static Elf_Word*
 get_shndx_table(Elf_Ehdr* ehdr)
 {
@@ -4368,7 +4375,7 @@ get_shndx_table(Elf_Ehdr* ehdr)
    }
    return NULL;
 }
-
+#endif
 
 /*
  * Generic ELF functions
@@ -4542,8 +4549,9 @@ ocVerifyImage_ELF ( ObjectCode* oc )
    if (nstrtab == 0) {
       IF_DEBUG(linker,debugBelch("   no normal string tables (potentially, but not necessarily a problem)\n"));
    }
-
+#if defined(SHN_XINDEX)
    Elf_Word* shndxTable = get_shndx_table(ehdr);
+#endif
    nsymtabs = 0;
    IF_DEBUG(linker,debugBelch( "Symbol tables\n" ));
    for (i = 0; i < shnum; i++) {
@@ -4562,11 +4570,13 @@ ocVerifyImage_ELF ( ObjectCode* oc )
       }
       for (j = 0; j < nent; j++) {
          Elf_Word secno = stab[j].st_shndx;
+#if defined(SHN_XINDEX)
          /* See Note [Many ELF Sections] */
          if (secno == SHN_XINDEX) {
             ASSERT(shndxTable);
             secno = shndxTable[j];
          }
+#endif
          IF_DEBUG(linker,debugBelch("   %2d  ", j ));
          IF_DEBUG(linker,debugBelch("  sec=%-5d  size=%-3d  val=%5p  ",
                              (int)secno,
@@ -4681,7 +4691,9 @@ ocGetNames_ELF ( ObjectCode* oc )
    char*     strtab;
    Elf_Shdr* shdr     = (Elf_Shdr*) (ehdrC + ehdr->e_shoff);
    Section * sections;
+#if defined(SHN_XINDEX)
    Elf_Word* shndxTable = get_shndx_table(ehdr);
+#endif
    const Elf_Word shnum = elf_shnum(ehdr);
 
    ASSERT(symhash != NULL);
@@ -4784,13 +4796,13 @@ ocGetNames_ELF ( ObjectCode* oc )
           * shndx variable, not the section number in secno. Sections with the
           * real number in the SHN_LORESERVE..HIRESERVE range will have shndx
           * SHN_XINDEX and a secno with one of the reserved values. */
+         secno = shndx;
+#if defined(SHN_XINDEX)
          if (shndx == SHN_XINDEX) {
             ASSERT(shndxTable);
             secno = shndxTable[j];
-         } else {
-            secno = shndx;
          }
-
+#endif
          /* Figure out if we want to add it; if so, set ad to its
             address.  Otherwise leave ad == NULL. */
 
@@ -4812,7 +4824,11 @@ ocGetNames_ELF ( ObjectCode* oc )
               /* and not an undefined symbol */
               && shndx != SHN_UNDEF
               /* and not in a "special section" */
-              && (shndx < SHN_LORESERVE || shndx == SHN_XINDEX)
+              && (shndx < SHN_LORESERVE
+#if defined(SHN_XINDEX)
+                  || shndx == SHN_XINDEX
+#endif
+                 )
               &&
               /* and it's a not a section or string table or anything silly */
               ( ELF_ST_TYPE(stab[j].st_info)==STT_FUNC ||
@@ -4909,7 +4925,9 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC,
    int target_shndx = shdr[shnum].sh_info;
    int symtab_shndx = shdr[shnum].sh_link;
    int strtab_shndx = shdr[symtab_shndx].sh_link;
+#if defined(SHN_XINDEX)
    Elf_Word* shndx_table = get_shndx_table((Elf_Ehdr*)ehdrC);
+#endif
 
    stab  = (Elf_Sym*) (ehdrC + shdr[ symtab_shndx ].sh_offset);
    strtab= (char*)    (ehdrC + shdr[ strtab_shndx ].sh_offset);
@@ -4955,10 +4973,12 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC,
             symbol = sym.st_name==0 ? "(noname)" : strtab+sym.st_name;
             /* See Note [Many ELF Sections] */
             Elf_Word secno = sym.st_shndx;
+#if defined(SHN_XINDEX)
             if (secno == SHN_XINDEX) {
                ASSERT(shndx_table);
                secno = shndx_table[ELF_R_SYM(info)];
             }
+#endif
             S = (Elf_Addr)oc->sections[ secno ].start +
                 stab[ELF_R_SYM(info)].st_value;
          } else {
@@ -5219,7 +5239,9 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
    int symtab_shndx = shdr[shnum].sh_link;
    int strtab_shndx = shdr[symtab_shndx].sh_link;
    int target_shndx = shdr[shnum].sh_info;
+#if defined(SHN_XINDEX)
    Elf_Word* shndx_table = get_shndx_table((Elf_Ehdr*)ehdrC);
+#endif
 #if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
    /* This #ifdef only serves to avoid unused-var warnings. */
    Elf_Addr targ = (Elf_Addr) oc->sections[target_shndx].start;
@@ -5272,9 +5294,11 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
             symbol = sym.st_name==0 ? "(noname)" : strtab+sym.st_name;
             /* See Note [Many ELF Sections] */
             Elf_Word secno = sym.st_shndx;
+#if defined(SHN_XINDEX)
             if (secno == SHN_XINDEX) {
               secno = shndx_table[ELF_R_SYM(info)];
             }
+#endif
             S = (Elf_Addr)oc->sections[secno].start
                 + stab[ELF_R_SYM(info)].st_value;
 #ifdef ELF_FUNCTION_DESC


From git at git.haskell.org  Wed Nov 11 21:40:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 21:40:27 +0000 (UTC)
Subject: [commit: ghc] wip/custom-type-errors: Change the rendering of
 user-defined type errors to `(TypeError ...)` (9204abc)
Message-ID: <20151111214027.E19D93A300@ghc.haskell.org>

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

On branch  : wip/custom-type-errors
Link       : http://ghc.haskell.org/trac/ghc/changeset/9204abc01073d7a11e8a094a56e7b9eebd56eae7/ghc

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

commit 9204abc01073d7a11e8a094a56e7b9eebd56eae7
Author: Iavor S. Diatchki <diatchki at galois.com>
Date:   Wed Nov 11 13:39:50 2015 -0800

    Change the rendering of user-defined type errors to `(TypeError ...)`


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

9204abc01073d7a11e8a094a56e7b9eebd56eae7
 compiler/types/TypeRep.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/types/TypeRep.hs b/compiler/types/TypeRep.hs
index c5bfec3..556435a 100644
--- a/compiler/types/TypeRep.hs
+++ b/compiler/types/TypeRep.hs
@@ -713,7 +713,7 @@ pprTyTcApp p tc tys
     if gopt Opt_PrintExplicitKinds dflags then pprTcApp  p ppr_type tc tys
                                    else pprTyList p ty1 ty2
 
-  | tc `hasKey` errorMessageTypeErrorFamKey = text "(type error)"
+  | tc `hasKey` errorMessageTypeErrorFamKey = text "(TypeError ...)"
 
   | otherwise
   = pprTcApp p ppr_type tc tys


From git at git.haskell.org  Wed Nov 11 21:51:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 11 Nov 2015 21:51:45 +0000 (UTC)
Subject: [commit: ghc] wip/custom-type-errors: Add some tests. (3f82e93)
Message-ID: <20151111215145.904863A300@ghc.haskell.org>

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

On branch  : wip/custom-type-errors
Link       : http://ghc.haskell.org/trac/ghc/changeset/3f82e9326f9d4f52680ff3a59d39322f4c5539e3/ghc

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

commit 3f82e9326f9d4f52680ff3a59d39322f4c5539e3
Author: Iavor S. Diatchki <diatchki at galois.com>
Date:   Wed Nov 11 13:51:43 2015 -0800

    Add some tests.


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

3f82e9326f9d4f52680ff3a59d39322f4c5539e3
 .../tests/typecheck/should_fail/CustomTypeErrors01.hs | 14 ++++++++++++++
 .../typecheck/should_fail/CustomTypeErrors01.stderr   |  5 +++++
 .../tests/typecheck/should_fail/CustomTypeErrors02.hs | 19 +++++++++++++++++++
 .../typecheck/should_fail/CustomTypeErrors02.stderr   | 10 ++++++++++
 .../tests/typecheck/should_fail/CustomTypeErrors03.hs |  7 +++++++
 .../typecheck/should_fail/CustomTypeErrors03.stderr   |  5 +++++
 testsuite/tests/typecheck/should_fail/all.T           |  5 +++++
 7 files changed, 65 insertions(+)

diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors01.hs b/testsuite/tests/typecheck/should_fail/CustomTypeErrors01.hs
new file mode 100644
index 0000000..c44da1d
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors01.hs
@@ -0,0 +1,14 @@
+{-# LANGUAGE DataKinds, UndecidableInstances #-}
+module T1 where
+import GHC.TypeLits
+
+
+data MyType = MyType
+
+instance
+  TypeError (Text "Values of type 'MyType' cannot be compared for equality.")
+    => Eq MyType where (==) = undefined
+
+err x = x == MyType
+
+
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors01.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors01.stderr
new file mode 100644
index 0000000..d95de09
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors01.stderr
@@ -0,0 +1,5 @@
+
+CustomTypeErrors01.hs:12:11: error:
+    Values of type 'MyType' cannot be compared for equality.
+    In the expression: x == MyType
+    In an equation for ?err?: err x = x == MyType
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.hs b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.hs
new file mode 100644
index 0000000..06eb234
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.hs
@@ -0,0 +1,19 @@
+{-# LANGUAGE DataKinds, UndecidableInstances #-}
+{-# LANGUAGE TypeFamilies, TypeOperators, FlexibleContexts #-}
+module T2 where
+
+import GHC.TypeLits
+
+type family IntRep a where
+  IntRep Int      = Integer
+  IntRep Integer  = Integer
+  IntRep Bool     = Integer
+  IntRep a        = TypeError (Text "The type '" :<>: ShowType a :<>:
+                               Text "' cannot be represented as an integer.")
+
+convert :: Num (IntRep a) => a -> IntRep a
+convert _ = 5
+
+err = convert id
+
+
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
new file mode 100644
index 0000000..d15637c
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
@@ -0,0 +1,10 @@
+
+CustomTypeErrors02.hs:17:1: error:
+    The type 'a_aBf -> a_aBf' cannot be represented as an integer.
+    When checking that ?err? has the inferred type
+      err :: (TypeError ...)
+
+CustomTypeErrors02.hs:17:7: error:
+    The type 'a0 -> a0' cannot be represented as an integer.
+    In the expression: convert id
+    In an equation for ?err?: err = convert id
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.hs b/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.hs
new file mode 100644
index 0000000..8c12227
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.hs
@@ -0,0 +1,7 @@
+{-# LANGUAGE DataKinds #-}
+module T3 where
+
+import GHC.TypeLits
+
+f :: TypeError (Text "This is a type error")
+f = undefined
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr
new file mode 100644
index 0000000..330fadb
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr
@@ -0,0 +1,5 @@
+
+CustomTypeErrors03.hs:6:6: error:
+    This is a type error
+    In the type signature for ?f?:
+      f :: TypeError (Text "This is a type error")
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index 0a222bd..c2ec105 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -390,3 +390,8 @@ test('T10715', normal, compile_fail, [''])
 test('T10715b', normal, compile_fail, [''])
 test('T10971b', normal, compile_fail, [''])
 test('T10971d', extra_clean(['T10971c.hi', 'T10971c.o']), multimod_compile_fail, ['T10971d','-v0'])
+test('CustomTypeErrors01', normal, compile_fail, [''])
+test('CustomTypeErrors02', normal, compile_fail, [''])
+test('CustomTypeErrors03', normal, compile_fail, [''])
+
+


From git at git.haskell.org  Thu Nov 12 12:07:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 12:07:15 +0000 (UTC)
Subject: [commit: packages/array] branch 'D1426' created
Message-ID: <20151112120715.AE0E83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/array

New branch : D1426
Referencing: 4b43c95af80ed7e1567244527e5e459912d3e504

From git at git.haskell.org  Thu Nov 12 12:07:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 12:07:17 +0000 (UTC)
Subject: [commit: packages/array] D1426: Update output (4b43c95)
Message-ID: <20151112120717.B3D8C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/array

On branch  : D1426
Link       : http://git.haskell.org/packages/array.git/commitdiff/4b43c95af80ed7e1567244527e5e459912d3e504

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

commit 4b43c95af80ed7e1567244527e5e459912d3e504
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Nov 4 23:42:33 2015 +0000

    Update output


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

4b43c95af80ed7e1567244527e5e459912d3e504
 tests/T2120.stdout | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/T2120.stdout b/tests/T2120.stdout
index 89c73bc..4ed3067 100644
--- a/tests/T2120.stdout
+++ b/tests/T2120.stdout
@@ -1,6 +1,6 @@
 Ix{Int}.index: Index (5) out of range ((1,4))
-CallStack:
+CallStack (from ImplicitParams):
   error, called at libraries/base/GHC/Arr.hs:176:5 in base:GHC.Arr
 Error in array index
-CallStack:
+CallStack (from ImplicitParams):
   error, called at libraries/base/GHC/Arr.hs:182:22 in base:GHC.Arr


From git at git.haskell.org  Thu Nov 12 12:07:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 12:07:47 +0000 (UTC)
Subject: [commit: packages/hpc] branch 'D1426' created
Message-ID: <20151112120747.3BAE43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hpc

New branch : D1426
Referencing: e17eef982ea43282d54b103ee1c115847229c93f

From git at git.haskell.org  Thu Nov 12 12:07:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 12:07:49 +0000 (UTC)
Subject: [commit: packages/hpc] D1426: Update output (e17eef9)
Message-ID: <20151112120749.423473A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hpc

On branch  : D1426
Link       : http://git.haskell.org/packages/hpc.git/commitdiff/e17eef982ea43282d54b103ee1c115847229c93f

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

commit e17eef982ea43282d54b103ee1c115847229c93f
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Nov 4 23:43:31 2015 +0000

    Update output


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

e17eef982ea43282d54b103ee1c115847229c93f
 tests/function/tough.stdout   | 4 ++--
 tests/function2/tough2.stdout | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/function/tough.stdout b/tests/function/tough.stdout
index 22adc34..21a31a0 100644
--- a/tests/function/tough.stdout
+++ b/tests/function/tough.stdout
@@ -1,10 +1,10 @@
 "Hello"
 "Hello"
 badCase
-CallStack:
+CallStack (from ImplicitParams):
   error, called at tough.hs:39:14 in main:Main
 badCase
-CallStack:
+CallStack (from ImplicitParams):
   error, called at tough.hs:39:14 in main:Main
 "Bark"
 "Hello"
diff --git a/tests/function2/tough2.stdout b/tests/function2/tough2.stdout
index 690f386..66bb3f8 100644
--- a/tests/function2/tough2.stdout
+++ b/tests/function2/tough2.stdout
@@ -1,10 +1,10 @@
 "Hello"
 "Hello"
 badCase
-CallStack:
+CallStack (from ImplicitParams):
   error, called at subdir/tough2.lhs:40:14 in main:Main
 badCase
-CallStack:
+CallStack (from ImplicitParams):
   error, called at subdir/tough2.lhs:40:14 in main:Main
 "Bark"
 "Hello"


From git at git.haskell.org  Thu Nov 12 12:08:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 12:08:07 +0000 (UTC)
Subject: [commit: packages/stm] branch 'D1426' created
Message-ID: <20151112120807.8CA613A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/stm

New branch : D1426
Referencing: 9870cf156e5e7e21785b236da41f2466bf9f4b29

From git at git.haskell.org  Thu Nov 12 12:08:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 12:08:09 +0000 (UTC)
Subject: [commit: packages/stm] D1426: Update output (9870cf1)
Message-ID: <20151112120809.925F43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/stm

On branch  : D1426
Link       : http://git.haskell.org/packages/stm.git/commitdiff/9870cf156e5e7e21785b236da41f2466bf9f4b29

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

commit 9870cf156e5e7e21785b236da41f2466bf9f4b29
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Nov 4 23:44:01 2015 +0000

    Update output


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

9870cf156e5e7e21785b236da41f2466bf9f4b29
 tests/stm060.stdout | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/stm060.stdout b/tests/stm060.stdout
index 947395b..17302b9 100644
--- a/tests/stm060.stdout
+++ b/tests/stm060.stdout
@@ -24,7 +24,7 @@ Caught: Exn raised in invariant
 
 Adding a trivially false invariant (no TVar access)
 Caught: Transactional invariant violation
-CallStack:
+CallStack (from ImplicitParams):
   error, called at libraries/base/GHC/Conc/Sync.hs:767:61 in base:GHC.Conc.Sync
 
 Adding a trivially false invariant (with TVar access)


From git at git.haskell.org  Thu Nov 12 14:54:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 14:54:47 +0000 (UTC)
Subject: [commit: ghc] master: Implement function-sections for Haskell code,
 #8405 (4a32bf9)
Message-ID: <20151112145447.7815A3A300@ghc.haskell.org>

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

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

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

commit 4a32bf925b8aba7885d9c745769fe84a10979a53
Author: Simon Brenner <olsner at gmail.com>
Date:   Thu Nov 12 11:10:54 2015 +0100

    Implement function-sections for Haskell code, #8405
    
    This adds a flag -split-sections that does similar things to
    -split-objs, but using sections in single object files instead of
    relying on the Satanic Splitter and other abominations. This is very
    similar to the GCC flags -ffunction-sections and -fdata-sections.
    
    The --gc-sections linker flag, which allows unused sections to actually
    be removed, is added to all link commands (if the linker supports it) so
    that space savings from having base compiled with sections can be
    realized.
    
    Supported both in LLVM and the native code-gen, in theory for all
    architectures, but really tested on x86 only.
    
    In the GHC build, a new SplitSections variable enables -split-sections
    for relevant parts of the build.
    
    Test Plan: validate with both settings of SplitSections
    
    Reviewers: dterei, Phyx, austin, simonmar, thomie, bgamari
    
    Reviewed By: simonmar, thomie, bgamari
    
    Subscribers: hsyl20, erikd, kgardas, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1242
    
    GHC Trac Issues: #8405


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

4a32bf925b8aba7885d9c745769fe84a10979a53
 compiler/cmm/Cmm.hs                       |  11 ++-
 compiler/cmm/CmmBuildInfoTables.hs        |   6 +-
 compiler/cmm/CmmInfo.hs                   |   2 +-
 compiler/cmm/CmmParse.y                   |   4 +-
 compiler/cmm/CmmUtils.hs                  |   7 +-
 compiler/cmm/PprCmmDecl.hs                |  26 ++++---
 compiler/codeGen/StgCmm.hs                |   3 +-
 compiler/codeGen/StgCmmUtils.hs           |   2 +-
 compiler/ghc.mk                           |   3 +
 compiler/llvmGen/LlvmCodeGen/Base.hs      |   8 ++-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs   |   4 +-
 compiler/llvmGen/LlvmCodeGen/Data.hs      |  42 ++++++++---
 compiler/llvmGen/LlvmCodeGen/Ppr.hs       |   4 +-
 compiler/main/DriverPipeline.hs           |   4 ++
 compiler/main/DynFlags.hs                 |  15 +++-
 compiler/main/HscMain.hs                  |   2 +-
 compiler/main/SysTools.hs                 |   1 +
 compiler/nativeGen/AsmCodeGen.hs          |   8 ++-
 compiler/nativeGen/Dwarf.hs               |  15 +++-
 compiler/nativeGen/Dwarf/Types.hs         |  23 ++++---
 compiler/nativeGen/PPC/CodeGen.hs         |  11 ++-
 compiler/nativeGen/PPC/Ppr.hs             |  94 +++++++++++--------------
 compiler/nativeGen/PprBase.hs             |  52 +++++++++++++-
 compiler/nativeGen/SPARC/CodeGen.hs       |   4 +-
 compiler/nativeGen/SPARC/CodeGen/Gen32.hs |   4 +-
 compiler/nativeGen/SPARC/Ppr.hs           |  58 ++++++++--------
 compiler/nativeGen/X86/CodeGen.hs         |  61 ++++++++--------
 compiler/nativeGen/X86/Ppr.hs             | 111 +++++++++++-------------------
 docs/users_guide/phases.rst               |  14 ++++
 driver/utils/merge_sections.ld            |  26 +++++++
 mk/config.mk.in                           |  11 +++
 rts/ghc.mk                                |   4 ++
 rules/build-package-way.mk                |   6 +-
 rules/build-package.mk                    |   9 +++
 rules/distdir-way-opts.mk                 |   1 +
 utils/mkUserGuidePart/Options/Linking.hs  |   4 ++
 36 files changed, 413 insertions(+), 247 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4a32bf925b8aba7885d9c745769fe84a10979a53

From git at git.haskell.org  Thu Nov 12 14:54:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 14:54:51 +0000 (UTC)
Subject: [commit: ghc] master: Change demand information for foreign calls
 (e090f1b)
Message-ID: <20151112145451.0CA5C3A300@ghc.haskell.org>

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

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

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

commit e090f1bc14b5bf1deeef1c753c1145c162c0d27f
Author: Luite Stegeman <stegeman at gmail.com>
Date:   Thu Nov 12 11:13:54 2015 +0100

    Change demand information for foreign calls
    
    Foreign calls may not be strict for lifted arguments. Fixes Trac #11076.
    
    Test Plan: ./validate
    
    Reviewers: simonpj, bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1464
    
    GHC Trac Issues: #11076


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

e090f1bc14b5bf1deeef1c753c1145c162c0d27f
 compiler/basicTypes/MkId.hs                        |  5 ++++-
 testsuite/tests/stranal/should_run/T11076.hs       | 15 +++++++++++++++
 testsuite/tests/stranal/should_run/T11076.stdout   |  1 +
 testsuite/tests/stranal/should_run/T11076A.hs      | 21 +++++++++++++++++++++
 testsuite/tests/stranal/should_run/T11076_prim.cmm | 10 ++++++++++
 testsuite/tests/stranal/should_run/all.T           |  1 +
 testsuite/tests/stranal/sigs/T8598.stderr          |  2 +-
 7 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index 0fa0005..c2a3678 100644
--- a/compiler/basicTypes/MkId.hs
+++ b/compiler/basicTypes/MkId.hs
@@ -990,8 +990,11 @@ mkFCallId dflags uniq fcall ty
     (_, tau)        = tcSplitForAllTys ty
     (arg_tys, _)    = tcSplitFunTys tau
     arity           = length arg_tys
-    strict_sig      = mkClosedStrictSig (replicate arity evalDmd) topRes
 
+    strict_sig      = mkClosedStrictSig (replicate arity topDmd) topRes
+    -- the call does not claim to be strict in its arguments, since they
+    -- may be lifted (foreign import prim) and the called code doen't
+    -- necessarily force them. See Trac #11076.
 {-
 ************************************************************************
 *                                                                      *
diff --git a/testsuite/tests/stranal/should_run/T11076.hs b/testsuite/tests/stranal/should_run/T11076.hs
new file mode 100644
index 0000000..f095cc1
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/T11076.hs
@@ -0,0 +1,15 @@
+{-
+   Test case for a problem where GHC had incorrect strictness
+   information for foreign calls with lifted arguments
+ -}
+{-# OPTIONS_GHC -O0 #-}
+module Main where
+
+import T11076A
+import Control.Exception
+x :: Bool
+x = error "OK: x has been forced"
+
+main :: IO ()
+main = print (testBool x) `catch`
+          \(ErrorCall e) -> putStrLn e -- x should be forced
diff --git a/testsuite/tests/stranal/should_run/T11076.stdout b/testsuite/tests/stranal/should_run/T11076.stdout
new file mode 100644
index 0000000..8a17d8b
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/T11076.stdout
@@ -0,0 +1 @@
+OK: x has been forced
diff --git a/testsuite/tests/stranal/should_run/T11076A.hs b/testsuite/tests/stranal/should_run/T11076A.hs
new file mode 100644
index 0000000..153a887
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/T11076A.hs
@@ -0,0 +1,21 @@
+{-# OPTIONS_GHC -O #-}
+{-# LANGUAGE MagicHash,
+             ForeignFunctionInterface,
+             UnliftedFFITypes,
+             GHCForeignImportPrim,
+             BangPatterns
+  #-}
+module T11076A where
+
+import GHC.Exts
+import Unsafe.Coerce
+
+{-
+   If the demand type for the foreign call argument is incorrectly strict,
+   the bang pattern can be optimized out
+ -}
+testBool :: Bool -> Int
+testBool !x = I# (cmm_testPrim (unsafeCoerce x))
+{-# INLINE testBool #-}
+
+foreign import prim "testPrim" cmm_testPrim :: Any -> Int#
diff --git a/testsuite/tests/stranal/should_run/T11076_prim.cmm b/testsuite/tests/stranal/should_run/T11076_prim.cmm
new file mode 100644
index 0000000..6e738a7
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/T11076_prim.cmm
@@ -0,0 +1,10 @@
+#include "Cmm.h"
+#include "MachDeps.h"
+
+testPrim(gcptr x)
+{
+  W_ a;
+  a = 123;
+  return (a);
+}
+
diff --git a/testsuite/tests/stranal/should_run/all.T b/testsuite/tests/stranal/should_run/all.T
index 8a82ce8..efd1afa 100644
--- a/testsuite/tests/stranal/should_run/all.T
+++ b/testsuite/tests/stranal/should_run/all.T
@@ -10,3 +10,4 @@ test('T7649', normal, compile_and_run, [''])
 test('T9254', normal, compile_and_run, [''])
 test('T10148', normal, compile_and_run, [''])
 test('T10218', normal, compile_and_run, [''])
+test('T11076', normal, multimod_compile_and_run, ['T11076.hs', 'T11076_prim.cmm'])
diff --git a/testsuite/tests/stranal/sigs/T8598.stderr b/testsuite/tests/stranal/sigs/T8598.stderr
index 28d5dd0..477d408 100644
--- a/testsuite/tests/stranal/sigs/T8598.stderr
+++ b/testsuite/tests/stranal/sigs/T8598.stderr
@@ -1,6 +1,6 @@
 
 ==================== Strictness signatures ====================
 T8598.$trModule: m
-T8598.fun: <S(S),1*U(U)>m
+T8598.fun: <S,1*U(U)>m
 
 


From git at git.haskell.org  Thu Nov 12 14:54:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 14:54:53 +0000 (UTC)
Subject: [commit: ghc] master: rules/haddock: Set __HADDOCK_VERSION__ (8755719)
Message-ID: <20151112145453.AA5443A300@ghc.haskell.org>

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

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

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

commit 8755719462733dee52190e298436e8e8e8f12bea
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Nov 12 11:15:34 2015 +0100

    rules/haddock: Set __HADDOCK_VERSION__
    
    Test Plan: Validate
    
    Reviewers: austin, thomie
    
    Reviewed By: thomie
    
    Subscribers: kgardas, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1467


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

8755719462733dee52190e298436e8e8e8f12bea
 rules/haddock.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rules/haddock.mk b/rules/haddock.mk
index 988e254..499adad 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -10,6 +10,11 @@
 #
 # -----------------------------------------------------------------------------
 
+HADDOCK_VER := $(shell grep "^version:" utils/haddock/haddock.cabal | sed "s/^version: \+//")
+HADDOCK_MAJOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1/')
+HADDOCK_MINOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\2/')
+HADDOCK_PATCH_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\3/')
+HADDOCK_VERSION_STRING := $(shell echo $$(($(HADDOCK_MAJOR_VER) * 1000 + $(HADDOCK_MINOR_VER) * 10 + $(HADDOCK_PATCH_VER))))
 
 define haddock  # args: $1 = dir,  $2 = distdir
 $(call trace, haddock($1,$2))
@@ -40,6 +45,7 @@ $1_$2_HADDOCK_FLAGS += --source-module=src/%{MODULE/./-}.html --source-entity=sr
 endif
 
 ifneq "$$(BINDIST)" "YES"
+
 # We need the quadruple dollars for the dependencies, as it isn't
 # guaranteed that we are processing the packages in dependency order,
 # so we don't want to expand it yet.
@@ -56,6 +62,7 @@ endif
 	  --hoogle \
 	  --title="$$($1_PACKAGE)-$$($1_$2_VERSION)$$(if $$(strip $$($1_$2_SYNOPSIS)),: $$(strip $$($1_$2_SYNOPSIS)),)" \
 	  --prologue="$1/$2/haddock-prologue.txt" \
+    --optghc="-D__HADDOCK_VERSION__=$$(HADDOCK_VERSION_STRING)" \
 	  $$(foreach mod,$$($1_$2_HIDDEN_MODULES),--hide=$$(mod)) \
 	  $$(foreach pkg,$$($1_$2_DEPS),$$(if $$($$(pkg)_HADDOCK_FILE),--read-interface=../$$(pkg)$$(comma)../$$(pkg)/src/%{MODULE/./-}.html\#%{NAME}$$(comma)$$($$(pkg)_HADDOCK_FILE))) \
 	  $$(foreach opt,$$($1_$2_$$(HADDOCK_WAY)_ALL_HC_OPTS),--optghc=$$(opt)) \


From git at git.haskell.org  Thu Nov 12 14:54:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 14:54:56 +0000 (UTC)
Subject: [commit: ghc] master: New magic function for applying realWorld#
 (351de16)
Message-ID: <20151112145456.D0CDA3A300@ghc.haskell.org>

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

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

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

commit 351de169e14ad9277aaca653df4a3753c151f7bb
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Nov 12 14:52:11 2015 +0100

    New magic function for applying realWorld#
    
    Test Plan: validate
    
    Reviewers: goldfire, erikd, rwbarton, simonpj, austin, simonmar, hvr
    
    Reviewed By: simonpj
    
    Subscribers: simonmar, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1103
    
    GHC Trac Issues: #10678


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

351de169e14ad9277aaca653df4a3753c151f7bb
 compiler/basicTypes/MkId.hs                   | 59 +++++++++++++++++++++++++--
 compiler/coreSyn/CorePrep.hs                  | 13 +++++-
 compiler/prelude/PrelNames.hs                 |  3 +-
 includes/stg/MiscClosures.h                   |  2 +
 libraries/base/GHC/IO.hs                      |  5 +--
 libraries/base/GHC/ST.hs                      | 58 ++------------------------
 libraries/ghc-prim/GHC/Magic.hs               | 19 ++++++++-
 libraries/ghc-prim/changelog.md               |  1 +
 libraries/integer-gmp/src/GHC/Integer/Type.hs |  3 +-
 testsuite/tests/perf/should_run/all.T         |  3 +-
 testsuite/tests/primops/should_run/T10678.hs  | 22 ++++++++++
 testsuite/tests/primops/should_run/all.T      |  9 ++++
 12 files changed, 129 insertions(+), 68 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 351de169e14ad9277aaca653df4a3753c151f7bb

From git at git.haskell.org  Thu Nov 12 16:06:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 16:06:30 +0000 (UTC)
Subject: [commit: ghc] master: T10678: Fix bytes allocated statistic (ac2e1e5)
Message-ID: <20151112160630.149843A300@ghc.haskell.org>

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

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

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

commit ac2e1e57ac0755af0d296c072584d27e4e29f9b1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 12 17:06:08 2015 +0100

    T10678: Fix bytes allocated statistic


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

ac2e1e57ac0755af0d296c072584d27e4e29f9b1
 testsuite/tests/primops/should_run/all.T | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/primops/should_run/all.T b/testsuite/tests/primops/should_run/all.T
index b0001d6..2003fc3 100644
--- a/testsuite/tests/primops/should_run/all.T
+++ b/testsuite/tests/primops/should_run/all.T
@@ -5,7 +5,7 @@ test('T9430', omit_ways(['ghci']), compile_and_run, [''])
 test('T10481', exit_code(1), compile_and_run, [''])
 test('T10678',
      [stats_num_field('bytes allocated',
-                      [(wordsize(64), 88041768, 5)
+                      [(wordsize(64), 64004171, 5)
                        # 2015-11-04: 88041768 +/- 5%  (before runRW#)
                        # 2015-11-04: 64004171         (after runRW#)
                       ]),


From git at git.haskell.org  Thu Nov 12 19:34:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 12 Nov 2015 19:34:37 +0000 (UTC)
Subject: [commit: ghc] master: Ignore comments in getOptions (5d6133b)
Message-ID: <20151112193437.00BE43A300@ghc.haskell.org>

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

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

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

commit 5d6133bec0f682e86ee31bbdb6d82e6fb2ede8f7
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Thu Nov 12 20:33:39 2015 +0100

    Ignore comments in getOptions
    
    When Opt_KeepRawTokenStream is turned on then getOptions fails to find
    the language pragmas which can cause unexpected parse errors when using
    the GHC API. A simple solution is to make it skip over any comments in
    the token
    stream.
    
    Test Plan: ./validate
    
    Reviewers: austin, bgamari
    
    Subscribers: alanz, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1444
    
    GHC Trac Issues: #10942


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

5d6133bec0f682e86ee31bbdb6d82e6fb2ede8f7
 compiler/main/HeaderInfo.hs           | 14 ++++++++++++++
 testsuite/tests/ghc-api/T10942.hs     | 22 ++++++++++++++++++++++
 testsuite/tests/ghc-api/T10942.stdout |  1 +
 testsuite/tests/ghc-api/T10942_A.hs   | 16 ++++++++++++++++
 testsuite/tests/ghc-api/all.T         |  3 +++
 5 files changed, 56 insertions(+)

diff --git a/compiler/main/HeaderInfo.hs b/compiler/main/HeaderInfo.hs
index 08c7619..35107c8 100644
--- a/compiler/main/HeaderInfo.hs
+++ b/compiler/main/HeaderInfo.hs
@@ -256,6 +256,9 @@ getOptions' dflags toks
           parseToks (open:xs)
               | ITlanguage_prag <- getToken open
               = parseLanguage xs
+          parseToks (comment:xs) -- Skip over comments
+              | isComment (getToken comment)
+              = parseToks xs
           parseToks _ = []
           parseLanguage (L loc (ITconid fs):rest)
               = checkExtension dflags (L loc fs) :
@@ -269,6 +272,17 @@ getOptions' dflags toks
           parseLanguage []
               = panic "getOptions'.parseLanguage(2) went past eof token"
 
+          isComment :: Token -> Bool
+          isComment c =
+            case c of
+              (ITlineComment {})     -> True
+              (ITblockComment {})    -> True
+              (ITdocCommentNext {})  -> True
+              (ITdocCommentPrev {})  -> True
+              (ITdocCommentNamed {}) -> True
+              (ITdocSection {})      -> True
+              _                      -> False
+
 -----------------------------------------------------------------------------
 
 -- | Complain about non-dynamic flags in OPTIONS pragmas.
diff --git a/testsuite/tests/ghc-api/T10942.hs b/testsuite/tests/ghc-api/T10942.hs
new file mode 100644
index 0000000..6fbf1d5
--- /dev/null
+++ b/testsuite/tests/ghc-api/T10942.hs
@@ -0,0 +1,22 @@
+module Main where
+
+import DynFlags
+import GHC
+
+import Control.Monad.IO.Class (liftIO)
+import System.Environment
+import HeaderInfo
+import Outputable
+import StringBuffer
+
+main :: IO ()
+main = do
+  [libdir] <- getArgs
+  runGhc (Just libdir) $ do
+    dflags <- getSessionDynFlags
+    let dflags' = dflags `gopt_set` Opt_KeepRawTokenStream
+                         `gopt_set` Opt_Haddock
+        filename = "T10942_A.hs"
+    setSessionDynFlags dflags'
+    stringBuffer <- liftIO $ hGetStringBuffer filename
+    liftIO $ print (map unLoc (getOptions dflags' stringBuffer filename))
diff --git a/testsuite/tests/ghc-api/T10942.stdout b/testsuite/tests/ghc-api/T10942.stdout
new file mode 100644
index 0000000..40ead27
--- /dev/null
+++ b/testsuite/tests/ghc-api/T10942.stdout
@@ -0,0 +1 @@
+["-XFlexibleInstances","-XCPP"]
diff --git a/testsuite/tests/ghc-api/T10942_A.hs b/testsuite/tests/ghc-api/T10942_A.hs
new file mode 100644
index 0000000..359961c
--- /dev/null
+++ b/testsuite/tests/ghc-api/T10942_A.hs
@@ -0,0 +1,16 @@
+{-
+
+A normal comment, to check if we can still pick up the CPP directive after it.
+
+-}
+-- Check that we can parse a file with leading comments
+
+-- ^ haddock
+-- * haddock
+-- | haddock
+-- $ haddock
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE CPP #-}
+module T10942 where
+
+main = return ()
diff --git a/testsuite/tests/ghc-api/all.T b/testsuite/tests/ghc-api/all.T
index c4783ea..dee74b7 100644
--- a/testsuite/tests/ghc-api/all.T
+++ b/testsuite/tests/ghc-api/all.T
@@ -14,3 +14,6 @@ test('T9595', extra_run_opts('"' + config.libdir + '"'),
 test('T10508_api', extra_run_opts('"' + config.libdir + '"'),
                    compile_and_run,
                    ['-package ghc'])
+test('T10942', extra_run_opts('"' + config.libdir + '"'),
+                   compile_and_run,
+                   ['-package ghc'])


From git at git.haskell.org  Fri Nov 13 06:39:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 06:39:00 +0000 (UTC)
Subject: [commit: ghc] master: APIAnnotations:add Locations in hsSyn for
 layout (2290c8b)
Message-ID: <20151113063900.E77BB3A300@ghc.haskell.org>

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

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

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

commit 2290c8bd8c3faee0cb7dc1c2c7951bb9d5e3ebf9
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri Nov 13 08:39:07 2015 +0200

    APIAnnotations:add Locations in hsSyn for layout
    
    Summary:
    At the moment ghc-exactprint, which uses the GHC API Annotations to
    provide a framework for roundtripping Haskell source code with optional
    AST edits, has to implement a horrible workaround to manage the points
    where layout needs to be captured.
    
    These are
    
        MatchGroup
        HsDo
        HsCmdDo
        HsLet
        LetStmt
        HsCmdLet
        GRHSs
    
    To provide a more natural representation, the contents subject to layout
    rules need to be wrapped in a SrcSpan.
    
    This commit does this.
    
    Trac ticket #10250
    
    Test Plan: ./validate
    
    Reviewers: hvr, goldfire, bgamari, austin, mpickering
    
    Reviewed By: mpickering
    
    Subscribers: thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1370
    
    GHC Trac Issues: #10250


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

2290c8bd8c3faee0cb7dc1c2c7951bb9d5e3ebf9
 compiler/deSugar/Coverage.hs                       | 48 ++++++++---------
 compiler/deSugar/DsArrows.hs                       | 18 ++++---
 compiler/deSugar/DsExpr.hs                         | 33 ++++++------
 compiler/deSugar/DsGRHSs.hs                        |  4 +-
 compiler/deSugar/DsListComp.hs                     |  8 +--
 compiler/deSugar/DsMeta.hs                         | 35 +++++++------
 compiler/deSugar/Match.hs                          |  2 +-
 compiler/hsSyn/Convert.hs                          | 14 ++---
 compiler/hsSyn/HsExpr.hs                           | 47 ++++++++---------
 compiler/hsSyn/HsUtils.hs                          | 42 ++++++++-------
 compiler/main/InteractiveEval.hs                   |  2 +-
 compiler/parser/Parser.y                           | 20 ++++----
 compiler/parser/RdrHsSyn.hs                        | 14 ++---
 compiler/rename/RnBinds.hs                         |  6 +--
 compiler/rename/RnExpr.hs                          | 60 +++++++++++-----------
 compiler/rename/RnTypes.hs                         |  2 +-
 compiler/typecheck/TcArrows.hs                     | 16 +++---
 compiler/typecheck/TcBinds.hs                      |  4 +-
 compiler/typecheck/TcExpr.hs                       |  4 +-
 compiler/typecheck/TcGenDeriv.hs                   |  9 ++--
 compiler/typecheck/TcHsSyn.hs                      | 30 ++++++-----
 compiler/typecheck/TcMatches.hs                    | 43 ++++++++--------
 compiler/typecheck/TcPatSyn.hs                     | 21 ++++----
 compiler/typecheck/TcRnDriver.hs                   |  6 +--
 testsuite/tests/ghc-api/T6145.hs                   |  2 +-
 .../tests/ghc-api/annotations/listcomps.stdout     | 10 ++--
 testsuite/tests/ghc-api/landmines/landmines.stdout |  6 +--
 27 files changed, 268 insertions(+), 238 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2290c8bd8c3faee0cb7dc1c2c7951bb9d5e3ebf9

From git at git.haskell.org  Fri Nov 13 09:14:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 09:14:44 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11071' deleted
Message-ID: <20151113091444.763663A300@ghc.haskell.org>

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

Deleted branch: wip/T11071

From git at git.haskell.org  Fri Nov 13 09:14:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 09:14:47 +0000 (UTC)
Subject: [commit: ghc] master: Give helpful advice when a fully qualified name
 is not in scope (e66f79d)
Message-ID: <20151113091447.AA3CF3A300@ghc.haskell.org>

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

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

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

commit e66f79dfb22031dd3f75dd3eb341e8269ab51d83
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 10 17:07:10 2015 +0100

    Give helpful advice when a fully qualified name is not in scope
    
    This implements #11071. It needs to thread through a GlobalRdrEnv
    corresponding to the export list of the module if its exports were not
    restricted.
    
    A refactoring of ImportedModsVal into a proper data type follows.
    
    Differential Revision: https://phabricator.haskell.org/D1462


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

e66f79dfb22031dd3f75dd3eb341e8269ab51d83
 compiler/iface/MkIface.hs                          |   6 +-
 compiler/main/HscMain.hs                           |   4 +-
 compiler/main/HscTypes.hs                          |   2 +-
 compiler/rename/RnEnv.hs                           | 113 ++++++++++++++++++++-
 compiler/rename/RnNames.hs                         |  16 +--
 compiler/typecheck/TcRnTypes.hs                    |   4 +-
 compiler/utils/Outputable.hs                       |   8 +-
 testsuite/tests/ghc-api/annotations/T10313.stderr  |  12 ++-
 testsuite/tests/ghc-api/annotations/T10399.stderr  |  12 ++-
 testsuite/tests/ghci/scripts/T2452.stderr          |   4 +-
 testsuite/tests/ghci/scripts/T8639.stderr          |   3 +-
 testsuite/tests/ghci/scripts/ghci036.stderr        |   4 +-
 testsuite/tests/module/mod134.stderr               |   4 +-
 testsuite/tests/module/mod62.stderr                |   5 +-
 testsuite/tests/module/mod73.stderr                |   3 +-
 testsuite/tests/module/mod74.stderr                |   4 +-
 testsuite/tests/module/mod88.stderr                |   5 +-
 .../tests/rename/prog002/rename.prog002.stderr     |   5 +-
 testsuite/tests/rename/should_fail/T10781.stderr   |   4 +-
 testsuite/tests/rename/should_fail/T11071.hs       |  28 +++++
 testsuite/tests/rename/should_fail/T11071.stderr   |  53 ++++++++++
 testsuite/tests/rename/should_fail/T2901.stderr    |   7 +-
 testsuite/tests/rename/should_fail/T5657.stderr    |   6 +-
 testsuite/tests/rename/should_fail/T5892b.stderr   |   4 +-
 testsuite/tests/rename/should_fail/all.T           |   1 +
 .../tests/rename/should_fail/rnfail030.stderr      |   5 +-
 .../tests/rename/should_fail/rnfail031.stderr      |   5 +-
 .../tests/rename/should_fail/rnfail032.stderr      |   4 +-
 .../tests/rename/should_fail/rnfail033.stderr      |   4 +-
 .../tests/rename/should_fail/rnfail034.stderr      |   5 +-
 testsuite/tests/safeHaskell/ghci/p4.stderr         |   1 +
 31 files changed, 295 insertions(+), 46 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e66f79dfb22031dd3f75dd3eb341e8269ab51d83

From git at git.haskell.org  Fri Nov 13 09:14:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 09:14:50 +0000 (UTC)
Subject: [commit: ghc] master: Turn ImportedModsVal into a data type (b8d263d)
Message-ID: <20151113091450.67D593A300@ghc.haskell.org>

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

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

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

commit b8d263dc06e37349b2e210d20087b3173383d0a0
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 11 12:55:22 2015 +0100

    Turn ImportedModsVal into a data type
    
    it was a 4-tuple before my patch, and a 6-tuple afterwards. Clearly a
    record type is in order here!


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

b8d263dc06e37349b2e210d20087b3173383d0a0
 compiler/iface/MkIface.hs       |  6 +++---
 compiler/main/HscMain.hs        | 12 ++++++------
 compiler/main/HscTypes.hs       | 15 ++++++++++++---
 compiler/rename/RnEnv.hs        | 42 ++++++++++++++++++-----------------------
 compiler/rename/RnNames.hs      | 19 ++++++++++++-------
 compiler/typecheck/TcRnTypes.hs |  5 +++--
 6 files changed, 54 insertions(+), 45 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b8d263dc06e37349b2e210d20087b3173383d0a0

From git at git.haskell.org  Fri Nov 13 09:14:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 09:14:53 +0000 (UTC)
Subject: [commit: ghc] master: Remove imv_empty from ImportedModsVal (5a86292)
Message-ID: <20151113091453.128353A300@ghc.haskell.org>

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

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

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

commit 5a86292872f78da2289df1c711b407de0a0edd0d
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 11 12:58:40 2015 +0100

    Remove imv_empty from ImportedModsVal
    
    it seems that this field is never used.


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

5a86292872f78da2289df1c711b407de0a0edd0d
 compiler/main/HscTypes.hs       |  1 -
 compiler/rename/RnNames.hs      |  7 ++-----
 compiler/typecheck/TcRnTypes.hs | 23 ++---------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs
index 31fe778..849c803 100644
--- a/compiler/main/HscTypes.hs
+++ b/compiler/main/HscTypes.hs
@@ -1033,7 +1033,6 @@ type ImportedMods = ModuleEnv [ImportedModsVal]
 data ImportedModsVal
  = ImportedModsVal {
         imv_name :: ModuleName,         -- ^ The name the module is imported with
-        imv_empty :: Bool,              -- ^ whether it is an "import Foo ()" import
         imv_span :: SrcSpan,            -- ^ the source span of the whole import
         imv_is_safe :: IsSafeImport,    -- ^ whether this is a safe import
         imv_is_hiding :: Bool,          -- ^ whether this is an "hiding" import
diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs
index 44c7c17..8d4986e 100644
--- a/compiler/rename/RnNames.hs
+++ b/compiler/rename/RnNames.hs
@@ -270,10 +270,8 @@ rnImportDecl this_mod
 
     let gbl_env = mkGlobalRdrEnv gres
 
-        -- import_all == True <=> import M ()
-        (is_hiding, import_all) = case imp_details of
-                        Just (is_hiding, L _ ls) -> (is_hiding, not is_hiding && null ls)
-                        _                        -> (False, False)
+        is_hiding | Just (True,_) <- imp_details = True
+                  | otherwise                    = False
 
         -- should the import be safe?
         mod_safe' = mod_safe
@@ -282,7 +280,6 @@ rnImportDecl this_mod
 
     let imv = ImportedModsVal
             { imv_name        = qual_mod_name
-            , imv_empty       = import_all
             , imv_span        = loc
             , imv_is_safe     = mod_safe'
             , imv_is_hiding   = is_hiding
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 5c3727e..06ab9c2 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -969,27 +969,8 @@ data ImportAvails
           --      = ModuleEnv [ImportedModsVal],
           -- ^ Domain is all directly-imported modules
           --
-          -- 'imv_name' is what the module was imported as, e.g. in
-          -- @
-          --     import Foo as Bar
-          -- @
-          -- it is @Bar at .
-          --
-          -- The first 'Bool' means:
-          --
-          --  - @True@ => import was @import Foo ()@
-          --
-          --  - @False@ => import was some other form
-          --
-          -- Used
-          --
-          --   (a) to help construct the usage information in the interface
-          --       file; if we import something we need to recompile if the
-          --       export version changes
-          --
-          --   (b) to specify what child modules to initialise
-          --
-          -- The second 'Bool' means that the module is safe (see rnImportDecl)
+          -- See the documentaion on ImportedModsVal in HscTypes for the
+          -- meaning of the fields.
           --
           -- We need a full ModuleEnv rather than a ModuleNameEnv here,
           -- because we might be importing modules of the same name from


From git at git.haskell.org  Fri Nov 13 10:12:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 10:12:52 +0000 (UTC)
Subject: [commit: ghc] master: Update note for Parent to explain
 PatternSynonym. (8868ff3)
Message-ID: <20151113101252.C1D813A300@ghc.haskell.org>

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

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

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

commit 8868ff3eb742977c5de2609f7d748f4ff8882d6d
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Fri Nov 13 10:10:52 2015 +0000

    Update note for Parent to explain PatternSynonym.


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

8868ff3eb742977c5de2609f7d748f4ff8882d6d
 compiler/basicTypes/RdrName.hs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/compiler/basicTypes/RdrName.hs b/compiler/basicTypes/RdrName.hs
index e3d1216..bfb11e0 100644
--- a/compiler/basicTypes/RdrName.hs
+++ b/compiler/basicTypes/RdrName.hs
@@ -495,6 +495,23 @@ Note [Parents]
   class C          Class operations
                    Associated type constructors
 
+The `PatternSynonym` constructor is so called as pattern synonyms can be
+bundled with any type constructor (during renaming). In other words, they can
+have any parent.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~
+ Constructor      Meaning
+ ~~~~~~~~~~~~~~~~~~~~~~~~
+  NoParent        Can not be bundled with a type constructor.
+  ParentIs n      Can be bundled with the type constructor corresponding to
+                  n.
+  PatternSynonym  Can be bundled with any type constructor. It is so called
+                  because only pattern synonyms can be bundled with any type
+                  constructor.
+  FldParent       See Note [Parents for record fields]
+
+
+
 
 Note [Parents for record fields]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


From git at git.haskell.org  Fri Nov 13 12:38:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 12:38:58 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Benign changes to API
 annotatinos (ee68443)
Message-ID: <20151113123858.EE1B43A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/ee684438302338f8f45e1264759ac6abd241e396/ghc

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

commit ee684438302338f8f45e1264759ac6abd241e396
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Oct 30 16:51:18 2015 +0000

    Benign changes to API annotatinos
    
    These testsuite wibbles have been certified as "benign"
    by Alan Zimmerman


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

ee684438302338f8f45e1264759ac6abd241e396
 testsuite/tests/ghc-api/annotations/T10268.stdout    | 3 ++-
 testsuite/tests/ghc-api/annotations/T10354.stdout    | 4 +++-
 testsuite/tests/ghc-api/annotations/T10396.stdout    | 3 ++-
 testsuite/tests/ghc-api/annotations/listcomps.stdout | 3 +--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/ghc-api/annotations/T10268.stdout b/testsuite/tests/ghc-api/annotations/T10268.stdout
index 8c77efd..b33eac3 100644
--- a/testsuite/tests/ghc-api/annotations/T10268.stdout
+++ b/testsuite/tests/ghc-api/annotations/T10268.stdout
@@ -1,9 +1,10 @@
 ---Problems---------------------
 [
+(AK <no location info> AnnEofPos = [Test10268.hs:12:1])
 ]
 
 ---Problems'--------------------
-[]
+[(AnnEofPos, Test10268.hs:12:1)]
 --------------------------------
 [
 (AK Test10268.hs:1:1 AnnModule = [Test10268.hs:3:1-6])
diff --git a/testsuite/tests/ghc-api/annotations/T10354.stdout b/testsuite/tests/ghc-api/annotations/T10354.stdout
index b0203c9..585c63a 100644
--- a/testsuite/tests/ghc-api/annotations/T10354.stdout
+++ b/testsuite/tests/ghc-api/annotations/T10354.stdout
@@ -3,10 +3,12 @@
 (AK Test10354.hs:4:7-15 AnnCloseP = [Test10354.hs:4:15])
 
 (AK Test10354.hs:4:7-15 AnnOpenP = [Test10354.hs:4:7])
+
+(AK <no location info> AnnEofPos = [Test10354.hs:15:1])
 ]
 
 ---Problems'--------------------
-[]
+[(AnnEofPos, Test10354.hs:15:1)]
 --------------------------------
 [
 (AK Test10354.hs:1:1 AnnModule = [Test10354.hs:2:1-6])
diff --git a/testsuite/tests/ghc-api/annotations/T10396.stdout b/testsuite/tests/ghc-api/annotations/T10396.stdout
index 61d0399..3abfebd 100644
--- a/testsuite/tests/ghc-api/annotations/T10396.stdout
+++ b/testsuite/tests/ghc-api/annotations/T10396.stdout
@@ -1,9 +1,10 @@
 ---Problems---------------------
 [
+(AK <no location info> AnnEofPos = [Test10396.hs:8:1])
 ]
 
 ---Problems'--------------------
-[]
+[(AnnEofPos, Test10396.hs:8:1)]
 --------------------------------
 [
 (AK Test10396.hs:1:1 AnnModule = [Test10396.hs:2:1-6])
diff --git a/testsuite/tests/ghc-api/annotations/listcomps.stdout b/testsuite/tests/ghc-api/annotations/listcomps.stdout
index 081258a..3a89d4f 100644
--- a/testsuite/tests/ghc-api/annotations/listcomps.stdout
+++ b/testsuite/tests/ghc-api/annotations/listcomps.stdout
@@ -33,8 +33,7 @@
  ListComprehensions.hs:25:16-20, ListComprehensions.hs:26:16,
  ListComprehensions.hs:26:16-23,
  ListComprehensions.hs:(26,16)-(27,22),
- ListComprehensions.hs:26:21-23, ListComprehensions.hs:27:21-22,
- <no location info>}
+ ListComprehensions.hs:26:21-23, ListComprehensions.hs:27:21-22}
 --------------------------------
 [
 (AK ListComprehensions.hs:1:1 AnnModule = [ListComprehensions.hs:6:1-6])


From git at git.haskell.org  Fri Nov 13 12:39:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 12:39:01 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Merge branch
 'wip/spj-wildcard-refactor' of ssh://git.haskell.org/ghc into
 wip/spj-wildcard-refactor (2edeac6)
Message-ID: <20151113123901.C43383A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/2edeac6ea191b8f45d2faafff7a8097f27ca0f6a/ghc

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

commit 2edeac6ea191b8f45d2faafff7a8097f27ca0f6a
Merge: ee68443 93a97a6
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 11 08:45:32 2015 +0000

    Merge branch 'wip/spj-wildcard-refactor' of ssh://git.haskell.org/ghc into wip/spj-wildcard-refactor



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2edeac6ea191b8f45d2faafff7a8097f27ca0f6a

From git at git.haskell.org  Fri Nov 13 12:39:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 12:39:05 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch
 'origin/master' into wip/spj-wildcard-refactor (f11d47d)
Message-ID: <20151113123905.9B9A93A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/f11d47d569cc724ffa6b2b594994972620311ece/ghc

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

commit f11d47d569cc724ffa6b2b594994972620311ece
Merge: 2edeac6 8868ff3
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 13 11:51:21 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/hsSyn/HsDecls.hs
    	compiler/parser/Parser.y
    	compiler/parser/RdrHsSyn.hs
    	compiler/rename/RnEnv.hs
    	compiler/rename/RnExpr.hs
    	compiler/rename/RnSource.hs
    	compiler/typecheck/TcBinds.hs
    	testsuite/tests/ghc-api/annotations/T10268.stdout
    	testsuite/tests/ghc-api/annotations/T10354.stdout
    	testsuite/tests/ghc-api/annotations/T10396.stdout
    	testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr
    	testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr
    	testsuite/tests/rename/should_fail/T2901.stderr
    	utils/haddock



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f11d47d569cc724ffa6b2b594994972620311ece

From git at git.haskell.org  Fri Nov 13 12:39:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 12:39:08 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Wibbles (88a67a3)
Message-ID: <20151113123908.3BB8D3A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/88a67a3992d3b8fa6de9f45a52b038b50f480789/ghc

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

commit 88a67a3992d3b8fa6de9f45a52b038b50f480789
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 13 12:16:51 2015 +0000

    Wibbles


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

88a67a3992d3b8fa6de9f45a52b038b50f480789
 compiler/parser/Parser.y    | 2 +-
 compiler/parser/RdrHsSyn.hs | 2 +-
 compiler/rename/RnExpr.hs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 49dde76..7fe54ae 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -1880,7 +1880,7 @@ gadt_constr :: { LConDecl RdrName }
     -- see Note [Difference in parsing GADT and data constructors]
     -- Returns a list because of:   C,D :: ty
         : con_list '::' ctype
-                     {% let { (anns,gadtDecl) = mkGadtDecl (unLoc $1) $3 }
+                {% do { let { (anns,gadtDecl) = mkGadtDecl (unLoc $1) $3 }
                       ; ams (sLL $1 $> gadtDecl)
                             (mj AnnDcolon $2:anns) } }
 
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 927d6d8..2f48288 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -913,7 +913,7 @@ checkFunBind msg ann lhs_loc fun is_infix pats opt_sig (L rhs_span grhss)
         let match_span = combineSrcSpans lhs_loc rhs_span
         -- Add back the annotations stripped from any HsPar values in the lhs
         -- mapM_ (\a -> a match_span) ann
-        return (ann,makeFunBind fun is_infix
+        return (ann, makeFunBind fun
                   [L match_span (Match { m_fixity = FunBindMatch fun is_infix
                                        , m_pats = ps
                                        , m_type = opt_sig
diff --git a/compiler/rename/RnExpr.hs b/compiler/rename/RnExpr.hs
index b9c6d54..cfd012d 100644
--- a/compiler/rename/RnExpr.hs
+++ b/compiler/rename/RnExpr.hs
@@ -251,7 +251,7 @@ rnExpr (ExplicitTuple tup_args boxity)
     rnTupArg (L l (Missing _)) = return (L l (Missing placeHolderType)
                                         , emptyFVs)
 
-rnExpr (RecordCon con_id _ rec_binds@(HsRecFields { rec_dotdot = dd } _))
+rnExpr (RecordCon con_id _ rec_binds@(HsRecFields { rec_dotdot = dd }) _)
   = do { con_lname@(L _ con_name) <- lookupLocatedOccRn con_id
        ; (flds, fvs)   <- rnHsRecFields (HsRecFieldCon con_name) HsVar rec_binds
        ; (flds', fvss) <- mapAndUnzipM rn_field flds


From git at git.haskell.org  Fri Nov 13 12:39:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 12:39:10 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Update haddock submodule
 (fb2b7ae)
Message-ID: <20151113123910.D817A3A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/fb2b7ae625490541c31e8354d98b809683f2dbb8/ghc

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

commit fb2b7ae625490541c31e8354d98b809683f2dbb8
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 13 12:19:11 2015 +0000

    Update haddock submodule


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

fb2b7ae625490541c31e8354d98b809683f2dbb8
 utils/haddock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/haddock b/utils/haddock
index 0413c54..0d157fe 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 0413c544b60c063ef286777d3008c4e33b4afbcd
+Subproject commit 0d157fea7d1e4055abcb6453545f8bf326ce2279


From git at git.haskell.org  Fri Nov 13 12:39:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 12:39:13 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor's head updated: Update
 haddock submodule (fb2b7ae)
Message-ID: <20151113123913.7CA963A300@ghc.haskell.org>

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

Branch 'wip/spj-wildcard-refactor' now includes:

     ee68443 Benign changes to API annotatinos
     e2a78ee Signals: Ensure libdw session is freed
     8f02baa Remove Data.List.NonEmpty.{words,unwords,lines,unlines}
     bc7cc25 disable large address space on OpenBSD
     da1a8da llvmGen: Fix build with Clang
     8fd5cff llvmGen: Really fix build with Clang
     3021cc0 Add rts/Linker support for more than 64k sections
     31bcf9b Apply WERROR only to stage2 HC options
     c3b0215 Provide a utility to check API Annotations docs
     4ad2a8f rts/posix: Reduce heap allocation amount on mmap failure
     c8e866a Enforce linkage with pthread library on OpenBSD
     184dfce Linker: More uint64_t to uintptr_t fixes
     9f0ecb4 ghc-prim: Fix hs_ctz64 for powerpc
     62e1b35 Update array/stm/hpc/haddock submodules
     d2a7fb9 Update directory submodule
     12abc77 Update filepath submodule
     de8443c Update process submodule
     3238ef7 Update unix submodule
     32f92a3 Update hoopl submodule
     f8ba4b5 Bump `base` version to 4.9.0.0 (closes #11026)
     4b8b934 ghc-prim: add API delta as changelog (re #11043)
     84bf1eb Bump ghc-prim version to 0.5.0.0 (closes #11043)
     f16827f ApiAnnotations: BooleanFormula is not properly Located
     5a48180 keepCAFsForGHCi was broken
     677d768 DynFlags: -freverse-errors should be defFlag
     3431ad6 Update Cabal submodule
     6fb0ba6 Dwarf: Preserve stack pointer register
     76611d7 Dwarf.Types: Fix comment style
     159a1a2 cmm: Expose machine's stack and return address register
     d9f8862 StgStartup: Setup unwinding for stg_stop_thread
     bb446b2 Libdw: Remove special treatment for stg_stop_thread
     b8df858 Dwarf.Constants: Introduce Haddock sections
     52c6e3d Libdw: Fix symbol naming
     e9bfb3f Minor simplification in unariser pass:
     65f3c4c Change sphinx for documentation building on windows to the python3 version
     f46f32b EventLog: Loop fwrite if necessary during flush
     9fe5497 rts: Produce stack trace on fatal error
     1e2259b Update process submodule to process-1.4 release
     c00c5e5 get rid of Elf32/Elf64_Section as this is a non-portable Linux-ism.
     130ca3e Update filepath submodule for proper version
     5065cf4 base: Update `@since 4.8.2` annotations (re #11026)
     0bc8c6a base: GHC.RTS.Flags symbols really were introduced in 4.8.2
     83fd2ba base: Add changelog entry for 4.8.2.0
     8c80dcc base: Add new Control.Monad.Fail module (re #10751)
     b62605e Add `MonadPlus IO` and `Alternative IO` instances
     334fe45 rts/Hash: Constify HashTable* in lookupHashTable
     987d542 Build system: renable -Wall on validate (base)
     0e21678 Cabal-level sanity check to enforce Cabal flag-invariant
     22fcf9c Tweak settings for LLVM tests
     e547954 Use full name of LLVM program in error message
     10647d4 Linker: #ifdef cleanup
     a58eeb7 Call Arity: In "e x", the result of "x" is not shared
     ce1f160 Make GHCi & TH work when the compiler is built with -prof
     6e6438e Allow the GHCi Linker to resolve related dependencies when loading DLLs
     be88585 fix #10734 by adding braces to pretty-printing of let inside do
     2208011 Remove PatSynBuilderId
     d9c1450 Build system: use stage0 to build dll-split
     8262c95 Parser: allow empty multi-line deprecation warnings
     bd69f6f minor: use unless instead of (when . not)
     932d503 Replace freeVarsOf scrut with scrut_fvs to avoid repetition
     80d7ce8 Add pprSTrace for debugging with call stacks
     0e40c01 Quote file paths in linker scripts
     2b7d9c2 Add OpenBSD specific RTS symbols
     f405632 Fix sporadic failing ghci/Linker/Dyn tests
     3cfe60a Abstract TFs can have injectivity information
     2edeac6 Merge branch 'wip/spj-wildcard-refactor' of ssh://git.haskell.org/ghc into wip/spj-wildcard-refactor
     96621b1 Associate pattern synonyms with types in module exports
     5eb56ed Fix link in documentation
     fbc2537 OPTIONS_GHC compiler flags may contain spaces (#4931)
     ea8c116 Remove unused field in ConDecl
     f0f9365 Remove fun_infix from Funbind, as it is now in Match
     109d7ce Systools: read ELF section without calling readelf
     fa61edd Improve documentation of Data.List.lines:
     0f49508 Put kind variables before type variables when specializing
     badf5d5 Detect invalid foreign imports in bytecode compiler
     fb0d512 nativeGen.PPC: Fix shift arith. right > 31 bits
     afbd30b mkGadtDecl no longer in P monad
     63cad5d Rename bundled pattern synonym tests to reflect new terminology
     a038b72 Remove redundant test.
     9bea234 fix RTS Linker on platforms without SHN_XINDEX support
     4a32bf9 Implement function-sections for Haskell code, #8405
     e090f1b Change demand information for foreign calls
     8755719 rules/haddock: Set __HADDOCK_VERSION__
     351de16 New magic function for applying realWorld#
     ac2e1e5 T10678: Fix bytes allocated statistic
     5d6133b Ignore comments in getOptions
     2290c8b APIAnnotations:add Locations in hsSyn for layout
     e66f79d Give helpful advice when a fully qualified name is not in scope
     b8d263d Turn ImportedModsVal into a data type
     5a86292 Remove imv_empty from ImportedModsVal
     8868ff3 Update note for Parent to explain PatternSynonym.
     f11d47d Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
     88a67a3 Wibbles
     fb2b7ae Update haddock submodule

From git at git.haskell.org  Fri Nov 13 13:35:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 13:35:32 +0000 (UTC)
Subject: [commit: packages/hpc] D1426: Update output for D1426 (5123582)
Message-ID: <20151113133532.C43FF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hpc

On branch  : D1426
Link       : http://git.haskell.org/packages/hpc.git/commitdiff/5123582f48b46efc3d27424bc475125a1de78e2e

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

commit 5123582f48b46efc3d27424bc475125a1de78e2e
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Nov 13 13:33:52 2015 +0000

    Update output for D1426


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

5123582f48b46efc3d27424bc475125a1de78e2e
 tests/simple/tixs/T10529a.stderr | 2 +-
 tests/simple/tixs/T10529b.stderr | 2 +-
 tests/simple/tixs/T10529c.stderr | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/simple/tixs/T10529a.stderr b/tests/simple/tixs/T10529a.stderr
index d83560a..2f49554 100644
--- a/tests/simple/tixs/T10529a.stderr
+++ b/tests/simple/tixs/T10529a.stderr
@@ -1,3 +1,3 @@
 hpc: can not find NonExistingModule in ./.hpc
-CallStack:
+CallStack (from ImplicitParams):
   error, called at libraries/hpc/Trace/Hpc/Mix.hs:119:15 in hpc-0.6.0.2:Trace.Hpc.Mix
diff --git a/tests/simple/tixs/T10529b.stderr b/tests/simple/tixs/T10529b.stderr
index 151b953..ad9b675 100644
--- a/tests/simple/tixs/T10529b.stderr
+++ b/tests/simple/tixs/T10529b.stderr
@@ -1,4 +1,4 @@
 hpc: hash in tix file for module Main (1234567890)
 does not match hash in ./.hpc/Main.mix (2454134535)
-CallStack:
+CallStack (from ImplicitParams):
   error, called at libraries/hpc/Trace/Hpc/Mix.hs:129:17 in hpc-0.6.0.2:Trace.Hpc.Mix
diff --git a/tests/simple/tixs/T10529c.stderr b/tests/simple/tixs/T10529c.stderr
index 5c2f649..0700886 100644
--- a/tests/simple/tixs/T10529c.stderr
+++ b/tests/simple/tixs/T10529c.stderr
@@ -1,3 +1,3 @@
 hpc: can not parse ./.hpc/NoParse.mix
-CallStack:
+CallStack (from ImplicitParams):
   error, called at libraries/hpc/Trace/Hpc/Mix.hs:103:43 in hpc-0.6.0.2:Trace.Hpc.Mix


From git at git.haskell.org  Fri Nov 13 16:00:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 16:00:10 +0000 (UTC)
Subject: [commit: packages/array] master's head updated: Update output
 (4b43c95)
Message-ID: <20151113160010.5D0613A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/array

Branch 'master' now includes:

     4b43c95 Update output

From git at git.haskell.org  Fri Nov 13 16:03:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 16:03:34 +0000 (UTC)
Subject: [commit: packages/hpc] master's head updated: Update output for D1426
 (5123582)
Message-ID: <20151113160334.90FEF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hpc

Branch 'master' now includes:

     e17eef9 Update output
     5123582 Update output for D1426

From git at git.haskell.org  Fri Nov 13 16:04:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 16:04:28 +0000 (UTC)
Subject: [commit: packages/stm] master's head updated: Update output (9870cf1)
Message-ID: <20151113160428.A3F803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/stm

Branch 'master' now includes:

     9870cf1 Update output

From git at git.haskell.org  Fri Nov 13 16:06:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 13 Nov 2015 16:06:36 +0000 (UTC)
Subject: [commit: ghc] master: Make 'error' include the CCS call stack when
 profiled (8988be8)
Message-ID: <20151113160636.019923A300@ghc.haskell.org>

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

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

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

commit 8988be8561ce0857f3befd6ab3b6c29060685c0a
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Nov 3 14:06:09 2015 +0000

    Make 'error' include the CCS call stack when profiled
    
    Summary:
    The idea here is that this gives a more detailed stack trace in two
    cases:
    
    1. With `-prof` and `-fprof-auto`
    2. In GHCi (see #11047)
    
    Example, with an error inserted in nofib/shootout/binary-trees:
    
    ```
    $ ./Main 3
    Main: z
    CallStack (from ImplicitParams):
      error, called at Main.hs:67:29 in main:Main
    CallStack (from -prof):
      Main.check' (Main.hs:(67,1)-(68,82))
      Main.check (Main.hs:63:1-21)
      Main.stretch (Main.hs:32:35-57)
      Main.main.c (Main.hs:32:9-57)
      Main.main (Main.hs:(27,1)-(43,42))
      Main.CAF (<entire-module>)
    ```
    
    This doesn't quite obsolete +RTS -xc, which also attempts to display
    more information in the case when the error is in a CAF, but I'm
    exploring other solutions to that.
    
    Includes submodule updates.
    
    Test Plan: validate
    
    Reviewers: simonpj, ezyang, gridaphobe, bgamari, hvr, austin
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1426


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

8988be8561ce0857f3befd6ab3b6c29060685c0a
 libraries/array                                    |   2 +-
 libraries/base/GHC/Exception.hs                    |  33 ++--
 libraries/base/GHC/IO.hs                           | 155 +-----------------
 libraries/base/GHC/IO/Unsafe.hs                    | 180 +++++++++++++++++++++
 libraries/base/GHC/Stack.hs                        |  59 +++++++
 libraries/base/GHC/Stack.hsc                       |   1 -
 libraries/base/GHC/Stack/CCS.hs-boot               |  16 ++
 libraries/base/GHC/{Stack.hsc => Stack/CCS.hsc}    |  23 +--
 libraries/base/base.cabal                          |   2 +
 libraries/base/tests/assert.stderr                 |   3 +-
 libraries/base/tests/readFloat.stderr              |   2 +-
 libraries/hpc                                      |   2 +-
 libraries/stm                                      |   2 +-
 .../tests/annotations/should_fail/annfail12.stderr |   2 +-
 testsuite/tests/array/should_run/arr003.stderr     |   2 +-
 testsuite/tests/array/should_run/arr004.stderr     |   2 +-
 testsuite/tests/array/should_run/arr007.stderr     |   2 +-
 testsuite/tests/array/should_run/arr008.stderr     |   2 +-
 testsuite/tests/codeGen/should_run/T5626.stderr    |   4 +-
 testsuite/tests/codeGen/should_run/cgrun016.stderr |   2 +-
 testsuite/tests/codeGen/should_run/cgrun045.stderr |   2 +-
 testsuite/tests/codeGen/should_run/cgrun051.stderr |   2 +-
 testsuite/tests/codeGen/should_run/cgrun059.stderr |   2 +-
 .../tests/concurrent/should_run/conc021.stderr     |   2 +-
 testsuite/tests/deriving/should_run/T5628.stderr   |   2 +-
 testsuite/tests/driver/sigof02/sigof02.stderr      |   4 +-
 testsuite/tests/driver/sigof02/sigof02m.stderr     |   4 +-
 testsuite/tests/ffi/should_run/ffi008.stderr       |   2 +-
 testsuite/tests/ffi/should_run/fptrfail01.stderr   |   4 +-
 testsuite/tests/ghc-e/should_run/ghc-e005.stderr   |   2 +-
 .../tests/ghci.debugger/scripts/break009.stdout    |   2 +-
 .../tests/ghci.debugger/scripts/break011.stdout    |  10 +-
 .../tests/ghci.debugger/scripts/break017.stdout    |   2 +-
 testsuite/tests/ghci/scripts/T10501.stderr         |   8 +-
 testsuite/tests/ghci/scripts/T5557.stdout          |   4 +-
 testsuite/tests/ghci/scripts/ghci055.stdout        |   2 +-
 testsuite/tests/profiling/should_run/ioprof.stderr |  13 +-
 .../safeHaskell/safeLanguage/SafeLang09.stderr     |   2 +-
 testsuite/tests/simplCore/should_fail/T7411.stderr |   4 +-
 testsuite/tests/simplCore/should_run/T457.stderr   |   2 +-
 testsuite/tests/simplCore/should_run/T5587.stderr  |   2 +-
 testsuite/tests/simplCore/should_run/T5625.stderr  |   4 +-
 testsuite/tests/stranal/should_run/strun002.stderr |   2 +-
 testsuite/tests/th/T5358.stderr                    |   2 +-
 testsuite/tests/th/T5976.stderr                    |   2 +-
 testsuite/tests/th/T8987.stderr                    |   4 +-
 testsuite/tests/th/TH_exn2.stderr                  |   4 +-
 .../tests/typecheck/should_run/IPLocation.stdout   |  16 +-
 48 files changed, 355 insertions(+), 252 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8988be8561ce0857f3befd6ab3b6c29060685c0a

From git at git.haskell.org  Sat Nov 14 20:48:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 14 Nov 2015 20:48:41 +0000 (UTC)
Subject: [commit: ghc] master: Rip out __HADDOCK__ references (3353f62)
Message-ID: <20151114204841.C12E73A300@ghc.haskell.org>

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

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

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

commit 3353f62ab8658346b0084fe6382edeb86d104012
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Nov 12 20:35:47 2015 +0100

    Rip out __HADDOCK__ references
    
    As it turns out no one actually sets this macro anyways and haddock
    now clearly has no trouble parsing this code.
    
    Test Plan: Validate
    
    Reviewers: hvr, goldfire, austin
    
    Reviewed By: austin
    
    Subscribers: duncan, thomie, hvr
    
    Differential Revision: https://phabricator.haskell.org/D1463


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

3353f62ab8658346b0084fe6382edeb86d104012
 libraries/base/Foreign/Marshal/Error.hs      | 4 ----
 libraries/base/GHC/Base.hs                   | 8 --------
 libraries/base/GHC/ConsoleHandler.hs         | 2 +-
 libraries/integer-simple/GHC/Integer/Type.hs | 4 ----
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/libraries/base/Foreign/Marshal/Error.hs b/libraries/base/Foreign/Marshal/Error.hs
index 758812b..be75043 100644
--- a/libraries/base/Foreign/Marshal/Error.hs
+++ b/libraries/base/Foreign/Marshal/Error.hs
@@ -30,10 +30,6 @@ module Foreign.Marshal.Error (
 
 import Foreign.Ptr
 
-#ifdef __HADDOCK__
-import Data.Bool
-import System.IO.Error
-#endif
 import GHC.Base
 import GHC.Num
 import GHC.IO.Exception
diff --git a/libraries/base/GHC/Base.hs b/libraries/base/GHC/Base.hs
index 189e480..199664d 100644
--- a/libraries/base/GHC/Base.hs
+++ b/libraries/base/GHC/Base.hs
@@ -1204,11 +1204,3 @@ a `iShiftRL#` b | isTrue# (b >=# WORD_SIZE_IN_BITS#) = 0#
 --      unpackFoldr "foo" c (unpackFoldr "baz" c n)  =  unpackFoldr "foobaz" c n
 
   #-}
-
-
-#ifdef __HADDOCK__
--- | A special argument for the 'Control.Monad.ST.ST' type constructor,
--- indexing a state embedded in the 'Prelude.IO' monad by
--- 'Control.Monad.ST.stToIO'.
-data RealWorld
-#endif
diff --git a/libraries/base/GHC/ConsoleHandler.hs b/libraries/base/GHC/ConsoleHandler.hs
index 126e174..609eb20 100644
--- a/libraries/base/GHC/ConsoleHandler.hs
+++ b/libraries/base/GHC/ConsoleHandler.hs
@@ -19,7 +19,7 @@
 -----------------------------------------------------------------------------
 
 module GHC.ConsoleHandler
-#if !defined(mingw32_HOST_OS) && !defined(__HADDOCK__)
+#if !defined(mingw32_HOST_OS)
         where
 
 import GHC.Base ()  -- dummy dependency
diff --git a/libraries/integer-simple/GHC/Integer/Type.hs b/libraries/integer-simple/GHC/Integer/Type.hs
index cd39b7d..31f852b 100644
--- a/libraries/integer-simple/GHC/Integer/Type.hs
+++ b/libraries/integer-simple/GHC/Integer/Type.hs
@@ -34,8 +34,6 @@ import GHC.Tuple ()
 import GHC.IntWord64
 #endif
 
-#if !defined(__HADDOCK__)
-
 data Integer = Positive !Positive | Negative !Positive | Naught
 
 -------------------------------------------------------------------
@@ -868,8 +866,6 @@ floatFromPositive (Some w ds)
              (2.0# `powerFloat#` int2Float# (highHalfShift ())))
        `plusFloat#` int2Float# (word2Int# l)
 
-#endif
-
 {-
 Note [Avoid patError]
 


From git at git.haskell.org  Sat Nov 14 20:48:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 14 Nov 2015 20:48:44 +0000 (UTC)
Subject: [commit: ghc] master: Fix bootstrapping with GHC 7.10.1 (5488422)
Message-ID: <20151114204844.76BDF3A300@ghc.haskell.org>

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

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

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

commit 54884220cd8f68bcb4291cc3689d69258b835f6f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Nov 14 21:17:27 2015 +0100

    Fix bootstrapping with GHC 7.10.1
    
    Relying on CallStack being in GLASGOW_HASKELL >= 710 breaks
    bootstrappability with 7.10.1
    
    7.10.2 added the CallStack mechanism, and GHC already relies on this
    while being built. Unfortunately, it is enabled with "GLASGOW_HASKELL
    >= 710", which also applies to GHC 7.10.1, which does not have
    CallStack, and fails building the stage-1 compiler because the symbol
    is not found.
    
    This patch makes the CPP directive more strict, requiring **more than**
    7.10 instead of **at least**.
    
    Reviewers: jstolarek, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1472
    
    GHC Trac Issues: #11085


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

54884220cd8f68bcb4291cc3689d69258b835f6f
 compiler/utils/Outputable.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/utils/Outputable.hs b/compiler/utils/Outputable.hs
index db58469..83febd5 100644
--- a/compiler/utils/Outputable.hs
+++ b/compiler/utils/Outputable.hs
@@ -111,8 +111,10 @@ import Data.Graph (SCC(..))
 
 import GHC.Fingerprint
 import GHC.Show         ( showMultiLineString )
+#if __GLASGOW_HASKELL__ > 710
 import GHC.Stack
 import GHC.Exception
+#endif
 
 {-
 ************************************************************************
@@ -1042,7 +1044,7 @@ pprTrace str doc x
 
 -- | If debug output is on, show some 'SDoc' on the screen along
 -- with a call stack when available.
-#if __GLASGOW_HASKELL__ >= 710
+#if __GLASGOW_HASKELL__ > 710
 pprSTrace :: (?location :: CallStack) => SDoc -> a -> a
 pprSTrace = pprTrace (showCallStack ?location)
 #else


From git at git.haskell.org  Sat Nov 14 21:37:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 14 Nov 2015 21:37:18 +0000 (UTC)
Subject: [commit: ghc] master: Implement the Strict language extension
 (46a03fb)
Message-ID: <20151114213718.769B23A300@ghc.haskell.org>

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

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

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

commit 46a03fbec6a02761db079d1746532565f34c340f
Author: Adam Sandberg Eriksson <adam at sandbergericsson.se>
Date:   Sat Nov 14 22:06:16 2015 +0100

    Implement the Strict language extension
    
    Add a new language extension `-XStrict` which turns all bindings strict
    as if the programmer had written a `!` before it. This also upgrades
    ordinary Haskell to allow recursive and polymorphic strict bindings.
    
    See the wiki[1] and the Note [Desugar Strict binds] in DsBinds for
    specification and implementation details.
    
    [1] https://ghc.haskell.org/trac/ghc/wiki/StrictPragma
    
    Reviewers: austin, tibbe, simonpj, bgamari
    
    Reviewed By: tibbe, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1142
    
    GHC Trac Issues: #8347


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

46a03fbec6a02761db079d1746532565f34c340f
 compiler/deSugar/DsBinds.hs                        | 244 ++++++++++++----
 compiler/deSugar/DsExpr.hs                         |  45 +--
 compiler/deSugar/DsUtils.hs                        |  86 ++++--
 compiler/deSugar/Match.hs                          |   9 +-
 compiler/hsSyn/HsPat.hs                            |  29 +-
 compiler/main/DynFlags.hs                          |   2 +
 compiler/typecheck/TcBinds.hs                      |  10 +-
 docs/users_guide/glasgow_exts.rst                  | 309 +++++++++++++++++++--
 .../tests/deSugar/should_compile/DsStrictWarn.hs   |   7 +
 .../deSugar/should_compile/DsStrictWarn.stderr     |   4 +
 testsuite/tests/deSugar/should_compile/T5455.hs    |   0
 testsuite/tests/deSugar/should_compile/all.T       |   1 +
 .../tests/deSugar/should_fail/DsStrictFail.hs      |   5 +
 .../tests/deSugar/should_fail/DsStrictFail.stderr  |   2 +
 .../should_fail}/Makefile                          |   0
 testsuite/tests/deSugar/should_fail/all.T          |   6 +
 testsuite/tests/deSugar/should_run/DsStrict.hs     |  37 +++
 testsuite/tests/deSugar/should_run/DsStrict.stderr |   4 +
 testsuite/tests/deSugar/should_run/DsStrict.stdout |   8 +
 testsuite/tests/deSugar/should_run/DsStrictLet.hs  |  16 ++
 .../tests/deSugar/should_run/DsStrictLet.stderr    |   3 +
 testsuite/tests/deSugar/should_run/all.T           |   2 +
 testsuite/tests/driver/T4437.hs                    |   3 +-
 testsuite/tests/ghci/scripts/T9140.script          |   6 +-
 testsuite/tests/ghci/scripts/T9140.stdout          |  10 +-
 testsuite/tests/typecheck/should_fail/T6078.stderr |   4 +-
 26 files changed, 714 insertions(+), 138 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 46a03fbec6a02761db079d1746532565f34c340f

From git at git.haskell.org  Sun Nov 15 20:31:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 15 Nov 2015 20:31:34 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11071' created
Message-ID: <20151115203134.BCCC23A300@ghc.haskell.org>

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

New branch : wip/T11071
Referencing: c88873ce3339a757ca03cd30ec9f852a803f9021

From git at git.haskell.org  Sun Nov 15 20:31:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 15 Nov 2015 20:31:38 +0000 (UTC)
Subject: [commit: ghc] wip/T11071: More import related hints (c88873c)
Message-ID: <20151115203138.2A8F33A300@ghc.haskell.org>

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

On branch  : wip/T11071
Link       : http://ghc.haskell.org/trac/ghc/changeset/c88873ce3339a757ca03cd30ec9f852a803f9021/ghc

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

commit c88873ce3339a757ca03cd30ec9f852a803f9021
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Nov 15 19:13:51 2015 +0100

    More import related hints
    
    now for unqualified imports. Improves upon #11071.
    
    Unfortunately, it seems that since 7.10, ghc will not print all
    out-of-scope errors.


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

c88873ce3339a757ca03cd30ec9f852a803f9021
 compiler/main/HscTypes.hs                          |  11 +-
 compiler/rename/RnEnv.hs                           | 222 +++++++++++----------
 compiler/rename/RnNames.hs                         |   1 +
 compiler/typecheck/TcErrors.hs                     |   3 +-
 .../tests/annotations/should_fail/annfail11.stderr |   8 +-
 testsuite/tests/module/mod114.stderr               |   5 +-
 testsuite/tests/module/mod124.stderr               |   5 +-
 testsuite/tests/module/mod125.stderr               |   5 +-
 testsuite/tests/module/mod126.stderr               |   5 +-
 testsuite/tests/module/mod127.stderr               |   5 +-
 testsuite/tests/module/mod130.stderr               |   2 +
 testsuite/tests/module/mod29.stderr                |   5 +-
 testsuite/tests/module/mod36.stderr                |   5 +-
 testsuite/tests/module/mod87.stderr                |   2 +
 testsuite/tests/module/mod97.stderr                |   2 +
 testsuite/tests/rename/should_fail/T11071a.hs      |  16 ++
 testsuite/tests/rename/should_fail/T11071a.stderr  |  26 +++
 testsuite/tests/rename/should_fail/all.T           |   1 +
 18 files changed, 212 insertions(+), 117 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c88873ce3339a757ca03cd30ec9f852a803f9021

From git at git.haskell.org  Mon Nov 16 00:48:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 00:48:20 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: Implement AArch64 codegen in
 `mkJumpToAddr` (for GHCi). (fe52a81)
Message-ID: <20151116004820.526E03A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/fe52a8138d1fddb9ddabd55330af73cc99974052/ghc

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

commit fe52a8138d1fddb9ddabd55330af73cc99974052
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon Oct 12 15:17:30 2015 +1100

    Implement AArch64 codegen in `mkJumpToAddr` (for GHCi).


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

fe52a8138d1fddb9ddabd55330af73cc99974052
 compiler/ghci/ByteCodeItbls.hs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/compiler/ghci/ByteCodeItbls.hs b/compiler/ghci/ByteCodeItbls.hs
index 01420f5..ed6a97c 100644
--- a/compiler/ghci/ByteCodeItbls.hs
+++ b/compiler/ghci/ByteCodeItbls.hs
@@ -229,6 +229,23 @@ mkJumpToAddr dflags a = case platformArch (targetPlatform dflags) of
                 , 0x11, 0xff, 0x2f, 0xe1
                 , byte0 w32, byte1 w32, byte2 w32, byte3 w32]
 
+    ArchARM64 { } ->
+        -- Generates:
+        --
+        --      ldr     x1, label
+        --      br      x1
+        -- label:
+        --      .quad <addr>
+        --
+        -- which looks like:
+        --     0:       58000041        ldr     x1, <label>
+        --     4:       d61f0020        br      x1
+       let w64 = fromIntegral (funPtrToInt a) :: Word64
+       in Right [ 0x58000041
+                , 0xd61f0020
+                , fromIntegral w64
+                , fromIntegral (w64 `shiftR` 32) ]
+
     arch ->
         panic ("mkJumpToAddr not defined for " ++ show arch)
 


From git at git.haskell.org  Mon Nov 16 00:48:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 00:48:22 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: rts: Fix clobbered regs list for
 aarch64 StgRun (ecc1540)
Message-ID: <20151116004822.E8BBF3A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/ecc1540465e2dda1f50edefa4449d7da24e96153/ghc

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

commit ecc1540465e2dda1f50edefa4449d7da24e96153
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Wed Jun 3 05:54:23 2015 +0000

    rts: Fix clobbered regs list for aarch64 StgRun


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

ecc1540465e2dda1f50edefa4449d7da24e96153
 rts/StgCRun.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index 0a010d4..c9bbef0 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -829,8 +829,12 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
 
       : "=r" (r)
       : "r" (f), "r" (basereg), "i" (RESERVED_C_STACK_BYTES)
-        : "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25", "%x26", "%x27", "%x28",
-          "%x16", "%x17", "%x30"
+
+      : "%x16", "%x17", /* Exclude %r18 (platform/temporary register) */
+        "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25",
+        "%x26", "%x27", "%x28", /* Exclude %x29 (frame pointer) */
+        "%x30",
+        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14"
     );
     return r;
 }


From git at git.haskell.org  Mon Nov 16 00:48:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 00:48:25 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: rts/StgCRun.c: Add d15 to clobbered
 regs (5bb0707)
Message-ID: <20151116004825.882BC3A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/5bb07075668ac542396ef99ee897a03720b4ad66/ghc

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

commit 5bb07075668ac542396ef99ee897a03720b4ad66
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Tue Oct 13 09:45:39 2015 +1100

    rts/StgCRun.c: Add d15 to clobbered regs


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

5bb07075668ac542396ef99ee897a03720b4ad66
 rts/StgCRun.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index c9bbef0..9e80d02 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -834,7 +834,12 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
         "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25",
         "%x26", "%x27", "%x28", /* Exclude %x29 (frame pointer) */
         "%x30",
-        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14"
+        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14", "%d15"
+        /* Since all these registers listed as clobbered are being explicitly
+         * saved and restored, they should probably not be listed as
+         * clobbered. Leaving them as is for now while I debug other
+         * issues.
+         */
     );
     return r;
 }


From git at git.haskell.org  Mon Nov 16 00:48:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 00:48:28 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: configure.ac: AArch64 is now
 registerised (857daa7)
Message-ID: <20151116004828.27BCE3A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/857daa700d0639f295683045ed1af34e1b433e61/ghc

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

commit 857daa700d0639f295683045ed1af34e1b433e61
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Jul 5 11:22:24 2015 +0000

    configure.ac: AArch64 is now registerised


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

857daa700d0639f295683045ed1af34e1b433e61
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 84f381e..ce336dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,7 +240,7 @@ AC_SUBST(SOLARIS_BROKEN_SHLD)
 dnl ** Do an unregisterised build?
 dnl --------------------------------------------------------------
 case "$HostArch" in
-    i386|x86_64|powerpc|powerpc64|powerpc64le|arm)
+    i386|x86_64|powerpc|powerpc64|powerpc64le|arm|aarch64)
         UnregisterisedDefault=NO
         ;;
     *)


From git at git.haskell.org  Mon Nov 16 00:48:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 00:48:30 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: Linker: WIP on supporting
 Arm64/AArch64 (7cb15d9)
Message-ID: <20151116004830.D55C23A300@ghc.haskell.org>

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

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/7cb15d98e424b3c76f30ba532f66f7d0186cbe84/ghc

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

commit 7cb15d98e424b3c76f30ba532f66f7d0186cbe84
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Fri Oct 23 14:35:20 2015 +1100

    Linker: WIP on supporting Arm64/AArch64


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

7cb15d98e424b3c76f30ba532f66f7d0186cbe84
 rts/Linker.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 9cab5f2..77312ed 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4101,16 +4101,24 @@ ocRunInit_PEi386 ( ObjectCode *oc )
 #define FALSE 0
 #define TRUE  1
 
-#if defined(sparc_HOST_ARCH)
+#if sparc_HOST_ARCH
 #  define ELF_TARGET_SPARC  /* Used inside <elf.h> */
-#elif defined(i386_HOST_ARCH)
+#elif i386_HOST_ARCH
 #  define ELF_TARGET_386    /* Used inside <elf.h> */
-#elif defined(x86_64_HOST_ARCH)
+#elif x86_64_HOST_ARCH
 #  define ELF_TARGET_X64_64
 #  define ELF_64BIT
 #  define ELF_TARGET_AMD64 /* Used inside <elf.h> on Solaris 11 */
-#elif defined(powerpc64_HOST_ARCH)
+#elif powerpc64_HOST_ARCH
+#  define ELF_64BIT
+#elif aarch64_HOST_ARCH
 #  define ELF_64BIT
+#elif (arm_HOST_ARCH || arm_HOST_ARCH_PRE_ARMv7 || arm_HOST_ARCH_PRE_ARMv7 \
+		|| powerpc_HOST_ARCH)
+   /* Nothing here */
+#else
+	/* Need this so that new architectures get a compile error. */
+# error "Unknown HOST_ARCH"
 #endif
 
 #if !defined(openbsd_HOST_OS)
@@ -4441,6 +4449,10 @@ ocVerifyImage_ELF ( ObjectCode* oc )
 #elif defined(EM_AMD64)
       case EM_AMD64: IF_DEBUG(linker,debugBelch( "amd64" )); break;
 #endif
+#ifdef EM_AARCH64
+      case EM_AARCH64: IF_DEBUG(linker,debugBelch( "aarch64" )); break;
+#endif
+
       default:       IF_DEBUG(linker,debugBelch( "unknown" ));
                      errorBelch("%s: unknown architecture (e_machine == %d)"
                                 , oc->fileName, ehdr->e_machine);
@@ -5242,7 +5254,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
 #if defined(SHN_XINDEX)
    Elf_Word* shndx_table = get_shndx_table((Elf_Ehdr*)ehdrC);
 #endif
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(aarch64_HOST_ARCH)
    /* This #ifdef only serves to avoid unused-var warnings. */
    Elf_Addr targ = (Elf_Addr) oc->sections[target_shndx].start;
 #endif
@@ -5260,7 +5272,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
    }
 
    for (j = 0; j < nent; j++) {
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(aarch64_HOST_ARCH)
       /* This #ifdef only serves to avoid unused-var warnings. */
       Elf_Addr  offset = rtab[j].r_offset;
       Elf_Addr  P      = targ + offset;
@@ -5565,12 +5577,55 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
       }
 #endif
 
+	case R_AARCH64_ABS64:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ABS64");
+          *(Elf64_Xword *)P = S + A;
+          break;
+
+	case R_AARCH64_ADR_PREL_PG_HI21:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ADR_PREL_PG_HI21");
+          {
+            uint64_t final_address = (uint64_t) rtab + rtab[j].r_offset ;
+            // Operation: Page(S+A) - Page(P)
+            uint64_t result = ((S + A) & ~0xfffULL) - (final_address & ~0xfffULL);
+
+printf ("ehdrC: %p\nrtab : %p\n\n", ehdrC, rtab) ;
+
+printf ("rtab 0x%lx + 0x%lx -> 0x%lx\n", (uint64_t) rtab, (uint64_t) rtab[j].r_offset, final_address) ;
+printf ("S 0x%lx + A 0x%lx : 0x%lx\n", S, A, S + A) ;
+printf ("result 0x%lx\n", result) ;
+
+            // Check that -2^32 <= X < 2^32
+            if (result >> 32)
+                 barf ("%s: overflow check failed for relocation", oc->fileName);
+
+            *(Elf64_Xword *)P &= 0x9f00001fU;
+            // Immediate goes in bits 30:29 + 5:23 of ADRP instruction, taken
+            // from bits 32:12 of X.
+            *(Elf64_Xword *)P |= ((result & 0x3000U) << (29 - 12));
+            *(Elf64_Xword *)P |= ((result & 0x1ffffc000ULL) >> (14 - 5));
+          }
+          break;
+
+	case R_AARCH64_CALL26:
+	case R_AARCH64_JUMP26:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_CALL26/JUMP64");
+          {
+              // These two are handled in the same way.
+          }
+          break;
+
+	case R_AARCH64_ADD_ABS_LO12_NC:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ADD_ABS_LO12_NC");
+          {
+          }
+          break;
+
          default:
             errorBelch("%s: unhandled ELF relocation(RelA) type %" FMT_Word "\n",
                   oc->fileName, (W_)ELF_R_TYPE(info));
             return 0;
       }
-
    }
    return 1;
 }


From git at git.haskell.org  Mon Nov 16 00:48:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 00:48:33 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd's head updated: Linker: WIP on
 supporting Arm64/AArch64 (7cb15d9)
Message-ID: <20151116004833.6C71D3A300@ghc.haskell.org>

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

Branch 'wip/aarch64-regd' now includes:

     9fe5497 rts: Produce stack trace on fatal error
     1e2259b Update process submodule to process-1.4 release
     c00c5e5 get rid of Elf32/Elf64_Section as this is a non-portable Linux-ism.
     130ca3e Update filepath submodule for proper version
     5065cf4 base: Update `@since 4.8.2` annotations (re #11026)
     0bc8c6a base: GHC.RTS.Flags symbols really were introduced in 4.8.2
     83fd2ba base: Add changelog entry for 4.8.2.0
     8c80dcc base: Add new Control.Monad.Fail module (re #10751)
     b62605e Add `MonadPlus IO` and `Alternative IO` instances
     334fe45 rts/Hash: Constify HashTable* in lookupHashTable
     987d542 Build system: renable -Wall on validate (base)
     0e21678 Cabal-level sanity check to enforce Cabal flag-invariant
     22fcf9c Tweak settings for LLVM tests
     e547954 Use full name of LLVM program in error message
     10647d4 Linker: #ifdef cleanup
     a58eeb7 Call Arity: In "e x", the result of "x" is not shared
     ce1f160 Make GHCi & TH work when the compiler is built with -prof
     6e6438e Allow the GHCi Linker to resolve related dependencies when loading DLLs
     be88585 fix #10734 by adding braces to pretty-printing of let inside do
     2208011 Remove PatSynBuilderId
     d9c1450 Build system: use stage0 to build dll-split
     8262c95 Parser: allow empty multi-line deprecation warnings
     bd69f6f minor: use unless instead of (when . not)
     932d503 Replace freeVarsOf scrut with scrut_fvs to avoid repetition
     80d7ce8 Add pprSTrace for debugging with call stacks
     0e40c01 Quote file paths in linker scripts
     2b7d9c2 Add OpenBSD specific RTS symbols
     f405632 Fix sporadic failing ghci/Linker/Dyn tests
     3cfe60a Abstract TFs can have injectivity information
     96621b1 Associate pattern synonyms with types in module exports
     5eb56ed Fix link in documentation
     fbc2537 OPTIONS_GHC compiler flags may contain spaces (#4931)
     ea8c116 Remove unused field in ConDecl
     f0f9365 Remove fun_infix from Funbind, as it is now in Match
     109d7ce Systools: read ELF section without calling readelf
     fa61edd Improve documentation of Data.List.lines:
     0f49508 Put kind variables before type variables when specializing
     badf5d5 Detect invalid foreign imports in bytecode compiler
     fb0d512 nativeGen.PPC: Fix shift arith. right > 31 bits
     afbd30b mkGadtDecl no longer in P monad
     63cad5d Rename bundled pattern synonym tests to reflect new terminology
     a038b72 Remove redundant test.
     9bea234 fix RTS Linker on platforms without SHN_XINDEX support
     4a32bf9 Implement function-sections for Haskell code, #8405
     e090f1b Change demand information for foreign calls
     8755719 rules/haddock: Set __HADDOCK_VERSION__
     351de16 New magic function for applying realWorld#
     ac2e1e5 T10678: Fix bytes allocated statistic
     5d6133b Ignore comments in getOptions
     2290c8b APIAnnotations:add Locations in hsSyn for layout
     e66f79d Give helpful advice when a fully qualified name is not in scope
     b8d263d Turn ImportedModsVal into a data type
     5a86292 Remove imv_empty from ImportedModsVal
     8868ff3 Update note for Parent to explain PatternSynonym.
     8988be8 Make 'error' include the CCS call stack when profiled
     3353f62 Rip out __HADDOCK__ references
     5488422 Fix bootstrapping with GHC 7.10.1
     46a03fb Implement the Strict language extension
     ecc1540 rts: Fix clobbered regs list for aarch64 StgRun
     857daa7 configure.ac: AArch64 is now registerised
     fe52a81 Implement AArch64 codegen in `mkJumpToAddr` (for GHCi).
     5bb0707 rts/StgCRun.c: Add d15 to clobbered regs
     7cb15d9 Linker: WIP on supporting Arm64/AArch64

From git at git.haskell.org  Mon Nov 16 08:44:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 08:44:06 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/ghc710-aix' created
Message-ID: <20151116084406.B80AB3A300@ghc.haskell.org>

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

New branch : wip/ghc710-aix
Referencing: 45b904515fedfb39420053f39ac12e87634048bc

From git at git.haskell.org  Mon Nov 16 08:44:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 08:44:09 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: backported AIX tweaks to Cabal (d38b104)
Message-ID: <20151116084409.58C323A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/d38b1049bf5893ea88473b6d1afa9716d1bf6db9/ghc

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

commit d38b1049bf5893ea88473b6d1afa9716d1bf6db9
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:12:52 2015 +0100

    backported AIX tweaks to Cabal


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

d38b1049bf5893ea88473b6d1afa9716d1bf6db9
 libraries/Cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 4f6e9a5..a1d5b46 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 4f6e9a5b63640f4203560f3c7a89131fc66fdd7e
+Subproject commit a1d5b4647e6246dfe1a81bdddafb12af0aed9228


From git at git.haskell.org  Mon Nov 16 08:44:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 08:44:11 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: Workaround broken latin1 iconv on AIX
 (0c56fff)
Message-ID: <20151116084411.F25793A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/0c56fff5ce35d1b3e39b66e5f976d826a7eff1de/ghc

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

commit 0c56fff5ce35d1b3e39b66e5f976d826a7eff1de
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:14:42 2015 +0100

    Workaround broken latin1 iconv on AIX


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

0c56fff5ce35d1b3e39b66e5f976d826a7eff1de
 libraries/base/GHC/IO/Encoding.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/base/GHC/IO/Encoding.hs b/libraries/base/GHC/IO/Encoding.hs
index a690717..6dfc9d0 100644
--- a/libraries/base/GHC/IO/Encoding.hs
+++ b/libraries/base/GHC/IO/Encoding.hs
@@ -237,6 +237,8 @@ mkTextEncoding e = case mb_coding_failure_mode of
 mkTextEncoding' :: CodingFailureMode -> String -> IO TextEncoding
 mkTextEncoding' cfm enc =
   case [toUpper c | c <- enc, c /= '-'] of
+  -- ISO8859-1 we can handle ourself
+    "ISO88591" -> return $ Latin1.mkLatin1 cfm
   -- UTF-8 and friends we can handle ourselves
     "UTF8"    -> return $ UTF8.mkUTF8 cfm
     "UTF16"   -> return $ UTF16.mkUTF16 cfm


From git at git.haskell.org  Mon Nov 16 08:44:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 08:44:14 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: Make GHC aware of OSAIX and AixLD
 (6d2ec3f)
Message-ID: <20151116084414.9A26D3A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/6d2ec3f9d76e77b0011558a9a97339520d0d5987/ghc

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

commit 6d2ec3f9d76e77b0011558a9a97339520d0d5987
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:40:09 2015 +0100

    Make GHC aware of OSAIX and AixLD


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

6d2ec3f9d76e77b0011558a9a97339520d0d5987
 aclocal.m4                 | 10 ++++++++--
 compiler/main/DynFlags.hs  |  1 +
 compiler/main/SysTools.hs  |  4 ++++
 compiler/utils/Platform.hs |  2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 874e190..4242539 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -271,9 +271,12 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         nto-qnx)
             test -z "[$]2" || eval "[$]2=OSQNXNTO"
             ;;
-        dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
+        dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix)
             test -z "[$]2" || eval "[$]2=OSUnknown"
             ;;
+        aix)
+            test -z "[$]2" || eval "[$]2=OSAIX"
+            ;;
         linux-android)
             test -z "[$]2" || eval "[$]2=OSAndroid"
             ;;
@@ -2030,9 +2033,12 @@ case "$1-$2" in
         $3="linux"
         ;;
       # As far as I'm aware, none of these have relevant variants
-      freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+      freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|haiku)
         $3="$1"
         ;;
+      aix*) # e.g. powerpc-ibm-aix7.1.3.0
+        $3="aix"
+        ;;
       freebsd*) # like i686-gentoo-freebsd7
                 #      i686-gentoo-freebsd8
                 #      i686-gentoo-freebsd8.2
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 42ac14e..5b23ecc 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -4277,6 +4277,7 @@ data LinkerInfo
   | GnuGold  [Option]
   | DarwinLD [Option]
   | SolarisLD [Option]
+  | AixLD    [Option]
   | UnknownLD
   deriving Eq
 
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 8c3ab1a..311b45e 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -769,6 +769,7 @@ neededLinkArgs (GnuLD o)     = o
 neededLinkArgs (GnuGold o)   = o
 neededLinkArgs (DarwinLD o)  = o
 neededLinkArgs (SolarisLD o) = o
+neededLinkArgs (AixLD o)     = o
 neededLinkArgs UnknownLD     = []
 
 -- Grab linker info and cache it in DynFlags.
@@ -823,6 +824,9 @@ getLinkerInfo' dflags = do
                  -- precisely so we assume here, the Solaris linker is
                  -- used.
                  return $ SolarisLD []
+               OSAIX ->
+                 -- IBM AIX uses its own non-binutils linker as well
+                 return $ AixLD []
                OSDarwin ->
                  -- Darwin has neither GNU Gold or GNU LD, but a strange linker
                  -- that doesn't support --version. We can just assume that's
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
index 8f9a8de..4c3e894 100644
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -83,6 +83,7 @@ data OS
         | OSOsf3
         | OSQNXNTO
         | OSAndroid
+        | OSAIX
         deriving (Read, Show, Eq)
 
 -- | ARM Instruction Set Architecture, Extensions and ABI
@@ -127,6 +128,7 @@ osElfTarget OSOsf3      = False -- I don't know if this is right, but as
                                 -- per comment below it's safe
 osElfTarget OSQNXNTO    = False
 osElfTarget OSAndroid   = True
+osElfTarget OSAIX       = False
 osElfTarget OSUnknown   = False
  -- Defaulting to False is safe; it means don't rely on any
  -- ELF-specific functionality.  It is important to have a default for


From git at git.haskell.org  Mon Nov 16 08:44:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 08:44:17 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: On AIX we need -D_BSD defined in
 <Stg.h> (e64b049)
Message-ID: <20151116084417.3CC233A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/e64b0499020c0d1fca75185174dfbd8b11ccb177/ghc

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

commit e64b0499020c0d1fca75185174dfbd8b11ccb177
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:41:27 2015 +0100

    On AIX we need -D_BSD defined in <Stg.h>
    
    otherwise <math.h> includes <stdlib.h> which breaks compilation
    of .hc files


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

e64b0499020c0d1fca75185174dfbd8b11ccb177
 includes/Stg.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/includes/Stg.h b/includes/Stg.h
index f09fc00..35855b5 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -48,6 +48,11 @@
 // on Linux
 # define _BSD_SOURCE
 
+//# if aix_HOST_OS
+// On AIX we need _BSD defined, otherwise <math.h> includes <stdlib.h>
+#  define _BSD
+//# endif
+
 // '_BSD_SOURCE' is deprecated since glibc-2.20
 // in favour of '_DEFAULT_SOURCE'
 # define _DEFAULT_SOURCE


From git at git.haskell.org  Mon Nov 16 08:44:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 08:44:20 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: Random hacks for AIX (45b9045)
Message-ID: <20151116084420.2A1183A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/45b904515fedfb39420053f39ac12e87634048bc/ghc

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

commit 45b904515fedfb39420053f39ac12e87634048bc
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:42:41 2015 +0100

    Random hacks for AIX
    
    these need to be cleaned up properly


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

45b904515fedfb39420053f39ac12e87634048bc
 aclocal.m4                               |  6 ++++++
 ghc.mk                                   |  5 +++++
 mk/build.mk-aix                          | 32 ++++++++++++++++++++++++++++++++
 utils/deriveConstants/DeriveConstants.hs |  2 +-
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 4242539..8732e0e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -586,6 +586,12 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         $3="$$3 -fuse-ld=gold -Wl,-z,noexecstack"
         $4="$$4 -z noexecstack"
         ;;
+
+    powerpc-ibm-aix*)
+        $2="$$2 -mminimal-toc"
+        $3="$$3 -mminimal-toc"
+        ;;
+
     esac
 
     # If gcc knows about the stack protector, turn it off.
diff --git a/ghc.mk b/ghc.mk
index 9aa0dc3..23bda65 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -556,6 +556,11 @@ endif
 BOOT_LIBS = $(foreach lib,$(PACKAGES_STAGE0),$(libraries/$(lib)_dist-boot_v_LIB))
 
 # ----------------------------------------
+# magic / HVR HACK XXX
+libraries/base_CONFIGURE_OPTS += --configure-option=--disable-largefile
+libraries/unix_CONFIGURE_OPTS += --configure-option=--disable-largefile
+
+# ----------------------------------------
 # Special magic for the ghc-prim package
 
 # We want the ghc-prim package to include the GHC.Prim module when it
diff --git a/mk/build.mk-aix b/mk/build.mk-aix
new file mode 100644
index 0000000..819970f
--- /dev/null
+++ b/mk/build.mk-aix
@@ -0,0 +1,32 @@
+GhcLibWays = v
+
+GhcUnregisterised    = YES
+GhcWithNativeCodeGen = NO
+GhcThreaded          = NO
+
+INTEGER_LIBRARY    = integer-simple
+Stage1Only         = YES
+#stage=1
+
+DYNAMIC_BY_DEFAULT   = NO
+DYNAMIC_GHC_PROGRAMS = NO
+
+SRC_HC_OPTS          = -O -H64m
+GhcStage1HcOpts      = -O
+GhcStage2HcOpts      = -O
+GhcHcOpts            = -Rghc-timing
+GhcLibHcOpts         = -O
+
+SplitObjs            = NO
+HADDOCK_DOCS         = NO
+BUILD_DOCBOOK_HTML   = NO
+BUILD_DOCBOOK_PS     = NO
+BUILD_DOCBOOK_PDF    = NO
+#GhcLibWays     += p
+
+# NoFib settings
+NoFibWays =
+STRIP_CMD = :
+
+#
+compiler/stage2/build/Parser_HC_OPTS += -optc-mfull-toc
diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/DeriveConstants.hs
index ccf9028..c2eef33 100644
--- a/utils/deriveConstants/DeriveConstants.hs
+++ b/utils/deriveConstants/DeriveConstants.hs
@@ -662,7 +662,7 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram
          execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile])
          xs <- case os of
                  "openbsd" -> readProcess "/usr/bin/objdump" ["--syms", oFile] ""
-                 _         -> readProcess nmProgram ["-P", oFile] ""
+                 _         -> readProcess (nmProgram ++ "2") ["-P", oFile] ""
 
          let ls = lines xs
              ms = map parseNmLine ls


From git at git.haskell.org  Mon Nov 16 09:19:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 09:19:49 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: We need to use -mminimal-toc on IBM AIX
 (509f6d6)
Message-ID: <20151116091949.59BC43A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/509f6d63d8aab0034605d1e3acd90a938a21aee4/ghc

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

commit 509f6d63d8aab0034605d1e3acd90a938a21aee4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 10:16:43 2015 +0100

    We need to use -mminimal-toc on IBM AIX
    
    AIX's XCOFF is limited to 16k entries in its TOC for 32bit compilation,
    which quickly overflows with GHC's code generation.
    
    Otoh, the Parser.hs module contains more entries than fit into a
    minimal-toc, so we need to switch back to `-mfull-toc` for that single
    module again.


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

509f6d63d8aab0034605d1e3acd90a938a21aee4
 aclocal.m4      | 6 ++++++
 compiler/ghc.mk | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index 4242539..8732e0e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -586,6 +586,12 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         $3="$$3 -fuse-ld=gold -Wl,-z,noexecstack"
         $4="$$4 -z noexecstack"
         ;;
+
+    powerpc-ibm-aix*)
+        $2="$$2 -mminimal-toc"
+        $3="$$3 -mminimal-toc"
+        ;;
+
     esac
 
     # If gcc knows about the stack protector, turn it off.
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 7bb72c2..b7dc1c9 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -381,6 +381,14 @@ endif
 compiler/stage2/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 compiler/stage3/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 
+# Parser.hc has so many symbols it overflows when using -mminimal-toc
+ifeq "$(HostOS_CPP)" "aix"
+compiler/stage1/build/Parser_HC_OPTS += -optc-mfull-toc
+endif
+ifeq "$(TargetOS_CPP)" "aix"
+compiler/stage2/build/Parser_HC_OPTS += -optc-mfull-toc
+compiler/stage3/build/Parser_HC_OPTS += -optc-mfull-toc
+endif
 
 ifeq "$(GhcProfiled)" "YES"
 # If we're profiling GHC then we want SCCs.  However, adding -auto-all


From git at git.haskell.org  Mon Nov 16 09:19:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 09:19:52 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: WIP: local random AIX hacks (faf587b)
Message-ID: <20151116091952.50B943A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/faf587b6caf037daf91d906282b54f0d5dd2af4b/ghc

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

commit faf587b6caf037daf91d906282b54f0d5dd2af4b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 10:19:37 2015 +0100

    WIP: local random AIX hacks


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

faf587b6caf037daf91d906282b54f0d5dd2af4b
 ghc.mk                                   |  5 +++++
 mk/build.mk-aix                          | 32 ++++++++++++++++++++++++++++++++
 utils/deriveConstants/DeriveConstants.hs |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 9aa0dc3..23bda65 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -556,6 +556,11 @@ endif
 BOOT_LIBS = $(foreach lib,$(PACKAGES_STAGE0),$(libraries/$(lib)_dist-boot_v_LIB))
 
 # ----------------------------------------
+# magic / HVR HACK XXX
+libraries/base_CONFIGURE_OPTS += --configure-option=--disable-largefile
+libraries/unix_CONFIGURE_OPTS += --configure-option=--disable-largefile
+
+# ----------------------------------------
 # Special magic for the ghc-prim package
 
 # We want the ghc-prim package to include the GHC.Prim module when it
diff --git a/mk/build.mk-aix b/mk/build.mk-aix
new file mode 100644
index 0000000..d0464a2
--- /dev/null
+++ b/mk/build.mk-aix
@@ -0,0 +1,32 @@
+GhcLibWays = v
+
+GhcUnregisterised    = YES
+GhcWithNativeCodeGen = NO
+GhcThreaded          = NO
+
+INTEGER_LIBRARY    = integer-simple
+Stage1Only         = YES
+#stage=1
+
+DYNAMIC_BY_DEFAULT   = NO
+DYNAMIC_GHC_PROGRAMS = NO
+
+SRC_HC_OPTS          = -O -H64m
+GhcStage1HcOpts      = -O
+GhcStage2HcOpts      = -O
+GhcHcOpts            = -Rghc-timing
+GhcLibHcOpts         = -O
+
+SplitObjs            = NO
+HADDOCK_DOCS         = NO
+BUILD_DOCBOOK_HTML   = NO
+BUILD_DOCBOOK_PS     = NO
+BUILD_DOCBOOK_PDF    = NO
+#GhcLibWays     += p
+
+# NoFib settings
+NoFibWays =
+STRIP_CMD = :
+
+#
+#compiler/stage2/build/Parser_HC_OPTS += -optc-mfull-toc
diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/DeriveConstants.hs
index ccf9028..c2eef33 100644
--- a/utils/deriveConstants/DeriveConstants.hs
+++ b/utils/deriveConstants/DeriveConstants.hs
@@ -662,7 +662,7 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram
          execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile])
          xs <- case os of
                  "openbsd" -> readProcess "/usr/bin/objdump" ["--syms", oFile] ""
-                 _         -> readProcess nmProgram ["-P", oFile] ""
+                 _         -> readProcess (nmProgram ++ "2") ["-P", oFile] ""
 
          let ls = lines xs
              ms = map parseNmLine ls


From git at git.haskell.org  Mon Nov 16 12:43:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 12:43:52 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Revert to commit
 7bddf4db39764bffbc082b37c8eea47fe897ed49 (fcf77e0)
Message-ID: <20151116124352.77F4D3A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/fcf77e0c2c55c260ee42a6592f0d9c4427f6b86e/ghc

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

commit fcf77e0c2c55c260ee42a6592f0d9c4427f6b86e
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Mon Nov 16 11:55:45 2015 +0100

    Revert to commit 7bddf4db39764bffbc082b37c8eea47fe897ed49
    
    Leave literal patterns in the pattern language


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

fcf77e0c2c55c260ee42a6592f0d9c4427f6b86e
 compiler/deSugar/Check.hs    | 1039 ++++++++++++++++++------------------------
 compiler/deSugar/TmOracle.hs |   13 +-
 2 files changed, 458 insertions(+), 594 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc fcf77e0c2c55c260ee42a6592f0d9c4427f6b86e

From git at git.haskell.org  Mon Nov 16 17:43:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 17:43:27 +0000 (UTC)
Subject: [commit: ghc] master: ApiAnnotations: Add SourceText for unicode
 tokens (fe95463)
Message-ID: <20151116174327.754253A300@ghc.haskell.org>

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

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

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

commit fe95463bdf42651d53d1edc7723491664257cc5a
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 16 19:43:34 2015 +0200

    ApiAnnotations: Add SourceText for unicode tokens
    
    Summary:
    At the moment there is no way to tell if a given token used its unicode
    variant or its normal one, except to look at the length of the token.
    
    This fails for the unicode '*'.
    
    Expose the original source text for unicode variants so that API
    Annotations can capture them specifically.
    
    Test Plan: ./validate
    
    Reviewers: mpickering, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1473
    
    GHC Trac Issues: #11018


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

fe95463bdf42651d53d1edc7723491664257cc5a
 compiler/parser/ApiAnnotation.hs                   |  40 +++-
 compiler/parser/Lexer.x                            | 100 +++++-----
 compiler/parser/Parser.y                           | 161 +++++++++-------
 .../ghc-api/annotations-literals/literals.stdout   |   8 +-
 testsuite/tests/ghc-api/annotations/Makefile       |   4 +
 testsuite/tests/ghc-api/annotations/T10307.stdout  |   1 +
 testsuite/tests/ghc-api/annotations/T10312.stdout  |   2 +
 testsuite/tests/ghc-api/annotations/T10357.stdout  |   1 +
 testsuite/tests/ghc-api/annotations/T10358.stdout  |   5 +
 testsuite/tests/ghc-api/annotations/T11018.stderr  |  40 ++++
 testsuite/tests/ghc-api/annotations/T11018.stdout  | 203 +++++++++++++++++++++
 testsuite/tests/ghc-api/annotations/Test11018.hs   |  52 ++++++
 testsuite/tests/ghc-api/annotations/all.T          |   1 +
 .../tests/ghc-api/annotations/exampleTest.stdout   |   2 +
 .../tests/ghc-api/annotations/listcomps.stdout     |   2 +
 .../tests/ghc-api/annotations/parseTree.stdout     |   4 +
 16 files changed, 505 insertions(+), 121 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc fe95463bdf42651d53d1edc7723491664257cc5a

From git at git.haskell.org  Mon Nov 16 19:10:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 19:10:31 +0000 (UTC)
Subject: [commit: ghc] master: ApiAnnotations : ITopenExpQuote needs
 SourceText (ee91482)
Message-ID: <20151116191031.E24C53A300@ghc.haskell.org>

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

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

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

commit ee9148284dd5a66ed4970aff5218d973997cb9cf
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 16 21:10:39 2015 +0200

    ApiAnnotations : ITopenExpQuote needs SourceText
    
    Summary:
    In the lexer, ITopenExpQuote can be recognised for '[e|' or '[|'.
    
    The token definition needs to capture the original SourceText, and pass
    it through to ExpBr, which also needs a SrcText field.
    
    It is easier to simply add a flag  to the token identifying the variant
    and to generate a different AnnKeywordId based on this.
    
    Test Plan: ./validate
    
    Reviewers: mpickering, bgamari, austin
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1479
    
    GHC Trac Issues: #10276


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

ee9148284dd5a66ed4970aff5218d973997cb9cf
 compiler/parser/ApiAnnotation.hs                  | 13 ++++
 compiler/parser/Lexer.x                           | 12 ++--
 compiler/parser/Parser.y                          | 15 +++--
 testsuite/tests/ghc-api/annotations/Makefile      |  4 ++
 testsuite/tests/ghc-api/annotations/T10276.stderr | 78 +++++++++++++++++++++++
 testsuite/tests/ghc-api/annotations/T10276.stdout | 63 ++++++++++++++++++
 testsuite/tests/ghc-api/annotations/Test10276.hs  | 15 +++++
 testsuite/tests/ghc-api/annotations/all.T         |  3 +-
 8 files changed, 192 insertions(+), 11 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ee9148284dd5a66ed4970aff5218d973997cb9cf

From git at git.haskell.org  Mon Nov 16 21:04:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:08 +0000 (UTC)
Subject: [commit: ghc] master: RtsFlags: Refactor some of the deeper switches
 (69822f0)
Message-ID: <20151116210408.73D033A300@ghc.haskell.org>

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

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

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

commit 69822f0c5b67161b4d7558081bc94f6f3a7c5dbb
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Nov 16 16:58:41 2015 +0100

    RtsFlags: Refactor some of the deeper switches
    
    This was previously nearly impossible to read; now it's merely
    difficult.
    
    Ideally we would do a more thorough refactoring of the RTS command line
    parser (#4243) but this is more effort than I have time for at the
    moment.
    
    Test Plan: Try using affected RTS flags
    
    Reviewers: simonmar, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1476
    
    GHC Trac Issues: #4243


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

69822f0c5b67161b4d7558081bc94f6f3a7c5dbb
 rts/RtsFlags.c | 435 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 236 insertions(+), 199 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 69822f0c5b67161b4d7558081bc94f6f3a7c5dbb

From git at git.haskell.org  Mon Nov 16 21:04:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:11 +0000 (UTC)
Subject: [commit: ghc] master: users-guide: Limit column width (b8a849b)
Message-ID: <20151116210411.1CA573A300@ghc.haskell.org>

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

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

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

commit b8a849b9a8b531f84cd1191e9e5f0526835d08d2
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 16 10:46:18 2015 +0100

    users-guide: Limit column width
    
    This tends to help readability


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

b8a849b9a8b531f84cd1191e9e5f0526835d08d2
 docs/users_guide/ghc-theme/static/ghc-theme.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/users_guide/ghc-theme/static/ghc-theme.css b/docs/users_guide/ghc-theme/static/ghc-theme.css
index 9e30122..12b7f80 100644
--- a/docs/users_guide/ghc-theme/static/ghc-theme.css
+++ b/docs/users_guide/ghc-theme/static/ghc-theme.css
@@ -25,8 +25,9 @@ body {
     padding: 0;
     border: 1px solid #aaa;
 
-    margin: 0px 80px 0px 80px;
+    margin: auto;
     min-width: 740px;
+    max-width: 1200px;
 }
 
 div.logo {


From git at git.haskell.org  Mon Nov 16 21:04:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:13 +0000 (UTC)
Subject: [commit: ghc] master: RtsFlags: Clean up stale CPP (83b214d)
Message-ID: <20151116210413.BB4B93A300@ghc.haskell.org>

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

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

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

commit 83b214d08e8cc74fb7b40e0442c3972325b6276c
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Nov 15 10:55:15 2015 +0100

    RtsFlags: Clean up stale CPP


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

83b214d08e8cc74fb7b40e0442c3972325b6276c
 rts/RtsFlags.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 9955518..c349ec3 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -298,8 +298,6 @@ usage_text[] = {
 "  -p       Time/allocation profile        (output file <program>.prof)",
 "  -P       More detailed Time/Allocation profile",
 "  -Pa      Give information about *all* cost centres",
-
-# if defined(PROFILING)
 "",
 "  -h<break-down> Heap residency profile (hp2ps) (output file <program>.hp)",
 "     break-down: c = cost centre stack (default)",
@@ -325,8 +323,7 @@ usage_text[] = {
 "  -xt            Include threads (TSOs) in a heap profile",
 "",
 "  -xc      Show current cost centre stack on raising an exception",
-# endif
-#endif /* PROFILING or PAR */
+#endif /* PROFILING */
 
 #ifdef TRACING
 "",


From git at git.haskell.org  Mon Nov 16 21:04:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:16 +0000 (UTC)
Subject: [commit: ghc] master: Use TcM instead of it's expanded form,
 in TcSplice (3773e91)
Message-ID: <20151116210416.6408D3A300@ghc.haskell.org>

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

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

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

commit 3773e9119b1f81563d9dadb02f1ddc0a9ef724a9
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Mon Nov 16 17:01:01 2015 +0100

    Use TcM instead of it's expanded form, in TcSplice
    
    Reviewers: austin, bgamari, goldfire
    
    Reviewed By: bgamari, goldfire
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1474


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

3773e9119b1f81563d9dadb02f1ddc0a9ef724a9
 compiler/typecheck/TcSplice.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcSplice.hs b/compiler/typecheck/TcSplice.hs
index 728c40a..5c85e7d 100644
--- a/compiler/typecheck/TcSplice.hs
+++ b/compiler/typecheck/TcSplice.hs
@@ -756,7 +756,7 @@ when showing an error message.
 To call runQ in the Tc monad, we need to make TcM an instance of Quasi:
 -}
 
-instance TH.Quasi (IOEnv (Env TcGblEnv TcLclEnv)) where
+instance TH.Quasi TcM where
   qNewName s = do { u <- newUnique
                   ; let i = getKey u
                   ; return (TH.mkNameU s i) }
@@ -840,7 +840,7 @@ instance TH.Quasi (IOEnv (Env TcGblEnv TcLclEnv)) where
       th_modfinalizers_var <- fmap tcg_th_modfinalizers getGblEnv
       updTcRef th_modfinalizers_var (\fins -> fin:fins)
 
-  qGetQ :: forall a. Typeable a => IOEnv (Env TcGblEnv TcLclEnv) (Maybe a)
+  qGetQ :: forall a. Typeable a => TcM (Maybe a)
   qGetQ = do
       th_state_var <- fmap tcg_th_state getGblEnv
       th_state <- readTcRef th_state_var


From git at git.haskell.org  Mon Nov 16 21:04:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:19 +0000 (UTC)
Subject: [commit: ghc] master: Weaken monadic list operations to Applicative
 (741cf18)
Message-ID: <20151116210419.0B2873A300@ghc.haskell.org>

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

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

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

commit 741cf18a5e4ee5d0aa8afcab813441e7bcd4050c
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 16 17:02:58 2015 +0100

    Weaken monadic list operations to Applicative
    
    Generalize `filterM`, `mapAndUnzipM`, `zipWithM`, `zipWithM_`,
    `replicateM`, and `replicateM_`.
    
    Reviewers: ekmett, #core_libraries_committee, austin, hvr, bgamari
    
    Reviewed By: ekmett, #core_libraries_committee, bgamari
    
    Subscribers: ekmett, glguy, thomie
    
    Projects: #ghc
    
    Differential Revision: https://phabricator.haskell.org/D1324
    
    GHC Trac Issues: #10168


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

741cf18a5e4ee5d0aa8afcab813441e7bcd4050c
 docs/users_guide/7.12.1-notes.rst |  5 +++++
 libraries/base/Control/Monad.hs   | 42 +++++++++++++++++++--------------------
 libraries/base/changelog.md       |  3 +++
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index 5cc02ad..d9ac18b 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -215,6 +215,11 @@ base
    ``disableAllocationLimit`` are now available from ``System.Mem``. Previously
    this functionality was only available from ``GHC.Conc``.
 
+- ``forever``, ``filterM``, ``mapAndUnzipM``, ``zipWithM``, ``zipWithM_``,
+  ``replicateM``, and ``replicateM`` were generalized from ``Monad`` to
+  ``Applicative``. If this causes performance regressions, try to make the
+  implementation of ``(*>)`` match that of ``(>>)``.
+
 
 binary
 ~~~~~~
diff --git a/libraries/base/Control/Monad.hs b/libraries/base/Control/Monad.hs
index be3765d..7de41ba 100644
--- a/libraries/base/Control/Monad.hs
+++ b/libraries/base/Control/Monad.hs
@@ -75,12 +75,13 @@ module Control.Monad
     , (<$!>)
     ) where
 
-import Data.Foldable ( Foldable, sequence_, msum, mapM_, foldlM, forM_ )
-import Data.Functor ( void )
-import Data.Traversable ( forM, mapM, sequence )
+import Data.Functor ( void, (<$>) )
+import Data.Foldable ( Foldable, sequence_, sequenceA_, msum, mapM_, foldlM, forM_ )
+import Data.Traversable ( forM, mapM, traverse, sequence, sequenceA )
 
 import GHC.Base hiding ( mapM, sequence )
-import GHC.List ( zipWith, unzip, replicate )
+import GHC.Enum ( pred )
+import GHC.List ( zipWith, unzip )
 
 -- -----------------------------------------------------------------------------
 -- Functions mandated by the Prelude
@@ -94,13 +95,8 @@ guard False     =  empty
 -- | This generalizes the list-based 'filter' function.
 
 {-# INLINE filterM #-}
-filterM          :: (Monad m) => (a -> m Bool) -> [a] -> m [a]
-filterM p        = foldr go (return [])
-  where
-    go x r = do
-      flg <- p x
-      ys <- r
-      return (if flg then x:ys else ys)
+filterM          :: (Applicative m) => (a -> m Bool) -> [a] -> m [a]
+filterM p        = foldr (\ x -> liftA2 (\ flg -> if flg then (x:) else id) (p x)) (pure [])
 
 infixr 1 <=<, >=>
 
@@ -125,19 +121,19 @@ forever a   = let a' = a *> a' in a'
 -- | The 'mapAndUnzipM' function maps its first argument over a list, returning
 -- the result as a pair of lists. This function is mainly used with complicated
 -- data structures or a state-transforming monad.
-mapAndUnzipM      :: (Monad m) => (a -> m (b,c)) -> [a] -> m ([b], [c])
+mapAndUnzipM      :: (Applicative m) => (a -> m (b,c)) -> [a] -> m ([b], [c])
 {-# INLINE mapAndUnzipM #-}
-mapAndUnzipM f xs =  sequence (map f xs) >>= return . unzip
+mapAndUnzipM f xs =  unzip <$> traverse f xs
 
--- | The 'zipWithM' function generalizes 'zipWith' to arbitrary monads.
-zipWithM          :: (Monad m) => (a -> b -> m c) -> [a] -> [b] -> m [c]
+-- | The 'zipWithM' function generalizes 'zipWith' to arbitrary applicative functors.
+zipWithM          :: (Applicative m) => (a -> b -> m c) -> [a] -> [b] -> m [c]
 {-# INLINE zipWithM #-}
-zipWithM f xs ys  =  sequence (zipWith f xs ys)
+zipWithM f xs ys  =  sequenceA (zipWith f xs ys)
 
 -- | 'zipWithM_' is the extension of 'zipWithM' which ignores the final result.
-zipWithM_         :: (Monad m) => (a -> b -> m c) -> [a] -> [b] -> m ()
+zipWithM_         :: (Applicative m) => (a -> b -> m c) -> [a] -> [b] -> m ()
 {-# INLINE zipWithM_ #-}
-zipWithM_ f xs ys =  sequence_ (zipWith f xs ys)
+zipWithM_ f xs ys =  sequenceA_ (zipWith f xs ys)
 
 {- | The 'foldM' function is analogous to 'foldl', except that its result is
 encapsulated in a monad. Note that 'foldM' works from left-to-right over
@@ -175,18 +171,20 @@ foldM_ f a xs  = foldlM f a xs >> return ()
 
 -- | @'replicateM' n act@ performs the action @n@ times,
 -- gathering the results.
-replicateM        :: (Monad m) => Int -> m a -> m [a]
+replicateM        :: (Applicative m) => Int -> m a -> m [a]
 {-# INLINEABLE replicateM #-}
 {-# SPECIALISE replicateM :: Int -> IO a -> IO [a] #-}
 {-# SPECIALISE replicateM :: Int -> Maybe a -> Maybe [a] #-}
-replicateM n x    = sequence (replicate n x)
+replicateM 0 _    = pure []
+replicateM n x    = liftA2 (:) x (replicateM (pred n) x)
 
 -- | Like 'replicateM', but discards the result.
-replicateM_       :: (Monad m) => Int -> m a -> m ()
+replicateM_       :: (Applicative m) => Int -> m a -> m ()
 {-# INLINEABLE replicateM_ #-}
 {-# SPECIALISE replicateM_ :: Int -> IO a -> IO () #-}
 {-# SPECIALISE replicateM_ :: Int -> Maybe a -> Maybe () #-}
-replicateM_ n x   = sequence_ (replicate n x)
+replicateM_ 0 _   = pure ()
+replicateM_ n x   = x *> replicateM_ (pred n) x
 
 -- | The reverse of 'when'.
 unless            :: (Applicative f) => Bool -> f () -> f ()
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 7fb4d78..74692a7 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -50,6 +50,9 @@
 
   * Generalise `forever` from `Monad` to `Applicative`
 
+  * Generalize `filterM`, `mapAndUnzipM`, `zipWithM`, `zipWithM_`, `replicateM`,
+    `replicateM` from `Monad` to `Applicative` (#10168)
+
   * Exported `GiveGCStats`, `DoCostCentres`, `DoHeapProfile`, `DoTrace`,
     `RtsTime`, and `RtsNat` from `GHC.RTS.Flags`
 


From git at git.haskell.org  Mon Nov 16 21:04:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:21 +0000 (UTC)
Subject: [commit: ghc] master: ghc.mk: Make install_docs rule sh-compatible
 (7485d0c)
Message-ID: <20151116210421.9E14B3A300@ghc.haskell.org>

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

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

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

commit 7485d0ce03247ca573073738aba34a66e01180a8
Author: Ben Gamari <ben at well-typed.com>
Date:   Mon Nov 16 16:56:12 2015 +0200

    ghc.mk: Make install_docs rule sh-compatible


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

7485d0ce03247ca573073738aba34a66e01180a8
 ghc.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 5e74b7b..caa903d 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -929,14 +929,14 @@ ifneq "$(INSTALL_LIBRARY_DOCS)" ""
 	$(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
 endif
 ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
+	# We need to filter out the directories so install doesn't choke on them
 	for i in $(INSTALL_HTML_DOC_DIRS); do \
 		$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
-    for f in $$i/*; do \
-# We filter out the directories so install doesn't choke on them \
-      if test -f $$f; then \
-		    $(INSTALL_DOC) $(INSTALL_OPTS) "$$f" "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
-      fi \
-    done \
+		for f in $$i/*; do \
+			if test -f $$f; then \
+				$(INSTALL_DOC) $(INSTALL_OPTS) "$$f" "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
+			fi \
+		done \
 	done
 endif
 


From git at git.haskell.org  Mon Nov 16 21:04:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:24 +0000 (UTC)
Subject: [commit: ghc] master: haddock.mk: Use \{1,\} instead of \+ (82cf672)
Message-ID: <20151116210424.4110B3A300@ghc.haskell.org>

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

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

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

commit 82cf6724b97ed40d5efedfd28bd3cccf90d1dff2
Author: Ben Gamari <ben at well-typed.com>
Date:   Mon Nov 16 16:42:16 2015 +0200

    haddock.mk: Use \{1,\} instead of \+
    
    This works around Mac OS X's sed, which doesn't support \+.
    For the record,
    
        The regex implementation in Mac OS X 10.8 and later is based on a heavily
        modified subset of TRE, http://laurikari.net/tre/


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

82cf6724b97ed40d5efedfd28bd3cccf90d1dff2
 rules/haddock.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/haddock.mk b/rules/haddock.mk
index 499adad..e716bb8 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -10,10 +10,10 @@
 #
 # -----------------------------------------------------------------------------
 
-HADDOCK_VER := $(shell grep "^version:" utils/haddock/haddock.cabal | sed "s/^version: \+//")
-HADDOCK_MAJOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1/')
-HADDOCK_MINOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\2/')
-HADDOCK_PATCH_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\3/')
+HADDOCK_VER := $(shell grep "^version:" utils/haddock/haddock.cabal | sed "s/version: *//")
+HADDOCK_MAJOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\1/')
+HADDOCK_MINOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\2/')
+HADDOCK_PATCH_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\3/')
 HADDOCK_VERSION_STRING := $(shell echo $$(($(HADDOCK_MAJOR_VER) * 1000 + $(HADDOCK_MINOR_VER) * 10 + $(HADDOCK_PATCH_VER))))
 
 define haddock  # args: $1 = dir,  $2 = distdir


From git at git.haskell.org  Mon Nov 16 21:04:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:26 +0000 (UTC)
Subject: [commit: ghc] master: Data.List.isSubsequenceOf documentation
 clarification (e2d9821)
Message-ID: <20151116210426.D63ED3A300@ghc.haskell.org>

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

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

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

commit e2d9821bf611da389df7ab8826b957d37351c29d
Author: Justin Raymond <justin.raymond.14 at gmail.com>
Date:   Mon Nov 16 17:05:36 2015 +0100

    Data.List.isSubsequenceOf documentation clarification
    
    Fixes #11083.
    
    Reviewers: austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1477
    
    GHC Trac Issues: #11083


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

e2d9821bf611da389df7ab8826b957d37351c29d
 libraries/base/Data/List.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/base/Data/List.hs b/libraries/base/Data/List.hs
index ab85cf4..693c0dd 100644
--- a/libraries/base/Data/List.hs
+++ b/libraries/base/Data/List.hs
@@ -219,8 +219,9 @@ import Data.OldList hiding ( all, and, any, concat, concatMap, elem, find,
 
 import GHC.Base ( Bool(..), Eq((==)), otherwise )
 
--- | The 'isSubsequenceOf' function takes two lists and returns 'True' if the
--- first list is a subsequence of the second list.
+-- | The 'isSubsequenceOf' function takes two lists and returns 'True' if all
+-- the elements of the first list occur, in order, in the second. The
+-- elements do not have to occur consecutively.
 --
 -- @'isSubsequenceOf' x y@ is equivalent to @'elem' x ('subsequences' y)@.
 --


From git at git.haskell.org  Mon Nov 16 21:04:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 21:04:30 +0000 (UTC)
Subject: [commit: ghc] master: Implement support for user-defined type errors.
 (2d1a563)
Message-ID: <20151116210430.8F5653A300@ghc.haskell.org>

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

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

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

commit 2d1a563bf25a4e402088feb1cdcac3d7bc50c6d3
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Mon Nov 16 17:08:14 2015 +0100

    Implement support for user-defined type errors.
    
    Implements Lennart's idea from the Haskell Symposium.
    Users may use the special type function `TypeError`, which is
    similar to `error` at the value level.
    
    See Trac ticket https://ghc.haskell.org/trac/ghc/ticket/9637, and wiki
    page https://ghc.haskell.org/trac/ghc/wiki/CustomTypeErros
    
    Test Plan: Included testcases
    
    Reviewers: simonpj, austin, hvr, goldfire, bgamari
    
    Reviewed By: goldfire, bgamari
    
    Subscribers: adamgundry, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1236
    
    GHC Trac Issues: #9637


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

2d1a563bf25a4e402088feb1cdcac3d7bc50c6d3
 compiler/prelude/PrelNames.hs                      | 47 +++++++++++++++++++++
 compiler/typecheck/TcErrors.hs                     | 18 +++++++-
 compiler/typecheck/TcRnTypes.hs                    | 21 +++++++++-
 compiler/typecheck/TcValidity.hs                   | 12 ++++++
 compiler/types/Type.hs                             | 48 +++++++++++++++++++++-
 compiler/types/TypeRep.hs                          |  3 ++
 libraries/base/GHC/TypeLits.hs                     | 27 ++++++++++++
 .../typecheck/should_fail/CustomTypeErrors01.hs    | 14 +++++++
 .../should_fail/CustomTypeErrors01.stderr          |  5 +++
 .../typecheck/should_fail/CustomTypeErrors02.hs    | 19 +++++++++
 .../should_fail/CustomTypeErrors02.stderr          | 10 +++++
 .../typecheck/should_fail/CustomTypeErrors03.hs    |  7 ++++
 .../should_fail/CustomTypeErrors03.stderr          |  5 +++
 testsuite/tests/typecheck/should_fail/all.T        |  5 +++
 14 files changed, 237 insertions(+), 4 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2d1a563bf25a4e402088feb1cdcac3d7bc50c6d3

From git at git.haskell.org  Mon Nov 16 23:33:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 23:33:09 +0000 (UTC)
Subject: [commit: ghc] master: Revert "Unify hsig and hs-boot;
 add preliminary "hs-boot" merging." (ac1a379)
Message-ID: <20151116233309.26AE23A300@ghc.haskell.org>

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

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

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

commit ac1a379363618a6f2f17fff65ce9129164b6ef30
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Nov 13 16:18:24 2015 -0800

    Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."
    
    Summary:
    This reverts commit 06d46b1e4507e09eb2a7a04998a92610c8dc6277.
    
    This also has a Haddock submodule update.
    
    Test Plan: validate
    
    Reviewers: simonpj, austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1475


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

ac1a379363618a6f2f17fff65ce9129164b6ef30
 compiler/deSugar/Desugar.hs                        |   2 +-
 compiler/iface/LoadIface.hs                        |   2 +-
 compiler/iface/MkIface.hs                          |  47 ++--------
 compiler/main/DriverMkDepend.hs                    |   6 +-
 compiler/main/DriverPhases.hs                      |  80 +++++++++-------
 compiler/main/DriverPipeline.hs                    |  83 +++++------------
 compiler/main/Finder.hs                            |   8 +-
 compiler/main/GHC.hs                               |   2 +-
 compiler/main/GhcMake.hs                           | 103 ++++++++-------------
 compiler/main/HscMain.hs                           |  69 +-------------
 compiler/main/HscTypes.hs                          |  40 ++++----
 compiler/typecheck/TcBinds.hs                      |   4 +-
 compiler/typecheck/TcInstDcls.hs                   |   4 +-
 compiler/typecheck/TcRnDriver.hs                   |  43 +++++----
 compiler/typecheck/TcRnMonad.hs                    |   2 +-
 compiler/typecheck/TcRnTypes.hs                    |   1 -
 ghc/Main.hs                                        |  19 +---
 testsuite/.gitignore                               |   1 -
 .../dynamicToo005/{A005.hs-boot => A005.hsig}      |   0
 .../tests/driver/dynamicToo/dynamicToo005/Makefile |   8 +-
 .../dynamicToo/dynamicToo006/{A.hs-boot => A.hsig} |   0
 .../tests/driver/dynamicToo/dynamicToo006/Makefile |   2 -
 testsuite/tests/driver/recomp014/Makefile          |  33 -------
 testsuite/tests/driver/recomp014/all.T             |   4 -
 testsuite/tests/driver/recomp014/recomp014.stdout  |   4 -
 .../tests/driver/sigof01/{B.hs-boot => B.hsig}     |   0
 testsuite/tests/driver/sigof01/Makefile            |   9 +-
 testsuite/tests/driver/sigof01/all.T               |  10 --
 testsuite/tests/driver/sigof01/sigof01i.script     |   1 -
 testsuite/tests/driver/sigof01/sigof01i.stdout     |   3 -
 testsuite/tests/driver/sigof01/sigof01i2.script    |   3 -
 testsuite/tests/driver/sigof01/sigof01i2.stdout    |   9 --
 testsuite/tests/driver/sigof01/sigof01m.stdout     |   7 +-
 testsuite/tests/driver/sigof02/Makefile            |  21 ++---
 .../tests/driver/sigof02/{Map.hs-boot => Map.hsig} |   0
 .../sigof02/{MapAsSet.hs-boot => MapAsSet.hsig}    |   0
 testsuite/tests/driver/sigof02/sigof02dm.stdout    |   8 +-
 testsuite/tests/driver/sigof02/sigof02m.stdout     |  10 +-
 .../driver/sigof03/{ASig1.hs-boot => ASig1.hsig}   |   0
 .../driver/sigof03/{ASig2.hs-boot => ASig2.hsig}   |   0
 testsuite/tests/driver/sigof03/Makefile            |   5 +-
 testsuite/tests/driver/sigof04/Makefile            |   2 +-
 .../tests/driver/sigof04/{Sig.hs-boot => Sig.hsig} |   0
 testsuite/tests/driver/sigof04/sigof04.stderr      |   4 +-
 testsuite/tests/typecheck/should_compile/all.T     |   2 +-
 .../should_compile/{tc264.hs-boot => tc264.hsig}   |   0
 .../tests/typecheck/should_compile/tc264.stderr    |   2 +-
 testsuite/tests/typecheck/should_fail/all.T        |   8 +-
 .../{tcfail219.hs-boot => tcfail219.hsig}          |   0
 .../tests/typecheck/should_fail/tcfail219.stderr   |   5 +-
 .../{tcfail220.hs-boot => tcfail220.hsig}          |   0
 .../tests/typecheck/should_fail/tcfail220.stderr   |  10 +-
 .../{tcfail221.hs-boot => tcfail221.hsig}          |   0
 .../tests/typecheck/should_fail/tcfail221.stderr   |   8 +-
 .../{tcfail222.hs-boot => tcfail222.hsig}          |   0
 .../tests/typecheck/should_fail/tcfail222.stderr   |   6 +-
 utils/ghctags/Main.hs                              |   7 +-
 utils/haddock                                      |   2 +-
 58 files changed, 230 insertions(+), 479 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ac1a379363618a6f2f17fff65ce9129164b6ef30

From git at git.haskell.org  Mon Nov 16 23:33:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 23:33:11 +0000 (UTC)
Subject: [commit: ghc] master: Move usage calculation to desugaring,
 simplifying ModGuts. (9193629)
Message-ID: <20151116233311.D3E323A300@ghc.haskell.org>

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

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

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

commit 9193629a6d8c7605ba81e62bc7f9a04a8ce65013
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Thu Nov 12 16:38:02 2015 -0800

    Move usage calculation to desugaring, simplifying ModGuts.
    
    Summary:
    (This patch was excised from the fat interfaces patch, which
    has been put indefinitely on hold.)
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: simonpj, austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1469


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

9193629a6d8c7605ba81e62bc7f9a04a8ce65013
 compiler/basicTypes/IdInfo.hs |   2 +-
 compiler/deSugar/Desugar.hs   | 201 +++++++++++++++++++++++++++++++++++++--
 compiler/iface/MkIface.hs     | 212 +++---------------------------------------
 compiler/main/HscMain.hs      |   7 +-
 compiler/main/HscTypes.hs     |   8 +-
 5 files changed, 215 insertions(+), 215 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9193629a6d8c7605ba81e62bc7f9a04a8ce65013

From git at git.haskell.org  Mon Nov 16 23:33:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 16 Nov 2015 23:33:14 +0000 (UTC)
Subject: [commit: ghc] master: s/FrontendMerge/FrontendInterface/g (3d88e89)
Message-ID: <20151116233314.866CD3A300@ghc.haskell.org>

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

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

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

commit 3d88e8990320780520a670191d704a37bff5c910
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Mon Oct 19 19:16:14 2015 -0700

    s/FrontendMerge/FrontendInterface/g
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


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

3d88e8990320780520a670191d704a37bff5c910
 compiler/main/HscMain.hs        | 4 ++--
 compiler/typecheck/TcRnTypes.hs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 1497a2d..9ffd3c9 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -609,7 +609,7 @@ genericHscFrontend mod_summary =
 genericHscFrontend' :: ModSummary -> Hsc FrontendResult
 genericHscFrontend' mod_summary
     | ms_hsc_src mod_summary == HsBootMerge
-    = FrontendMerge `fmap` hscMergeFrontEnd mod_summary
+    = FrontendInterface `fmap` hscMergeFrontEnd mod_summary
     | otherwise
     = FrontendTypecheck `fmap` hscFileFrontEnd mod_summary
 
@@ -662,7 +662,7 @@ hscIncrementalCompile always_do_basic_recompilation_check m_tc_result
                        ms_hsc_src mod_summary == HsSrcFile
                        then finish              hsc_env mod_summary tc_result mb_old_hash
                        else finishTypecheckOnly hsc_env mod_summary tc_result mb_old_hash
-                FrontendMerge raw_iface ->
+                FrontendInterface raw_iface ->
                             finishMerge         hsc_env mod_summary raw_iface mb_old_hash
             liftIO $ hscMaybeWriteIface dflags (hm_iface hmi) no_change mod_summary
             return (status, hmi)
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 3f703fa..f4cfa4f 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -341,7 +341,7 @@ data DsMetaVal
 -- to have a TcGblEnv which is only defined here.
 data FrontendResult
         = FrontendTypecheck TcGblEnv
-        | FrontendMerge     ModIface
+        | FrontendInterface ModIface
 
 -- | 'TcGblEnv' describes the top-level of the module at the
 -- point at which the typechecker is finished work.


From git at git.haskell.org  Tue Nov 17 08:37:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 08:37:59 +0000 (UTC)
Subject: [commit: ghc] master: Bump process submodule (df8169c)
Message-ID: <20151117083759.4B1C03A300@ghc.haskell.org>

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

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

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

commit df8169c8d4e1a14080e5f689aae6c9204d8a34c3
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Nov 17 09:37:51 2015 +0100

    Bump process submodule


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

df8169c8d4e1a14080e5f689aae6c9204d8a34c3
 libraries/process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/process b/libraries/process
index 7428b61..e5a7ee3 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 7428b614841e6b6416e501453546b0af19a0cd1f
+Subproject commit e5a7ee3189028d12a57391388184f20d0d257c08


From git at git.haskell.org  Tue Nov 17 12:57:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 12:57:55 +0000 (UTC)
Subject: [commit: ghc] master: T9181: Fix testsuite output (4e74ef9)
Message-ID: <20151117125755.DA83A3A300@ghc.haskell.org>

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

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

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

commit 4e74ef96960187bba2848a73f5899c8807bb2a39
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Nov 17 06:20:30 2015 -0500

    T9181: Fix testsuite output
    
    I'm not really sure how this one snuck through my local validation. Hmm.


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

4e74ef96960187bba2848a73f5899c8807bb2a39
 testsuite/tests/ghci/scripts/T9181.stdout | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/testsuite/tests/ghci/scripts/T9181.stdout b/testsuite/tests/ghci/scripts/T9181.stdout
index 3ea130d..15504ec 100644
--- a/testsuite/tests/ghci/scripts/T9181.stdout
+++ b/testsuite/tests/ghci/scripts/T9181.stdout
@@ -5,6 +5,11 @@ type (<=) (x :: Nat) (y :: Nat) = (x <=? y) ~ 'True
 type family (<=?) (a :: Nat) (b :: Nat) :: Bool
 type family CmpNat (a :: Nat) (b :: Nat) :: Ordering
 type family CmpSymbol (a :: Symbol) (b :: Symbol) :: Ordering
+data ErrorMessage where
+  Text :: Symbol -> ErrorMessage
+  ShowType :: t -> ErrorMessage
+  (:<>:) :: ErrorMessage -> ErrorMessage -> ErrorMessage
+  (:$$:) :: ErrorMessage -> ErrorMessage -> ErrorMessage
 class KnownNat (n :: Nat) where
   natSing :: SNat n
   {-# MINIMAL natSing #-}
@@ -15,6 +20,7 @@ data SomeNat where
   SomeNat :: KnownNat n => (Proxy n) -> SomeNat
 data SomeSymbol where
   SomeSymbol :: KnownSymbol n => (Proxy n) -> SomeSymbol
+type family TypeError (a :: ErrorMessage) :: b where
 type family (^) (a :: Nat) (b :: Nat) :: Nat
 natVal :: KnownNat n => proxy n -> Integer
 natVal' :: KnownNat n => Proxy# n -> Integer


From git at git.haskell.org  Tue Nov 17 12:57:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 12:57:58 +0000 (UTC)
Subject: [commit: ghc] master: Remove orphan Functor instance of
 Data.Graph.SCC (615ba5f)
Message-ID: <20151117125758.8BDF73A300@ghc.haskell.org>

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

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

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

commit 615ba5ff4d78ef69898e8f84c5831cdb1bad3b21
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Tue Nov 17 09:50:05 2015 +0100

    Remove orphan Functor instance of Data.Graph.SCC
    
    Reviewers: bgamari, austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1481


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

615ba5ff4d78ef69898e8f84c5831cdb1bad3b21
 compiler/utils/Digraph.hs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/compiler/utils/Digraph.hs b/compiler/utils/Digraph.hs
index c6e63fb..2c90c1e 100644
--- a/compiler/utils/Digraph.hs
+++ b/compiler/utils/Digraph.hs
@@ -1,8 +1,7 @@
 -- (c) The University of Glasgow 2006
 
 {-# LANGUAGE CPP, ScopedTypeVariables #-}
--- For Functor SCC. ToDo: Remove me when 7.10 is released
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module Digraph(
         Graph, graphFromEdgedVertices,
 
@@ -329,14 +328,6 @@ graphEmpty g = lo > hi
 
 type IntGraph = G.Graph
 
--- Functor instance was added in 7.8, in containers 0.5.3.2 release
--- ToDo: Drop me when 7.10 is released.
-#if __GLASGOW_HASKELL__ < 708
-instance Functor SCC where
-    fmap f (AcyclicSCC v) = AcyclicSCC (f v)
-    fmap f (CyclicSCC vs) = CyclicSCC (fmap f vs)
-#endif
-
 {-
 ------------------------------------------------------------
 -- Depth first search numbering


From git at git.haskell.org  Tue Nov 17 14:57:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 14:57:39 +0000 (UTC)
Subject: [commit: ghc] master: template-haskell: drop `TemplateHaskell`
 requirement (7c9cbfd)
Message-ID: <20151117145739.D1DBB3A300@ghc.haskell.org>

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

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

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

commit 7c9cbfd9074055d6db93d4b44c8aea8d32402aa6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 17 15:55:43 2015 +0100

    template-haskell: drop `TemplateHaskell` requirement
    
    `other-extensions: TemplateHaskell` is inaccurate: It's not required
    to compile `template-haskell` (otherwise we wouldn't be able to build
    that package via `ghc-stage1`...)
    
    This has been discovered while working on #11102


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

7c9cbfd9074055d6db93d4b44c8aea8d32402aa6
 libraries/template-haskell/template-haskell.cabal | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index 40debcb..d4dd81e 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -32,7 +32,6 @@ Library
         PolymorphicComponents
         RankNTypes
         ScopedTypeVariables
-        TemplateHaskell
         UnboxedTuples
 
     exposed-modules:


From git at git.haskell.org  Tue Nov 17 15:20:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 15:20:03 +0000 (UTC)
Subject: [commit: ghc] master: Fix archive loading on Windows by the runtime
 loader (acce37f)
Message-ID: <20151117152003.A711B3A300@ghc.haskell.org>

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

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

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

commit acce37f38bc3867f86cf717694915746bb2f278e
Author: Tamar Christina <tamar at zhox.com>
Date:   Tue Nov 17 15:35:46 2015 +0100

    Fix archive loading on Windows by the runtime loader
    
    The runtime loader is unable to find archive files `.a` shipping
    with the inplace `GCC`.
    
    It seems the issue is caused by `findArchive` being unable to
    find any archives that are shipped using the in-place `GCC`.
    
    - It works on Linux because `findArchive` would search
      the standard Linux include path.
    - It works during compilation because `GCC` can find it's own libraries
      (we explicitly tell it where to look for libraries using the `gcc`
      wrapper around `realgcc`)
    
    So fixing the issue means using `searchForLibUsingGcc` in `findArchive`
    as well, which will then find the correct file.
    
    The reason for the error as it is, is because if we can't locate the
    library using any of the methods we have, we assume it is a system dll,
    or something on the system search path.  e.g. if trying to load
    `kernel32.dll`.
    
    There is a slight issue in that the `GHCi` code (incorrectly) favors
    `static archives` over `dynamic` ones
    
    ```
    findDll        `orElse`
    findArchive    `orElse`
    tryGcc         `orElse`
    tryGccPrefixed `orElse`
    assumeDll
    ```
    This has the unwanted effect of when `kernel32` is specified as a lib,
    it will try to load `kernel32.a` instead of `kernel32.dll`.
    
    To solve this I have added another search function that is able to
    search the Windows search paths using `SearchPath` in order to find if
    it is a dll on the system search path.
    
    The new search order is:
    
    ```
    findDll     `orElse`
    findSysDll  `orElse`
    tryGcc      `orElse`
    findArchive `orElse`
    assumeDll
    ```
    
    (`tryGccPrefixed` was rolled into `tryGcc` so it is no longer needed at
    top level)
    
    Test Plan: ./validate added new windows tests T3242
    
    Reviewers: thomie, erikd, hvr, austin, bgamari
    
    Reviewed By: thomie, erikd, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1455
    
    GHC Trac Issues: #3242


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

acce37f38bc3867f86cf717694915746bb2f278e
 compiler/ghci/Linker.hs                   | 26 ++++++++++++++-------
 compiler/ghci/ObjLink.hs                  | 39 ++++++++++++++++++++-----------
 includes/rts/Linker.h                     |  7 ++++++
 rts/Linker.c                              | 37 +++++++++++++++++++++++++++++
 rts/RtsSymbols.c                          |  1 +
 testsuite/tests/ghci/linking/dyn/Makefile |  5 +++-
 testsuite/tests/ghci/linking/dyn/all.T    |  5 ++++
 7 files changed, 98 insertions(+), 22 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc acce37f38bc3867f86cf717694915746bb2f278e

From git at git.haskell.org  Tue Nov 17 15:20:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 15:20:06 +0000 (UTC)
Subject: [commit: ghc] master: Make `timer_create(CLOCK_REALTIME)` autoconf
 test more reliable (8ad9e74)
Message-ID: <20151117152006.53AA93A300@ghc.haskell.org>

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

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

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

commit 8ad9e74f1f88d5c86d2e76f9992f9b2d267421d3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 17 15:30:56 2015 +0100

    Make `timer_create(CLOCK_REALTIME)` autoconf test more reliable
    
    I've noticed that on a platform with a coarse timer/scheduling
    granularity of 10ms this autoconf tests fails to detect a working
    `timer_create(CLOCK_REALTIME)`.
    
    On AIX, this effectively means that intervals/timers are rounded up to
    multiples of 10ms, so a 13ms delay is effectively a 20ms delay.
    
    By using a 100ms timeout we are on the safe side.
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1483


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

8ad9e74f1f88d5c86d2e76f9992f9b2d267421d3
 aclocal.m4 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 2bf27be..33f05e5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1591,17 +1591,18 @@ int main(int argc, char *argv[])
         exit(2);
     }
 
+    tock = 0;
+
     it.it_value.tv_sec = 0;
-    it.it_value.tv_nsec = 1000000;
+    it.it_value.tv_nsec = 1000000; // 1ms
     it.it_interval = it.it_value;
     if (timer_settime(timer, 0, &it, NULL) != 0) {
         fprintf(stderr,"settime problem\n");
         exit(4);
     }
 
-    tock = 0;
-
-    usleep(3000);
+    // some environments have coarse scheduler/timer granularity of ~10ms and worse
+    usleep(100000); // 100ms
 
     if (!tock) {
         fprintf(stderr,"no CLOCK_REALTIME signal\n");


From git at git.haskell.org  Tue Nov 17 15:20:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 15:20:09 +0000 (UTC)
Subject: [commit: ghc] master: Update Cabal submodule for new known extension
 (b3d6c0f)
Message-ID: <20151117152009.01A023A300@ghc.haskell.org>

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

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

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

commit b3d6c0f77df0c2cbb5cedaa48a8e874fad3e9942
Author: Adam Sandberg Eriksson <adam at sandbergericsson.se>
Date:   Tue Nov 17 15:29:22 2015 +0100

    Update Cabal submodule for new known extension
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1485


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

b3d6c0f77df0c2cbb5cedaa48a8e874fad3e9942
 libraries/Cabal                 | 2 +-
 testsuite/tests/driver/T4437.hs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 75d2807..4e11fb9 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 75d2807a2bb11762f4db70540d2cc9049e9c7968
+Subproject commit 4e11fb9f353ad78c862c4c123143a0e793fc22d5
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 0d9d146..f345ce6 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -32,8 +32,7 @@ check title expected got
 expectedGhcOnlyExtensions :: [String]
 expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
-                             "AlternativeLayoutRuleTransitional",
-                             "Strict"]
+                             "AlternativeLayoutRuleTransitional"]
 
 expectedCabalOnlyExtensions :: [String]
 expectedCabalOnlyExtensions = ["Generics",


From git at git.haskell.org  Tue Nov 17 15:58:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 15:58:46 +0000 (UTC)
Subject: [commit: ghc] master: Implement OverloadedLabels (7b962ba)
Message-ID: <20151117155846.33DCF3A300@ghc.haskell.org>

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

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

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

commit 7b962bab384e2ae85b41d30f503c3d0295b0214f
Author: Adam Gundry <adam at well-typed.com>
Date:   Tue Nov 17 15:50:33 2015 +0100

    Implement OverloadedLabels
    
    See
    https://ghc.haskell.org/trac/ghc/wiki/Records/OverloadedRecordFields/OverloadedLabels
    for the big picture.
    
    Reviewers: goldfire, simonpj, austin, hvr, bgamari
    
    Reviewed By: simonpj, bgamari
    
    Subscribers: kosmikus, thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1331


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

7b962bab384e2ae85b41d30f503c3d0295b0214f
 compiler/deSugar/Coverage.hs                       |  1 +
 compiler/deSugar/DsExpr.hs                         |  1 +
 compiler/deSugar/DsMeta.hs                         |  1 +
 compiler/deSugar/Match.hs                          |  1 +
 compiler/hsSyn/HsExpr.hs                           |  5 ++
 compiler/main/DynFlags.hs                          |  2 +
 compiler/parser/Lexer.x                            | 17 +++++-
 compiler/parser/Parser.y                           |  9 ++++
 compiler/prelude/PrelNames.hs                      | 15 ++++++
 compiler/rename/RnExpr.hs                          |  3 ++
 compiler/typecheck/TcEvidence.hs                   |  9 ++--
 compiler/typecheck/TcExpr.hs                       | 37 +++++++++++++
 compiler/typecheck/TcHsSyn.hs                      |  3 ++
 compiler/typecheck/TcRnTypes.hs                    |  3 ++
 libraries/base/GHC/OverloadedLabels.hs             | 48 +++++++++++++++++
 libraries/base/base.cabal                          |  1 +
 testsuite/tests/driver/T4437.hs                    |  3 +-
 testsuite/tests/overloadedrecflds/ghci/all.T       |  1 +
 .../ghci/overloadedlabelsghci01.script             | 12 +++++
 .../ghci/overloadedlabelsghci01.stdout             |  4 ++
 .../tests/overloadedrecflds/should_fail/all.T      |  1 +
 .../should_fail/overloadedlabelsfail01.hs          | 15 ++++++
 .../should_fail/overloadedlabelsfail01.stderr      | 31 +++++++++++
 .../should_run/OverloadedLabelsRun04_A.hs          |  8 +++
 testsuite/tests/overloadedrecflds/should_run/all.T |  6 +++
 .../should_run/overloadedlabelsrun01.hs            | 29 ++++++++++
 .../should_run/overloadedlabelsrun01.stdout}       |  3 +-
 .../should_run/overloadedlabelsrun02.hs            | 61 ++++++++++++++++++++++
 .../should_run/overloadedlabelsrun02.stdout        |  3 ++
 .../should_run/overloadedlabelsrun03.hs            | 21 ++++++++
 .../should_run/overloadedlabelsrun03.stdout        |  2 +
 .../should_run/overloadedlabelsrun04.hs            | 13 +++++
 .../should_run/overloadedlabelsrun04.stdout        |  1 +
 33 files changed, 363 insertions(+), 7 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 7b962bab384e2ae85b41d30f503c3d0295b0214f

From git at git.haskell.org  Tue Nov 17 17:30:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 17:30:12 +0000 (UTC)
Subject: [commit: ghc] master: MonadFail proposal, phase 1 (233d131)
Message-ID: <20151117173012.48FB73A300@ghc.haskell.org>

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

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

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

commit 233d1312bf15940fca5feca6884f965e7944b555
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Tue Nov 17 17:10:02 2015 +0100

    MonadFail proposal, phase 1
    
    This implements phase 1 of the MonadFail proposal (MFP, #10751).
    
    - MonadFail warnings are all issued as desired, tunable with two new flags
    - GHC was *not* made warning-free with `-fwarn-missing-monadfail-warnings`
      (but it's disabled by default right now)
    
    Credits/thanks to
    - Franz Thoma, whose help was crucial to implementing this
    - My employer TNG Technology Consulting GmbH for partially funding us
      for this work
    
    Reviewers: goldfire, austin, #core_libraries_committee, hvr, bgamari, fmthoma
    
    Reviewed By: hvr, bgamari, fmthoma
    
    Subscribers: thomie
    
    Projects: #ghc
    
    Differential Revision: https://phabricator.haskell.org/D1248
    
    GHC Trac Issues: #10751


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

233d1312bf15940fca5feca6884f965e7944b555
 compiler/coreSyn/CoreLint.hs                       |   8 ++
 compiler/hsSyn/HsExpr.hs                           |   2 +-
 compiler/main/DynFlags.hs                          |   4 +
 compiler/parser/Lexer.x                            |   8 ++
 compiler/prelude/PrelNames.hs                      |  39 +++++---
 compiler/prelude/PrelRules.hs                      |   8 ++
 compiler/rename/RnEnv.hs                           |   4 +-
 compiler/rename/RnExpr.hs                          |  17 +++-
 compiler/specialise/Specialise.hs                  |   8 ++
 compiler/typecheck/TcArrows.hs                     |   2 +-
 compiler/typecheck/TcErrors.hs                     |  23 +++--
 compiler/typecheck/TcMatches.hs                    |  87 +++++++++++++++--
 compiler/typecheck/TcRnDriver.hs                   |   3 +-
 compiler/typecheck/TcRnTypes.hs                    |  12 +++
 compiler/typecheck/TcSMonad.hs                     |   8 ++
 compiler/types/Unify.hs                            |   8 ++
 compiler/utils/IOEnv.hs                            |   9 ++
 compiler/utils/Maybes.hs                           |   9 ++
 docs/users_guide/glasgow_exts.rst                  |  16 +++
 docs/users_guide/using-warnings.rst                |  20 +++-
 libraries/base/Control/Monad.hs                    |   2 +-
 libraries/base/Text/ParserCombinators/ReadP.hs     |  15 +++
 libraries/base/Text/ParserCombinators/ReadPrec.hs  |  10 ++
 testsuite/tests/driver/T4437.hs                    |   4 +-
 testsuite/tests/monadfail/MonadFailErrors.hs       |  95 ++++++++++++++++++
 testsuite/tests/monadfail/MonadFailErrors.stderr   |  74 ++++++++++++++
 testsuite/tests/monadfail/MonadFailWarnings.hs     | 107 +++++++++++++++++++++
 testsuite/tests/monadfail/MonadFailWarnings.stderr |  60 ++++++++++++
 .../tests/monadfail/MonadFailWarningsDisabled.hs   |  94 ++++++++++++++++++
 .../MonadFailWarningsWithRebindableSyntax.hs       |  14 +++
 .../MonadFailWarningsWithRebindableSyntax.stderr   |   5 +
 testsuite/tests/monadfail/all.T                    |   4 +
 testsuite/tests/rebindable/rebindable1.hs          |   1 +
 testsuite/tests/rebindable/rebindable6.hs          |   9 +-
 testsuite/tests/rebindable/rebindable6.stderr      |  24 ++---
 35 files changed, 756 insertions(+), 57 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 233d1312bf15940fca5feca6884f965e7944b555

From git at git.haskell.org  Tue Nov 17 17:43:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 17:43:13 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Update submodules (to
 origin/master) after snafu (fa49e2a)
Message-ID: <20151117174313.168133A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/fa49e2afe27500053087bffa1660a0c9fd5e65bc/ghc

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

commit fa49e2afe27500053087bffa1660a0c9fd5e65bc
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 13 12:53:25 2015 +0000

    Update submodules (to origin/master) after snafu


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

fa49e2afe27500053087bffa1660a0c9fd5e65bc
 libraries/Cabal        | 2 +-
 libraries/array        | 2 +-
 libraries/deepseq      | 2 +-
 libraries/directory    | 2 +-
 libraries/filepath     | 2 +-
 libraries/haskeline    | 2 +-
 libraries/hoopl        | 2 +-
 libraries/hpc          | 2 +-
 libraries/primitive    | 2 +-
 libraries/process      | 2 +-
 libraries/stm          | 2 +-
 libraries/terminfo     | 2 +-
 libraries/transformers | 2 +-
 libraries/unix         | 2 +-
 libraries/vector       | 2 +-
 utils/haddock          | 2 +-
 utils/hsc2hs           | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index b083151..75d2807 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit b083151f2a01ad7245f21502fd20f21189ab7665
+Subproject commit 75d2807a2bb11762f4db70540d2cc9049e9c7968
diff --git a/libraries/array b/libraries/array
index 2f5b772..dd75c73 160000
--- a/libraries/array
+++ b/libraries/array
@@ -1 +1 @@
-Subproject commit 2f5b772f4475d70a68c6f9d10390ac9812afdb7d
+Subproject commit dd75c73d191b3f07209c38f78ebe9dcc26fc5ed4
diff --git a/libraries/deepseq b/libraries/deepseq
index c6cb196..36bfcd2 160000
--- a/libraries/deepseq
+++ b/libraries/deepseq
@@ -1 +1 @@
-Subproject commit c6cb196fb1bd5f16bb5945add2d6ece3f7910e90
+Subproject commit 36bfcd2a6236f2e019de76c256b05ee670492373
diff --git a/libraries/directory b/libraries/directory
index 7233248..a7a5b0b 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit 7233248952648ed4dd213f91ed52af2317a3f23b
+Subproject commit a7a5b0b738aad432a9cad512a26d7564120ef0e8
diff --git a/libraries/filepath b/libraries/filepath
index 81375ae..564c5a7 160000
--- a/libraries/filepath
+++ b/libraries/filepath
@@ -1 +1 @@
-Subproject commit 81375ae0c892b5951f2c1184c655a8f3a5193c9c
+Subproject commit 564c5a78d028ebde6a27f61ff9f686fce490c809
diff --git a/libraries/haskeline b/libraries/haskeline
index 7a72748..fb5b288 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit 7a72748b3898e68c99e3d5ae7d06c58dd190b149
+Subproject commit fb5b2884dd00843f6d2fbbeca87b241822088b83
diff --git a/libraries/hoopl b/libraries/hoopl
index b38e92f..84255f0 160000
--- a/libraries/hoopl
+++ b/libraries/hoopl
@@ -1 +1 @@
-Subproject commit b38e92f67cabfa0d0ed12ac93c2d431f2391de70
+Subproject commit 84255f0fe07f3fd1f5bc96e60b64c582394edcf1
diff --git a/libraries/hpc b/libraries/hpc
index 886429b..e20c61c 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit 886429bf84097bbc16cdb6602b60ba1b9156cf6a
+Subproject commit e20c61c358e749ea62f6687089ad2a878d5d1a66
diff --git a/libraries/primitive b/libraries/primitive
index 0359ea1..83d3d23 160000
--- a/libraries/primitive
+++ b/libraries/primitive
@@ -1 +1 @@
-Subproject commit 0359ea15842d4e6bef27c0d621964507e4bfd219
+Subproject commit 83d3d23d2fa1583ecd1b59464cc889924e1b5fff
diff --git a/libraries/process b/libraries/process
index e0983fb..7428b61 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit e0983fbbfa8a3d81c7b99e83a3169fc686caab62
+Subproject commit 7428b614841e6b6416e501453546b0af19a0cd1f
diff --git a/libraries/stm b/libraries/stm
index f7db2c3d..e917b59 160000
--- a/libraries/stm
+++ b/libraries/stm
@@ -1 +1 @@
-Subproject commit f7db2c3df86ec644e5e06baa8090a1cb525754e2
+Subproject commit e917b5944ce0a5b4e32dcc8f00eaddbec1256e98
diff --git a/libraries/terminfo b/libraries/terminfo
index 1b5ab01..68e88c4 160000
--- a/libraries/terminfo
+++ b/libraries/terminfo
@@ -1 +1 @@
-Subproject commit 1b5ab01452eaa6c21de7174ad4312a017a13d0ab
+Subproject commit 68e88c453237763084f5032d133ee7347980f8b2
diff --git a/libraries/transformers b/libraries/transformers
index 0c7207e..5ccb747 160000
--- a/libraries/transformers
+++ b/libraries/transformers
@@ -1 +1 @@
-Subproject commit 0c7207e9702afb5344cc33892eb6da9126a85cf3
+Subproject commit 5ccb747e67d579e3f212fd3526469c35282e532e
diff --git a/libraries/unix b/libraries/unix
index 4260c25..137fa1b 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 4260c25687d3a4bc1ffacdacfbe7e47082ff2550
+Subproject commit 137fa1b06a79a9baa0d5fcf2ec11f964c3423f6a
diff --git a/libraries/vector b/libraries/vector
index 552ff11..6c17dd6 160000
--- a/libraries/vector
+++ b/libraries/vector
@@ -1 +1 @@
-Subproject commit 552ff11c2bd905faff53b2e34900cbbbf59955c8
+Subproject commit 6c17dd6fadc5e7e3e09f7892380ce1339f296efd
diff --git a/utils/haddock b/utils/haddock
index 0d157fe..83a9e9d 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 0d157fea7d1e4055abcb6453545f8bf326ce2279
+Subproject commit 83a9e9d2c7f0debec9d56e8b3b7cc8a8eb73361e
diff --git a/utils/hsc2hs b/utils/hsc2hs
index 293f41c..bb205d8 160000
--- a/utils/hsc2hs
+++ b/utils/hsc2hs
@@ -1 +1 @@
-Subproject commit 293f41c78e956b78363ede463e7ff52eb6bc997d
+Subproject commit bb205d806c1368e483edde288cbf8ed2cfca2ba6


From git at git.haskell.org  Tue Nov 17 17:43:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 17:43:18 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: More wibbles;
 getting close now (51705d7)
Message-ID: <20151117174318.882E83A301@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/51705d755c12b73d54e11f19f6290c3066cc454b/ghc

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

commit 51705d755c12b73d54e11f19f6290c3066cc454b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Nov 17 17:43:15 2015 +0000

    More wibbles; getting close now


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

51705d755c12b73d54e11f19f6290c3066cc454b
 compiler/rename/RnEnv.hs                           |  3 +-
 compiler/rename/RnTypes.hs                         |  5 +-
 compiler/typecheck/TcBinds.hs                      |  2 +-
 compiler/typecheck/TcEvidence.hs                   |  4 +-
 compiler/typecheck/TcExpr.hs                       |  2 +-
 compiler/typecheck/TcSimplify.hs                   | 10 ++--
 compiler/typecheck/TcTyClsDecls.hs                 | 59 +++++++++++++---------
 compiler/typecheck/TcValidity.hs                   |  2 +-
 compiler/types/Coercion.hs                         |  6 ++-
 compiler/types/TyCon.hs                            | 18 +++++--
 compiler/utils/Util.hs                             | 27 +++++-----
 testsuite/tests/ghc-api/annotations/all.T          |  2 +-
 testsuite/tests/ghc-api/landmines/Makefile         |  2 +-
 testsuite/tests/ghci/scripts/Defer02.stderr        | 39 ++++----------
 .../tests/indexed-types/should_fail/BadSock.hs     |  0
 .../indexed-types/should_fail/SimpleFail16.stderr  |  2 +-
 .../tests/indexed-types/should_fail/T1897b.stderr  |  2 +-
 .../partial-sigs/should_compile/T10403.stderr      | 24 ++++-----
 .../partial-sigs/should_fail/Defaulting1MROff.hs   |  2 +
 .../should_fail/Defaulting1MROff.stderr            | 11 ++--
 .../ExtraConstraintsWildcardNotPresent.stderr      | 13 ++---
 .../tests/partial-sigs/should_fail/T10615.stderr   | 34 ++++++-------
 .../partial-sigs/should_fail/Trac10045.stderr      | 29 ++---------
 testsuite/tests/partial-sigs/should_fail/all.T     |  4 +-
 testsuite/tests/rename/should_fail/T2901.stderr    |  4 +-
 .../tests/roles/should_fail/RolesIArray.stderr     |  8 +--
 testsuite/tests/typecheck/should_fail/T5300.hs     |  4 +-
 testsuite/tests/typecheck/should_fail/T8142.stderr |  2 +-
 testsuite/tests/typecheck/should_run/Defer01.hs    |  2 -
 29 files changed, 154 insertions(+), 168 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 51705d755c12b73d54e11f19f6290c3066cc454b

From git at git.haskell.org  Tue Nov 17 17:43:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 17:43:15 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Update haddock submodule
 again (664d7ab)
Message-ID: <20151117174315.ACABA3A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/664d7abedea2d5e2dde2b006ca3066b00dbc9cdc/ghc

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

commit 664d7abedea2d5e2dde2b006ca3066b00dbc9cdc
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 13 12:54:55 2015 +0000

    Update haddock submodule again


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

664d7abedea2d5e2dde2b006ca3066b00dbc9cdc
 utils/haddock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/haddock b/utils/haddock
index 83a9e9d..0d157fe 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 83a9e9d2c7f0debec9d56e8b3b7cc8a8eb73361e
+Subproject commit 0d157fea7d1e4055abcb6453545f8bf326ce2279


From git at git.haskell.org  Tue Nov 17 22:28:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:28:56 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: backported AIX tweaks to Cabal (ed60ab4)
Message-ID: <20151117222856.921AC3A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/ed60ab4169c4409ebc08d0c3084a80263b171a82/ghc

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

commit ed60ab4169c4409ebc08d0c3084a80263b171a82
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:12:52 2015 +0100

    backported AIX tweaks to Cabal


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

ed60ab4169c4409ebc08d0c3084a80263b171a82
 libraries/Cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 4f6e9a5..a1d5b46 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 4f6e9a5b63640f4203560f3c7a89131fc66fdd7e
+Subproject commit a1d5b4647e6246dfe1a81bdddafb12af0aed9228


From git at git.haskell.org  Tue Nov 17 22:28:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:28:59 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: On AIX we need -D_BSD defined in
 <Stg.h> (bac953b)
Message-ID: <20151117222859.410373A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/bac953b23611fc2fb58a79bd2e432a947668c1b6/ghc

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

commit bac953b23611fc2fb58a79bd2e432a947668c1b6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:41:27 2015 +0100

    On AIX we need -D_BSD defined in <Stg.h>
    
    otherwise <math.h> includes <stdlib.h> which breaks compilation
    of .hc files


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

bac953b23611fc2fb58a79bd2e432a947668c1b6
 includes/Stg.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/includes/Stg.h b/includes/Stg.h
index f09fc00..35855b5 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -48,6 +48,11 @@
 // on Linux
 # define _BSD_SOURCE
 
+//# if aix_HOST_OS
+// On AIX we need _BSD defined, otherwise <math.h> includes <stdlib.h>
+#  define _BSD
+//# endif
+
 // '_BSD_SOURCE' is deprecated since glibc-2.20
 // in favour of '_DEFAULT_SOURCE'
 # define _DEFAULT_SOURCE


From git at git.haskell.org  Tue Nov 17 22:29:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:29:01 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: Make GHC aware of OSAIX and AixLD
 (da67465)
Message-ID: <20151117222901.DAFCF3A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/da67465b3102c75693714aaf89da2516588babd0/ghc

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

commit da67465b3102c75693714aaf89da2516588babd0
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:40:09 2015 +0100

    Make GHC aware of OSAIX and AixLD


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

da67465b3102c75693714aaf89da2516588babd0
 aclocal.m4                 | 10 ++++++++--
 compiler/main/DynFlags.hs  |  1 +
 compiler/main/SysTools.hs  |  4 ++++
 compiler/utils/Platform.hs |  2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 874e190..4242539 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -271,9 +271,12 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         nto-qnx)
             test -z "[$]2" || eval "[$]2=OSQNXNTO"
             ;;
-        dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
+        dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix)
             test -z "[$]2" || eval "[$]2=OSUnknown"
             ;;
+        aix)
+            test -z "[$]2" || eval "[$]2=OSAIX"
+            ;;
         linux-android)
             test -z "[$]2" || eval "[$]2=OSAndroid"
             ;;
@@ -2030,9 +2033,12 @@ case "$1-$2" in
         $3="linux"
         ;;
       # As far as I'm aware, none of these have relevant variants
-      freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+      freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|haiku)
         $3="$1"
         ;;
+      aix*) # e.g. powerpc-ibm-aix7.1.3.0
+        $3="aix"
+        ;;
       freebsd*) # like i686-gentoo-freebsd7
                 #      i686-gentoo-freebsd8
                 #      i686-gentoo-freebsd8.2
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 42ac14e..5b23ecc 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -4277,6 +4277,7 @@ data LinkerInfo
   | GnuGold  [Option]
   | DarwinLD [Option]
   | SolarisLD [Option]
+  | AixLD    [Option]
   | UnknownLD
   deriving Eq
 
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 8c3ab1a..311b45e 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -769,6 +769,7 @@ neededLinkArgs (GnuLD o)     = o
 neededLinkArgs (GnuGold o)   = o
 neededLinkArgs (DarwinLD o)  = o
 neededLinkArgs (SolarisLD o) = o
+neededLinkArgs (AixLD o)     = o
 neededLinkArgs UnknownLD     = []
 
 -- Grab linker info and cache it in DynFlags.
@@ -823,6 +824,9 @@ getLinkerInfo' dflags = do
                  -- precisely so we assume here, the Solaris linker is
                  -- used.
                  return $ SolarisLD []
+               OSAIX ->
+                 -- IBM AIX uses its own non-binutils linker as well
+                 return $ AixLD []
                OSDarwin ->
                  -- Darwin has neither GNU Gold or GNU LD, but a strange linker
                  -- that doesn't support --version. We can just assume that's
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
index 8f9a8de..4c3e894 100644
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -83,6 +83,7 @@ data OS
         | OSOsf3
         | OSQNXNTO
         | OSAndroid
+        | OSAIX
         deriving (Read, Show, Eq)
 
 -- | ARM Instruction Set Architecture, Extensions and ABI
@@ -127,6 +128,7 @@ osElfTarget OSOsf3      = False -- I don't know if this is right, but as
                                 -- per comment below it's safe
 osElfTarget OSQNXNTO    = False
 osElfTarget OSAndroid   = True
+osElfTarget OSAIX       = False
 osElfTarget OSUnknown   = False
  -- Defaulting to False is safe; it means don't rely on any
  -- ELF-specific functionality.  It is important to have a default for


From git at git.haskell.org  Tue Nov 17 22:29:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:29:04 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: We need to use -mminimal-toc on IBM AIX
 (e71cab2)
Message-ID: <20151117222904.838383A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/e71cab2663323415c15033c09fa5314b42ae47ef/ghc

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

commit e71cab2663323415c15033c09fa5314b42ae47ef
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 10:16:43 2015 +0100

    We need to use -mminimal-toc on IBM AIX
    
    AIX's XCOFF is limited to 16k entries in its TOC for 32bit compilation,
    which quickly overflows with GHC's code generation.
    
    Otoh, the Parser.hs module contains more entries than fit into a
    minimal-toc, so we need to switch back to `-mfull-toc` for that single
    module again.


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

e71cab2663323415c15033c09fa5314b42ae47ef
 aclocal.m4      | 6 ++++++
 compiler/ghc.mk | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index 4242539..8732e0e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -586,6 +586,12 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         $3="$$3 -fuse-ld=gold -Wl,-z,noexecstack"
         $4="$$4 -z noexecstack"
         ;;
+
+    powerpc-ibm-aix*)
+        $2="$$2 -mminimal-toc"
+        $3="$$3 -mminimal-toc"
+        ;;
+
     esac
 
     # If gcc knows about the stack protector, turn it off.
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 7bb72c2..b7dc1c9 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -381,6 +381,14 @@ endif
 compiler/stage2/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 compiler/stage3/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 
+# Parser.hc has so many symbols it overflows when using -mminimal-toc
+ifeq "$(HostOS_CPP)" "aix"
+compiler/stage1/build/Parser_HC_OPTS += -optc-mfull-toc
+endif
+ifeq "$(TargetOS_CPP)" "aix"
+compiler/stage2/build/Parser_HC_OPTS += -optc-mfull-toc
+compiler/stage3/build/Parser_HC_OPTS += -optc-mfull-toc
+endif
 
 ifeq "$(GhcProfiled)" "YES"
 # If we're profiling GHC then we want SCCs.  However, adding -auto-all


From git at git.haskell.org  Tue Nov 17 22:29:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:29:07 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: Workaround broken latin1 iconv on AIX
 (0cea7e3)
Message-ID: <20151117222907.2A7773A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/0cea7e326140094eeaa997377cf5c53afb949bd8/ghc

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

commit 0cea7e326140094eeaa997377cf5c53afb949bd8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 09:14:42 2015 +0100

    Workaround broken latin1 iconv on AIX


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

0cea7e326140094eeaa997377cf5c53afb949bd8
 libraries/base/GHC/IO/Encoding.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/base/GHC/IO/Encoding.hs b/libraries/base/GHC/IO/Encoding.hs
index a690717..6dfc9d0 100644
--- a/libraries/base/GHC/IO/Encoding.hs
+++ b/libraries/base/GHC/IO/Encoding.hs
@@ -237,6 +237,8 @@ mkTextEncoding e = case mb_coding_failure_mode of
 mkTextEncoding' :: CodingFailureMode -> String -> IO TextEncoding
 mkTextEncoding' cfm enc =
   case [toUpper c | c <- enc, c /= '-'] of
+  -- ISO8859-1 we can handle ourself
+    "ISO88591" -> return $ Latin1.mkLatin1 cfm
   -- UTF-8 and friends we can handle ourselves
     "UTF8"    -> return $ UTF8.mkUTF8 cfm
     "UTF16"   -> return $ UTF16.mkUTF16 cfm


From git at git.haskell.org  Tue Nov 17 22:29:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:29:09 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: Update unix submodule to pull in AIX
 fixes (b6fcbca)
Message-ID: <20151117222909.BB5483A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/b6fcbca0363c007813bd52d2d23a3d75226be31e/ghc

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

commit b6fcbca0363c007813bd52d2d23a3d75226be31e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 17 16:53:13 2015 +0100

    Update unix submodule to pull in AIX fixes


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

b6fcbca0363c007813bd52d2d23a3d75226be31e
 libraries/unix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/unix b/libraries/unix
index 4260c25..03632e3 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 4260c25687d3a4bc1ffacdacfbe7e47082ff2550
+Subproject commit 03632e32eb1d2e8f5d41ddc0f81bc6eff6a343c9


From git at git.haskell.org  Tue Nov 17 22:29:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:29:12 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: Make `timer_create(CLOCK_REALTIME)`
 autoconf test more reliable (3d5270d)
Message-ID: <20151117222912.56A123A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/3d5270d75ceef8ed0c82e077ad10d5d21247f03c/ghc

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

commit 3d5270d75ceef8ed0c82e077ad10d5d21247f03c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 17 15:30:56 2015 +0100

    Make `timer_create(CLOCK_REALTIME)` autoconf test more reliable
    
    I've noticed that on a platform with a coarse timer/scheduling
    granularity of 10ms this autoconf tests fails to detect a working
    `timer_create(CLOCK_REALTIME)`.
    
    On AIX, this effectively means that intervals/timers are rounded up to
    multiples of 10ms, so a 13ms delay is effectively a 20ms delay.
    
    By using a 100ms timeout we are on the safe side.
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1483
    
    (cherry picked from commit 8ad9e74f1f88d5c86d2e76f9992f9b2d267421d3)


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

3d5270d75ceef8ed0c82e077ad10d5d21247f03c
 aclocal.m4 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 8732e0e..67692e3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1772,17 +1772,18 @@ out:
         exit(2);
     }
 
+    tock = 0;
+
     it.it_value.tv_sec = 0;
-    it.it_value.tv_nsec = 1000000;
+    it.it_value.tv_nsec = 1000000; // 1ms
     it.it_interval = it.it_value;
     if (timer_settime(timer, 0, &it, NULL) != 0) {
         fprintf(stderr,"settime problem\n");
         exit(4);
     }
 
-    tock = 0;
-
-    usleep(3000);
+    // some environments have coarse scheduler/timer granularity of ~10ms and worse
+    usleep(100000); // 100ms
 
     if (!tock) {
         fprintf(stderr,"no CLOCK_REALTIME signal\n");


From git at git.haskell.org  Tue Nov 17 22:29:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:29:14 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: Set `THREAD_SAFE` CPP macro for AIX
 (9b987c3)
Message-ID: <20151117222914.EC1E43A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/9b987c3f929c80e0bf8d5bc2f7f41fa26b9ea9c3/ghc

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

commit 9b987c3f929c80e0bf8d5bc2f7f41fa26b9ea9c3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 17 23:25:03 2015 +0100

    Set `THREAD_SAFE` CPP macro for AIX
    
    The most important effect of this macro is unlocking a thread-safe
    `errno` which is essential for the threaded runtime.


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

9b987c3f929c80e0bf8d5bc2f7f41fa26b9ea9c3
 aclocal.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 67692e3..65ee2cd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -588,8 +588,9 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         ;;
 
     powerpc-ibm-aix*)
-        $2="$$2 -mminimal-toc"
-        $3="$$3 -mminimal-toc"
+        $2="$$2 -mminimal-toc -D_THREAD_SAFE"
+        $3="$$3 -mminimal-toc -D_THREAD_SAFE"
+        $5="$$5 -D_THREAD_SAFE"
         ;;
 
     esac


From git at git.haskell.org  Tue Nov 17 22:29:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:29:17 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix: WIP: local random AIX hacks (3c2fb6b)
Message-ID: <20151117222917.EDC1E3A300@ghc.haskell.org>

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/3c2fb6bbb5d5ae6dd6f22ac669e35c08d1d65ae2/ghc

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

commit 3c2fb6bbb5d5ae6dd6f22ac669e35c08d1d65ae2
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 10:19:37 2015 +0100

    WIP: local random AIX hacks


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

3c2fb6bbb5d5ae6dd6f22ac669e35c08d1d65ae2
 aclocal.m4                               |  4 ++--
 ghc.mk                                   |  5 +++++
 mk/build.mk-aix                          | 32 ++++++++++++++++++++++++++++++++
 utils/deriveConstants/DeriveConstants.hs |  2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 65ee2cd..11df1de 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -588,8 +588,8 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         ;;
 
     powerpc-ibm-aix*)
-        $2="$$2 -mminimal-toc -D_THREAD_SAFE"
-        $3="$$3 -mminimal-toc -D_THREAD_SAFE"
+        $2="$$2 -mcpu=power7 -mminimal-toc -D_THREAD_SAFE"
+        $3="$$3 -mcpu=power7 -mminimal-toc -D_THREAD_SAFE"
         $5="$$5 -D_THREAD_SAFE"
         ;;
 
diff --git a/ghc.mk b/ghc.mk
index 9aa0dc3..23bda65 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -556,6 +556,11 @@ endif
 BOOT_LIBS = $(foreach lib,$(PACKAGES_STAGE0),$(libraries/$(lib)_dist-boot_v_LIB))
 
 # ----------------------------------------
+# magic / HVR HACK XXX
+libraries/base_CONFIGURE_OPTS += --configure-option=--disable-largefile
+libraries/unix_CONFIGURE_OPTS += --configure-option=--disable-largefile
+
+# ----------------------------------------
 # Special magic for the ghc-prim package
 
 # We want the ghc-prim package to include the GHC.Prim module when it
diff --git a/mk/build.mk-aix b/mk/build.mk-aix
new file mode 100644
index 0000000..d0464a2
--- /dev/null
+++ b/mk/build.mk-aix
@@ -0,0 +1,32 @@
+GhcLibWays = v
+
+GhcUnregisterised    = YES
+GhcWithNativeCodeGen = NO
+GhcThreaded          = NO
+
+INTEGER_LIBRARY    = integer-simple
+Stage1Only         = YES
+#stage=1
+
+DYNAMIC_BY_DEFAULT   = NO
+DYNAMIC_GHC_PROGRAMS = NO
+
+SRC_HC_OPTS          = -O -H64m
+GhcStage1HcOpts      = -O
+GhcStage2HcOpts      = -O
+GhcHcOpts            = -Rghc-timing
+GhcLibHcOpts         = -O
+
+SplitObjs            = NO
+HADDOCK_DOCS         = NO
+BUILD_DOCBOOK_HTML   = NO
+BUILD_DOCBOOK_PS     = NO
+BUILD_DOCBOOK_PDF    = NO
+#GhcLibWays     += p
+
+# NoFib settings
+NoFibWays =
+STRIP_CMD = :
+
+#
+#compiler/stage2/build/Parser_HC_OPTS += -optc-mfull-toc
diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/DeriveConstants.hs
index ccf9028..c2eef33 100644
--- a/utils/deriveConstants/DeriveConstants.hs
+++ b/utils/deriveConstants/DeriveConstants.hs
@@ -662,7 +662,7 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram
          execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile])
          xs <- case os of
                  "openbsd" -> readProcess "/usr/bin/objdump" ["--syms", oFile] ""
-                 _         -> readProcess nmProgram ["-P", oFile] ""
+                 _         -> readProcess (nmProgram ++ "2") ["-P", oFile] ""
 
          let ls = lines xs
              ms = map parseNmLine ls


From git at git.haskell.org  Tue Nov 17 22:29:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 17 Nov 2015 22:29:20 +0000 (UTC)
Subject: [commit: ghc] wip/ghc710-aix's head updated: WIP: local random AIX
 hacks (3c2fb6b)
Message-ID: <20151117222920.4801B3A300@ghc.haskell.org>

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

Branch 'wip/ghc710-aix' now includes:

     1b1fab8 Call Arity: In "e x", the result of "x" is not shared
     9c8e7f8 PPC nativeGen: fix shift right arithmetic > 31 bit
     ed60ab4 backported AIX tweaks to Cabal
     0cea7e3 Workaround broken latin1 iconv on AIX
     da67465 Make GHC aware of OSAIX and AixLD
     bac953b On AIX we need -D_BSD defined in <Stg.h>
     e71cab2 We need to use -mminimal-toc on IBM AIX
     b6fcbca Update unix submodule to pull in AIX fixes
     3d5270d Make `timer_create(CLOCK_REALTIME)` autoconf test more reliable
     9b987c3 Set `THREAD_SAFE` CPP macro for AIX
     3c2fb6b WIP: local random AIX hacks

From git at git.haskell.org  Wed Nov 18 07:02:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 07:02:17 +0000 (UTC)
Subject: [commit: ghc] master: DynFlags: Don't list TemplateHaskell as
 supported if it's not (98a4fa5)
Message-ID: <20151118070217.B20603A300@ghc.haskell.org>

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

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

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

commit 98a4fa5fb740ce43a1787eb5730e35b463a2de79
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Wed Nov 18 07:56:30 2015 +0100

    DynFlags: Don't list TemplateHaskell as supported if it's not
    
    `-XTemplateHaskell` requires GHCi; don't show it in
    `--supported-extensions` if it's not supported.
    
    Together with https://github.com/haskell/cabal/issues/2644
    this allows to finally fix a long-standing annoyance in cabal
    of not being able to detect availability of TH in build-plans.
    
    Fixes #11102
    
    See also https://github.com/haskell/cabal/pull/2930 which provides
    emulation of this feature for older GHCs.
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1484


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

98a4fa5fb740ce43a1787eb5730e35b463a2de79
 compiler/main/DynFlags.hs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 45fb72e..3a93e02 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -3085,8 +3085,19 @@ supportedLanguageOverlays :: [String]
 supportedLanguageOverlays = map flagSpecName safeHaskellFlags
 
 supportedExtensions :: [String]
-supportedExtensions
-    = concatMap (\name -> [name, "No" ++ name]) (map flagSpecName xFlags)
+supportedExtensions = concatMap toFlagSpecNamePair xFlags
+  where
+    toFlagSpecNamePair flg
+#ifndef GHCI
+      -- make sure that `ghc --supported-extensions` omits
+      -- "TemplateHaskell" when it's known to be unsupported. See also
+      -- GHC #11102 for rationale
+      | flagSpecFlag flg == Opt_TemplateHaskell  = [noName]
+#endif
+      | otherwise = [name, noName]
+      where
+        noName = "No" ++ name
+        name = flagSpecName flg
 
 supportedLanguagesAndExtensions :: [String]
 supportedLanguagesAndExtensions =


From git at git.haskell.org  Wed Nov 18 08:27:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 08:27:27 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Wibbles (84a7e57)
Message-ID: <20151118082727.55E903A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/84a7e5715bc1d0852981625d163e9faaae7a4ef4/ghc

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

commit 84a7e5715bc1d0852981625d163e9faaae7a4ef4
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Nov 17 23:25:56 2015 +0000

    Wibbles


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

84a7e5715bc1d0852981625d163e9faaae7a4ef4
 compiler/typecheck/TcTyClsDecls.hs | 40 ++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 35bd67f..3a4547d 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -158,7 +158,12 @@ tcTyClGroup tyclds
            -- Do it before Step 4 (adding implicit things) because the latter
            -- expects well-formed TyCons
        ; traceTc "Starting validity check" (ppr tyclss)
-       ; tyclss <- mapM checkValidTyCl tyclss
+       ; tyclss <- tcExtendGlobalEnv tyclss $
+                       -- Hack alert: bring the generic default methods into
+                       -- scope so that we can look them up to check their
+                       -- validity.  This is really wrong.  We should store
+                       -- their type in the Class.  Trac #11105.
+                   mapM checkValidTyCl tyclss
        ; traceTc "Done validity check" (ppr tyclss)
        ; mapM_ (recoverM (return ()) . checkValidRoleAnnots role_annots) tyclss
            -- See Note [Check role annotations in a second pass]
@@ -172,19 +177,31 @@ tcTyClGroup tyclds
 zipRecTyClss :: [(Name, Kind)]
              -> [TyThing]           -- Knot-tied
              -> [(Name,TyThing)]
--- Build a name-TyThing mapping for the things bound by decls
--- being careful not to look at the [TyThing]
+-- Build a name-TyThing mapping for the TyCons bound by decls
+-- being careful not to look at the knot-tied [TyThing]
 -- The TyThings in the result list must have a visible ATyCon,
--- because typechecking types (in, say, tcTyClDecl) looks at this outer constructor
+-- because typechecking types (in, say, tcTyClDecl) looks at
+-- this outer constructor
 zipRecTyClss kind_pairs rec_things
   = [ (name, ATyCon (get name)) | (name, _kind) <- kind_pairs ]
   where
-    rec_type_env :: TypeEnv
-    rec_type_env = mkTypeEnv rec_things
+    rec_tc_env :: NameEnv TyCon
+    rec_tc_env = foldr add_tc emptyNameEnv rec_things
 
-    get name = case lookupTypeEnv rec_type_env name of
-                 Just (ATyCon tc) -> tc
-                 other            -> pprPanic "zipRecTyClss" (ppr name <+> ppr other)
+    add_tc :: TyThing -> NameEnv TyCon -> NameEnv TyCon
+    add_tc (ATyCon tc) env
+      | Just cls <- tyConClass_maybe tc
+      = foldr add_one_tc (add_one_tc tc env) (classATs cls)
+      | otherwise
+      = add_one_tc tc env
+    add_tc _ env = env
+
+    add_one_tc :: TyCon -> NameEnv TyCon -> NameEnv TyCon
+    add_one_tc tc env = extendNameEnv env (tyConName tc) tc
+
+    get name = case lookupNameEnv rec_tc_env name of
+                 Just tc -> tc
+                 other   -> pprPanic "zipRecTyClss" (ppr name <+> ppr other)
 
 {-
 ************************************************************************
@@ -644,10 +661,9 @@ tcTyClDecl1 _parent rec_info
                             , let gen_dm_ty = mkSigmaTy tvs'
                                                       [mkClassPred clas (mkTyVarTys tvs')]
                                                       gen_dm_tau
-                            ]
-             ; class_ats = map ATyCon (classATs clas) }
+                            ] }
 
-       ; return (ATyCon (classTyCon clas) : gen_dm_ids ++ class_ats ) }
+       ; return (ATyCon (classTyCon clas) : gen_dm_ids ) }
   where
     tc_fundep (tvs1, tvs2) = do { tvs1' <- mapM tcFdTyVar tvs1
                                 ; tvs2' <- mapM tcFdTyVar tvs2


From git at git.haskell.org  Wed Nov 18 10:02:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 10:02:45 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Wibble (181d00c)
Message-ID: <20151118100245.0ABB33A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/181d00c033a165a6df873f44f9b6287f245051e5/ghc

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

commit 181d00c033a165a6df873f44f9b6287f245051e5
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 18 10:02:42 2015 +0000

    Wibble


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

181d00c033a165a6df873f44f9b6287f245051e5
 testsuite/tests/typecheck/should_fail/T8030.stderr | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/testsuite/tests/typecheck/should_fail/T8030.stderr b/testsuite/tests/typecheck/should_fail/T8030.stderr
index 39ac86a..11adf8d 100644
--- a/testsuite/tests/typecheck/should_fail/T8030.stderr
+++ b/testsuite/tests/typecheck/should_fail/T8030.stderr
@@ -8,3 +8,15 @@ T8030.hs:9:3: error:
     When checking the class method:
       op1 :: forall (k :: BOX) (a :: k). C a => Pr a
     In the class declaration for ?C?
+
+T8030.hs:10:3: error:
+    Couldn't match type ?Pr a0? with ?Pr a?
+    NB: ?Pr? is a type function, and may not be injective
+    The type variable ?a0? is ambiguous
+    Expected type: Pr a -> Pr a -> Pr a
+      Actual type: Pr a0 -> Pr a0 -> Pr a0
+    In the ambiguity check for ?op2?
+    To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+    When checking the class method:
+      op2 :: forall (k :: BOX) (a :: k). C a => Pr a -> Pr a -> Pr a
+    In the class declaration for ?C?


From git at git.haskell.org  Wed Nov 18 11:34:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:34:37 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Wibbles plus update haddock
 submodule (560d70e)
Message-ID: <20151118113437.14A953A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/560d70ed04935054e8ac5dc2f0f3fc931c12125f/ghc

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

commit 560d70ed04935054e8ac5dc2f0f3fc931c12125f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 18 11:34:25 2015 +0000

    Wibbles plus update haddock submodule


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

560d70ed04935054e8ac5dc2f0f3fc931c12125f
 testsuite/tests/typecheck/should_run/T7861.stderr | 7 +++----
 utils/haddock                                     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/typecheck/should_run/T7861.stderr b/testsuite/tests/typecheck/should_run/T7861.stderr
index 80cc901..1183de1 100644
--- a/testsuite/tests/typecheck/should_run/T7861.stderr
+++ b/testsuite/tests/typecheck/should_run/T7861.stderr
@@ -1,9 +1,9 @@
 T7861: T7861.hs:10:5: error:
     Couldn't match type ?a? with ?[a]?
     ?a? is a rigid type variable bound by
-        the type signature for:
-          f :: (forall b. a) -> a
-        at T7861.hs:9:6
+      the type signature for:
+        f :: forall a. (forall b. a) -> a
+      at T7861.hs:9:6
     Expected type: (forall b. a) -> a
       Actual type: (forall b. a) -> [a]
     Relevant bindings include
@@ -11,4 +11,3 @@ T7861: T7861.hs:10:5: error:
     In the expression: doA
     In an equation for ?f?: f = doA
 (deferred type error)
-
diff --git a/utils/haddock b/utils/haddock
index 0d157fe..c122a76 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 0d157fea7d1e4055abcb6453545f8bf326ce2279
+Subproject commit c122a762c7839704644221a251cbe5ad3254f836


From git at git.haskell.org  Wed Nov 18 11:53:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:53:44 +0000 (UTC)
Subject: [commit: ghc] master: More import related hints (11e336e)
Message-ID: <20151118115344.8A21F3A300@ghc.haskell.org>

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

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

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

commit 11e336e4a4f7a0c0319d9bfb1a6931a5861299cf
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 18 12:18:17 2015 +0100

    More import related hints
    
    Now for unqualified imports. Improves upon #11071.
    
    Unfortunately, it seems that since 7.10, ghc will not print all
    out-of-scope errors.
    
    Test Plan: test suite updated
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1478
    
    GHC Trac Issues: #11071


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

11e336e4a4f7a0c0319d9bfb1a6931a5861299cf
 compiler/main/HscTypes.hs                          |  11 +-
 compiler/rename/RnEnv.hs                           | 222 +++++++++++----------
 compiler/rename/RnNames.hs                         |   1 +
 compiler/typecheck/TcErrors.hs                     |   3 +-
 .../tests/annotations/should_fail/annfail11.stderr |   8 +-
 testsuite/tests/module/mod114.stderr               |   5 +-
 testsuite/tests/module/mod124.stderr               |   5 +-
 testsuite/tests/module/mod125.stderr               |   5 +-
 testsuite/tests/module/mod126.stderr               |   5 +-
 testsuite/tests/module/mod127.stderr               |   5 +-
 testsuite/tests/module/mod130.stderr               |   2 +
 testsuite/tests/module/mod29.stderr                |   5 +-
 testsuite/tests/module/mod36.stderr                |   5 +-
 testsuite/tests/module/mod87.stderr                |   2 +
 testsuite/tests/module/mod97.stderr                |   2 +
 testsuite/tests/rename/should_fail/T11071a.hs      |  16 ++
 testsuite/tests/rename/should_fail/T11071a.stderr  |  26 +++
 testsuite/tests/rename/should_fail/all.T           |   1 +
 18 files changed, 212 insertions(+), 117 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 11e336e4a4f7a0c0319d9bfb1a6931a5861299cf

From git at git.haskell.org  Wed Nov 18 11:53:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:53:47 +0000 (UTC)
Subject: [commit: ghc] master: Disable failed specialisation warnings by
 default & update documentation. (f405e1e)
Message-ID: <20151118115347.3A9803A300@ghc.haskell.org>

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

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

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

commit f405e1e75cd845c436e51c934958560c0e401248
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Wed Nov 18 12:19:01 2015 +0100

    Disable failed specialisation warnings by default & update documentation.
    
    These were far too noisy to enable by default. In the future we will
    hopefully have a more variant of -Wall targetted at these sorts of
    diagnostics.
    
    In the interim I've pointed out the existence of these options in the
    release
    notes in hopes that people will discover them.
    
    Test Plan: Validate
    
    Reviewers: hvr, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1492


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

f405e1e75cd845c436e51c934958560c0e401248
 compiler/main/DynFlags.hs                   |  6 ++----
 docs/users_guide/7.12.1-notes.rst           |  7 +++++++
 docs/users_guide/using-warnings.rst         | 21 ++++++++++-----------
 testsuite/tests/ghci/scripts/T9293.stdout   |  4 ----
 testsuite/tests/ghci/scripts/ghci024.stdout |  1 -
 testsuite/tests/ghci/scripts/ghci057.stdout |  4 ----
 utils/mkUserGuidePart/Options/Warnings.hs   | 12 ++++++++++++
 7 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 3a93e02..655998e 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -3436,8 +3436,7 @@ standardWarnings -- see Note [Documenting warning flags]
         Opt_WarnAlternativeLayoutRuleTransitional,
         Opt_WarnUnsupportedLlvmVersion,
         Opt_WarnContextQuantification,
-        Opt_WarnTabs,
-        Opt_WarnMissedSpecs
+        Opt_WarnTabs
       ]
 
 minusWOpts :: [WarningFlag]
@@ -3465,8 +3464,7 @@ minusWallOpts
         Opt_WarnOrphans,
         Opt_WarnUnusedDoBind,
         Opt_WarnTrustworthySafe,
-        Opt_WarnUntickedPromotedConstructors,
-        Opt_WarnAllMissedSpecs
+        Opt_WarnUntickedPromotedConstructors
       ]
 
 enableUnusedBinds :: DynP ()
diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index d9ac18b..bd4f78b 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -108,6 +108,13 @@ Compiler
    Enabling ``-fworker-wrapper`` while strictness analysis is disabled (by
    ``-fno-strictness``) has no effect.
 
+-  Added the options ``-fwarn-missed-specialisations`` and
+   ``-fwarn-all-missed-specialisations``. When enabled, the simplifier will
+   produce a warning when a overloaded imported function cannot be
+   specialised (typically due to a missing ``INLINEABLE`` pragma). This
+   is intended to alert users to cases where they apply ``INLINEABLE`` but
+   may not get the speed-up they expect.
+
 GHCi
 ~~~~
 
diff --git a/docs/users_guide/using-warnings.rst b/docs/users_guide/using-warnings.rst
index 8cf329c..db57b18 100644
--- a/docs/users_guide/using-warnings.rst
+++ b/docs/users_guide/using-warnings.rst
@@ -158,17 +158,16 @@ command line.
        single: warnings
        single: pragmas
 
-    Emits a warning if GHC cannot specialise a function that is imported
-    and overloaded, usually because the function needs an ``INLINEABLE``
-    pragma.. The "all" form reports all such situations. The "non-all"
-    form only reports when the situation arises during specialisation of
-    an imported function; presumably teh latter was marked
-    ``INLINEABLE`` so that it would specialise but if it, in turn, calls
-    other functions that are not specialised you won't get the
-    performance boost you expect.
-
-    ``-fwarn-missed-specialisations`` is on by default;
-    ``-fwarn-all-missed-specialisations`` is implied by ``-Wall``.
+    Emits a warning if GHC cannot specialise an overloaded function, usually
+    because the function needs an ``INLINEABLE`` pragma. The "all" form reports
+    all such situations whereas the "non-all" form only reports when the
+    situation arises during specialisation of an imported function.
+
+    The "non-all" form is intended to catch cases where an imported function
+    that is marked as ``INLINEABLE`` (presumably to enable specialisation) cannot
+    be specialised as it calls other functions that are themselves not specialised.
+
+    These options are both off by default.
 
 ``-fwarn-warnings-deprecations``
     .. index::
diff --git a/testsuite/tests/ghci/scripts/T9293.stdout b/testsuite/tests/ghci/scripts/T9293.stdout
index 1dc12f1..67fc630 100644
--- a/testsuite/tests/ghci/scripts/T9293.stdout
+++ b/testsuite/tests/ghci/scripts/T9293.stdout
@@ -8,7 +8,6 @@ other dynamic, non-language, flag settings:
   -fno-ghci-history
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
 Should fail, GADTs is not enabled
 options currently set: none.
 base language is: Haskell2010
@@ -23,7 +22,6 @@ other dynamic, non-language, flag settings:
   -fno-ghci-history
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
 Should work, GADTs is in force from :set
 options currently set: none.
 base language is: Haskell2010
@@ -37,7 +35,6 @@ other dynamic, non-language, flag settings:
   -fno-ghci-history
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
 Should fail, GADTs is now disabled
 base language is: Haskell2010
 with the following modifiers:
@@ -53,6 +50,5 @@ other dynamic, non-language, flag settings:
   -fno-ghci-history
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
 Should fail, GADTs is only enabled at the prompt
 C :: T Int
diff --git a/testsuite/tests/ghci/scripts/ghci024.stdout b/testsuite/tests/ghci/scripts/ghci024.stdout
index 084f1ff..1624322 100644
--- a/testsuite/tests/ghci/scripts/ghci024.stdout
+++ b/testsuite/tests/ghci/scripts/ghci024.stdout
@@ -9,7 +9,6 @@ other dynamic, non-language, flag settings:
   -fforce-recomp
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
   -fno-warn-tabs
 ~~~~~~~~~~ Testing :set -a
 options currently set: none.
diff --git a/testsuite/tests/ghci/scripts/ghci057.stdout b/testsuite/tests/ghci/scripts/ghci057.stdout
index 1dc12f1..67fc630 100644
--- a/testsuite/tests/ghci/scripts/ghci057.stdout
+++ b/testsuite/tests/ghci/scripts/ghci057.stdout
@@ -8,7 +8,6 @@ other dynamic, non-language, flag settings:
   -fno-ghci-history
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
 Should fail, GADTs is not enabled
 options currently set: none.
 base language is: Haskell2010
@@ -23,7 +22,6 @@ other dynamic, non-language, flag settings:
   -fno-ghci-history
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
 Should work, GADTs is in force from :set
 options currently set: none.
 base language is: Haskell2010
@@ -37,7 +35,6 @@ other dynamic, non-language, flag settings:
   -fno-ghci-history
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
 Should fail, GADTs is now disabled
 base language is: Haskell2010
 with the following modifiers:
@@ -53,6 +50,5 @@ other dynamic, non-language, flag settings:
   -fno-ghci-history
   -fimplicit-import-qualified
 warning settings:
-  -fno-warn-missed-specialisations
 Should fail, GADTs is only enabled at the prompt
 C :: T Int
diff --git a/utils/mkUserGuidePart/Options/Warnings.hs b/utils/mkUserGuidePart/Options/Warnings.hs
index 688a7e6..593a20c 100644
--- a/utils/mkUserGuidePart/Options/Warnings.hs
+++ b/utils/mkUserGuidePart/Options/Warnings.hs
@@ -145,6 +145,18 @@ warningsOptions =
          , flagType = DynamicFlag
          , flagReverse = "-fno-warn-missing-local-sigs"
          }
+  , flag { flagName = "-fwarn-missed-specialisations"
+         , flagDescription =
+           "warn when specialisation of an imported, overloaded function fails."
+         , flagType = DynamicFlag
+         , flagReverse = "-fno-warn-missed-specialisations"
+         }
+  , flag { flagName = "-fwarn-all-missed-specialisations"
+         , flagDescription =
+           "warn when specialisation of any overloaded function fails."
+         , flagType = DynamicFlag
+         , flagReverse = "-fno-warn-all-missed-specialisations"
+         }
   , flag { flagName = "-fwarn-monomorphism-restriction"
          , flagDescription = "warn when the Monomorphism Restriction is applied"
          , flagType = DynamicFlag


From git at git.haskell.org  Wed Nov 18 11:53:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:53:49 +0000 (UTC)
Subject: [commit: ghc] master: rts: Kill PAPI support (6b3d5b5)
Message-ID: <20151118115349.EE8A63A300@ghc.haskell.org>

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

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

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

commit 6b3d5b5990b9b306e13575e60d7e1c8ce264b0ef
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Wed Nov 18 12:22:02 2015 +0100

    rts: Kill PAPI support
    
    This hasn't been used for a very long time and will soon be superceded
    by perf_events support.
    
    Test Plan: validate
    
    Reviewers: austin, simonmar
    
    Reviewed By: austin, simonmar
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1493


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

6b3d5b5990b9b306e13575e60d7e1c8ce264b0ef
 configure.ac                      |   6 -
 docs/users_guide/7.12.1-notes.rst |   2 +-
 includes/rts/Flags.h              |  26 ---
 mk/config.mk.in                   |   6 -
 rts/Papi.c                        | 396 --------------------------------------
 rts/Papi.h                        |  36 ----
 rts/RtsFlags.c                    |  71 -------
 rts/RtsStartup.c                  |  13 --
 rts/Stats.c                       |  48 +----
 rts/Stats.h                       |   8 +-
 rts/ghc.mk                        |  27 ---
 rts/package.conf.in               |   9 +-
 rts/posix/GetTime.c               |  29 +--
 rts/sm/GC.c                       |  18 --
 rts/sm/GCThread.h                 |   6 +-
 15 files changed, 13 insertions(+), 688 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6b3d5b5990b9b306e13575e60d7e1c8ce264b0ef

From git at git.haskell.org  Wed Nov 18 11:53:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:53:52 +0000 (UTC)
Subject: [commit: ghc] master: base: Documentation for TypeError (c945c90)
Message-ID: <20151118115352.95E3B3A300@ghc.haskell.org>

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

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

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

commit c945c90bd910b7e38abd2f98af7783eea281d8f8
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Wed Nov 18 12:22:58 2015 +0100

    base: Documentation for TypeError
    
    Test Plan: Read
    
    Reviewers: yav, hvr, austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1490


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

c945c90bd910b7e38abd2f98af7783eea281d8f8
 docs/users_guide/7.12.1-notes.rst |  2 ++
 libraries/base/GHC/TypeLits.hs    | 26 ++++++++++++++++++++++++++
 libraries/base/changelog.md       |  3 +++
 3 files changed, 31 insertions(+)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index 10ed77e..d52b066 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -227,6 +227,8 @@ base
   ``Applicative``. If this causes performance regressions, try to make the
   implementation of ``(*>)`` match that of ``(>>)``.
 
+- Add ``GHC.TypeLits.TypeError`` and ``ErrorMessage`` to allow users
+  to define custom compile-time error messages.
 
 binary
 ~~~~~~
diff --git a/libraries/base/GHC/TypeLits.hs b/libraries/base/GHC/TypeLits.hs
index f124017..0d9f4fe 100644
--- a/libraries/base/GHC/TypeLits.hs
+++ b/libraries/base/GHC/TypeLits.hs
@@ -215,6 +215,32 @@ data {-kind-} ErrorMessage = Text Symbol
 infixl 5 :$$:
 infixl 6 :<>:
 
+-- | The type-level equivalent of 'error'.
+--
+-- The polymorphic kind of this type allows it to be used in several settings.
+-- For instance, it can be used as a constraint, e.g. to provide a better error
+-- message for a non-existant instance,
+--
+-- @@
+-- -- in a context
+-- instance TypeError (Text "Cannot 'Show' functions." :$$:
+--                     Text "Perhaps there is a missing argument?")
+--       => Show (a -> b) where
+--     showsPrec = error "unreachable"
+-- @@
+--
+-- It can also be placed on the right-hand side of a type-level function
+-- to provide an error for an invalid case,
+--
+-- @@
+-- type family ByteSize x where
+--    ByteSize Word16   = 2
+--    ByteSize Word8    = 1
+--    ByteSize a        = TypeError (Text "The type " :<>: ShowType a :<>:
+--                                   Text " is not exportable.")
+-- @@
+--
+-- @since 4.9.0.0
 type family TypeError (a :: ErrorMessage) :: b where
 
 
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 74692a7..f7718fa 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -91,6 +91,9 @@
   * Add `MonadPlus IO` and `Alternative IO` instances
     (previously orphans in `transformers`) (#10755)
 
+  * Add `GHC.TypeLits.TypeError` and `ErrorMessage` to allow users
+    to define custom compile-time error messages.
+
 ## 4.8.2.0  *Oct 2015*
 
   * Bundled with GHC 7.10.3


From git at git.haskell.org  Wed Nov 18 11:53:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:53:55 +0000 (UTC)
Subject: [commit: ghc] master: Add -fwarn-missing-monadfail-instance to
 mkUserGuidePart (f9e17fd)
Message-ID: <20151118115355.3ECE43A300@ghc.haskell.org>

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

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

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

commit f9e17fd70d466fc00825f7324c944609f5c09251
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 18 12:20:35 2015 +0100

    Add -fwarn-missing-monadfail-instance to mkUserGuidePart


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

f9e17fd70d466fc00825f7324c944609f5c09251
 utils/mkUserGuidePart/Options/Warnings.hs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utils/mkUserGuidePart/Options/Warnings.hs b/utils/mkUserGuidePart/Options/Warnings.hs
index 593a20c..d3c2a5c 100644
--- a/utils/mkUserGuidePart/Options/Warnings.hs
+++ b/utils/mkUserGuidePart/Options/Warnings.hs
@@ -145,6 +145,13 @@ warningsOptions =
          , flagType = DynamicFlag
          , flagReverse = "-fno-warn-missing-local-sigs"
          }
+  , flag { flagName = "-fwarn-missing-monadfail-instance"
+         , flagDescription =
+           "warn when a failable pattern is used in a do-block that does not  "++
+           "have a ``MonadFail`` instance."
+         , flagType = DynamicFlag
+         , flagReverse = "-fno-warn-missing-monadfail-instance"
+         }
   , flag { flagName = "-fwarn-missed-specialisations"
          , flagDescription =
            "warn when specialisation of an imported, overloaded function fails."


From git at git.haskell.org  Wed Nov 18 11:53:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:53:57 +0000 (UTC)
Subject: [commit: ghc] master: docs: Ignore Sphinx doctrees produced by
 manpage build (112ce87)
Message-ID: <20151118115357.DAD163A300@ghc.haskell.org>

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

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

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

commit 112ce87444362f9f09e6a9ccf532f2ab5d80ad81
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Wed Nov 18 12:23:25 2015 +0100

    docs: Ignore Sphinx doctrees produced by manpage build
    
    Test Plan: Validate
    
    Reviewers: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1491


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

112ce87444362f9f09e6a9ccf532f2ab5d80ad81
 .gitignore              | 3 +--
 docs/users_guide/ghc.mk | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 322ae6a..a223f30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,8 +98,7 @@ _darcs/
 /docs/users_guide/users_guide.pdf
 /docs/users_guide/build-html
 /docs/users_guide/build-pdf
-/docs/users_guide/.doctrees-html
-/docs/users_guide/.doctrees-pdf
+/docs/users_guide/.doctrees-*
 /driver/ghci/ghc-pkg-inplace
 /driver/ghci/ghci-inplace
 /driver/ghci/ghci.res
diff --git a/docs/users_guide/ghc.mk b/docs/users_guide/ghc.mk
index 1d48fa1..deb60a3 100644
--- a/docs/users_guide/ghc.mk
+++ b/docs/users_guide/ghc.mk
@@ -27,7 +27,7 @@ MAN_PAGES := docs/users_guide/ghc.1
 
 ifneq "$(BINDIST)" "YES"
 $(MAN_PAGES): $(docs/users_guide_MAN_RST_SOURCES) $(utils/mkUserGuidePart_GENERATED_RST_SOURCES)
-	$(SPHINXBUILD) -b man docs/users_guide docs/users_guide
+	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide
 endif
 
 man : $(MAN_PAGES)


From git at git.haskell.org  Wed Nov 18 11:54:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:54:00 +0000 (UTC)
Subject: [commit: ghc] master: Improve MonadFail errors by mentioning the
 pattern (3ee0c14)
Message-ID: <20151118115400.860DD3A300@ghc.haskell.org>

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

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

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

commit 3ee0c143a7e3e474c2c8511174702ccb8441f8d9
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Wed Nov 18 12:23:57 2015 +0100

    Improve MonadFail errors by mentioning the pattern
    
    Example error message:
    
        MonadFailErrors.hs:16:5: error:
            Could not deduce (MonadFail m)
              arising from a do statement
                           with the failable pattern ?Just x?
    
    Depends on D1248
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1489


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

3ee0c143a7e3e474c2c8511174702ccb8441f8d9
 compiler/typecheck/TcMatches.hs                  |  8 +++++--
 compiler/typecheck/TcRnTypes.hs                  | 29 +++++++++++++++++++-----
 testsuite/tests/driver/T4437.hs                  |  1 -
 testsuite/tests/monadfail/MonadFailErrors.stderr | 24 +++++++++++++++-----
 testsuite/tests/rebindable/rebindable6.stderr    |  1 +
 5 files changed, 48 insertions(+), 15 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3ee0c143a7e3e474c2c8511174702ccb8441f8d9

From git at git.haskell.org  Wed Nov 18 11:54:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:54:03 +0000 (UTC)
Subject: [commit: ghc] master: relnotes: Update base version (a0f977e)
Message-ID: <20151118115403.2D7FF3A300@ghc.haskell.org>

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

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

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

commit a0f977efc2504b463dc930ff53b66f952ea99a20
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Nov 17 22:04:33 2015 +0100

    relnotes: Update base version


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

a0f977efc2504b463dc930ff53b66f952ea99a20
 docs/users_guide/7.12.1-notes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index d52b066..60f160c 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -198,7 +198,7 @@ array
 base
 ~~~~
 
--  Version number XXXXX (was 4.7.0.0)
+-  Version number 4.9.0.0 (was 4.7.0.0)
 
 -  A new module ``GHC.SrcLoc`` was added, exporting a new type
    ``SrcLoc``. A ``SrcLoc`` contains package, module, and file names, as


From git at git.haskell.org  Wed Nov 18 11:54:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 11:54:05 +0000 (UTC)
Subject: [commit: ghc] master: users-guide: Give links more contrast (2f7e895)
Message-ID: <20151118115405.CFEB53A300@ghc.haskell.org>

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

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

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

commit 2f7e895be83a3e73a0daef8de6638ba248a103a0
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 18 11:22:40 2015 +0100

    users-guide: Give links more contrast


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

2f7e895be83a3e73a0daef8de6638ba248a103a0
 docs/users_guide/ghc-theme/static/ghc-theme.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users_guide/ghc-theme/static/ghc-theme.css b/docs/users_guide/ghc-theme/static/ghc-theme.css
index 12b7f80..8ef5440 100644
--- a/docs/users_guide/ghc-theme/static/ghc-theme.css
+++ b/docs/users_guide/ghc-theme/static/ghc-theme.css
@@ -140,7 +140,7 @@ p {
 }
 
 a {
-    color: #428BCA;
+    color: #2b628c;
     text-decoration: none;
 }
 


From git at git.haskell.org  Wed Nov 18 12:06:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 12:06:47 +0000 (UTC)
Subject: [commit: ghc] master: users-guide: Use tango pygments style (8eefdf0)
Message-ID: <20151118120647.EC06D3A300@ghc.haskell.org>

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

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

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

commit 8eefdf0e5267c13fa0a7ffe6cc1743b2931abc35
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 18 13:06:50 2015 +0100

    users-guide: Use tango pygments style


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

8eefdf0e5267c13fa0a7ffe6cc1743b2931abc35
 docs/users_guide/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users_guide/conf.py b/docs/users_guide/conf.py
index eef8f4c..dd369b1 100644
--- a/docs/users_guide/conf.py
+++ b/docs/users_guide/conf.py
@@ -27,7 +27,7 @@ release = version  # The full version, including alpha/beta/rc tags.
 
 # Syntax highlighting
 highlight_language = 'haskell'
-pygments_style = 'colorful'
+pygments_style = 'tango'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.


From git at git.haskell.org  Wed Nov 18 12:54:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 12:54:52 +0000 (UTC)
Subject: [commit: ghc] master: users-guide: Fix typo in conf.py (02eb44d)
Message-ID: <20151118125452.762773A300@ghc.haskell.org>

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

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

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

commit 02eb44d42f265ff330044971d5d7f11fd16322b2
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 18 13:53:53 2015 +0100

    users-guide: Fix typo in conf.py
    
    inputenv /= inputenc


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

02eb44d42f265ff330044971d5d7f11fd16322b2
 docs/users_guide/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users_guide/conf.py b/docs/users_guide/conf.py
index dd369b1..e7c203b 100644
--- a/docs/users_guide/conf.py
+++ b/docs/users_guide/conf.py
@@ -62,7 +62,7 @@ htmlhelp_basename = 'GHCUsersGuide'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-    'inputenv': '',
+    'inputenc': '',
     'utf8extra': '',
     'preamble': '''
 \usepackage{fontspec}


From git at git.haskell.org  Wed Nov 18 13:45:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 13:45:49 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Accepting changes declared
 as benign (954389f)
Message-ID: <20151118134549.D4EE03A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/954389f2281392dd0b821292ac6f5d71333cb7e4/ghc

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

commit 954389f2281392dd0b821292ac6f5d71333cb7e4
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 18 13:45:33 2015 +0000

    Accepting changes declared as benign
    
    ..by Alan Zimmerman in person.


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

954389f2281392dd0b821292ac6f5d71333cb7e4
 .../tests/ghc-api/annotations/listcomps.stdout     |     3 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout | 59047 ++++++++++++++++++-
 2 files changed, 59048 insertions(+), 2 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 954389f2281392dd0b821292ac6f5d71333cb7e4

From git at git.haskell.org  Wed Nov 18 15:18:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 15:18:54 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: Change demand information for foreign calls
 (86318ff)
Message-ID: <20151118151854.81A2F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/86318ff9572a79819b02f9a79b855fa4d4a41df2/ghc

>---------------------------------------------------------------

commit 86318ff9572a79819b02f9a79b855fa4d4a41df2
Author: Luite Stegeman <stegeman at gmail.com>
Date:   Thu Nov 12 11:13:54 2015 +0100

    Change demand information for foreign calls
    
    Foreign calls may not be strict for lifted arguments. Fixes Trac #11076.
    
    Test Plan: ./validate
    
    Reviewers: simonpj, bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1464
    
    GHC Trac Issues: #11076


>---------------------------------------------------------------

86318ff9572a79819b02f9a79b855fa4d4a41df2
 compiler/basicTypes/MkId.hs                        |  5 ++++-
 testsuite/tests/stranal/should_run/T11076.hs       | 15 +++++++++++++++
 testsuite/tests/stranal/should_run/T11076.stdout   |  1 +
 testsuite/tests/stranal/should_run/T11076A.hs      | 21 +++++++++++++++++++++
 testsuite/tests/stranal/should_run/T11076_prim.cmm | 10 ++++++++++
 testsuite/tests/stranal/should_run/all.T           |  1 +
 testsuite/tests/stranal/sigs/T8598.stderr          |  2 +-
 7 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index c6161c5..c3a9f9a 100644
--- a/compiler/basicTypes/MkId.hs
+++ b/compiler/basicTypes/MkId.hs
@@ -941,8 +941,11 @@ mkFCallId dflags uniq fcall ty
     (_, tau)        = tcSplitForAllTys ty
     (arg_tys, _)    = tcSplitFunTys tau
     arity           = length arg_tys
-    strict_sig      = mkClosedStrictSig (replicate arity evalDmd) topRes
 
+    strict_sig      = mkClosedStrictSig (replicate arity topDmd) topRes
+    -- the call does not claim to be strict in its arguments, since they
+    -- may be lifted (foreign import prim) and the called code doen't
+    -- necessarily force them. See Trac #11076.
 {-
 ************************************************************************
 *                                                                      *
diff --git a/testsuite/tests/stranal/should_run/T11076.hs b/testsuite/tests/stranal/should_run/T11076.hs
new file mode 100644
index 0000000..f095cc1
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/T11076.hs
@@ -0,0 +1,15 @@
+{-
+   Test case for a problem where GHC had incorrect strictness
+   information for foreign calls with lifted arguments
+ -}
+{-# OPTIONS_GHC -O0 #-}
+module Main where
+
+import T11076A
+import Control.Exception
+x :: Bool
+x = error "OK: x has been forced"
+
+main :: IO ()
+main = print (testBool x) `catch`
+          \(ErrorCall e) -> putStrLn e -- x should be forced
diff --git a/testsuite/tests/stranal/should_run/T11076.stdout b/testsuite/tests/stranal/should_run/T11076.stdout
new file mode 100644
index 0000000..8a17d8b
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/T11076.stdout
@@ -0,0 +1 @@
+OK: x has been forced
diff --git a/testsuite/tests/stranal/should_run/T11076A.hs b/testsuite/tests/stranal/should_run/T11076A.hs
new file mode 100644
index 0000000..153a887
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/T11076A.hs
@@ -0,0 +1,21 @@
+{-# OPTIONS_GHC -O #-}
+{-# LANGUAGE MagicHash,
+             ForeignFunctionInterface,
+             UnliftedFFITypes,
+             GHCForeignImportPrim,
+             BangPatterns
+  #-}
+module T11076A where
+
+import GHC.Exts
+import Unsafe.Coerce
+
+{-
+   If the demand type for the foreign call argument is incorrectly strict,
+   the bang pattern can be optimized out
+ -}
+testBool :: Bool -> Int
+testBool !x = I# (cmm_testPrim (unsafeCoerce x))
+{-# INLINE testBool #-}
+
+foreign import prim "testPrim" cmm_testPrim :: Any -> Int#
diff --git a/testsuite/tests/stranal/should_run/T11076_prim.cmm b/testsuite/tests/stranal/should_run/T11076_prim.cmm
new file mode 100644
index 0000000..6e738a7
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/T11076_prim.cmm
@@ -0,0 +1,10 @@
+#include "Cmm.h"
+#include "MachDeps.h"
+
+testPrim(gcptr x)
+{
+  W_ a;
+  a = 123;
+  return (a);
+}
+
diff --git a/testsuite/tests/stranal/should_run/all.T b/testsuite/tests/stranal/should_run/all.T
index 8a82ce8..efd1afa 100644
--- a/testsuite/tests/stranal/should_run/all.T
+++ b/testsuite/tests/stranal/should_run/all.T
@@ -10,3 +10,4 @@ test('T7649', normal, compile_and_run, [''])
 test('T9254', normal, compile_and_run, [''])
 test('T10148', normal, compile_and_run, [''])
 test('T10218', normal, compile_and_run, [''])
+test('T11076', normal, multimod_compile_and_run, ['T11076.hs', 'T11076_prim.cmm'])
diff --git a/testsuite/tests/stranal/sigs/T8598.stderr b/testsuite/tests/stranal/sigs/T8598.stderr
index 8de5d31..a457cc5 100644
--- a/testsuite/tests/stranal/sigs/T8598.stderr
+++ b/testsuite/tests/stranal/sigs/T8598.stderr
@@ -1,5 +1,5 @@
 
 ==================== Strictness signatures ====================
-T8598.fun: <S(S),1*U(U)>m
+T8598.fun: <S,1*U(U)>m
 
 


From git at git.haskell.org  Wed Nov 18 15:18:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 15:18:57 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: x86 codegen: don't generate location comments
 (2bc3be7)
Message-ID: <20151118151857.871B53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/2bc3be72d52f29a9fd50a0f53ad977d2ec926841/ghc

>---------------------------------------------------------------

commit 2bc3be72d52f29a9fd50a0f53ad977d2ec926841
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Thu Oct 29 23:03:42 2015 +0000

    x86 codegen: don't generate location comments
    
    The following source snippet 'module A where x */* y = 42'
    when being compiled with '-g' option emits syntactically
    invalid comment for GNU as:
    
        .text
            .align 8
            .loc 1 3 1 /* */* */
    
    Fixed by not emitting comments at all. We already suppress
    all asm comments in 'X86/Ppr.hs'.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>
    
    Test Plan: added test and check it works
    
    Reviewers: scpmw, simonmar, austin, bgamari
    
    Reviewed By: simonmar
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1386
    
    GHC Trac Issues: #10667


>---------------------------------------------------------------

2bc3be72d52f29a9fd50a0f53ad977d2ec926841
 compiler/nativeGen/X86/Ppr.hs                    | 5 ++---
 testsuite/tests/codeGen/should_compile/T10667.hs | 6 ++++++
 testsuite/tests/codeGen/should_compile/all.T     | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs
index 7022e59..d76e1e9 100644
--- a/compiler/nativeGen/X86/Ppr.hs
+++ b/compiler/nativeGen/X86/Ppr.hs
@@ -506,9 +506,8 @@ pprInstr (COMMENT _) = empty -- nuke 'em
 pprInstr (COMMENT s) = ptext (sLit "# ") <> ftext s
 -}
 
-pprInstr (LOCATION file line col name)
-   = ptext (sLit "\t.loc ") <> ppr file <+> ppr line <+> ppr col <>
-     ptext (sLit " /* ") <> text name <> ptext (sLit " */")
+pprInstr (LOCATION file line col _name)
+   = ptext (sLit "\t.loc ") <> ppr file <+> ppr line <+> ppr col
 
 pprInstr (DELTA d)
    = pprInstr (COMMENT (mkFastString ("\tdelta = " ++ show d)))
diff --git a/testsuite/tests/codeGen/should_compile/T10667.hs b/testsuite/tests/codeGen/should_compile/T10667.hs
new file mode 100644
index 0000000..665c764
--- /dev/null
+++ b/testsuite/tests/codeGen/should_compile/T10667.hs
@@ -0,0 +1,6 @@
+module A where
+
+-- when used with '-g' debug generation option
+-- '*/*' leaked into a /* comment */ and broke
+-- GNU as.
+x */* y = 42
diff --git a/testsuite/tests/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T
index c78f9ac..ca71576 100644
--- a/testsuite/tests/codeGen/should_compile/all.T
+++ b/testsuite/tests/codeGen/should_compile/all.T
@@ -31,3 +31,4 @@ test('debug', extra_clean(['debug.cmm']),
      ['$MAKE -s --no-print-directory debug'])
 test('T9964', normal, compile, ['-O'])
 test('T10518', [cmm_src], compile, [''])
+test('T10667', normal, compile, ['-g'])


From git at git.haskell.org  Wed Nov 18 15:19:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 15:19:00 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: release notes: Note some known bugs (bc977c2)
Message-ID: <20151118151900.30C6C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/bc977c220eb5f25958bed58a0d4d7146e1208abb/ghc

>---------------------------------------------------------------

commit bc977c220eb5f25958bed58a0d4d7146e1208abb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 18 16:18:49 2015 +0100

    release notes: Note some known bugs


>---------------------------------------------------------------

bc977c220eb5f25958bed58a0d4d7146e1208abb
 docs/users_guide/7.10.3-notes.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/users_guide/7.10.3-notes.xml b/docs/users_guide/7.10.3-notes.xml
index e17d96a..358d9fc 100644
--- a/docs/users_guide/7.10.3-notes.xml
+++ b/docs/users_guide/7.10.3-notes.xml
@@ -85,6 +85,8 @@
           ARM support should be substantially more reliable as the compiler now
           takes precautions to avoid linking against Thumb code (<ulink
           href="https://ghc.haskell.org/trac/ghc/ticket/10375">Trac #10375</ulink>).
+          Unfortunately the fix involved breaking some configurations. See the
+          entry in the "Known Bugs" section below.
         </para>
       </listitem>
 
@@ -152,6 +154,30 @@
   <sect2>
     <title>Known bugs</title>
     <itemizedlist>
+      <listitem>
+        <para>
+            The <literal>Cabal</literal> release shipped with this GHC release lacks
+            support for response files, a mechanism used on Windows to workaround the
+            low command-line length limit on that platform. For this reason you
+            may experience line length issues when building Haddock documentation with Cabal
+            on Windows.
+        </para>
+        <para>
+          At the time of release there is a <ulink
+          href="https://github.com/haskell/cabal/commit/1c1228a808b55331ac1db6d71fd2f8533f5fc57e">fix</ulink>
+          in the <literal>Cabal</literal> upstream respository, although it is not yet
+          present in a release.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Unfortunately the fix for
+          <ulink href="https://ghc.haskell.org/trac/ghc/ticket/10375">Trac #10375</ulink>
+          required that support for the ARM Thumb instruction set be disabled.
+          See <ulink href="https://ghc.haskell.org/trac/ghc/ticket/11058">Trac
+          #11058</ulink> for details.
+        </para>
+      </listitem>
    </itemizedlist>
   </sect2>
 </sect1>


From git at git.haskell.org  Wed Nov 18 15:57:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 15:57:25 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (2d0e1db)
Message-ID: <20151118155725.53D923A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2d0e1db3e5d6400b50d349ec1fedc328c35c1af1/ghc

>---------------------------------------------------------------

commit 2d0e1db3e5d6400b50d349ec1fedc328c35c1af1
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 9 09:38:53 2015 +0000

    Comments only


>---------------------------------------------------------------

2d0e1db3e5d6400b50d349ec1fedc328c35c1af1
 compiler/typecheck/TcInteract.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs
index 47147d7..180ddd3 100644
--- a/compiler/typecheck/TcInteract.hs
+++ b/compiler/typecheck/TcInteract.hs
@@ -602,12 +602,13 @@ we keep?  More subtle than you might think!
          See Note [Solving superclass constraints] in TcInstDcls
 
        - Keep the one that has a non-trivial evidence binding.
-         Note [Tracking redundant constraints] again.
             Example:  f :: (Eq a, Ord a) => blah
-            then we may find [G] sc_sel (d1::Ord a) :: Eq a
+            then we may find [G] d3 :: Eq a
                              [G] d2 :: Eq a
+              with bindings  d3 = sc_sel (d1::Ord a)
             We want to discard d2 in favour of the superclass selection from
             the Ord dictionary.
+         Why? See Note [Tracking redundant constraints] in TcSimplify again.
 
   * Finally, when there is still a choice, use IRKeep rather than
     IRReplace, to avoid unnecessary munging of the inert set.


From git at git.haskell.org  Wed Nov 18 15:57:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 15:57:27 +0000 (UTC)
Subject: [commit: ghc] master: Comments on TcRnTypes.canDischarge (8e8d26a)
Message-ID: <20151118155727.ECC9F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8e8d26ace7576e4bd90eb342e1a175a00b730b12/ghc

>---------------------------------------------------------------

commit 8e8d26ace7576e4bd90eb342e1a175a00b730b12
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 18 13:51:35 2015 +0000

    Comments on TcRnTypes.canDischarge


>---------------------------------------------------------------

8e8d26ace7576e4bd90eb342e1a175a00b730b12
 compiler/typecheck/TcRnTypes.hs | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index b1d8d46..bbf77be 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -1879,7 +1879,8 @@ ctFlavourRole = ctEvFlavourRole . cc_ev
 ~~~~~~~~~~~~~~~~~~~
 (eqCanRewrite ct1 ct2) holds if the constraint ct1 (a CTyEqCan of form
 tv ~ ty) can be used to rewrite ct2.  It must satisfy the properties of
-a can-rewrite relation, see Definition [Can-rewrite relation]
+a can-rewrite relation, see Definition [Can-rewrite relation] in
+TcSMonad.
 
 With the solver handling Coercible constraints like equality constraints,
 the rewrite conditions must take role into account, never allowing
@@ -1905,7 +1906,8 @@ improvement works; see Note [The improvement story] in TcInteract.
 However, for now at least I'm only letting (Derived,NomEq) rewrite
 (Derived,NomEq) and not doing anything for ReprEq.  If we have
     eqCanRewriteFR (Derived, NomEq) (Derived, _)  = True
-then we lose the property of Note [Can-rewrite relation]
+then we lose property R2 of Definition [Can-rewrite relation]
+in TcSMonad
   R2.  If f1 >= f, and f2 >= f,
        then either f1 >= f2 or f2 >= f1
 Consider f1 = (Given, ReprEq)
@@ -1917,12 +1919,27 @@ we can; straight from the Wanteds during improvment. And from a Derived
 ReprEq we could conceivably get a Derived NomEq improvment (by decomposing
 a type constructor with Nomninal role), and hence unify.
 
-Note [canRewriteOrSame]
-~~~~~~~~~~~~~~~~~~~~~~~
-canRewriteOrSame is similar but
- * returns True for Wanted/Wanted.
- * works for all kinds of constraints, not just CTyEqCans
-See the call sites for explanations.
+Note [canDischarge]
+~~~~~~~~~~~~~~~~~~~
+(x1:c1 `canDischarge` x2:c2) returns True if we can use c1 to
+/discharge/ c2; that is, if we can simply drop (x2:c2) altogether,
+perhaps adding a binding for x2 in terms of x1.  We only ask this
+question in two cases:
+
+* Identical equality constraints:
+      (x1:s~t) `canDischarge` (xs:s~t)
+  In this case we can just drop x2 in favour of x1.
+
+* Function calls with the same LHS:
+    (x1:F ts ~ f1) `canDischarge` (x2:F ts ~ f2)
+  Here we can drop x2 in favour of x1, either unifying
+  f2 (if it's a flatten meta-var) or adding a new Given
+  (f1 ~ f2), if x2 is a Given.
+
+This is different from eqCanRewrite; for exammple, a Wanted
+can certainly discharge an identical Wanted.  So canDicharge
+does /not/ define a can-rewrite relation in the sense of
+Definition [Can-rewrite relation] in TcSMonad.
 -}
 
 eqCanRewrite :: CtEvidence -> CtEvidence -> Bool
@@ -1939,7 +1956,7 @@ eqCanRewriteFR (Derived, NomEq)   (Derived, NomEq)  = True
 eqCanRewriteFR _                 _                  = False
 
 canDischarge :: CtEvidence -> CtEvidence -> Bool
--- See Note [canRewriteOrSame]
+-- See Note [canDischarge]
 canDischarge ev1 ev2 = ctEvFlavourRole ev1 `canDischargeFR` ctEvFlavourRole ev2
 
 canDischargeFR :: CtFlavourRole -> CtFlavourRole -> Bool


From git at git.haskell.org  Wed Nov 18 15:57:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 15:57:30 +0000 (UTC)
Subject: [commit: ghc] master: Refactor HsExpr.RecordCon, RecordUpd (07eb258)
Message-ID: <20151118155730.A4F343A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/07eb258dfcbf8a67e4e931397128b7255356d19e/ghc

>---------------------------------------------------------------

commit 07eb258dfcbf8a67e4e931397128b7255356d19e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 18 15:57:13 2015 +0000

    Refactor HsExpr.RecordCon, RecordUpd
    
    This follows Matthew's patch making pattern synoyms work
    with records.
    
    This patch
     - replaces the (PostTc id [FieldLabel]) field of
       RecordCon with (PostTc id ConLike)
    
     - record-ises both RecordCon and RecordUpd, which
       both have quite a lot of fields.
    
    No change in behaviour


>---------------------------------------------------------------

07eb258dfcbf8a67e4e931397128b7255356d19e
 compiler/deSugar/Coverage.hs  | 20 ++++++++------------
 compiler/deSugar/DsExpr.hs    | 40 ++++++++++++++++++++++------------------
 compiler/deSugar/DsMeta.hs    |  4 ++--
 compiler/hsSyn/Convert.hs     |  9 ++-------
 compiler/hsSyn/HsExpr.hs      | 37 +++++++++++++++++++------------------
 compiler/hsSyn/PlaceHolder.hs |  1 +
 compiler/parser/RdrHsSyn.hs   | 20 ++++++++++++++++----
 compiler/rename/RnExpr.hs     | 13 +++++++------
 compiler/typecheck/TcExpr.hs  | 16 ++++++++++------
 compiler/typecheck/TcHsSyn.hs | 14 +++++++++-----
 10 files changed, 96 insertions(+), 78 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 07eb258dfcbf8a67e4e931397128b7255356d19e

From git at git.haskell.org  Wed Nov 18 16:31:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 16:31:09 +0000 (UTC)
Subject: [commit: ghc] master: Fix inconsistent pretty-printing of type
 families (c61759d)
Message-ID: <20151118163109.685A33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c61759d5917996a10b06a286eb5b776e4069e35c/ghc

>---------------------------------------------------------------

commit c61759d5917996a10b06a286eb5b776e4069e35c
Author: Micha? So?nicki <sosnicki.michal at gmail.com>
Date:   Wed Nov 18 16:02:53 2015 +0100

    Fix inconsistent pretty-printing of type families
    
    After the changes, the three functions used to print type families
    were identical, so they are refactored into one.
    
    Original RHSs of data instance declarations are recreated and
    printed in user error messages.
    
    RHSs containing representation TyCons are printed in the
    Coercion Axioms section in a typechecker dump.
    
    Add vbar to the list of SDocs exported by Outputable.
    Replace all text "|" docs with it.
    
    Fixes #10839
    
    Reviewers: goldfire, jstolarek, austin, bgamari
    
    Reviewed By: jstolarek
    
    Subscribers: jstolarek, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1441
    
    GHC Trac Issues: #10839


>---------------------------------------------------------------

c61759d5917996a10b06a286eb5b776e4069e35c
 compiler/basicTypes/DataCon.hs-boot                |  2 +
 compiler/coreSyn/CoreLint.hs                       | 12 ++--
 compiler/deSugar/DsUtils.hs                        |  2 +-
 compiler/hsSyn/HsDecls.hs                          |  2 +-
 compiler/hsSyn/HsExpr.hs                           | 10 +--
 compiler/iface/IfaceSyn.hs                         |  4 +-
 compiler/iface/LoadIface.hs                        |  7 +-
 compiler/nativeGen/Reg.hs                          |  5 +-
 compiler/nativeGen/SPARC/Ppr.hs                    |  2 +-
 compiler/typecheck/FamInst.hs                      | 12 ++--
 compiler/typecheck/TcInstDcls.hs                   |  3 +-
 compiler/typecheck/TcValidity.hs                   | 16 ++---
 compiler/types/Class.hs                            |  2 +-
 compiler/types/Coercion.hs                         | 42 +++++++-----
 compiler/types/TypeRep.hs                          | 18 ++++-
 compiler/utils/BooleanFormula.hs                   |  2 +-
 compiler/utils/Outputable.hs                       | 13 +++-
 compiler/utils/Pretty.hs                           |  8 ++-
 testsuite/tests/ghci/scripts/T6018ghcifail.stderr  | 56 ++++++++--------
 .../indexed-types/should_compile/T3017.stderr      |  3 +-
 .../indexed-types/should_compile/T9085.stderr      |  2 +-
 .../tests/indexed-types/should_fail/NoGood.stderr  |  4 +-
 .../tests/indexed-types/should_fail/Over.stderr    |  8 +--
 .../indexed-types/should_fail/SimpleFail11a.stderr |  8 +--
 .../indexed-types/should_fail/SimpleFail11b.stderr |  8 +--
 .../indexed-types/should_fail/SimpleFail11c.stderr |  8 +--
 .../indexed-types/should_fail/SimpleFail11d.stderr |  4 +-
 .../indexed-types/should_fail/SimpleFail2b.stderr  |  4 +-
 .../tests/indexed-types/should_fail/T2334A.stderr  |  4 +-
 .../tests/indexed-types/should_fail/T2677.stderr   |  4 +-
 .../tests/indexed-types/should_fail/T3330b.stderr  |  4 +-
 .../tests/indexed-types/should_fail/T4246.stderr   |  8 +--
 .../tests/indexed-types/should_fail/T9371.stderr   |  4 +-
 .../should_compile/DataFamilyInstanceLHS.stderr    |  3 +-
 .../should_compile/TypeFamilyInstanceLHS.stderr    |  6 +-
 testsuite/tests/polykinds/T7524.stderr             |  5 +-
 .../tests/roles/should_compile/Roles14.stderr      |  2 +-
 testsuite/tests/roles/should_compile/Roles3.stderr | 11 ++--
 testsuite/tests/roles/should_compile/Roles4.stderr |  5 +-
 testsuite/tests/roles/should_compile/T8958.stderr  |  3 +-
 testsuite/tests/th/T6018th.stderr                  |  4 +-
 .../tests/typecheck/should_compile/T6018.stderr    |  4 +-
 .../tests/typecheck/should_compile/tc231.stderr    |  3 +-
 .../tests/typecheck/should_compile/tc265.stderr    |  2 +-
 .../tests/typecheck/should_fail/T10836.stderr      |  8 +--
 .../tests/typecheck/should_fail/T6018fail.stderr   | 77 +++++++++++-----------
 .../typecheck/should_fail/T6018failclosed.stderr   | 33 +++++-----
 47 files changed, 261 insertions(+), 196 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c61759d5917996a10b06a286eb5b776e4069e35c

From git at git.haskell.org  Wed Nov 18 16:45:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 16:45:58 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11071' deleted
Message-ID: <20151118164558.85C203A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Deleted branch: wip/T11071

From git at git.haskell.org  Wed Nov 18 17:44:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 17:44:16 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Wibbles (43338e0)
Message-ID: <20151118174416.6D7143A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/43338e00a279e5f3f0ab22daa328c5cb7efe3cff/ghc

>---------------------------------------------------------------

commit 43338e00a279e5f3f0ab22daa328c5cb7efe3cff
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 18 17:44:22 2015 +0000

    Wibbles


>---------------------------------------------------------------

43338e00a279e5f3f0ab22daa328c5cb7efe3cff
 compiler/main/HscTypes.hs                  | 2 ++
 testsuite/tests/perf/compiler/T5837.stderr | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs
index 849c803..751b58d 100644
--- a/compiler/main/HscTypes.hs
+++ b/compiler/main/HscTypes.hs
@@ -1712,10 +1712,12 @@ implicitClassThings :: Class -> [TyThing]
 implicitClassThings cl
   = -- Does not include default methods, because those Ids may have
     --    their own pragmas, unfoldings etc, not derived from the Class object
+
     -- associated types
     --    No recursive call for the classATs, because they
     --    are only the family decls; they have no implicit things
     map ATyCon (classATs cl) ++
+
     -- superclass and operation selectors
     map AnId (classAllSelIds cl)
 
diff --git a/testsuite/tests/perf/compiler/T5837.stderr b/testsuite/tests/perf/compiler/T5837.stderr
index 7add7e3..324e817 100644
--- a/testsuite/tests/perf/compiler/T5837.stderr
+++ b/testsuite/tests/perf/compiler/T5837.stderr
@@ -1,5 +1,5 @@
 
-T5837.hs:8:6:
+T5837.hs:8:6: error:
     Reduction stack overflow; size = 51
     When simplifying the following type:
       TF
@@ -86,6 +86,6 @@ T5837.hs:8:6:
     (any upper bound you could choose might fail unpredictably with
      minor updates to GHC, so disabling the check is recommended if
      you're sure that type checking should terminate)
-    In the ambiguity check for the type signature for ?t?:
-      t :: forall a. (a ~ TF (a, Int)) => Int
-    In the type signature for ?t?: t :: (a ~ TF (a, Int)) => Int
+    In the ambiguity check for ?t?
+    In the type signature:
+      t :: (a ~ TF (a, Int)) => Int


From git at git.haskell.org  Wed Nov 18 22:13:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 22:13:41 +0000 (UTC)
Subject: [commit: ghc] master: users-guide: Move <h1> outside of <a> tag
 (cc79dd1)
Message-ID: <20151118221341.D706A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/cc79dd156c79068d1b9318a6b3ac7710a668fb47/ghc

>---------------------------------------------------------------

commit cc79dd156c79068d1b9318a6b3ac7710a668fb47
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Nov 18 17:42:46 2015 +0100

    users-guide: Move <h1> outside of <a> tag
    
    Otherwise the header extends across the entire body, increasing the
    chance that the user hits it instead of the "next" link below it.


>---------------------------------------------------------------

cc79dd156c79068d1b9318a6b3ac7710a668fb47
 docs/users_guide/ghc-theme/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users_guide/ghc-theme/layout.html b/docs/users_guide/ghc-theme/layout.html
index 0391543..fc5a6a5 100644
--- a/docs/users_guide/ghc-theme/layout.html
+++ b/docs/users_guide/ghc-theme/layout.html
@@ -11,7 +11,7 @@
 
 {% block relbar1 %}
 <div class="logo">
-    <a href="{{ pathto('index') }}"><h1>Glasgow Haskell Compiler Users Guide</h1></a>
+    <h1><a href="{{ pathto('index') }}">Glasgow Haskell Compiler Users Guide</a></h1>
 </div>
 {{ super() }}
 {% endblock %}


From git at git.haskell.org  Wed Nov 18 22:13:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 22:13:44 +0000 (UTC)
Subject: [commit: ghc] master: Correct &gt; to > in user's guide (971f2c9)
Message-ID: <20151118221344.87F793A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/971f2c9ddc4b1e3f2cfc2dbce7f0825448b975fd/ghc

>---------------------------------------------------------------

commit 971f2c9ddc4b1e3f2cfc2dbce7f0825448b975fd
Author: Reid Barton <rwbarton at gmail.com>
Date:   Wed Nov 18 23:12:05 2015 +0100

    Correct &gt; to > in user's guide
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1497


>---------------------------------------------------------------

971f2c9ddc4b1e3f2cfc2dbce7f0825448b975fd
 docs/users_guide/glasgow_exts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 70879b1..42f60bc 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -3801,10 +3801,10 @@ There are some other differences regarding what data types can have derived
    this data type::
 
        data E a where
-           E1 :: (a ~ Int) =&gt; a   -> E a
+           E1 :: (a ~ Int) => a   -> E a
            E2 ::              Int -> E Int
-           E3 :: (a ~ Int) =&gt; a   -> E Int
-           E4 :: (a ~ Int) =&gt; Int -> E a
+           E3 :: (a ~ Int) => a   -> E Int
+           E4 :: (a ~ Int) => Int -> E a
 
        deriving instance Foldable E
 


From git at git.haskell.org  Wed Nov 18 22:13:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 18 Nov 2015 22:13:47 +0000 (UTC)
Subject: [commit: ghc] master: Mention "-XMonadFailDesugaring" in the docs
 (a41830f)
Message-ID: <20151118221347.3D2883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a41830f2e82dd25a7bc9f1bc5e5b02cb0496c8f2/ghc

>---------------------------------------------------------------

commit a41830f2e82dd25a7bc9f1bc5e5b02cb0496c8f2
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Wed Nov 18 23:12:47 2015 +0100

    Mention "-XMonadFailDesugaring" in the docs
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1496


>---------------------------------------------------------------

a41830f2e82dd25a7bc9f1bc5e5b02cb0496c8f2
 compiler/main/DynFlags.hs         | 4 ++--
 docs/users_guide/glasgow_exts.rst | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 655998e..014a11e 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -504,7 +504,7 @@ data WarningFlag =
    | Opt_WarnContextQuantification
    | Opt_WarnWarningsDeprecations
    | Opt_WarnDeprecatedFlags
-   | Opt_WarnAMP
+   | Opt_WarnAMP -- Introduced in GHC 7.8, obsolete since 7.10
    | Opt_WarnMissingMonadFailInstance
    | Opt_WarnDodgyExports
    | Opt_WarnDodgyImports
@@ -2873,7 +2873,7 @@ fWarningFlags = [
   flagSpec "warn-alternative-layout-rule-transitional"
                                       Opt_WarnAlternativeLayoutRuleTransitional,
   flagSpec' "warn-amp"                        Opt_WarnAMP
-    (\_ -> deprecate "it has no effect, and will be removed in GHC 7.12"),
+    (\_ -> deprecate "it has no effect"),
   flagSpec' "warn-auto-orphans"               Opt_WarnAutoOrphans
     (\_ -> deprecate "it has no effect"),
   flagSpec "warn-deferred-type-errors"        Opt_WarnDeferredTypeErrors,
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 42f60bc..c88f7ba 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -1689,9 +1689,10 @@ New monadic failure desugaring mechanism
 .. index::
     single: -XMonadFailDesugaring option
 
-Switch desugaring of ``do``-blocks to use ``MonadFail.fail`` instead of
-``Monad.fail``. This will be the default behaviour in a future GHC release,
-under the MonadFail Proposal (MFP).
+The ``-XMonadFailDesugaring`` extension switches the desugaring of
+``do``-blocks to use ``MonadFail.fail`` instead of ``Monad.fail``. This will
+eventually be the default behaviour in a future GHC release, under the
+MonadFail Proposal (MFP).
 
 This extension is temporary, and will be deprecated in a future release. It is
 included so that library authors have a hard check for whether their code


From git at git.haskell.org  Thu Nov 19 09:50:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 09:50:35 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/D1500' created
Message-ID: <20151119095035.490B33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New branch : wip/D1500
Referencing: 44d9e639107b5353957cb0eb2075f5b4d3246111

From git at git.haskell.org  Thu Nov 19 09:50:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 09:50:37 +0000 (UTC)
Subject: [commit: ghc] wip/D1500: Make `derivedConstants` more
 crosscompile-friendly (60bf878)
Message-ID: <20151119095037.F33DD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/D1500
Link       : http://ghc.haskell.org/trac/ghc/changeset/60bf878cc3c6b592a6f6f2159d59a211c692678b/ghc

>---------------------------------------------------------------

commit 60bf878cc3c6b592a6f6f2159d59a211c692678b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 18 23:57:37 2015 +0100

    Make `derivedConstants` more crosscompile-friendly
    
    Summary:
    `derivedConstants` currently uses `System.Info.os` for decisions (which
    doesn't necessarily reflect the build-target), as well as hardcoding
    "/usr/bin/objdump" for openbsd.
    
    This patch auto-detects `objdump` similiar to how `nm` is detected via
    Autoconf as well as passing the target-os into `derivedConstants` via
    commandline.
    
    Reviewers: bgamari, austin
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1499


>---------------------------------------------------------------

60bf878cc3c6b592a6f6f2159d59a211c692678b
 configure.ac                  |  8 ++++++++
 includes/ghc.mk               |  4 ++++
 utils/deriveConstants/Main.hs | 40 +++++++++++++++++++++++++++-------------
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1e43896..99fd892 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,6 +478,12 @@ FP_ARG_WITH_PATH_GNU_PROG([NM], [nm], [nm])
 NmCmd="$NM"
 AC_SUBST([NmCmd])
 
+dnl ** Which objdump to use?
+dnl --------------------------------------------------------------
+FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([OBJDUMP], [objdump], [objdump])
+ObjdumpCmd="$OBJDUMP"
+AC_SUBST([ObjdumpCmd])
+
 dnl ** Which ar to use?
 dnl --------------------------------------------------------------
 FP_ARG_WITH_PATH_GNU_PROG([AR], [ar], [ar])
@@ -1152,6 +1158,8 @@ echo ["\
    hs-cpp       : $HaskellCPPCmd
    hs-cpp-flags : $HaskellCPPArgs
    ld           : $LdCmd
+   nm           : $NmCmd
+   objdump      : $ObjdumpCmd
    Happy        : $HappyCmd ($HappyVersion)
    Alex         : $AlexCmd ($AlexVersion)
    Perl         : $PerlCmd
diff --git a/includes/ghc.mk b/includes/ghc.mk
index 06f4912..e87a487 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -187,6 +187,10 @@ INSTALL_LIBS += $(includes_GHCCONSTANTS_HASKELL_VALUE)
 DERIVE_CONSTANTS_FLAGS += --gcc-program "$(WhatGccIsCalled)"
 DERIVE_CONSTANTS_FLAGS += $(addprefix --gcc-flag$(space),$(includes_CC_OPTS) -fcommon)
 DERIVE_CONSTANTS_FLAGS += --nm-program "$(NM)"
+ifneq "$(OBJDUMP)" ""
+DERIVE_CONSTANTS_FLAGS += --objdump-program "$(OBJDUMP)"
+endif
+DERIVE_CONSTANTS_FLAGS += --target-os "$(TargetOS_CPP)"
 
 ifneq "$(BINDIST)" "YES"
 $(includes_DERIVEDCONSTANTS):           $$(includes_H_CONFIG) $$(includes_H_PLATFORM) $$(includes_H_VERSION) $$(includes_H_FILES) $$(rts_H_FILES)
diff --git a/utils/deriveConstants/Main.hs b/utils/deriveConstants/Main.hs
index 00a9c1a..832d4bc 100644
--- a/utils/deriveConstants/Main.hs
+++ b/utils/deriveConstants/Main.hs
@@ -37,7 +37,6 @@ import System.Environment (getArgs)
 import System.Exit (ExitCode(ExitSuccess), exitFailure)
 import System.FilePath ((</>))
 import System.IO (stderr, hPutStrLn)
-import System.Info (os)
 import System.Process (showCommandForUser, readProcess, rawSystem)
 
 main :: IO ()
@@ -47,6 +46,11 @@ main = do opts <- parseArgs
                                     Nothing -> die ("No " ++ descr ++ " given")
           mode <- getOption "mode" o_mode
           fn <- getOption "output filename" o_outputFilename
+          os <- getOption "target os"   o_targetOS
+
+          let haskellWanteds = [ what | (wh, what) <- wanteds os
+                                      , wh `elem` [Haskell, Both] ]
+
           case mode of
               Gen_Haskell_Type     -> writeHaskellType     fn haskellWanteds
               Gen_Haskell_Wrappers -> writeHaskellWrappers fn haskellWanteds
@@ -57,7 +61,8 @@ main = do opts <- parseArgs
                      nmProg  <- getOption "nm program"  o_nmProg
                      let verbose = o_verbose opts
                          gccFlags = o_gccFlags opts
-                     rs <- getWanted verbose tmpdir gccProg gccFlags nmProg
+                     rs <- getWanted verbose os tmpdir gccProg gccFlags nmProg
+                                     (o_objdumpProg opts)
                      let haskellRs = [ what
                                      | (wh, what) <- rs
                                      , wh `elem` [Haskell, Both] ]
@@ -67,8 +72,6 @@ main = do opts <- parseArgs
                      case cm of
                          ComputeHaskell -> writeHaskellValue fn haskellRs
                          ComputeHeader  -> writeHeader       fn cRs
-    where haskellWanteds = [ what | (wh, what) <- wanteds,
-                                    wh `elem` [Haskell, Both] ]
 
 data Options = Options {
                    o_verbose :: Bool,
@@ -77,7 +80,9 @@ data Options = Options {
                    o_outputFilename :: Maybe FilePath,
                    o_gccProg :: Maybe FilePath,
                    o_gccFlags :: [String],
-                   o_nmProg :: Maybe FilePath
+                   o_nmProg :: Maybe FilePath,
+                   o_objdumpProg :: Maybe FilePath,
+                   o_targetOS :: Maybe String
                }
 
 parseArgs :: IO Options
@@ -91,7 +96,9 @@ parseArgs = do args <- getArgs
                              o_outputFilename = Nothing,
                              o_gccProg = Nothing,
                              o_gccFlags = [],
-                             o_nmProg = Nothing
+                             o_nmProg = Nothing,
+                             o_objdumpProg = Nothing,
+                             o_targetOS = Nothing
                          }
           f opts [] = return opts
           f opts ("-v" : args')
@@ -116,6 +123,10 @@ parseArgs = do args <- getArgs
               = f (opts {o_gccFlags = flag : o_gccFlags opts}) args'
           f opts ("--nm-program" : prog : args')
               = f (opts {o_nmProg = Just prog}) args'
+          f opts ("--objdump-program" : prog : args')
+              = f (opts {o_objdumpProg = Just prog}) args'
+          f opts ("--target-os" : os : args')
+              = f (opts {o_targetOS = Just os}) args'
           f _ (flag : _) = die ("Unrecognised flag: " ++ show flag)
 
 data Mode = Gen_Haskell_Type
@@ -283,8 +294,8 @@ haskellise :: Name -> Name
 haskellise (c : cs) = toLower c : cs
 haskellise "" = ""
 
-wanteds :: Wanteds
-wanteds = concat
+wanteds :: String -> Wanteds
+wanteds os = concat
           [-- Closure header sizes.
            constantWord Both "STD_HDR_SIZE"
                              -- grrr.. PROFILING is on so we need to
@@ -654,21 +665,22 @@ wanteds = concat
           ,constantNatural Haskell "ILDV_STATE_USE"    "LDV_STATE_USE"
           ]
 
-getWanted :: Bool -> FilePath -> FilePath -> [String] -> FilePath -> IO Results
-getWanted verbose tmpdir gccProgram gccFlags nmProgram
-    = do let cStuff = unlines (headers ++ concatMap (doWanted . snd) wanteds)
+getWanted :: Bool -> String -> FilePath -> FilePath -> [String] -> FilePath -> Maybe FilePath
+             -> IO Results
+getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
+    = do let cStuff = unlines (headers ++ concatMap (doWanted . snd) (wanteds os))
              cFile = tmpdir </> "tmp.c"
              oFile = tmpdir </> "tmp.o"
          writeFile cFile cStuff
          execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile])
          xs <- case os of
-                 "openbsd" -> readProcess "/usr/bin/objdump" ["--syms", oFile] ""
+                 "openbsd" -> readProcess objdumpProgam ["--syms", oFile] ""
                  _         -> readProcess nmProgram ["-P", oFile] ""
 
          let ls = lines xs
              ms = map parseNmLine ls
              m = Map.fromList $ catMaybes ms
-         rs <- mapM (lookupResult m) wanteds
+         rs <- mapM (lookupResult m) (wanteds os)
          return rs
     where headers = ["#define IN_STG_CODE 0",
                      "",
@@ -698,6 +710,8 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram
                      "#pragma GCC poison sizeof"
                      ]
 
+          objdumpProgam = maybe (error "no objdump program given") id mobjdumpProgram
+
           prefix = "derivedConstant"
           mkFullName name = prefix ++ name
 


From git at git.haskell.org  Thu Nov 19 09:50:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 09:50:40 +0000 (UTC)
Subject: [commit: ghc] wip/D1500: derivedConstants: Add support for AIX
 (44d9e63)
Message-ID: <20151119095040.952E33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/D1500
Link       : http://ghc.haskell.org/trac/ghc/changeset/44d9e639107b5353957cb0eb2075f5b4d3246111/ghc

>---------------------------------------------------------------

commit 44d9e639107b5353957cb0eb2075f5b4d3246111
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Nov 19 10:50:20 2015 +0100

    derivedConstants: Add support for AIX
    
    Summary:
    On IBM AIX `nm` doesn't support reporting symbol sizes, so we need to
    resort to `objdump` instead, which has a peculiar output format on AIX.
    
    depends on D1499
    
    Reviewers: bgamari, austin
    
    Subscribers: kgardas, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1500


>---------------------------------------------------------------

44d9e639107b5353957cb0eb2075f5b4d3246111
 utils/deriveConstants/Main.hs | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/utils/deriveConstants/Main.hs b/utils/deriveConstants/Main.hs
index 832d4bc..09c94ab 100644
--- a/utils/deriveConstants/Main.hs
+++ b/utils/deriveConstants/Main.hs
@@ -675,11 +675,13 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
          execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile])
          xs <- case os of
                  "openbsd" -> readProcess objdumpProgam ["--syms", oFile] ""
+                 "aix"     -> readProcess objdumpProgam ["--syms", oFile] ""
                  _         -> readProcess nmProgram ["-P", oFile] ""
 
          let ls = lines xs
-             ms = map parseNmLine ls
-             m = Map.fromList $ catMaybes ms
+             m = Map.fromList $ case os of
+                 "aix" -> parseAixObjdump ls
+                 _     -> catMaybes $ map parseNmLine ls
          rs <- mapM (lookupResult m) (wanteds os)
          return rs
     where headers = ["#define IN_STG_CODE 0",
@@ -764,6 +766,28 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
                         (Just name, [(size, "")]) -> Just (name, size)
                         _ -> Nothing
 
+          -- On AIX, `nm` isn't able to tell us the symbol size, so we
+          -- need to use `objdump --syms`. However, unlike on OpenBSD,
+          -- `objdump --syms` outputs entries spanning two lines, e.g.
+          --
+          -- [ 50](sec  3)(fl 0x00)(ty   0)(scl   2) (nx 1) 0x00000318 derivedConstantBLOCK_SIZE
+          -- AUX val  4097 prmhsh 0 snhsh 0 typ 3 algn 3 clss 5 stb 0 snstb 0
+          --
+          parseAixObjdump :: [String] -> [(String,Integer)]
+          parseAixObjdump = catMaybes . goAix
+            where
+              goAix (l1@('[':_):l2@('A':'U':'X':_):ls')
+                  = parseObjDumpEntry l1 l2 : goAix ls'
+              goAix (_:ls') = goAix ls'
+              goAix [] = []
+
+              parseObjDumpEntry l1 l2
+                  | ["val",n] <- take 2 (tail $ words l2)
+                  , Just sym <- stripPrefix prefix sym0 = Just (sym, read n)
+                  | otherwise = Nothing
+                where
+                  [sym0, adr] = take 2 (reverse $ words l1)
+
           -- If an Int value is larger than 2^28 or smaller
           -- than -2^28, then fail.
           -- This test is a bit conservative, but if any


From git at git.haskell.org  Thu Nov 19 11:29:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 11:29:10 +0000 (UTC)
Subject: [commit: ghc] master: Release Notes: Mention out-of-scope error
 message improvements (a586622)
Message-ID: <20151119112910.83D303A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a586622c5386610e8ceffca7ef1efdf33d753587/ghc

>---------------------------------------------------------------

commit a586622c5386610e8ceffca7ef1efdf33d753587
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Nov 19 00:05:50 2015 +0100

    Release Notes: Mention out-of-scope error message improvements
    
    Summary: as implemented for #11071.
    
    Differential Revision: https://phabricator.haskell.org/D1498


>---------------------------------------------------------------

a586622c5386610e8ceffca7ef1efdf33d753587
 docs/users_guide/7.12.1-notes.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index 60f160c..6364219 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -115,6 +115,9 @@ Compiler
    is intended to alert users to cases where they apply ``INLINEABLE`` but
    may not get the speed-up they expect.
 
+-  When printing an out-of-scope error message, GHC will give helpful advice if
+   the error might be caused by too restrictive imports.
+
 GHCi
 ~~~~
 


From git at git.haskell.org  Thu Nov 19 12:24:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 12:24:31 +0000 (UTC)
Subject: [commit: ghc] master: Fix broken build-system when libffi uses
 install-sh (3e2a4ee)
Message-ID: <20151119122431.E90AA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3e2a4eefbed7002437c3f3ee340832a42f0b37f8/ghc

>---------------------------------------------------------------

commit 3e2a4eefbed7002437c3f3ee340832a42f0b37f8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Nov 19 12:21:04 2015 +0100

    Fix broken build-system when libffi uses install-sh
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1494
    
    GHC Trac Issues: #11109


>---------------------------------------------------------------

3e2a4eefbed7002437c3f3ee340832a42f0b37f8
 libffi/ghc.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index a37e3be..19b6f43 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -79,6 +79,11 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
 	mv libffi/build/Makefile.in libffi/build/Makefile.in.orig
 	sed 's:@toolexeclibdir@:$$(libdir):g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in
 
+	# install-sh is used when /usr/bin/install is missing; ensure its
+	# path in libffi's Makefile is correct. See GHC #11109.
+	mv libffi/build/Makefile.in libffi/build/Makefile.in.orig
+	sed 's:@INSTALL@:$$(subst ../install-sh,$(TOP)/install-sh, at INSTALL@):g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in
+
 # * Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
 #   warnings off or the compilation of libffi might fail due to warnings;
 #   hence the -w flags.


From git at git.haskell.org  Thu Nov 19 12:24:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 12:24:34 +0000 (UTC)
Subject: [commit: ghc] master: Fix interaction of DuplicateRecordFields and
 GHC.Generics (2442038)
Message-ID: <20151119122434.DE2883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2442038554440923179d532137199d5290875cff/ghc

>---------------------------------------------------------------

commit 2442038554440923179d532137199d5290875cff
Author: Adam Gundry <adam at well-typed.com>
Date:   Thu Nov 19 12:53:46 2015 +0100

    Fix interaction of DuplicateRecordFields and GHC.Generics
    
    This prevents GHC.Generics from exposing mangled selector names
    when used on a datatype defined with DuplicateRecordFields enabled.
    
    Test Plan:
    New test overloadedrecflds_generics, which tests that both
    GHC.Generics and Data.Data use the correct field labels, not mangled
    names.
    
    Reviewers: kosmikus, simonpj, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1486


>---------------------------------------------------------------

2442038554440923179d532137199d5290875cff
 compiler/typecheck/TcGenGenerics.hs                |  4 +-
 testsuite/tests/overloadedrecflds/should_run/all.T |  1 +
 .../should_run/overloadedrecflds_generics.hs       | 49 ++++++++++++++++++++++
 .../should_run/overloadedrecflds_generics.stdout   |  4 ++
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcGenGenerics.hs b/compiler/typecheck/TcGenGenerics.hs
index 9a1c506..acb39de 100644
--- a/compiler/typecheck/TcGenGenerics.hs
+++ b/compiler/typecheck/TcGenGenerics.hs
@@ -737,7 +737,7 @@ mkBindsMetaD fix_env tycon = (dtBinds, allConBinds, allSelBinds)
         loc           = srcLocSpan (getSrcLoc tycon)
         mkStringLHS s = [mkSimpleHsAlt nlWildPat (nlHsLit (mkHsString s))]
         datacons      = tyConDataCons tycon
-        datasels      = map (map flSelector . dataConFieldLabels) datacons
+        datasels      = map dataConFieldLabels datacons
 
         tyConName_user = case tyConFamInst_maybe tycon of
                            Just (ptycon, _) -> tyConName ptycon
@@ -756,7 +756,7 @@ mkBindsMetaD fix_env tycon = (dtBinds, allConBinds, allSelBinds)
         conFixity_matches   c = [mkSimpleHsAlt nlWildPat (fixity c)]
         conIsRecord_matches _ = [mkSimpleHsAlt nlWildPat (nlHsVar true_RDR)]
 
-        selName_matches     s = mkStringLHS (occNameString (nameOccName s))
+        selName_matches    fl = mkStringLHS (unpackFS (flLabel fl))
 
 
 --------------------------------------------------------------------------------
diff --git a/testsuite/tests/overloadedrecflds/should_run/all.T b/testsuite/tests/overloadedrecflds/should_run/all.T
index 21391ac..019a1ef 100644
--- a/testsuite/tests/overloadedrecflds/should_run/all.T
+++ b/testsuite/tests/overloadedrecflds/should_run/all.T
@@ -8,6 +8,7 @@ test('overloadedrecfldsrun03', normal, compile_and_run, [''])
 test('overloadedrecfldsrun04', normal, compile_and_run, [''])
 test('overloadedrecfldsrun05', normal, compile_and_run, [''])
 test('overloadedrecfldsrun06', normal, compile_and_run, [''])
+test('overloadedrecflds_generics', normal, compile_and_run, [''])
 test('overloadedlabelsrun01', normal, compile_and_run, [''])
 test('overloadedlabelsrun02', normal, compile_and_run, [''])
 test('overloadedlabelsrun03', normal, compile_and_run, [''])
diff --git a/testsuite/tests/overloadedrecflds/should_run/overloadedrecflds_generics.hs b/testsuite/tests/overloadedrecflds/should_run/overloadedrecflds_generics.hs
new file mode 100644
index 0000000..987a24f
--- /dev/null
+++ b/testsuite/tests/overloadedrecflds/should_run/overloadedrecflds_generics.hs
@@ -0,0 +1,49 @@
+-- Test that DuplicateRecordFields doesn't affect the metadata
+-- generated by GHC.Generics or Data.Data
+
+-- Based on a Stack Overflow post by bennofs
+-- (http://stackoverflow.com/questions/24474581)
+-- licensed under cc by-sa 3.0
+
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE TypeFamilies #-}
+
+import GHC.Generics
+import Data.Data
+import Data.Proxy
+
+type family FirstSelector (f :: * -> *) :: *
+type instance FirstSelector (M1 D x f) = FirstSelector f
+type instance FirstSelector (M1 C x f) = FirstSelector f
+type instance FirstSelector (a :*: b)  = FirstSelector a
+type instance FirstSelector (M1 S s f) = s
+
+data SelectorProxy s (f :: * -> *) a = SelectorProxy
+type SelectorProxy' s = SelectorProxy s Proxy ()
+
+-- Extract the first selector name using GHC.Generics
+firstSelectorName :: forall a. Selector (FirstSelector (Rep a))
+                  => Proxy a -> String
+firstSelectorName _ =
+    selName (SelectorProxy :: SelectorProxy' (FirstSelector (Rep a)))
+
+-- Extract the list of selector names for a constructor using Data.Data
+selectorNames :: Data a => a -> [String]
+selectorNames = constrFields . toConstr
+
+data T = MkT { foo :: Int } deriving (Data, Generic)
+data U = MkU { foo :: Int, bar :: Bool } deriving (Data, Generic)
+
+main = do -- This should yield "foo", not "$sel:foo:MkT"
+          print (firstSelectorName (Proxy :: Proxy T))
+          -- Similarly this should yield "foo"
+          print (firstSelectorName (Proxy :: Proxy U))
+          -- This should yield ["foo"]
+          print (selectorNames (MkT 3))
+          -- And this should yield ["foo","bar"]
+          print (selectorNames (MkU 3 True))
diff --git a/testsuite/tests/overloadedrecflds/should_run/overloadedrecflds_generics.stdout b/testsuite/tests/overloadedrecflds/should_run/overloadedrecflds_generics.stdout
new file mode 100644
index 0000000..7212e4f
--- /dev/null
+++ b/testsuite/tests/overloadedrecflds/should_run/overloadedrecflds_generics.stdout
@@ -0,0 +1,4 @@
+"foo"
+"foo"
+["foo"]
+["foo","bar"]


From git at git.haskell.org  Thu Nov 19 12:24:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 12:24:37 +0000 (UTC)
Subject: [commit: ghc] master: Make `derivedConstants` more
 crosscompile-friendly (65d7ff0)
Message-ID: <20151119122437.802093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/65d7ff06573f8c55ec98b43059f7abffae79d8c3/ghc

>---------------------------------------------------------------

commit 65d7ff06573f8c55ec98b43059f7abffae79d8c3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Nov 19 12:54:54 2015 +0100

    Make `derivedConstants` more crosscompile-friendly
    
    `derivedConstants` currently uses `System.Info.os` for decisions (which
    doesn't necessarily reflect the build-target), as well as hardcoding
    "/usr/bin/objdump" for openbsd.
    
    This patch auto-detects `objdump` similiar to how `nm` is detected via
    Autoconf as well as passing the target-os into `derivedConstants` via
    commandline.
    
    Reviewers: austin, kgardas, erikd, bgamari
    
    Reviewed By: kgardas, erikd, bgamari
    
    Subscribers: kgardas, thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1499


>---------------------------------------------------------------

65d7ff06573f8c55ec98b43059f7abffae79d8c3
 configure.ac                  |  8 ++++++++
 includes/ghc.mk               |  4 ++++
 utils/deriveConstants/Main.hs | 40 +++++++++++++++++++++++++++-------------
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1e43896..99fd892 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,6 +478,12 @@ FP_ARG_WITH_PATH_GNU_PROG([NM], [nm], [nm])
 NmCmd="$NM"
 AC_SUBST([NmCmd])
 
+dnl ** Which objdump to use?
+dnl --------------------------------------------------------------
+FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([OBJDUMP], [objdump], [objdump])
+ObjdumpCmd="$OBJDUMP"
+AC_SUBST([ObjdumpCmd])
+
 dnl ** Which ar to use?
 dnl --------------------------------------------------------------
 FP_ARG_WITH_PATH_GNU_PROG([AR], [ar], [ar])
@@ -1152,6 +1158,8 @@ echo ["\
    hs-cpp       : $HaskellCPPCmd
    hs-cpp-flags : $HaskellCPPArgs
    ld           : $LdCmd
+   nm           : $NmCmd
+   objdump      : $ObjdumpCmd
    Happy        : $HappyCmd ($HappyVersion)
    Alex         : $AlexCmd ($AlexVersion)
    Perl         : $PerlCmd
diff --git a/includes/ghc.mk b/includes/ghc.mk
index 06f4912..e87a487 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -187,6 +187,10 @@ INSTALL_LIBS += $(includes_GHCCONSTANTS_HASKELL_VALUE)
 DERIVE_CONSTANTS_FLAGS += --gcc-program "$(WhatGccIsCalled)"
 DERIVE_CONSTANTS_FLAGS += $(addprefix --gcc-flag$(space),$(includes_CC_OPTS) -fcommon)
 DERIVE_CONSTANTS_FLAGS += --nm-program "$(NM)"
+ifneq "$(OBJDUMP)" ""
+DERIVE_CONSTANTS_FLAGS += --objdump-program "$(OBJDUMP)"
+endif
+DERIVE_CONSTANTS_FLAGS += --target-os "$(TargetOS_CPP)"
 
 ifneq "$(BINDIST)" "YES"
 $(includes_DERIVEDCONSTANTS):           $$(includes_H_CONFIG) $$(includes_H_PLATFORM) $$(includes_H_VERSION) $$(includes_H_FILES) $$(rts_H_FILES)
diff --git a/utils/deriveConstants/Main.hs b/utils/deriveConstants/Main.hs
index 00a9c1a..832d4bc 100644
--- a/utils/deriveConstants/Main.hs
+++ b/utils/deriveConstants/Main.hs
@@ -37,7 +37,6 @@ import System.Environment (getArgs)
 import System.Exit (ExitCode(ExitSuccess), exitFailure)
 import System.FilePath ((</>))
 import System.IO (stderr, hPutStrLn)
-import System.Info (os)
 import System.Process (showCommandForUser, readProcess, rawSystem)
 
 main :: IO ()
@@ -47,6 +46,11 @@ main = do opts <- parseArgs
                                     Nothing -> die ("No " ++ descr ++ " given")
           mode <- getOption "mode" o_mode
           fn <- getOption "output filename" o_outputFilename
+          os <- getOption "target os"   o_targetOS
+
+          let haskellWanteds = [ what | (wh, what) <- wanteds os
+                                      , wh `elem` [Haskell, Both] ]
+
           case mode of
               Gen_Haskell_Type     -> writeHaskellType     fn haskellWanteds
               Gen_Haskell_Wrappers -> writeHaskellWrappers fn haskellWanteds
@@ -57,7 +61,8 @@ main = do opts <- parseArgs
                      nmProg  <- getOption "nm program"  o_nmProg
                      let verbose = o_verbose opts
                          gccFlags = o_gccFlags opts
-                     rs <- getWanted verbose tmpdir gccProg gccFlags nmProg
+                     rs <- getWanted verbose os tmpdir gccProg gccFlags nmProg
+                                     (o_objdumpProg opts)
                      let haskellRs = [ what
                                      | (wh, what) <- rs
                                      , wh `elem` [Haskell, Both] ]
@@ -67,8 +72,6 @@ main = do opts <- parseArgs
                      case cm of
                          ComputeHaskell -> writeHaskellValue fn haskellRs
                          ComputeHeader  -> writeHeader       fn cRs
-    where haskellWanteds = [ what | (wh, what) <- wanteds,
-                                    wh `elem` [Haskell, Both] ]
 
 data Options = Options {
                    o_verbose :: Bool,
@@ -77,7 +80,9 @@ data Options = Options {
                    o_outputFilename :: Maybe FilePath,
                    o_gccProg :: Maybe FilePath,
                    o_gccFlags :: [String],
-                   o_nmProg :: Maybe FilePath
+                   o_nmProg :: Maybe FilePath,
+                   o_objdumpProg :: Maybe FilePath,
+                   o_targetOS :: Maybe String
                }
 
 parseArgs :: IO Options
@@ -91,7 +96,9 @@ parseArgs = do args <- getArgs
                              o_outputFilename = Nothing,
                              o_gccProg = Nothing,
                              o_gccFlags = [],
-                             o_nmProg = Nothing
+                             o_nmProg = Nothing,
+                             o_objdumpProg = Nothing,
+                             o_targetOS = Nothing
                          }
           f opts [] = return opts
           f opts ("-v" : args')
@@ -116,6 +123,10 @@ parseArgs = do args <- getArgs
               = f (opts {o_gccFlags = flag : o_gccFlags opts}) args'
           f opts ("--nm-program" : prog : args')
               = f (opts {o_nmProg = Just prog}) args'
+          f opts ("--objdump-program" : prog : args')
+              = f (opts {o_objdumpProg = Just prog}) args'
+          f opts ("--target-os" : os : args')
+              = f (opts {o_targetOS = Just os}) args'
           f _ (flag : _) = die ("Unrecognised flag: " ++ show flag)
 
 data Mode = Gen_Haskell_Type
@@ -283,8 +294,8 @@ haskellise :: Name -> Name
 haskellise (c : cs) = toLower c : cs
 haskellise "" = ""
 
-wanteds :: Wanteds
-wanteds = concat
+wanteds :: String -> Wanteds
+wanteds os = concat
           [-- Closure header sizes.
            constantWord Both "STD_HDR_SIZE"
                              -- grrr.. PROFILING is on so we need to
@@ -654,21 +665,22 @@ wanteds = concat
           ,constantNatural Haskell "ILDV_STATE_USE"    "LDV_STATE_USE"
           ]
 
-getWanted :: Bool -> FilePath -> FilePath -> [String] -> FilePath -> IO Results
-getWanted verbose tmpdir gccProgram gccFlags nmProgram
-    = do let cStuff = unlines (headers ++ concatMap (doWanted . snd) wanteds)
+getWanted :: Bool -> String -> FilePath -> FilePath -> [String] -> FilePath -> Maybe FilePath
+             -> IO Results
+getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
+    = do let cStuff = unlines (headers ++ concatMap (doWanted . snd) (wanteds os))
              cFile = tmpdir </> "tmp.c"
              oFile = tmpdir </> "tmp.o"
          writeFile cFile cStuff
          execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile])
          xs <- case os of
-                 "openbsd" -> readProcess "/usr/bin/objdump" ["--syms", oFile] ""
+                 "openbsd" -> readProcess objdumpProgam ["--syms", oFile] ""
                  _         -> readProcess nmProgram ["-P", oFile] ""
 
          let ls = lines xs
              ms = map parseNmLine ls
              m = Map.fromList $ catMaybes ms
-         rs <- mapM (lookupResult m) wanteds
+         rs <- mapM (lookupResult m) (wanteds os)
          return rs
     where headers = ["#define IN_STG_CODE 0",
                      "",
@@ -698,6 +710,8 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram
                      "#pragma GCC poison sizeof"
                      ]
 
+          objdumpProgam = maybe (error "no objdump program given") id mobjdumpProgram
+
           prefix = "derivedConstant"
           mkFullName name = prefix ++ name
 


From git at git.haskell.org  Thu Nov 19 12:24:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 12:24:40 +0000 (UTC)
Subject: [commit: ghc] master: Unbreak Text.Read.Lex.lex on Unicode symbols
 (fce0465)
Message-ID: <20151119122440.213643A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fce04651f2389d59b3355c67d9e189c62969ac76/ghc

>---------------------------------------------------------------

commit fce04651f2389d59b3355c67d9e189c62969ac76
Author: M Farkas-Dyck <strake888 at gmail.com>
Date:   Thu Nov 19 12:19:30 2015 +0100

    Unbreak Text.Read.Lex.lex on Unicode symbols
    
    Reviewers: thomie, hvr, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: bgamari, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1480
    
    GHC Trac Issues: #10444


>---------------------------------------------------------------

fce04651f2389d59b3355c67d9e189c62969ac76
 libraries/base/Text/Read/Lex.hs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/libraries/base/Text/Read/Lex.hs b/libraries/base/Text/Read/Lex.hs
index d7d6547..608bf85 100644
--- a/libraries/base/Text/Read/Lex.hs
+++ b/libraries/base/Text/Read/Lex.hs
@@ -39,7 +39,8 @@ import GHC.Base
 import GHC.Char
 import GHC.Num( Num(..), Integer )
 import GHC.Show( Show(..) )
-import GHC.Unicode( isSpace, isAlpha, isAlphaNum )
+import GHC.Unicode
+  ( GeneralCategory(..), generalCategory, isSpace, isAlpha, isAlphaNum )
 import GHC.Real( Rational, (%), fromIntegral, Integral,
                  toInteger, (^), quot, even )
 import GHC.List
@@ -198,8 +199,10 @@ lexPunc :: ReadP Lexeme
 lexPunc =
   do c <- satisfy isPuncChar
      return (Punc [c])
- where
-  isPuncChar c = c `elem` ",;()[]{}`"
+
+-- | The @special@ character class as defined in the Haskell Report.
+isPuncChar :: Char -> Bool
+isPuncChar c = c `elem` ",;()[]{}`"
 
 -- ----------------------------------------------------------------------
 -- Symbols
@@ -212,7 +215,15 @@ lexSymbol =
       else
         return (Symbol s)
  where
-  isSymbolChar c = c `elem` "!@#$%&*+./<=>?\\^|:-~"
+  isSymbolChar c = not (isPuncChar c) && case generalCategory c of
+      MathSymbol              -> True
+      CurrencySymbol          -> True
+      ModifierSymbol          -> True
+      OtherSymbol             -> True
+      DashPunctuation         -> True
+      OtherPunctuation        -> not (c `elem` "'\"")
+      ConnectorPunctuation    -> c /= '_'
+      _                       -> False
   reserved_ops   = ["..", "::", "=", "\\", "|", "<-", "->", "@", "~", "=>"]
 
 -- ----------------------------------------------------------------------


From git at git.haskell.org  Thu Nov 19 12:24:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 12:24:42 +0000 (UTC)
Subject: [commit: ghc] master: Make GHC aware of OSAIX and AixLD (c5d8162)
Message-ID: <20151119122442.BACCE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c5d8162d230c373b2b49ec94d3f9a027ff6e2dd6/ghc

>---------------------------------------------------------------

commit c5d8162d230c373b2b49ec94d3f9a027ff6e2dd6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Nov 19 12:55:35 2015 +0100

    Make GHC aware of OSAIX and AixLD
    
    GHC needs to be aware of targetting AIX because
    AIX requires some special handling for the toolchain
    (similiar to Solaris)
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1501


>---------------------------------------------------------------

c5d8162d230c373b2b49ec94d3f9a027ff6e2dd6
 aclocal.m4                 | 8 +++++++-
 compiler/main/DynFlags.hs  | 1 +
 compiler/main/SysTools.hs  | 4 ++++
 compiler/utils/Platform.hs | 2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 33f05e5..e816e09 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -277,6 +277,9 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         dragonfly|osf1|hpux|linuxaout|freebsd2|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
             test -z "[$]2" || eval "[$]2=OSUnknown"
             ;;
+        aix)
+            test -z "[$]2" || eval "[$]2=OSAIX"
+            ;;
         linux-android)
             test -z "[$]2" || eval "[$]2=OSAndroid"
             ;;
@@ -1862,9 +1865,12 @@ case "$1-$2" in
         $3="linux"
         ;;
       # As far as I'm aware, none of these have relevant variants
-      freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+      freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|haiku)
         $3="$1"
         ;;
+      aix*) # e.g. powerpc-ibm-aix7.1.3.0
+        $3="aix"
+        ;;
       freebsd*) # like i686-gentoo-freebsd7
                 #      i686-gentoo-freebsd8
                 #      i686-gentoo-freebsd8.2
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 014a11e..19df18e 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -4369,6 +4369,7 @@ data LinkerInfo
   | GnuGold  [Option]
   | DarwinLD [Option]
   | SolarisLD [Option]
+  | AixLD    [Option]
   | UnknownLD
   deriving Eq
 
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 303e8de..0e3acb6 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -762,6 +762,7 @@ neededLinkArgs (GnuLD o)     = o
 neededLinkArgs (GnuGold o)   = o
 neededLinkArgs (DarwinLD o)  = o
 neededLinkArgs (SolarisLD o) = o
+neededLinkArgs (AixLD o)     = o
 neededLinkArgs UnknownLD     = []
 
 -- Grab linker info and cache it in DynFlags.
@@ -817,6 +818,9 @@ getLinkerInfo' dflags = do
                  -- precisely so we assume here, the Solaris linker is
                  -- used.
                  return $ SolarisLD []
+               OSAIX ->
+                 -- IBM AIX uses its own non-binutils linker as well
+                 return $ AixLD []
                OSDarwin ->
                  -- Darwin has neither GNU Gold or GNU LD, but a strange linker
                  -- that doesn't support --version. We can just assume that's
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
index 5f1d97a..617237f 100644
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -86,6 +86,7 @@ data OS
         | OSOsf3
         | OSQNXNTO
         | OSAndroid
+        | OSAIX
         deriving (Read, Show, Eq)
 
 -- | ARM Instruction Set Architecture, Extensions and ABI
@@ -138,6 +139,7 @@ osElfTarget OSOsf3      = False -- I don't know if this is right, but as
                                 -- per comment below it's safe
 osElfTarget OSQNXNTO    = False
 osElfTarget OSAndroid   = True
+osElfTarget OSAIX       = False
 osElfTarget OSUnknown   = False
  -- Defaulting to False is safe; it means don't rely on any
  -- ELF-specific functionality.  It is important to have a default for


From git at git.haskell.org  Thu Nov 19 12:24:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 12:24:45 +0000 (UTC)
Subject: [commit: ghc] master: Set AIX specific CFLAGS flags (75036aa)
Message-ID: <20151119122445.5F8033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/75036aacb492886a7c65035127ee11fec11ee7ce/ghc

>---------------------------------------------------------------

commit 75036aacb492886a7c65035127ee11fec11ee7ce
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Nov 19 12:56:48 2015 +0100

    Set AIX specific CFLAGS flags
    
    First of all, we need to use -mminimal-toc on IBM AIX
    
    AIX's XCOFF is limited to 16k entries in its TOC for 32bit compilation,
    which quickly overflows with GHC's code generation.
    
    Otoh, the Parser.hs module contains more entries than fit into a
    minimal-toc, so we need to switch back to `-mfull-toc` for that single
    module again.
    
    Then, we also need to set the `THREAD_SAFE` CPP #define in order to
    unlock the thread-safe `errno` which is essential for the threaded
    runtime.
    
    Depends on D1501
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1502


>---------------------------------------------------------------

75036aacb492886a7c65035127ee11fec11ee7ce
 aclocal.m4      | 14 ++++++++++++++
 compiler/ghc.mk | 13 +++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index e816e09..4bd8198 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -587,6 +587,20 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         $3="$$3 -fuse-ld=gold -Wl,-z,noexecstack"
         $4="$$4 -z noexecstack"
         ;;
+
+    powerpc-ibm-aix*)
+        # On IBM AIX, we need to workaround XCOFF's limitations. Specifically,
+        # there's a TOC which only supports at most 16k entries (see
+        # http://www.ibm.com/developerworks/rational/library/overview-toc-aix/
+        # for more details), and by using `-mminimal-toc` we use up only one TOC
+        # entry per translation unit, at the cost of an additional pointer
+        # indirection. However, see note in `compiler/ghc.mk` about `Parser.hs`.
+        # Finally, we need `-D_THREAD_SAFE` to unlock a thread-local `errno`.
+        $2="$$2 -mminimal-toc -D_THREAD_SAFE"
+        $3="$$3 -mminimal-toc -D_THREAD_SAFE"
+        $5="$$5 -D_THREAD_SAFE"
+        ;;
+
     esac
 
     # If gcc knows about the stack protector, turn it off.
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 887a876..6fde5c0 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -380,6 +380,19 @@ endif
 compiler/stage2/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 compiler/stage3/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 
+# On IBM AIX we need to wrokaround XCOFF's TOC limitations (see also
+# comment in `aclocal.m4` about `-mminimal-toc` for more details)
+# However, Parser.hc defines so many symbols that `-mminimal-toc`
+# generates instructions with offsets exceeding the PPC offset
+# addressing limits.  So we need to counter-act this via `-mfull-toc`
+# which disables a preceding `-mminimal-toc` again.
+ifeq "$(HostOS_CPP)" "aix"
+compiler/stage1/build/Parser_HC_OPTS += -optc-mfull-toc
+endif
+ifeq "$(TargetOS_CPP)" "aix"
+compiler/stage2/build/Parser_HC_OPTS += -optc-mfull-toc
+compiler/stage3/build/Parser_HC_OPTS += -optc-mfull-toc
+endif
 
 ifeq "$(GhcProfiled)" "YES"
 # If we're profiling GHC then we want SCCs.  However, adding -auto-all


From git at git.haskell.org  Thu Nov 19 12:24:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 12:24:48 +0000 (UTC)
Subject: [commit: ghc] master: derivedConstants: Add support for AIX (7dfde0e)
Message-ID: <20151119122448.183D03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7dfde0e8263f123c2a21dde50027fa97a20500ec/ghc

>---------------------------------------------------------------

commit 7dfde0e8263f123c2a21dde50027fa97a20500ec
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Nov 19 12:55:26 2015 +0100

    derivedConstants: Add support for AIX
    
    On IBM AIX `nm` doesn't support reporting symbol sizes, so we need to
    resort to `objdump` instead, which has a peculiar output format on AIX.
    
    depends on D1499
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: kgardas, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1500


>---------------------------------------------------------------

7dfde0e8263f123c2a21dde50027fa97a20500ec
 utils/deriveConstants/Main.hs | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/utils/deriveConstants/Main.hs b/utils/deriveConstants/Main.hs
index 832d4bc..09c94ab 100644
--- a/utils/deriveConstants/Main.hs
+++ b/utils/deriveConstants/Main.hs
@@ -675,11 +675,13 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
          execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile])
          xs <- case os of
                  "openbsd" -> readProcess objdumpProgam ["--syms", oFile] ""
+                 "aix"     -> readProcess objdumpProgam ["--syms", oFile] ""
                  _         -> readProcess nmProgram ["-P", oFile] ""
 
          let ls = lines xs
-             ms = map parseNmLine ls
-             m = Map.fromList $ catMaybes ms
+             m = Map.fromList $ case os of
+                 "aix" -> parseAixObjdump ls
+                 _     -> catMaybes $ map parseNmLine ls
          rs <- mapM (lookupResult m) (wanteds os)
          return rs
     where headers = ["#define IN_STG_CODE 0",
@@ -764,6 +766,28 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
                         (Just name, [(size, "")]) -> Just (name, size)
                         _ -> Nothing
 
+          -- On AIX, `nm` isn't able to tell us the symbol size, so we
+          -- need to use `objdump --syms`. However, unlike on OpenBSD,
+          -- `objdump --syms` outputs entries spanning two lines, e.g.
+          --
+          -- [ 50](sec  3)(fl 0x00)(ty   0)(scl   2) (nx 1) 0x00000318 derivedConstantBLOCK_SIZE
+          -- AUX val  4097 prmhsh 0 snhsh 0 typ 3 algn 3 clss 5 stb 0 snstb 0
+          --
+          parseAixObjdump :: [String] -> [(String,Integer)]
+          parseAixObjdump = catMaybes . goAix
+            where
+              goAix (l1@('[':_):l2@('A':'U':'X':_):ls')
+                  = parseObjDumpEntry l1 l2 : goAix ls'
+              goAix (_:ls') = goAix ls'
+              goAix [] = []
+
+              parseObjDumpEntry l1 l2
+                  | ["val",n] <- take 2 (tail $ words l2)
+                  , Just sym <- stripPrefix prefix sym0 = Just (sym, read n)
+                  | otherwise = Nothing
+                where
+                  [sym0, adr] = take 2 (reverse $ words l1)
+
           -- If an Int value is larger than 2^28 or smaller
           -- than -2^28, then fail.
           -- This test is a bit conservative, but if any


From git at git.haskell.org  Thu Nov 19 13:05:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 13:05:54 +0000 (UTC)
Subject: [commit: ghc] master: Bump process submodule (d732ce0)
Message-ID: <20151119130554.A5E993A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d732ce0d947565fb659f0b7058db5730ce04a6f7/ghc

>---------------------------------------------------------------

commit d732ce0d947565fb659f0b7058db5730ce04a6f7
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 19 14:05:27 2015 +0100

    Bump process submodule


>---------------------------------------------------------------

d732ce0d947565fb659f0b7058db5730ce04a6f7
 libraries/process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/process b/libraries/process
index e5a7ee3..0edb978 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit e5a7ee3189028d12a57391388184f20d0d257c08
+Subproject commit 0edb97876c2f783b33f9a69089ca9d26a061e112


From git at git.haskell.org  Thu Nov 19 13:52:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 13:52:17 +0000 (UTC)
Subject: [commit: ghc] master: Pattern Synonym Documentation (b72ca3e)
Message-ID: <20151119135217.91AAE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b72ca3e3fa54b80a2c376e259cd09df60c7106bf/ghc

>---------------------------------------------------------------

commit b72ca3e3fa54b80a2c376e259cd09df60c7106bf
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Thu Nov 19 13:50:01 2015 +0000

    Pattern Synonym Documentation
    
    Summary:
    This patch adds documentation for record pattern synonyms (D1258) and
    bundling pattern synonyms with type constructors in export lists (D1152).
    
    There are also other small improvements motivated by #10900.
    
    Reviewers: goldfire, bgamari, austin
    
    Reviewed By: bgamari
    
    Subscribers: goldfire, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1325
    
    GHC Trac Issues: #10900


>---------------------------------------------------------------

b72ca3e3fa54b80a2c376e259cd09df60c7106bf
 docs/users_guide/7.12.1-notes.rst |  30 +++++++
 docs/users_guide/glasgow_exts.rst | 180 ++++++++++++++++++++++++++++++++------
 2 files changed, 183 insertions(+), 27 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b72ca3e3fa54b80a2c376e259cd09df60c7106bf

From git at git.haskell.org  Thu Nov 19 14:25:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 19 Nov 2015 14:25:04 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/D1500' deleted
Message-ID: <20151119142504.DE6AB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Deleted branch: wip/D1500

From git at git.haskell.org  Fri Nov 20 13:28:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 13:28:52 +0000 (UTC)
Subject: [commit: ghc] master: ghci: don't let ctags/etags overwrite source
 files (a689c8e)
Message-ID: <20151120132852.971DC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a689c8edb1639669cb8df58092b8b77a0a581717/ghc

>---------------------------------------------------------------

commit a689c8edb1639669cb8df58092b8b77a0a581717
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Nov 20 07:26:42 2015 -0600

    ghci: don't let ctags/etags overwrite source files
    
    A ource file which was accidently passed as parameter into `:ctags` or `:etags`
    can be overwritten by tag data. This patch updates documentation to avoid
    confusion in commands usage and prevents `collateAndWriteTags` from modifying
    existing source files.
    
    Reviewed By: thomie, bgamari, austin
    
    Differential Revision: https://phabricator.haskell.org/D1471
    
    GHC Trac Issues: #10989


>---------------------------------------------------------------

a689c8edb1639669cb8df58092b8b77a0a581717
 ghc/GhciTags.hs                                          | 16 +++++++++++++---
 ghc/InteractiveUI.hs                                     |  6 +++---
 testsuite/tests/ghci/scripts/T10989.script               | 15 +++++++++++++++
 testsuite/tests/ghci/scripts/T10989.stderr               |  6 ++++++
 .../T5315.stdout => ghci/scripts/T10989.stdout}          |  1 +
 testsuite/tests/ghci/scripts/all.T                       |  5 +++++
 6 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/ghc/GhciTags.hs b/ghc/GhciTags.hs
index b250637..fa94ea6 100644
--- a/ghc/GhciTags.hs
+++ b/ghc/GhciTags.hs
@@ -28,9 +28,11 @@ import MonadUtils
 import Data.Function
 import Data.Maybe
 import Data.Ord
+import DriverPhases
 import Panic
 import Data.List
 import Control.Monad
+import System.Directory
 import System.IO
 import System.IO.Error
 
@@ -131,23 +133,31 @@ tagInfo dflags unqual exported kind name loc
         (showSDocForUser dflags unqual $ ftext (srcLocFile loc))
         (srcLocLine loc) (srcLocCol loc) Nothing
 
+-- throw an exception when someone tries to overwrite existing source file (fix for #10989)
+writeTagsSafely :: FilePath -> String -> IO ()
+writeTagsSafely file str = do
+    dfe <- doesFileExist file
+    if dfe && isSourceFilename file
+        then throwGhcException (CmdLineError (file ++ " is existing source file. " ++
+             "Please specify another file name to store tags data"))
+        else writeFile file str
 
 collateAndWriteTags :: TagsKind -> FilePath -> [TagInfo] -> IO (Either IOError ())
 -- ctags style with the Ex exresion being just the line number, Vim et al
 collateAndWriteTags CTagsWithLineNumbers file tagInfos = do
   let tags = unlines $ sort $ map showCTag tagInfos
-  tryIO (writeFile file tags)
+  tryIO (writeTagsSafely file tags)
 
 -- ctags style with the Ex exresion being a regex searching the line, Vim et al
 collateAndWriteTags CTagsWithRegExes file tagInfos = do -- ctags style, Vim et al
   tagInfoGroups <- makeTagGroupsWithSrcInfo tagInfos
   let tags = unlines $ sort $ map showCTag $concat tagInfoGroups
-  tryIO (writeFile file tags)
+  tryIO (writeTagsSafely file tags)
 
 collateAndWriteTags ETags file tagInfos = do -- etags style, Emacs/XEmacs
   tagInfoGroups <- makeTagGroupsWithSrcInfo $filter tagExported tagInfos
   let tagGroups = map processGroup tagInfoGroups
-  tryIO (writeFile file $ concat tagGroups)
+  tryIO (writeTagsSafely file $ concat tagGroups)
 
   where
     processGroup [] = throwGhcException (CmdLineError "empty tag file group??")
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index 21eff8f..8f861ee 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -244,13 +244,13 @@ defFullHelpText =
   "   :cd <dir>                   change directory to <dir>\n" ++
   "   :cmd <expr>                 run the commands returned by <expr>::IO String\n" ++
   "   :complete <dom> [<rng>] <s> list completions for partial input string\n" ++
-  "   :ctags[!] [<file>]          create tags file for Vi (default: \"tags\")\n" ++
+  "   :ctags[!] [<file>]          create tags file <file> for Vi (default: \"tags\")\n" ++
   "                               (!: use regex instead of line number)\n" ++
   "   :def <cmd> <expr>           define command :<cmd> (later defined command has\n" ++
   "                               precedence, ::<cmd> is always a builtin command)\n" ++
   "   :edit <file>                edit file\n" ++
   "   :edit                       edit last module\n" ++
-  "   :etags [<file>]             create tags file for Emacs (default: \"TAGS\")\n" ++
+  "   :etags [<file>]             create tags file <file> for Emacs (default: \"TAGS\")\n" ++
   "   :help, :?                   display this list of commands\n" ++
   "   :info[!] [<name> ...]       display information about the given names\n" ++
   "                               (!: do not filter instances)\n" ++
@@ -265,7 +265,7 @@ defFullHelpText =
   "   :reload[!]                  reload the current module set\n" ++
   "                               (!: defer type errors)\n" ++
   "   :run function [<arguments> ...] run the function with the given arguments\n" ++
-  "   :script <filename>          run the script <filename>\n" ++
+  "   :script <file>              run the script <file>\n" ++
   "   :type <expr>                show the type of <expr>\n" ++
   "   :undef <cmd>                undefine user-defined command :<cmd>\n" ++
   "   :!<command>                 run the shell command <command>\n" ++
diff --git a/testsuite/tests/ghci/scripts/T10989.script b/testsuite/tests/ghci/scripts/T10989.script
new file mode 100644
index 0000000..d109e4e
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/T10989.script
@@ -0,0 +1,15 @@
+writeFile "dummy.hs"  "t = putStrLn \"Test\""
+writeFile "dummy.lhs" "> t = putStrLn \"Test\""
+:ctags  dummy.hs
+:ctags  dummy.lhs
+:ctags! dummy.hs
+:ctags! dummy.lhs
+:etags  dummy.hs
+:etags  dummy.lhs
+:ctags  dummy.tags
+:ctags! dummy.tags
+:etags  dummy.tags
+:l dummy.hs
+t
+:l dummy.lhs
+t
diff --git a/testsuite/tests/ghci/scripts/T10989.stderr b/testsuite/tests/ghci/scripts/T10989.stderr
new file mode 100644
index 0000000..97b0d90
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/T10989.stderr
@@ -0,0 +1,6 @@
+dummy.hs is existing source file. Please specify another file name to store tags data
+dummy.lhs is existing source file. Please specify another file name to store tags data
+dummy.hs is existing source file. Please specify another file name to store tags data
+dummy.lhs is existing source file. Please specify another file name to store tags data
+dummy.hs is existing source file. Please specify another file name to store tags data
+dummy.lhs is existing source file. Please specify another file name to store tags data
diff --git a/testsuite/tests/simplCore/should_run/T5315.stdout b/testsuite/tests/ghci/scripts/T10989.stdout
similarity index 50%
copy from testsuite/tests/simplCore/should_run/T5315.stdout
copy to testsuite/tests/ghci/scripts/T10989.stdout
index 345e6ae..95306f6 100644
--- a/testsuite/tests/simplCore/should_run/T5315.stdout
+++ b/testsuite/tests/ghci/scripts/T10989.stdout
@@ -1 +1,2 @@
 Test
+Test
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index 283251c..1a664d1 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -221,3 +221,8 @@ test('T10466', normal, ghci_script, ['T10466.script'])
 test('T10501', normal, ghci_script, ['T10501.script'])
 test('T10508', normal, ghci_script, ['T10508.script'])
 test('T10520', normal, ghci_script, ['T10520.script'])
+test('T10989',
+    [
+      extra_clean(['dummy.hs', 'dummy.lhs', 'dummy.tags'])
+    ],
+    ghci_script, ['T10989.script'])


From git at git.haskell.org  Fri Nov 20 13:28:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 13:28:55 +0000 (UTC)
Subject: [commit: ghc] master: user's guide: Fix some accidental triple-`
 quote (1994304)
Message-ID: <20151120132855.494B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1994304255f785f00a7ba3e74b62b0bb7c487626/ghc

>---------------------------------------------------------------

commit 1994304255f785f00a7ba3e74b62b0bb7c487626
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Nov 20 07:28:22 2015 -0600

    user's guide: Fix some accidental triple-` quote
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1503


>---------------------------------------------------------------

1994304255f785f00a7ba3e74b62b0bb7c487626
 docs/users_guide/codegens.rst             | 4 ++--
 docs/users_guide/ffi-chap.rst             | 2 +-
 docs/users_guide/glasgow_exts.rst         | 2 +-
 docs/users_guide/separate_compilation.rst | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/users_guide/codegens.rst b/docs/users_guide/codegens.rst
index 9915452..6db5499 100644
--- a/docs/users_guide/codegens.rst
+++ b/docs/users_guide/codegens.rst
@@ -81,7 +81,7 @@ output to facilitate porting GHC itself to a new platform. This mode
 produces much slower code though so it's unlikely your version of GHC
 was built this way. If it has then the native code generator probably
 won't be available. You can check this information by calling
-```ghc --info`` (see :ref:`ghc-info`).
+``ghc --info`` (see :ref:`ghc-info`).
 
 .. _unreg:
 
@@ -112,4 +112,4 @@ to build GHC with the appropriate options set. Consult the GHC Building
 Guide for details.
 
 You can check if your GHC is unregisterised by calling
-```ghc --info`` (see :ref:`ghc-info`).
+``ghc --info`` (see :ref:`ghc-info`).
diff --git a/docs/users_guide/ffi-chap.rst b/docs/users_guide/ffi-chap.rst
index f9ebe5a..2cc24a4 100644
--- a/docs/users_guide/ffi-chap.rst
+++ b/docs/users_guide/ffi-chap.rst
@@ -10,7 +10,7 @@ Foreign function interface (FFI)
 
 GHC (mostly) conforms to the Haskell Foreign Function Interface, whose
 definition is part of the Haskell Report on
-```http://www.haskell.org/`` <http://www.haskell.org/>`__.
+``http://www.haskell.org/`` <http://www.haskell.org/>`__.
 
 FFI support is enabled by default, but can be enabled or disabled
 explicitly with the ``-XForeignFunctionInterface`` flag.
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 4879624..2289440 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -9985,7 +9985,7 @@ more details, see
    source code).
 
 -  The arrows web page at
-   ```http://www.haskell.org/arrows/`` <http://www.haskell.org/arrows/>`__.
+   ``http://www.haskell.org/arrows/`` <http://www.haskell.org/arrows/>`__.
 
 With the ``-XArrows`` flag, GHC supports the arrow notation described in
 the second of these papers, translating it using combinators from the
diff --git a/docs/users_guide/separate_compilation.rst b/docs/users_guide/separate_compilation.rst
index 11ce8c8..c8285d5 100644
--- a/docs/users_guide/separate_compilation.rst
+++ b/docs/users_guide/separate_compilation.rst
@@ -1077,7 +1077,7 @@ off with ``-fno-warn-orphans``, and ``-Werror`` will make the
 compilation fail if the warning is issued.
 
 You can identify an orphan module by looking in its interface file,
-``M.hi``, using the ```--show-iface`` :ref:`mode <modes>`. If there is a
+``M.hi``, using the ``--show-iface`` :ref:`mode <modes>`. If there is a
 ``[orphan module]`` on the first line, GHC considers it an orphan
 module.
 


From git at git.haskell.org  Fri Nov 20 14:35:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 14:35:42 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Eagerly apply substitution in uncovered +
 all pretty printing in Check.hs (3e1dfb6)
Message-ID: <20151120143542.D04A53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/3e1dfb65f3d9add2f7d612e1f2d0811979affcfb/ghc

>---------------------------------------------------------------

commit 3e1dfb65f3d9add2f7d612e1f2d0811979affcfb
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Nov 20 14:54:34 2015 +0100

    Eagerly apply substitution in uncovered + all pretty printing in Check.hs


>---------------------------------------------------------------

3e1dfb65f3d9add2f7d612e1f2d0811979affcfb
 compiler/deSugar/Check.hs    | 192 +++++++++++++++++++++++++------------------
 compiler/deSugar/Match.hs    |  78 +-----------------
 compiler/deSugar/TmOracle.hs |  14 ++++
 3 files changed, 129 insertions(+), 155 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3e1dfb65f3d9add2f7d612e1f2d0811979affcfb

From git at git.haskell.org  Fri Nov 20 14:35:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 14:35:45 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: removed some unused sanity checks (3553b4e)
Message-ID: <20151120143545.752BD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/3553b4e2ca15458eabcb2513ce5691cbc7c037a8/ghc

>---------------------------------------------------------------

commit 3553b4e2ca15458eabcb2513ce5691cbc7c037a8
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Nov 20 15:05:58 2015 +0100

    removed some unused sanity checks


>---------------------------------------------------------------

3553b4e2ca15458eabcb2513ce5691cbc7c037a8
 compiler/deSugar/Check.hs | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 9d94a15..fbd285c 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -832,7 +832,6 @@ A simple example is trac #322:
 %************************************************************************
 -}
 
--- ADD ASSERTS EVERYWHERE, THEY COME *FOR FREE* (ACTIVATED ONLY WHEN DEBUGISON)
 type PmArity = Int
 
 patVecArity :: PatVec -> PmArity
@@ -842,28 +841,6 @@ patternArity :: Pattern -> PmArity
 patternArity (PmGuard  {}) = 0
 patternArity (NonGuard {}) = 1
 
--- Should get a default value because an empty set has any arity
--- (We have no value vector abstractions to see)
-vsaArity :: PmArity -> ValSetAbs -> PmArity
-vsaArity  arity Empty = arity
-vsaArity _arity vsa   = ASSERT (allTheSame arities) (head arities)
-  where arities = vsaArities vsa
-
-vsaArities :: ValSetAbs -> [PmArity] -- Arity for every path. INVARIANT: All the same
-vsaArities Empty              = []
-vsaArities (Union vsa1 vsa2)  = vsaArities vsa1 ++ vsaArities vsa2
-vsaArities Singleton          = [0]
-vsaArities (Constraint _ vsa) = vsaArities vsa
-vsaArities (Cons _ vsa)       = [1 + arity | arity <- vsaArities vsa]
-
-allTheSame :: Eq a => [a] -> Bool
-allTheSame []     = True
-allTheSame (x:xs) = all (==x) xs
-
-sameArity :: PatVec -> ValSetAbs -> Bool
-sameArity pv vsa = vsaArity pv_a vsa == pv_a
-  where pv_a = patVecArity pv
-
 {-
 %************************************************************************
 %*                                                                      *
@@ -1260,7 +1237,7 @@ guards in the first pattern `p' though.
 dsPmWarn :: DynFlags -> DsMatchContext -> DsM PmResult -> DsM ()
 dsPmWarn dflags ctx@(DsMatchContext kind loc) mPmResult -- (redundant, inaccessible, uncovered)
   = when (flag_i || flag_u) $ do
-      (redundant, inaccessible, uncovered) <- mPmResult
+      (redundant, inaccessible, uncovered) <- mPmResult -- shadows, change the names?
       let exists_r = flag_i && notNull redundant
           exists_i = flag_i && notNull inaccessible
           exists_u = flag_u && notNull uncovered


From git at git.haskell.org  Fri Nov 20 14:35:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 14:35:48 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: names (6c5876a)
Message-ID: <20151120143548.386893A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/6c5876a5c39d2fa2e326b68423efac4b7c2688f4/ghc

>---------------------------------------------------------------

commit 6c5876a5c39d2fa2e326b68423efac4b7c2688f4
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Nov 20 15:35:39 2015 +0100

    names


>---------------------------------------------------------------

6c5876a5c39d2fa2e326b68423efac4b7c2688f4
 compiler/deSugar/Check.hs | 98 +++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 59 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6c5876a5c39d2fa2e326b68423efac4b7c2688f4

From git at git.haskell.org  Fri Nov 20 15:33:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 15:33:06 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: remove unused stuff (b36ad5a)
Message-ID: <20151120153306.A94383A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/b36ad5a26d40fd7596ea7ea82c41e8e1f4d5e219/ghc

>---------------------------------------------------------------

commit b36ad5a26d40fd7596ea7ea82c41e8e1f4d5e219
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Nov 20 16:31:05 2015 +0100

    remove unused stuff


>---------------------------------------------------------------

b36ad5a26d40fd7596ea7ea82c41e8e1f4d5e219
 compiler/basicTypes/Var.hs      |  4 +---
 compiler/typecheck/TcMType.hs   |  1 -
 compiler/typecheck/TcRnTypes.hs | 13 -------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/compiler/basicTypes/Var.hs b/compiler/basicTypes/Var.hs
index 2b22f36..925ffe3 100644
--- a/compiler/basicTypes/Var.hs
+++ b/compiler/basicTypes/Var.hs
@@ -205,7 +205,6 @@ After CoreTidy, top-level LocalIds are turned into GlobalIds
 -}
 
 instance Outputable Var where
-  -- ppr var = parens (ppr (varName var) <+> dcolon <+> ppr (varType var)) <> getPprStyle (ppr_debug var)
   ppr var = ppr (varName var) <> getPprStyle (ppr_debug var)
 
 ppr_debug :: Var -> PprStyle -> SDoc
@@ -308,8 +307,7 @@ mkTcTyVar name kind details
 
 tcTyVarDetails :: TyVar -> TcTyVarDetails
 tcTyVarDetails (TcTyVar { tc_tv_details = details }) = details
-tcTyVarDetails tv@(TyVar {}) =  pprPanic "tcTyVarDetails" (ptext (sLit "TyVar") $$ ppr tv)
-tcTyVarDetails tv@(Id {})    =  pprPanic "tcTyVarDetails" (ptext (sLit "Id") $$ ppr tv)
+tcTyVarDetails var = pprPanic "tcTyVarDetails" (ppr var)
 
 setTcTyVarDetails :: TyVar -> TcTyVarDetails -> TyVar
 setTcTyVarDetails tv details = tv { tc_tv_details = details }
diff --git a/compiler/typecheck/TcMType.hs b/compiler/typecheck/TcMType.hs
index 6276b92..2f118fc 100644
--- a/compiler/typecheck/TcMType.hs
+++ b/compiler/typecheck/TcMType.hs
@@ -87,7 +87,6 @@ import Outputable
 import FastString
 import SrcLoc
 import Bag
-import UniqSupply (UniqSupply, splitUniqSupply, uniqFromSupply)
 
 import Control.Monad
 import Data.List        ( partition, mapAccumL )
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 32d78ad..49a35c6 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -91,9 +91,6 @@ module TcRnTypes(
         pprEvVars, pprEvVarWithType,
         pprArising, pprArisingAt,
 
-        -- Debugging
-        pprInTcRnIf,
-
         -- Misc other types
         TcId, TcIdSet, HoleSort(..)
 
@@ -151,10 +148,6 @@ import Data.Typeable ( TypeRep )
 import qualified Language.Haskell.TH as TH
 #endif
 
--- still debugging
-import System.IO.Unsafe (unsafePerformIO)
-
-
 {-
 ************************************************************************
 *                                                                      *
@@ -2237,9 +2230,3 @@ data TcPluginResult
     -- These are removed from the inert set,
     -- and the evidence for them is recorded.
     -- The second field contains new work, that should be processed by
-
---- - CHECKING MY PRINTING
-pprInTcRnIf :: SDoc -> TcRnIf gbl lcl ()
-pprInTcRnIf doc = do
-  dflags <- getDynFlags
-  liftIO (putStrLn (showSDoc dflags doc))


From git at git.haskell.org  Fri Nov 20 15:49:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 15:49:14 +0000 (UTC)
Subject: [commit: ghc] master: users-guide: Fix version number (998c371)
Message-ID: <20151120154914.6F7D43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/998c371b62d31499c95bb8ea3967c44d2ee23e90/ghc

>---------------------------------------------------------------

commit 998c371b62d31499c95bb8ea3967c44d2ee23e90
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 19 15:27:28 2015 +0100

    users-guide: Fix version number
    
    Previously used GhcVersion, which is apparently the version of the
    bootstrap compiler. ProjectVersion appears to be the thing to use here.


>---------------------------------------------------------------

998c371b62d31499c95bb8ea3967c44d2ee23e90
 docs/users_guide/ghc_config.py.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in
index 0f15d3f..41aee8d 100644
--- a/docs/users_guide/ghc_config.py.in
+++ b/docs/users_guide/ghc_config.py.in
@@ -6,4 +6,4 @@ extlinks = {
     'ghc-wiki': ('http://ghc.haskell.org/trac/ghc/wiki/%s', 'Trac #'),
 }
 
-version = '@GhcVersion@'
+version = '@ProjectVersion@'


From git at git.haskell.org  Fri Nov 20 15:49:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 15:49:17 +0000 (UTC)
Subject: [commit: ghc] master: base: Delete errant GHC/Stack.hsc (7e6dcf4)
Message-ID: <20151120154917.147493A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7e6dcf482addcba89f2835e55e41720881cb10a4/ghc

>---------------------------------------------------------------

commit 7e6dcf482addcba89f2835e55e41720881cb10a4
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 19 17:58:37 2015 +0100

    base: Delete errant GHC/Stack.hsc
    
    This was added in 8988be8561ce0857f3befd6ab3b6c29060685c0a, probably due
    to an incorrect merge resolution. The build system has been building
    `Stack.hs`.


>---------------------------------------------------------------

7e6dcf482addcba89f2835e55e41720881cb10a4
 libraries/base/GHC/Stack.hs  |   2 +-
 libraries/base/GHC/Stack.hsc | 132 -------------------------------------------
 2 files changed, 1 insertion(+), 133 deletions(-)

diff --git a/libraries/base/GHC/Stack.hs b/libraries/base/GHC/Stack.hs
index d1dd596..f6fe41f 100644
--- a/libraries/base/GHC/Stack.hs
+++ b/libraries/base/GHC/Stack.hs
@@ -15,7 +15,7 @@
 -- @since 4.5.0.0
 -----------------------------------------------------------------------------
 
-{-# LANGUAGE UnboxedTuples, MagicHash, NoImplicitPrelude #-}
+{-# LANGUAGE MagicHash, NoImplicitPrelude #-}
 module GHC.Stack (
     -- * Call stacks
     currentCallStack,
diff --git a/libraries/base/GHC/Stack.hsc b/libraries/base/GHC/Stack.hsc
deleted file mode 100644
index c544721..0000000
--- a/libraries/base/GHC/Stack.hsc
+++ /dev/null
@@ -1,132 +0,0 @@
-{-# LANGUAGE Trustworthy #-}
-
------------------------------------------------------------------------------
--- |
--- Module      :  GHC.Stack
--- Copyright   :  (c) The University of Glasgow 2011
--- License     :  see libraries/base/LICENSE
---
--- Maintainer  :  cvs-ghc at haskell.org
--- Stability   :  internal
--- Portability :  non-portable (GHC Extensions)
---
--- Access to GHC's call-stack simulation
---
--- @since 4.5.0.0
------------------------------------------------------------------------------
-
-{-# LANGUAGE UnboxedTuples, MagicHash, NoImplicitPrelude #-}
-module GHC.Stack (
-    -- * Call stacks
-    currentCallStack,
-    whoCreated,
-    errorWithStackTrace,
-
-    -- * Implicit parameter call stacks
-    SrcLoc(..), CallStack(..),
-
-    -- * Internals
-    CostCentreStack,
-    CostCentre,
-    getCurrentCCS,
-    getCCSOf,
-    ccsCC,
-    ccsParent,
-    ccLabel,
-    ccModule,
-    ccSrcSpan,
-    ccsToStrings,
-    renderStack
-  ) where
-
-import Foreign
-import Foreign.C
-
-import GHC.IO
-import GHC.Base
-import GHC.Ptr
-import GHC.Foreign as GHC
-import GHC.IO.Encoding
-import GHC.List ( concatMap, null, reverse )
-
-#define PROFILING
-#include "Rts.h"
-
-data CostCentreStack
-data CostCentre
-
-getCurrentCCS :: dummy -> IO (Ptr CostCentreStack)
-getCurrentCCS dummy = IO $ \s ->
-   case getCurrentCCS## dummy s of
-     (## s', addr ##) -> (## s', Ptr addr ##)
-
-getCCSOf :: a -> IO (Ptr CostCentreStack)
-getCCSOf obj = IO $ \s ->
-   case getCCSOf## obj s of
-     (## s', addr ##) -> (## s', Ptr addr ##)
-
-ccsCC :: Ptr CostCentreStack -> IO (Ptr CostCentre)
-ccsCC p = (# peek CostCentreStack, cc) p
-
-ccsParent :: Ptr CostCentreStack -> IO (Ptr CostCentreStack)
-ccsParent p = (# peek CostCentreStack, prevStack) p
-
-ccLabel :: Ptr CostCentre -> IO CString
-ccLabel p = (# peek CostCentre, label) p
-
-ccModule :: Ptr CostCentre -> IO CString
-ccModule p = (# peek CostCentre, module) p
-
-ccSrcSpan :: Ptr CostCentre -> IO CString
-ccSrcSpan p = (# peek CostCentre, srcloc) p
-
--- | returns a '[String]' representing the current call stack.  This
--- can be useful for debugging.
---
--- The implementation uses the call-stack simulation maintined by the
--- profiler, so it only works if the program was compiled with @-prof@
--- and contains suitable SCC annotations (e.g. by using @-fprof-auto@).
--- Otherwise, the list returned is likely to be empty or
--- uninformative.
---
--- @since 4.5.0.0
-
-currentCallStack :: IO [String]
-currentCallStack = ccsToStrings =<< getCurrentCCS ()
-
-ccsToStrings :: Ptr CostCentreStack -> IO [String]
-ccsToStrings ccs0 = go ccs0 []
-  where
-    go ccs acc
-     | ccs == nullPtr = return acc
-     | otherwise = do
-        cc  <- ccsCC ccs
-        lbl <- GHC.peekCString utf8 =<< ccLabel cc
-        mdl <- GHC.peekCString utf8 =<< ccModule cc
-        loc <- GHC.peekCString utf8 =<< ccSrcSpan cc
-        parent <- ccsParent ccs
-        if (mdl == "MAIN" && lbl == "MAIN")
-           then return acc
-           else go parent ((mdl ++ '.':lbl ++ ' ':'(':loc ++ ")") : acc)
-
--- | Get the stack trace attached to an object.
---
--- @since 4.5.0.0
-whoCreated :: a -> IO [String]
-whoCreated obj = do
-  ccs <- getCCSOf obj
-  ccsToStrings ccs
-
-renderStack :: [String] -> String
-renderStack strs = "Stack trace:" ++ concatMap ("\n  "++) (reverse strs)
-
--- | Like the function 'error', but appends a stack trace to the error
--- message if one is available.
---
--- @since 4.7.0.0
-errorWithStackTrace :: String -> a
-errorWithStackTrace x = unsafeDupablePerformIO $ do
-   stack <- ccsToStrings =<< getCurrentCCS x
-   if null stack
-      then throwIO (ErrorCall x)
-      else throwIO (ErrorCallWithLocation x (renderStack stack))


From git at git.haskell.org  Fri Nov 20 17:02:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 17:02:33 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: More wibbles (fafafad)
Message-ID: <20151120170233.618A83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/fafafad1a9575b63e28120da0a83b3b790090e0e/ghc

>---------------------------------------------------------------

commit fafafad1a9575b63e28120da0a83b3b790090e0e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 20 15:46:04 2015 +0000

    More wibbles


>---------------------------------------------------------------

fafafad1a9575b63e28120da0a83b3b790090e0e
 compiler/typecheck/TcTyClsDecls.hs                 |     8 +-
 compiler/typecheck/TcTyDecls.hs                    |    30 +-
 compiler/typecheck/TcTypeable.hs                   |    24 +-
 compiler/types/TyCon.hs                            |     7 +-
 testsuite/tests/ghc-api/landmines/Makefile         |     2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout | 59045 -------------------
 6 files changed, 40 insertions(+), 59076 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc fafafad1a9575b63e28120da0a83b3b790090e0e

From git at git.haskell.org  Fri Nov 20 17:09:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 17:09:17 +0000 (UTC)
Subject: [commit: ghc] master: Follow-up fixup to c5d8162d230c373 (f40fe62)
Message-ID: <20151120170917.46D373A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f40fe62d451d7a5af41430cdb6906fd2701698e0/ghc

>---------------------------------------------------------------

commit f40fe62d451d7a5af41430cdb6906fd2701698e0
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Nov 20 18:06:50 2015 +0100

    Follow-up fixup to c5d8162d230c373
    
    This was missing from c5d8162d230c373b2b49ec94d3f9a027ff6e2dd6 / D1501
    for some reason causing the AIX detection to result in `OSUnknown`
    rather than `OSAIX`.


>---------------------------------------------------------------

f40fe62d451d7a5af41430cdb6906fd2701698e0
 aclocal.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 4bd8198..0c8252c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -274,7 +274,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         nto-qnx)
             test -z "[$]2" || eval "[$]2=OSQNXNTO"
             ;;
-        dragonfly|osf1|hpux|linuxaout|freebsd2|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
+        dragonfly|osf1|hpux|linuxaout|freebsd2|gnu|nextstep2|nextstep3|sunos4|ultrix|irix)
             test -z "[$]2" || eval "[$]2=OSUnknown"
             ;;
         aix)


From git at git.haskell.org  Fri Nov 20 23:55:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 23:55:17 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch
 (eb3adff)
Message-ID: <20151120235517.BCD413A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/eb3adffcd8ab9593f7e109d5f703a15ea7b97613/ghc

>---------------------------------------------------------------

commit eb3adffcd8ab9593f7e109d5f703a15ea7b97613
Merge: fafafad f40fe62
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 20 23:50:27 2015 +0000

    Merge remote-tracking branch
    
      'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/parser/Parser.y
    	compiler/rename/RnEnv.hs
    	compiler/rename/RnExpr.hs
    	compiler/typecheck/TcBinds.hs
    	compiler/typecheck/TcErrors.hs
    	compiler/typecheck/TcEvidence.hs
    	compiler/typecheck/TcExpr.hs
    	utils/haddock



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc eb3adffcd8ab9593f7e109d5f703a15ea7b97613

From git at git.haskell.org  Fri Nov 20 23:55:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 20 Nov 2015 23:55:20 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor's head updated: Merge
 remote-tracking branch (eb3adff)
Message-ID: <20151120235520.4510B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/spj-wildcard-refactor' now includes:

     8988be8 Make 'error' include the CCS call stack when profiled
     3353f62 Rip out __HADDOCK__ references
     5488422 Fix bootstrapping with GHC 7.10.1
     46a03fb Implement the Strict language extension
     fe95463 ApiAnnotations: Add SourceText for unicode tokens
     ee91482 ApiAnnotations : ITopenExpQuote needs SourceText
     83b214d RtsFlags: Clean up stale CPP
     b8a849b users-guide: Limit column width
     69822f0 RtsFlags: Refactor some of the deeper switches
     7485d0c ghc.mk: Make install_docs rule sh-compatible
     82cf672 haddock.mk: Use \{1,\} instead of \+
     3773e91 Use TcM instead of it's expanded form, in TcSplice
     741cf18 Weaken monadic list operations to Applicative
     e2d9821 Data.List.isSubsequenceOf documentation clarification
     2d1a563 Implement support for user-defined type errors.
     3d88e89 s/FrontendMerge/FrontendInterface/g
     9193629 Move usage calculation to desugaring, simplifying ModGuts.
     ac1a379 Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."
     df8169c Bump process submodule
     4e74ef9 T9181: Fix testsuite output
     615ba5f Remove orphan Functor instance of Data.Graph.SCC
     7c9cbfd template-haskell: drop `TemplateHaskell` requirement
     b3d6c0f Update Cabal submodule for new known extension
     8ad9e74 Make `timer_create(CLOCK_REALTIME)` autoconf test more reliable
     acce37f Fix archive loading on Windows by the runtime loader
     7b962ba Implement OverloadedLabels
     233d131 MonadFail proposal, phase 1
     98a4fa5 DynFlags: Don't list TemplateHaskell as supported if it's not
     11e336e More import related hints
     f405e1e Disable failed specialisation warnings by default & update documentation.
     f9e17fd Add -fwarn-missing-monadfail-instance to mkUserGuidePart
     6b3d5b5 rts: Kill PAPI support
     c945c90 base: Documentation for TypeError
     112ce87 docs: Ignore Sphinx doctrees produced by manpage build
     3ee0c14 Improve MonadFail errors by mentioning the pattern
     2f7e895 users-guide: Give links more contrast
     a0f977e relnotes: Update base version
     8eefdf0 users-guide: Use tango pygments style
     02eb44d users-guide: Fix typo in conf.py
     2d0e1db Comments only
     8e8d26a Comments on TcRnTypes.canDischarge
     07eb258 Refactor HsExpr.RecordCon, RecordUpd
     c61759d Fix inconsistent pretty-printing of type families
     cc79dd1 users-guide: Move <h1> outside of <a> tag
     971f2c9 Correct &gt; to > in user's guide
     a41830f Mention "-XMonadFailDesugaring" in the docs
     a586622 Release Notes: Mention out-of-scope error message improvements
     2442038 Fix interaction of DuplicateRecordFields and GHC.Generics
     3e2a4ee Fix broken build-system when libffi uses install-sh
     65d7ff0 Make `derivedConstants` more crosscompile-friendly
     7dfde0e derivedConstants: Add support for AIX
     c5d8162 Make GHC aware of OSAIX and AixLD
     75036aa Set AIX specific CFLAGS flags
     fce0465 Unbreak Text.Read.Lex.lex on Unicode symbols
     d732ce0 Bump process submodule
     b72ca3e Pattern Synonym Documentation
     a689c8e ghci: don't let ctags/etags overwrite source files
     1994304 user's guide: Fix some accidental triple-` quote
     998c371 users-guide: Fix version number
     7e6dcf4 base: Delete errant GHC/Stack.hsc
     f40fe62 Follow-up fixup to c5d8162d230c373
     eb3adff Merge remote-tracking branch

From git at git.haskell.org  Sat Nov 21 12:43:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 21 Nov 2015 12:43:12 +0000 (UTC)
Subject: [commit: ghc] master: Fix Windows builds after D1242 (7f77e4e)
Message-ID: <20151121124312.183AF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7f77e4e9b301493db0782cf2d129cf62dbcd5af6/ghc

>---------------------------------------------------------------

commit 7f77e4e9b301493db0782cf2d129cf62dbcd5af6
Author: Tamar Christina <tamar at zhox.com>
Date:   Sat Nov 21 13:33:09 2015 +0100

    Fix Windows builds after D1242
    
    Summary:
    Only use the merge_sections.ld linker script if SplitSections is enabled.
    
    I thought I had a way to make the linker script actually work on Windows
    and produce object files instead of image files (by using the "INSERT AFTER"
    linker script command to get the default script's output format setting),
    but that fix caused ghci to crash with an illegal instruction on startup.
    
    Gave up and made a simpler fix of just disabling this for normal builds,
    as it's only really relevant with SplitSections enabled anyway.
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: austin, thomie
    
    Subscribers: Phyx, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1505
    
    GHC Trac Issues: #8405


>---------------------------------------------------------------

7f77e4e9b301493db0782cf2d129cf62dbcd5af6
 rules/build-package-way.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index d048f74..905b7f0 100644
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@ -136,7 +136,11 @@ BINDIST_LIBS += $$($1_$2_$3_LIB)
 BINDIST_LIBS += $$($1_$2_$3_LIB0)
 endif
 
+ifeq "$$($1_$2_SplitSections)" "YES"
+ifeq "$(LdIsGNULd)" "YES"
 $1_$2_LD_SCRIPT = driver/utils/merge_sections.ld
+endif
+endif
 
 # Build the GHCi library
 ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES"
@@ -151,7 +155,7 @@ BINDIST_LIBS += $$($1_$2_GHCI_LIB)
 endif
 endif
 $$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) $$($1_$2_LD_SCRIPT)
-	$$(call cmd,LD) $$(CONF_LD_LINKER_OPTS_STAGE$4) -r $(if $(filter YES,$(LdIsGNULd)),-T $$($1_$2_LD_SCRIPT)) -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS)
+	$$(call cmd,LD) $$(CONF_LD_LINKER_OPTS_STAGE$4) -r $$(if $$($1_$2_LD_SCRIPT),-T $$($1_$2_LD_SCRIPT)) -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS)
 
 ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES"
 # Don't bother making ghci libs for bootstrapping packages


From git at git.haskell.org  Sat Nov 21 16:15:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 21 Nov 2015 16:15:39 +0000 (UTC)
Subject: [commit: ghc] master: RtsFlags: Fix const warning (d585073)
Message-ID: <20151121161539.BE6BE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d585073d582d82fae80781dc23176b1ef59527a9/ghc

>---------------------------------------------------------------

commit d585073d582d82fae80781dc23176b1ef59527a9
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sat Nov 21 15:48:09 2015 +0100

    RtsFlags: Fix const warning
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1509


>---------------------------------------------------------------

d585073d582d82fae80781dc23176b1ef59527a9
 includes/rts/Flags.h | 14 +++++++-------
 rts/ProfHeap.c       |  4 ++--
 rts/ProfHeap.h       |  2 +-
 rts/RtsFlags.c       |  9 ++++++++-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/includes/rts/Flags.h b/includes/rts/Flags.h
index 878e0f1..9321b4d 100644
--- a/includes/rts/Flags.h
+++ b/includes/rts/Flags.h
@@ -131,13 +131,13 @@ typedef struct _PROFILING_FLAGS {
 
     nat                 ccsLength;
 
-    char*               modSelector;
-    char*               descrSelector;
-    char*               typeSelector;
-    char*               ccSelector;
-    char*               ccsSelector;
-    char*               retainerSelector;
-    char*               bioSelector;
+    const char*         modSelector;
+    const char*         descrSelector;
+    const char*         typeSelector;
+    const char*         ccSelector;
+    const char*         ccsSelector;
+    const char*         retainerSelector;
+    const char*         bioSelector;
 
 } PROFILING_FLAGS;
 
diff --git a/rts/ProfHeap.c b/rts/ProfHeap.c
index bfb8aaa..43bd7b4 100644
--- a/rts/ProfHeap.c
+++ b/rts/ProfHeap.c
@@ -549,9 +549,9 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length)
 }
 
 rtsBool
-strMatchesSelector( char* str, char* sel )
+strMatchesSelector( const char* str, const char* sel )
 {
-   char* p;
+   const char* p;
    // debugBelch("str_matches_selector %s %s\n", str, sel);
    while (1) {
        // Compare str against wherever we've got to in sel.
diff --git a/rts/ProfHeap.h b/rts/ProfHeap.h
index b3bed90..e29a9f6 100644
--- a/rts/ProfHeap.h
+++ b/rts/ProfHeap.h
@@ -14,7 +14,7 @@
 void    heapCensus         (Time t);
 nat     initHeapProfiling  (void);
 void    endHeapProfiling   (void);
-rtsBool strMatchesSelector (char* str, char* sel);
+rtsBool strMatchesSelector (const char* str, const char* sel);
 
 #include "EndPrivate.h"
 
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index e305128..9457279 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -1531,9 +1531,15 @@ static void read_debug_flags(const char* arg)
 
 #ifdef PROFILING
 // Parse a "-h" flag, returning whether the parse resulted in an error.
-static rtsBool read_heap_profiling_flag(const char *arg)
+static rtsBool read_heap_profiling_flag(const char *arg_in)
 {
     // Already parsed "-h"
+
+    // For historical reasons the parser here mutates the arguments.
+    // However, for sanity we want to guarantee const-correctness and parsing
+    // really ought to be an immutable operation. To avoid rewriting the parser
+    // we just operate on a temporary copy of the argument.
+    char *arg = strdup(arg_in);
     rtsBool error = rtsFalse;
     switch (arg[2]) {
     case '\0':
@@ -1638,6 +1644,7 @@ static rtsBool read_heap_profiling_flag(const char *arg)
         error = rtsTrue;
     }
 
+    free(arg);
     return error;
 }
 #endif


From git at git.haskell.org  Sat Nov 21 16:15:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 21 Nov 2015 16:15:42 +0000 (UTC)
Subject: [commit: ghc] master: Suppress conflicting types for builtins
 warnings (192dd06)
Message-ID: <20151121161542.700FD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/192dd068890701a7692890677d4cbf9f2abdb64a/ghc

>---------------------------------------------------------------

commit 192dd068890701a7692890677d4cbf9f2abdb64a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Nov 21 15:48:49 2015 +0100

    Suppress conflicting types for builtins warnings
    
    GCC 4.0 and later warn about type-conflicting prototypes for built-in
    functions such as `strlen`. This is a problem for the via-c backend as
    it generates code such as
    
      typedef void *(*(*StgFunPtr)(void))(void);
      extern StgFunPtr strlen();
    
    However, by using the `-fno-builtin` flag, GCC is told not to try to
    auto-detect such built-in functions and instead treat them as ordinary
    external functions.  This also suppresses this warning.
    
    This address #7660
    
    Test Plan: IIAM
    
    Reviewers: bgamari, austin
    
    Reviewed By: austin
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1506
    
    GHC Trac Issues: #7660


>---------------------------------------------------------------

192dd068890701a7692890677d4cbf9f2abdb64a
 aclocal.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index 0c8252c..e0cd330 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1436,6 +1436,9 @@ AC_CACHE_CHECK([for extra options to pass gcc when compiling via C], [fp_cv_gcc_
  FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.4],
   [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fwrapv"],
   [])
+ FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [4.0],
+  [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fno-builtin"],
+  [])
 ])
 AC_SUBST([GccExtraViaCOpts],$fp_cv_gcc_extra_opts)
 ])


From git at git.haskell.org  Sat Nov 21 16:15:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 21 Nov 2015 16:15:45 +0000 (UTC)
Subject: [commit: ghc] master: Add DVarSet - a deterministic set of Vars
 (6664ab8)
Message-ID: <20151121161545.77C293A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6664ab8356f00ef0b2186f30a0d29a9c0228c045/ghc

>---------------------------------------------------------------

commit 6664ab8356f00ef0b2186f30a0d29a9c0228c045
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Sat Nov 21 15:49:14 2015 +0100

    Add DVarSet - a deterministic set of Vars
    
    This implements `DVarSet`, a deterministic set of Vars, with an
    interface very similar to `VarSet` with a couple of functions missing.
    
    I will need this in changes that follow, one of them will be about
    changing the type of the set of Vars that `RuleInfo` holds to make the
    free variable computation deterministic.
    
    Test Plan:
    ./validate
    I can add new tests if anyone wants me to.
    
    Reviewers: simonpj, simonmar, austin, bgamari
    
    Reviewed By: simonmar, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1487
    
    GHC Trac Issues: #4012


>---------------------------------------------------------------

6664ab8356f00ef0b2186f30a0d29a9c0228c045
 compiler/basicTypes/VarSet.hs |  79 +++++++++++++++++++++-
 compiler/ghc.cabal.in         |   3 +-
 compiler/ghc.mk               |   3 +-
 compiler/utils/UniqDFM.hs     | 150 +++++++++++++++++++++++++++++++++++++++---
 compiler/utils/UniqDSet.hs    |  88 +++++++++++++++++++++++++
 5 files changed, 312 insertions(+), 11 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6664ab8356f00ef0b2186f30a0d29a9c0228c045

From git at git.haskell.org  Sat Nov 21 16:15:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 21 Nov 2015 16:15:48 +0000 (UTC)
Subject: [commit: ghc] master: Create a deterministic version of tyVarsOfType
 (2325bd4)
Message-ID: <20151121161548.E6F883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2325bd4e0fad0e5872556c5a78d1a6a1873e7201/ghc

>---------------------------------------------------------------

commit 2325bd4e0fad0e5872556c5a78d1a6a1873e7201
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Sat Nov 21 15:57:09 2015 +0100

    Create a deterministic version of tyVarsOfType
    
    I've run into situations where I need deterministic `tyVarsOfType` and
    this implementation achieves that and also brings an algorithmic
    improvement.  Union of two `VarSet`s takes linear time the size of the
    sets and in the worst case we can have `n` unions of sets of sizes
    `(n-1, 1), (n-2, 1)...` making it quadratic.
    
    One reason why we need deterministic `tyVarsOfType` is in `abstractVars`
    in `SetLevels`. When we abstract type variables when floating we want
    them to be abstracted in deterministic order.
    
    Test Plan: harbormaster
    
    Reviewers: simonpj, goldfire, austin, hvr, simonmar, bgamari
    
    Reviewed By: simonmar
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1468
    
    GHC Trac Issues: #4012


>---------------------------------------------------------------

2325bd4e0fad0e5872556c5a78d1a6a1873e7201
 compiler/basicTypes/IdInfo.hs                      |   6 +-
 compiler/coreSyn/CoreFVs.hs                        | 248 ++++++++++++---------
 compiler/coreSyn/CoreSeq.hs                        |   4 +-
 compiler/coreSyn/CoreSubst.hs                      |  17 +-
 compiler/deSugar/DsCCall.hs                        |   3 +-
 compiler/deSugar/DsExpr.hs                         |   2 +-
 compiler/ghc.cabal.in                              |   1 +
 compiler/ghc.mk                                    |   1 +
 compiler/ghci/ByteCodeGen.hs                       |  50 ++---
 compiler/ghci/ByteCodeInstr.hs                     |   2 +-
 compiler/ghci/RtClosureInspect.hs                  |   2 +-
 compiler/simplCore/FloatIn.hs                      |  33 +--
 compiler/simplCore/SetLevels.hs                    |  36 +--
 compiler/specialise/Rules.hs                       |   8 +-
 compiler/typecheck/TcDeriv.hs                      |   2 +-
 compiler/typecheck/TcErrors.hs                     |   4 +-
 compiler/typecheck/TcHsType.hs                     |   2 +-
 compiler/typecheck/TcType.hs                       |   1 +
 compiler/types/Coercion.hs                         |  53 +++--
 compiler/types/TypeRep.hs                          |  47 +++-
 compiler/types/Unify.hs                            |   2 +-
 compiler/utils/FV.hs                               |  87 ++++++++
 compiler/vectorise/Vectorise/Exp.hs                |  26 ++-
 .../partial-sigs/should_compile/T10403.stderr      |  12 +-
 .../partial-sigs/should_fail/Trac10045.stderr      |   6 +-
 testsuite/tests/perf/should_run/T10359             | Bin 0 -> 2506523 bytes
 testsuite/tests/polykinds/T9222.stderr             |   8 +-
 27 files changed, 421 insertions(+), 242 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2325bd4e0fad0e5872556c5a78d1a6a1873e7201

From git at git.haskell.org  Sat Nov 21 16:15:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 21 Nov 2015 16:15:52 +0000 (UTC)
Subject: [commit: ghc] master: Function definition in GHCi (b98ff3c)
Message-ID: <20151121161552.AEC5A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b98ff3ccb14e36145404f075349c8689762a2913/ghc

>---------------------------------------------------------------

commit b98ff3ccb14e36145404f075349c8689762a2913
Author: Roman Shatsov <roshats at gmail.com>
Date:   Sat Nov 21 15:58:34 2015 +0100

    Function definition in GHCi
    
    This patch allows define and re-define functions in ghci. `let` is not
    required anymore (but can be used).
    
    Idea: If ghci input string can be parsed as statement then run it as
    statement else run it as declaration.
    
    Reviewers: mpickering, bgamari, austin
    
    Reviewed By: mpickering, bgamari, austin
    
    Subscribers: hvr, mpickering, dterei, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1299
    
    GHC Trac Issues: #7253


>---------------------------------------------------------------

b98ff3ccb14e36145404f075349c8689762a2913
 docs/users_guide/7.12.1-notes.rst            |  2 +
 docs/users_guide/ghci.rst                    | 23 +++++-----
 ghc/GhciMonad.hs                             | 19 +++++++-
 ghc/InteractiveUI.hs                         | 25 ++--------
 testsuite/tests/ghci/should_run/T7253.script | 69 ++++++++++++++++++++++++++++
 testsuite/tests/ghci/should_run/T7253.stderr |  7 +++
 testsuite/tests/ghci/should_run/T7253.stdout |  5 ++
 testsuite/tests/ghci/should_run/T9915.stderr |  5 --
 testsuite/tests/ghci/should_run/all.T        |  1 +
 testsuite/tests/safeHaskell/ghci/p14.stderr  |  6 ++-
 10 files changed, 123 insertions(+), 39 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b98ff3ccb14e36145404f075349c8689762a2913

From git at git.haskell.org  Sun Nov 22 08:14:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 22 Nov 2015 08:14:16 +0000 (UTC)
Subject: [commit: ghc] master: Remove accidentally added T10359 blob (a703fbc)
Message-ID: <20151122081416.F14363A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a703fbce20969e6f02e74fee76c0a9e22b513426/ghc

>---------------------------------------------------------------

commit a703fbce20969e6f02e74fee76c0a9e22b513426
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 22 09:09:06 2015 +0100

    Remove accidentally added T10359 blob
    
    This sneaked in via 2325bd4e0fad0e5872556c5a78d1a6a1873e7201 / D1468 / #4012
    
    This is frustrating... we've added a useless 2.4MiB binary blob to our
    Git history which wastes *everyones* bandwidth for eternity
    (unless we truncate or rewrite history).
    
    We should add lint-checks and/or a pre-receive commit hook test to prevent
    this in future.


>---------------------------------------------------------------

a703fbce20969e6f02e74fee76c0a9e22b513426
 testsuite/.gitignore                   |   1 +
 testsuite/tests/perf/should_run/T10359 | Bin 2506523 -> 0 bytes
 2 files changed, 1 insertion(+)

diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index c2892e6..b126e32 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -1219,6 +1219,7 @@ mk/ghcconfig*_test___spaces_ghc*.exe.mk
 /tests/perf/should_run/T876
 /tests/perf/should_run/T9203
 /tests/perf/should_run/T9339
+/tests/perf/should_run/T10359
 /tests/perf/should_run/lazy-bs-alloc
 /tests/perf/should_run/lazy-bs-alloc.stats
 /tests/perf/should_run/speed.f32
diff --git a/testsuite/tests/perf/should_run/T10359 b/testsuite/tests/perf/should_run/T10359
deleted file mode 100755
index 4968e1b..0000000
Binary files a/testsuite/tests/perf/should_run/T10359 and /dev/null differ


From git at git.haskell.org  Sun Nov 22 08:41:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 22 Nov 2015 08:41:54 +0000 (UTC)
Subject: [commit: ghc] master: Follow-up fix to 3e2a4eefbed7002437c3f (re
 #11109) (4976ab2)
Message-ID: <20151122084154.B14823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4976ab2bd333e28a1d4cfe924d4d8ebb49489366/ghc

>---------------------------------------------------------------

commit 4976ab2bd333e28a1d4cfe924d4d8ebb49489366
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 22 09:38:38 2015 +0100

    Follow-up fix to 3e2a4eefbed7002437c3f (re #11109)
    
    Using `:` as sed-`s`-expr separator is not a good idea on windows, as
    this can result in an expression like
    
       's:@INSTALL@:$(subst ../install-sh,E:/msys64/home/foo/ghc/install-sh, at INSTALL@):g'
    
    (note the `E:/` drive component)
    
    Using `|` instead of `:` has less risk of collision with the substitution expression


>---------------------------------------------------------------

4976ab2bd333e28a1d4cfe924d4d8ebb49489366
 libffi/ghc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 19b6f43..a25dbf0 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -82,7 +82,7 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
 	# install-sh is used when /usr/bin/install is missing; ensure its
 	# path in libffi's Makefile is correct. See GHC #11109.
 	mv libffi/build/Makefile.in libffi/build/Makefile.in.orig
-	sed 's:@INSTALL@:$$(subst ../install-sh,$(TOP)/install-sh, at INSTALL@):g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in
+	sed 's|@INSTALL@|$$(subst ../install-sh,$(TOP)/install-sh, at INSTALL@)|g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in
 
 # * Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
 #   warnings off or the compilation of libffi might fail due to warnings;


From git at git.haskell.org  Sun Nov 22 19:26:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 22 Nov 2015 19:26:30 +0000 (UTC)
Subject: [commit: ghc] master: Add comment to Parser.y re extra API Annotation
 (638fde5)
Message-ID: <20151122192630.9DA5B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/638fde50365f29bc82fdf7058ab966a33d19e5ca/ghc

>---------------------------------------------------------------

commit 638fde50365f29bc82fdf7058ab966a33d19e5ca
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Nov 22 21:18:24 2015 +0200

    Add comment to Parser.y re extra API Annotation
    
    Document extra AnnRarrow annotation on a HsFunTy


>---------------------------------------------------------------

638fde50365f29bc82fdf7058ab966a33d19e5ca
 compiler/parser/Parser.y | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 7b40574..e761828 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -1607,12 +1607,28 @@ context :: { LHsContext RdrName }
                                                    else return ()
                                                 ; ams ctx anns
                                                 } }
+{- Note [GADT decl discards annotations]
+~~~~~~~~~~~~~~~~~~~~~
+The type production for
+
+    btype `->` btype
+
+adds the AnnRarrow annotation twice, in different places.
+
+This is because if the type is processed as usual, it belongs on the annotations
+for the type as a whole.
+
+But if the type is passed to mkGadtDecl, it discards the top level SrcSpan, and
+the top-level annotation will be disconnected. Hence for this specific case it
+is connected to the first type too.
+-}
+
 -- See Note [Parsing ~]
 type :: { LHsType RdrName }
         : btype                         { splitTilde $1 }
         | btype qtyconop type           { sLL $1 $> $ mkHsOpTy $1 $2 $3 }
         | btype tyvarop  type           { sLL $1 $> $ mkHsOpTy $1 $2 $3 }
-        | btype '->'     ctype          {% ams $1 [mu AnnRarrow $2]
+        | btype '->'     ctype          {% ams $1 [mu AnnRarrow $2] -- See note [GADT decl discards annotations]
                                         >> ams (sLL $1 $> $ HsFunTy (splitTilde $1) $3)
                                                [mu AnnRarrow $2] }
         | btype SIMPLEQUOTE qconop type  {% ams (sLL $1 $> $ mkHsOpTy $1 $3 $4)


From git at git.haskell.org  Sun Nov 22 23:10:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 22 Nov 2015 23:10:37 +0000 (UTC)
Subject: [commit: ghc] master: New expected test output for 32 bit platforms
 (64737f2)
Message-ID: <20151122231037.4C42D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/64737f2dfa0ff9ca4f4c056143b3591cedd32652/ghc

>---------------------------------------------------------------

commit 64737f2dfa0ff9ca4f4c056143b3591cedd32652
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Nov 22 23:32:33 2015 +0100

    New expected test output for 32 bit platforms
    
    Test Plan: Test on Arm and PowerPc.
    
    Reviewers: bgamari, thomie, austin
    
    Differential Revision: https://phabricator.haskell.org/D1510
    
    GHC Trac Issues: #11060


>---------------------------------------------------------------

64737f2dfa0ff9ca4f4c056143b3591cedd32652
 testsuite/.gitignore                               |  2 ++
 .../{T2431.stderr => T2431.stderr-ws-32}           |  2 +-
 .../{Roles1.stderr => Roles1.stderr-ws-32}         | 40 +++++++++++-----------
 .../{Roles13.stderr => Roles13.stderr-ws-32}       |  6 ++--
 .../{Roles14.stderr => Roles14.stderr-ws-32}       |  4 +--
 .../{Roles2.stderr => Roles2.stderr-ws-32}         |  8 ++---
 .../{Roles3.stderr => Roles3.stderr-ws-32}         | 16 ++++-----
 .../{Roles4.stderr => Roles4.stderr-ws-32}         |  8 ++---
 .../{T8958.stderr => T8958.stderr-ws-32}           |  8 ++---
 .../{T7360.stderr => T7360.stderr-ws-32}           |  2 +-
 .../{T8274.stdout => T8274.stdout-ws-32}           |  8 ++---
 .../{TH_Roles2.stderr => TH_Roles2.stderr-ws-32}   |  4 +--
 12 files changed, 55 insertions(+), 53 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 64737f2dfa0ff9ca4f4c056143b3591cedd32652

From git at git.haskell.org  Sun Nov 22 23:10:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 22 Nov 2015 23:10:40 +0000 (UTC)
Subject: [commit: ghc] master: ApiAnnotations: Make all RdrName occurences
 Located (3df9563)
Message-ID: <20151122231040.168443A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3df9563e590bbfbfe1bc9171a0e8fc93ceef690d/ghc

>---------------------------------------------------------------

commit 3df9563e590bbfbfe1bc9171a0e8fc93ceef690d
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Nov 22 23:41:57 2015 +0100

    ApiAnnotations: Make all RdrName occurences Located
    
    At the moment the API Annotations can only be used on the ParsedSource,
    as there are changes made to the RenamedSource that prevent it from
    being used to round trip source code.
    
    It is possible to build a map from every Located Name in the
    RenamedSource from its location to the Name, which can then be used when
    resolved names are required when changing the ParsedSource.
    
    However, there are instances where the identifier is not located,
    specifically
    
      (GHC.VarPat name)
      (GHC.HsVar name)
      (GHC.UserTyVar name)
      (GHC.HsTyVar name)
    
    Replace each of the name types above with (Located name)
    
    Updates the haddock submodule.
    
    Test Plan: ./validate
    
    Reviewers: austin, goldfire, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: goldfire, thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1512
    
    GHC Trac Issues: #11019


>---------------------------------------------------------------

3df9563e590bbfbfe1bc9171a0e8fc93ceef690d
 compiler/deSugar/Check.hs                          |  2 +-
 compiler/deSugar/Coverage.hs                       |  2 +-
 compiler/deSugar/DsArrows.hs                       |  6 +--
 compiler/deSugar/DsExpr.hs                         |  5 ++-
 compiler/deSugar/DsGRHSs.hs                        |  6 +--
 compiler/deSugar/DsMeta.hs                         | 40 ++++++++---------
 compiler/deSugar/DsUtils.hs                        |  5 ++-
 compiler/deSugar/Match.hs                          |  2 +-
 compiler/hsSyn/Convert.hs                          | 45 +++++++++++--------
 compiler/hsSyn/HsExpr.hs                           | 20 ++++-----
 compiler/hsSyn/HsPat.hs                            |  4 +-
 compiler/hsSyn/HsTypes.hs                          | 49 +++++++++++----------
 compiler/hsSyn/HsUtils.hs                          | 17 ++++----
 compiler/hsSyn/PlaceHolder.hs                      |  2 +
 compiler/main/InteractiveEval.hs                   |  3 +-
 compiler/parser/Parser.y                           | 50 +++++++++++-----------
 compiler/parser/RdrHsSyn.hs                        | 46 ++++++++++----------
 compiler/rename/RnEnv.hs                           | 10 ++---
 compiler/rename/RnExpr.hs                          | 25 +++++------
 compiler/rename/RnPat.hs                           | 23 +++++-----
 compiler/rename/RnSource.hs                        |  2 +-
 compiler/rename/RnSplice.hs                        |  5 ++-
 compiler/rename/RnTypes.hs                         | 26 +++++------
 compiler/typecheck/Inst.hs                         |  4 +-
 compiler/typecheck/TcBinds.hs                      |  4 +-
 compiler/typecheck/TcExpr.hs                       | 49 +++++++++++----------
 compiler/typecheck/TcHsSyn.hs                      | 10 ++---
 compiler/typecheck/TcHsType.hs                     | 20 ++++-----
 compiler/typecheck/TcInstDcls.hs                   |  4 +-
 compiler/typecheck/TcPat.hs                        |  4 +-
 compiler/typecheck/TcPatSyn.hs                     | 10 ++---
 compiler/typecheck/TcRnDriver.hs                   | 15 ++++---
 compiler/typecheck/TcSplice.hs                     |  3 +-
 compiler/typecheck/TcTyClsDecls.hs                 |  3 +-
 compiler/typecheck/TcTyDecls.hs                    | 13 +++---
 testsuite/tests/ghc-api/landmines/landmines.stdout |  8 ++--
 testsuite/tests/quasiquotation/T7918.hs            |  6 +--
 utils/ghctags/Main.hs                              |  2 +-
 utils/haddock                                      |  2 +-
 39 files changed, 293 insertions(+), 259 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3df9563e590bbfbfe1bc9171a0e8fc93ceef690d

From git at git.haskell.org  Sun Nov 22 23:10:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 22 Nov 2015 23:10:43 +0000 (UTC)
Subject: [commit: ghc] master: Make abstractVars deterministic in SetLevel
 (6393dd8)
Message-ID: <20151122231043.8A2923A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6393dd8e437f68856b2e7889e576ed1bfb0a9678/ghc

>---------------------------------------------------------------

commit 6393dd8e437f68856b2e7889e576ed1bfb0a9678
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Sun Nov 22 23:42:30 2015 +0100

    Make abstractVars deterministic in SetLevel
    
    This fixes a non-determinism bug where depending on the order
    of uniques allocated, the type variables would be in a different order
    when abstracted for the purpose of lifting out an expression.
    
    Test Plan:
    I've added a new testcase that reproduces the problem
    ./validate
    
    Reviewers: simonmar, austin, bgamari, simonpj
    
    Reviewed By: simonpj
    
    Subscribers: nomeata, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1504
    
    GHC Trac Issues: #4012


>---------------------------------------------------------------

6393dd8e437f68856b2e7889e576ed1bfb0a9678
 compiler/coreSyn/CoreFVs.hs                        |  1 +
 compiler/coreSyn/MkCore.hs                         | 11 ++---
 compiler/simplCore/SetLevels.hs                    | 27 ++++++-----
 testsuite/tests/determinism/typecheck/A.hs         | 52 ++++++++++++++++++++++
 .../determinism/{determ002 => typecheck}/Makefile  |  6 +--
 .../determinism/{determ003 => typecheck}/all.T     |  4 +-
 .../determ005.stdout}                              |  0
 7 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/compiler/coreSyn/CoreFVs.hs b/compiler/coreSyn/CoreFVs.hs
index 39a1599..0533038 100644
--- a/compiler/coreSyn/CoreFVs.hs
+++ b/compiler/coreSyn/CoreFVs.hs
@@ -22,6 +22,7 @@ module CoreFVs (
 
         -- * Free variables of Rules, Vars and Ids
         varTypeTyVars,
+        varTypeTyVarsAcc,
         idUnfoldingVars, idFreeVars, idRuleAndUnfoldingVars,
         idFreeVarsAcc,
         idRuleVars, idRuleRhsVars, stableUnfoldingVars,
diff --git a/compiler/coreSyn/MkCore.hs b/compiler/coreSyn/MkCore.hs
index 8670e21..b1d535f 100644
--- a/compiler/coreSyn/MkCore.hs
+++ b/compiler/coreSyn/MkCore.hs
@@ -80,10 +80,10 @@ import BasicTypes
 import Util
 import Pair
 import DynFlags
-
-import Data.Char        ( ord )
 import Data.List
 import Data.Ord
+
+import Data.Char        ( ord )
 #if __GLASGOW_HASKELL__ < 709
 import Data.Word        ( Word )
 #endif
@@ -97,13 +97,14 @@ infixl 4 `mkCoreApp`, `mkCoreApps`
 *                                                                      *
 ************************************************************************
 -}
-
 sortQuantVars :: [Var] -> [Var]
 -- Sort the variables (KindVars, TypeVars, and Ids)
 -- into order: Kind, then Type, then Id
-sortQuantVars = sortBy (comparing withCategory)
+-- It is a deterministic sort, meaining it doesn't look at the values of
+-- Uniques. For explanation why it's important See Note [Unique Determinism]
+-- in Unique.
+sortQuantVars = sortBy (comparing category)
   where
-    withCategory v = (category v, v)
     category :: Var -> Int
     category v
      | isKindVar v = 1
diff --git a/compiler/simplCore/SetLevels.hs b/compiler/simplCore/SetLevels.hs
index d37a62d..2f98007 100644
--- a/compiler/simplCore/SetLevels.hs
+++ b/compiler/simplCore/SetLevels.hs
@@ -998,19 +998,24 @@ abstractVars :: Level -> LevelEnv -> DVarSet -> [OutVar]
         -- Find the variables in fvs, free vars of the target expresion,
         -- whose level is greater than the destination level
         -- These are the ones we are going to abstract out
+        --
+        -- Note that to get reproducible builds, the variables need to be
+        -- abstracted in deterministic order, not dependent on the values of
+        -- Uniques. This is achieved by using DVarSets, deterministic free
+        -- variable computation and deterministic sort.
+        -- See Note [Unique Determinism] in Unique for explanation of why
+        -- Uniques are not deterministic.
 abstractVars dest_lvl (LE { le_subst = subst, le_lvl_env = lvl_env }) in_fvs
-  = map zap $ uniq $ sortQuantVars
+  = map zap $ sortQuantVars $ uniq
     [out_var | out_fv  <- dVarSetElems (substDVarSet subst in_fvs)
-             , out_var <- varSetElems (close out_fv)
+             , out_var <- dVarSetElems (close out_fv)
              , abstract_me out_var ]
         -- NB: it's important to call abstract_me only on the OutIds the
         -- come from substDVarSet (not on fv, which is an InId)
   where
     uniq :: [Var] -> [Var]
-        -- Remove adjacent duplicates; the sort will have brought them together
-    uniq (v1:v2:vs) | v1 == v2  = uniq (v2:vs)
-                    | otherwise = v1 : uniq (v2:vs)
-    uniq vs = vs
+        -- Remove duplicates, preserving order
+    uniq = dVarSetElems . mkDVarSet
 
     abstract_me v = case lookupVarEnv lvl_env v of
                         Just lvl -> dest_lvl `ltLvl` lvl
@@ -1024,11 +1029,11 @@ abstractVars dest_lvl (LE { le_subst = subst, le_lvl_env = lvl_env }) in_fvs
                      setIdInfo v vanillaIdInfo
           | otherwise = v
 
-    close :: Var -> VarSet  -- Close over variables free in the type
-                            -- Result includes the input variable itself
-    close v = foldVarSet (unionVarSet . close)
-                         (unitVarSet v)
-                         (varTypeTyVars v)
+    close :: Var -> DVarSet  -- Close over variables free in the type
+                             -- Result includes the input variable itself
+    close v = foldDVarSet (unionDVarSet . close)
+                          (unitDVarSet v)
+                          (runFVDSet $ varTypeTyVarsAcc v)
 
 type LvlM result = UniqSM result
 
diff --git a/testsuite/tests/determinism/typecheck/A.hs b/testsuite/tests/determinism/typecheck/A.hs
new file mode 100644
index 0000000..50b3ab1
--- /dev/null
+++ b/testsuite/tests/determinism/typecheck/A.hs
@@ -0,0 +1,52 @@
+module A (
+  ) where
+
+-- This reproduces the issue where type variables would be lifted out in
+-- different orders. Compare:
+--
+-- lvl =
+--   \ (@ (c :: * -> *)) (@ (t :: * -> *)) ->
+--     undefined
+--     @ ((forall d. Data d => c (t d))
+--        -> Maybe (c Node))
+--     (some Callstack thing)
+--
+-- $cdataCast1 =
+--   \ (@ (c :: * -> *)) (@ (t :: * -> *)) _ [Occ=Dead] ->
+--     lvl @ c @ t
+--
+-- vs
+--
+-- lvl =
+--   \ (@ (t :: * -> *)) (@ (c :: * -> *)) ->
+--     undefined
+--     @ ((forall d. Data d => c (t d))
+--        -> Maybe (c Node))
+--     (some Callstack thing)
+--
+-- $cdataCast1 =
+--   \ (@ (c :: * -> *)) (@ (t :: * -> *)) _ [Occ=Dead] ->
+--     lvl @ t @ c
+
+import Data.Data
+
+data Node = Node (Maybe Int) [Node]
+
+instance Data Node where
+
+  gfoldl = gfoldl
+  gunfold = gunfold
+  toConstr = toConstr
+  dataTypeOf = dataTypeOf
+
+  dataCast1 = undefined
+  dataCast2 = dataCast2
+
+  gmapT = gmapT
+  gmapQl = gmapQl
+  gmapQr = gmapQr
+  gmapQ = gmapQ
+  gmapQi = gmapQi
+  gmapM = gmapM
+  gmapMp = gmapMp
+  gmapMo = gmapMo
diff --git a/testsuite/tests/determinism/determ002/Makefile b/testsuite/tests/determinism/typecheck/Makefile
similarity index 57%
copy from testsuite/tests/determinism/determ002/Makefile
copy to testsuite/tests/determinism/typecheck/Makefile
index d94a1c2..f95bfc5 100644
--- a/testsuite/tests/determinism/determ002/Makefile
+++ b/testsuite/tests/determinism/typecheck/Makefile
@@ -4,10 +4,10 @@ include $(TOP)/mk/test.mk
 
 TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS))
 
-determ002:
+determ005:
 	$(RM) A.hi A.o
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O A.hs
 	$(CP) A.hi A.old.hi
 	$(RM) A.o
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777206 -dunique-increment=-1 -O A.hs
 	diff A.hi A.old.hi
diff --git a/testsuite/tests/determinism/determ003/all.T b/testsuite/tests/determinism/typecheck/all.T
similarity index 50%
copy from testsuite/tests/determinism/determ003/all.T
copy to testsuite/tests/determinism/typecheck/all.T
index c00544d..5696cef 100644
--- a/testsuite/tests/determinism/determ003/all.T
+++ b/testsuite/tests/determinism/typecheck/all.T
@@ -1,4 +1,4 @@
-test('determ003',
+test('determ005',
      extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
      run_command,
-     ['$MAKE -s --no-print-directory determ003'])
+     ['$MAKE -s --no-print-directory determ005'])
diff --git a/testsuite/tests/determinism/determ002/determ002.stdout b/testsuite/tests/determinism/typecheck/determ005.stdout
similarity index 100%
copy from testsuite/tests/determinism/determ002/determ002.stdout
copy to testsuite/tests/determinism/typecheck/determ005.stdout


From git at git.haskell.org  Mon Nov 23 10:37:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 10:37:04 +0000 (UTC)
Subject: [commit: ghc] master: build.mk.sample: Document meaning of WERROR
 (02c689c)
Message-ID: <20151123103704.C63663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/02c689cd1ce2a55adf6318eb9bd69f227f1abda2/ghc

>---------------------------------------------------------------

commit 02c689cd1ce2a55adf6318eb9bd69f227f1abda2
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 23 11:35:34 2015 +0100

    build.mk.sample: Document meaning of WERROR
    
    31bcf9b62ceaed98bdd3b7605e68d315bcff0c8a changed the behavior of WERROR
    such that it would only apply to the stage 2 build. The reason for this
    was to avoid silly redundant imports and such breaking validation on
    different bootstrap compiler versions.
    
    Document the fact that WERROR now only applies to the stage 2 build.


>---------------------------------------------------------------

02c689cd1ce2a55adf6318eb9bd69f227f1abda2
 mk/build.mk.sample | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 4f83ebb..196becb 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -63,7 +63,8 @@ endif
 # Please use V=1 (the default) when reporting GHC bugs.
 #V=0
 
-# Should all enabled warnings (see mk/warnings.mk) be turned into errors?
+# Should all enabled warnings (see mk/warnings.mk) be turned into errors while
+# building stage 2?
 #WERROR=-Werror
 
 # After stage 1 and the libraries have been built, you can uncomment this line:


From git at git.haskell.org  Mon Nov 23 12:44:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 12:44:09 +0000 (UTC)
Subject: [commit: ghc] master: Rip out Papi configure check (5d6cfbc)
Message-ID: <20151123124409.65CE93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5d6cfbcc89afd71a2e068c1b5f951cdd639079cc/ghc

>---------------------------------------------------------------

commit 5d6cfbcc89afd71a2e068c1b5f951cdd639079cc
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 23 13:44:13 2015 +0100

    Rip out Papi configure check


>---------------------------------------------------------------

5d6cfbcc89afd71a2e068c1b5f951cdd639079cc
 configure.ac | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 99fd892..3889cea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1014,13 +1014,6 @@ AC_COMPILE_IFELSE(
 
 AC_CHECK_FUNCS(__mingw_vfprintf)
 
-if test "$HavePapiLib" = "YES" -a "$HavePapiHeader" = "YES"; then
-   HavePapi=YES
-else
-   HavePapi=NO
-fi
-AC_SUBST(HavePapi)
-
 dnl large address space support (see includes/rts/storage/MBlock.h)
 dnl
 dnl Darwin has vm_allocate/vm_protect


From git at git.haskell.org  Mon Nov 23 13:39:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 13:39:00 +0000 (UTC)
Subject: [commit: ghc] master: Add a note explaining why every RdrName is
 Located (7c9a04d)
Message-ID: <20151123133900.5D50B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7c9a04d6eda5495f150a1140e6d26fc64e319b7e/ghc

>---------------------------------------------------------------

commit 7c9a04d6eda5495f150a1140e6d26fc64e319b7e
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 23 15:37:25 2015 +0200

    Add a note explaining why every RdrName is Located


>---------------------------------------------------------------

7c9a04d6eda5495f150a1140e6d26fc64e319b7e
 compiler/hsSyn/HsImpExp.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/hsSyn/HsImpExp.hs b/compiler/hsSyn/HsImpExp.hs
index b4108bf..429755e 100644
--- a/compiler/hsSyn/HsImpExp.hs
+++ b/compiler/hsSyn/HsImpExp.hs
@@ -153,6 +153,7 @@ data IE name
         --                                 'ApiAnnotation.AnnType'
 
         -- For details on above see note [Api annotations] in ApiAnnotation
+        -- See Note [Located RdrNames] in HsExpr
 
   | IEThingWith (Located name)
                 IEWildcard


From git at git.haskell.org  Mon Nov 23 14:21:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 14:21:39 +0000 (UTC)
Subject: [commit: ghc] master: Libdw: Fix initial register collection on i386
 (70ee638)
Message-ID: <20151123142139.C96723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/70ee6389ca6be37f369395f100e609e9f16a7200/ghc

>---------------------------------------------------------------

commit 70ee6389ca6be37f369395f100e609e9f16a7200
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 23 12:45:47 2015 +0100

    Libdw: Fix initial register collection on i386
    
    RIP-relative addressing isn't available on i386.


>---------------------------------------------------------------

70ee6389ca6be37f369395f100e609e9f16a7200
 rts/Libdw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rts/Libdw.c b/rts/Libdw.c
index 1415fe6..61fefbd 100644
--- a/rts/Libdw.c
+++ b/rts/Libdw.c
@@ -312,7 +312,8 @@ static bool set_initial_registers(Dwfl_Thread *thread,
              "movl %%ebp, 0x14(%0)\n\t"
              "movl %%esp, 0x18(%0)\n\t"
              "movl %%edi, 0x1c(%0)\n\t"
-             "lea 0(%%eip), %%eax\n\t"
+             "here:\n\t"
+             "movl here,  %%eax\n\t"
              "movl %%eax, 0x20(%0)\n\t"
              :                            /* no output */
              :"r" (&regs[0])              /* input */


From git at git.haskell.org  Mon Nov 23 14:21:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 14:21:42 +0000 (UTC)
Subject: [commit: ghc] master: Libdw: Fix build on 32-bit platforms (dbad0d5)
Message-ID: <20151123142142.6D63D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dbad0d5d8dc1fa616065a49f5175adafb4f36080/ghc

>---------------------------------------------------------------

commit dbad0d5d8dc1fa616065a49f5175adafb4f36080
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 23 12:37:17 2015 +0100

    Libdw: Fix build on 32-bit platforms
    
    The casting here is a bit tricky since Dwarf_Addr is always 64-bits.
    This means we first need to narrow to uintptr_t before casting to/from a
    pointer for compatibility on 32-bit architectures.


>---------------------------------------------------------------

dbad0d5d8dc1fa616065a49f5175adafb4f36080
 rts/Libdw.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rts/Libdw.c b/rts/Libdw.c
index 53c2cde..1415fe6 100644
--- a/rts/Libdw.c
+++ b/rts/Libdw.c
@@ -123,18 +123,19 @@ LibdwSession *libdwInit() {
 
 int libdwLookupLocation(LibdwSession *session, Location *frame,
                         StgPtr pc) {
+    Dwarf_Addr addr = (Dwarf_Addr) (uintptr_t) pc;
     // Find the module containing PC
-    Dwfl_Module *mod = dwfl_addrmodule(session->dwfl, (Dwarf_Addr) pc);
+    Dwfl_Module *mod = dwfl_addrmodule(session->dwfl, addr);
     if (mod == NULL)
         return 1;
     dwfl_module_info(mod, NULL, NULL, NULL, NULL, NULL,
                      &frame->object_file, NULL);
 
     // Find function name
-    frame->function = dwfl_module_addrname(mod, (Dwarf_Addr) pc);
+    frame->function = dwfl_module_addrname(mod, addr);
 
     // Try looking up source location
-    Dwfl_Line *line = dwfl_module_getsrc(mod, (Dwarf_Addr) pc);
+    Dwfl_Line *line = dwfl_module_getsrc(mod, addr);
     if (line != NULL) {
         Dwarf_Addr addr;
         int lineno, colno;
@@ -227,7 +228,7 @@ static int getBacktraceFrameCb(Dwfl_Frame *frame, void *arg) {
     } else {
         if (is_activation)
             pc -= 1; // TODO: is this right?
-        backtracePush(session->cur_bt, (StgPtr) pc);
+        backtracePush(session->cur_bt, (StgPtr) (uintptr_t) pc);
     }
 
     return DWARF_CB_OK;
@@ -264,7 +265,7 @@ static pid_t next_thread(Dwfl *dwfl, void *arg, void **thread_argp) {
 
 static bool memory_read(Dwfl *dwfl STG_UNUSED, Dwarf_Addr addr,
                         Dwarf_Word *result, void *arg STG_UNUSED) {
-    *result = *(Dwarf_Word *) addr;
+    *result = *(Dwarf_Word *) (uintptr_t) addr;
     return true;
 }
 


From git at git.haskell.org  Mon Nov 23 15:11:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 15:11:41 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Comments (852dac2)
Message-ID: <20151123151141.AE3E23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/852dac205f36e92a3ede91e9fcbd9b70493757f2/ghc

>---------------------------------------------------------------

commit 852dac205f36e92a3ede91e9fcbd9b70493757f2
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 13:19:04 2015 +0000

    Comments


>---------------------------------------------------------------

852dac205f36e92a3ede91e9fcbd9b70493757f2
 compiler/hsSyn/HsTypes.hs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/compiler/hsSyn/HsTypes.hs b/compiler/hsSyn/HsTypes.hs
index ee520a6..5f0db04 100644
--- a/compiler/hsSyn/HsTypes.hs
+++ b/compiler/hsSyn/HsTypes.hs
@@ -209,10 +209,6 @@ data LHsQTyVars name   -- See Note [HsType binders]
 deriving instance (DataId name) => Data (LHsQTyVars name)
 
 mkHsQTvs :: [LHsTyVarBndr RdrName] -> LHsQTyVars RdrName
--- Just at RdrName because in the Name variant we should know just
--- what the kind-variable binders are; and we don't
--- We put an empty list (rather than a panic) for the kind vars so
--- that the pretty printer works ok on them.
 mkHsQTvs tvs = HsQTvs { hsq_kvs = PlaceHolder, hsq_tvs = tvs }
 
 hsQTvBndrs :: LHsQTyVars name -> [LHsTyVarBndr name]


From git at git.haskell.org  Mon Nov 23 15:11:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 15:11:44 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Missing annotations: unicode
 foralls (4bbdb64)
Message-ID: <20151123151144.56BEA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/4bbdb64539255ff8a2705078bea370fcbedbde11/ghc

>---------------------------------------------------------------

commit 4bbdb64539255ff8a2705078bea370fcbedbde11
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 13:19:32 2015 +0000

    Missing annotations: unicode foralls


>---------------------------------------------------------------

4bbdb64539255ff8a2705078bea370fcbedbde11
 compiler/parser/Parser.y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 529bcbd..c6ce079 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -1559,7 +1559,7 @@ ctype   :: { LHsType RdrName }
                                            ams (sLL $1 $> $
                                                 HsForAllTy { hst_bndrs = $2
                                                            , hst_body = $4 })
-                                               [mj AnnForall $1, mj AnnDot $3] }
+                                               [mu AnnForall $1, mj AnnDot $3] }
         | context '=>' ctype          {% addAnnotation (gl $1) (toUnicodeAnn AnnDarrow $2) (gl $2)
                                          >> return (sLL $1 $> $
                                             HsQualTy { hst_ctxt = $1
@@ -1584,7 +1584,7 @@ ctypedoc :: { LHsType RdrName }
                                             ams (sLL $1 $> $
                                                  HsForAllTy { hst_bndrs = $2
                                                             , hst_body = $4 })
-                                                [mj AnnForall $1,mj AnnDot $3] }
+                                                [mu AnnForall $1,mj AnnDot $3] }
         | context '=>' ctypedoc       {% addAnnotation (gl $1) (toUnicodeAnn AnnDarrow $2) (gl $2)
                                          >> return (sLL $1 $> $
                                             HsQualTy { hst_ctxt = $1


From git at git.haskell.org  Mon Nov 23 15:11:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 15:11:47 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Error message wibbles
 (5e0727e)
Message-ID: <20151123151147.11D013A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/5e0727e3f253fa4aaf991e03631fb7113bb15e88/ghc

>---------------------------------------------------------------

commit 5e0727e3f253fa4aaf991e03631fb7113bb15e88
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 13:20:51 2015 +0000

    Error message wibbles


>---------------------------------------------------------------

5e0727e3f253fa4aaf991e03631fb7113bb15e88
 testsuite/tests/monadfail/MonadFailErrors.stderr           | 14 +++++++-------
 .../should_fail/overloadedlabelsfail01.stderr              |  2 +-
 .../tests/typecheck/should_fail/CustomTypeErrors02.stderr  |  2 +-
 .../tests/typecheck/should_fail/CustomTypeErrors03.stderr  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/testsuite/tests/monadfail/MonadFailErrors.stderr b/testsuite/tests/monadfail/MonadFailErrors.stderr
index 17807a4..960c84a 100644
--- a/testsuite/tests/monadfail/MonadFailErrors.stderr
+++ b/testsuite/tests/monadfail/MonadFailErrors.stderr
@@ -2,11 +2,11 @@
 MonadFailErrors.hs:16:5: error:
     Could not deduce (MonadFail m)
       arising from a do statement
-                   with the failable pattern ?Just x?
+      with the failable pattern ?Just x?
     from the context: Monad m
       bound by the type signature for:
                  general :: Monad m => m a
-      at MonadFailErrors.hs:14:12-25
+      at MonadFailErrors.hs:14:1-25
     Possible fix:
       add (MonadFail m) to the context of
         the type signature for:
@@ -23,7 +23,7 @@ MonadFailErrors.hs:16:5: error:
 MonadFailErrors.hs:30:5: error:
     No instance for (MonadFail Identity)
       arising from a do statement
-                   with the failable pattern ?Just x?
+      with the failable pattern ?Just x?
     In a stmt of a 'do' block: Just x <- undefined
     In the expression:
       do { Just x <- undefined;
@@ -36,7 +36,7 @@ MonadFailErrors.hs:30:5: error:
 MonadFailErrors.hs:44:5: error:
     No instance for (MonadFail (ST s))
       arising from a do statement
-                   with the failable pattern ?Just x?
+      with the failable pattern ?Just x?
     In a stmt of a 'do' block: Just x <- undefined
     In the expression:
       do { Just x <- undefined;
@@ -49,7 +49,7 @@ MonadFailErrors.hs:44:5: error:
 MonadFailErrors.hs:51:5: error:
     No instance for (MonadFail ((->) r))
       arising from a do statement
-                   with the failable pattern ?Just x?
+      with the failable pattern ?Just x?
     In a stmt of a 'do' block: Just x <- undefined
     In the expression:
       do { Just x <- undefined;
@@ -62,7 +62,7 @@ MonadFailErrors.hs:51:5: error:
 MonadFailErrors.hs:59:5: error:
     No instance for (MonadFail Identity)
       arising from a do statement
-                   with the failable pattern ?Newtype x?
+      with the failable pattern ?Newtype x?
     In a stmt of a 'do' block: Newtype x <- undefined
     In the expression:
       do { Newtype x <- undefined;
@@ -75,7 +75,7 @@ MonadFailErrors.hs:59:5: error:
 MonadFailErrors.hs:67:5: error:
     No instance for (MonadFail Identity)
       arising from a do statement
-                   with the failable pattern ?Data x?
+      with the failable pattern ?Data x?
     In a stmt of a 'do' block: Data x <- undefined
     In the expression:
       do { Data x <- undefined;
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedlabelsfail01.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedlabelsfail01.stderr
index 1631c6d..b9d3bba 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedlabelsfail01.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedlabelsfail01.stderr
@@ -26,6 +26,6 @@ overloadedlabelsfail01.hs:13:5: error:
     from the context: IsLabel "x" t
       bound by the type signature for:
                  c :: IsLabel "x" t => t
-      at overloadedlabelsfail01.hs:12:6-23
+      at overloadedlabelsfail01.hs:12:1-23
     In the expression: #y
     In an equation for ?c?: c = #y
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
index 9ca22ee..b4d4c76 100644
--- a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
@@ -1,7 +1,7 @@
 
 CustomTypeErrors02.hs:17:1: error:
     The type 'a_aES -> a_aES' cannot be represented as an integer.
-    When checking that ?err? has the inferred type
+    When checking the inferred type
       err :: (TypeError ...)
 
 CustomTypeErrors02.hs:17:7: error:
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr
index 330fadb..b1ceb26 100644
--- a/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr
@@ -1,5 +1,5 @@
 
 CustomTypeErrors03.hs:6:6: error:
     This is a type error
-    In the type signature for ?f?:
+    In the type signature:
       f :: TypeError (Text "This is a type error")


From git at git.haskell.org  Mon Nov 23 15:11:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 15:11:50 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch
 'origin/master' into wip/spj-wildcard-refactor (e6be9fd)
Message-ID: <20151123151150.AE3723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/e6be9fda05697784a11195bd0e0472a8487e7466/ghc

>---------------------------------------------------------------

commit e6be9fda05697784a11195bd0e0472a8487e7466
Merge: 5e0727e 5d6cfbc
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 13:42:29 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/deSugar/DsMeta.hs
    	compiler/hsSyn/Convert.hs
    	compiler/hsSyn/HsTypes.hs
    	compiler/parser/Parser.y
    	compiler/parser/RdrHsSyn.hs
    	compiler/rename/RnExpr.hs
    	compiler/rename/RnTypes.hs
    	compiler/typecheck/TcRnDriver.hs
    	compiler/typecheck/TcTyClsDecls.hs
    	testsuite/tests/ghc-api/landmines/landmines.stdout
    	testsuite/tests/partial-sigs/should_compile/T10403.stderr
    	testsuite/tests/partial-sigs/should_fail/Trac10045.stderr
    	testsuite/tests/polykinds/T9222.stderr
    	utils/haddock



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e6be9fda05697784a11195bd0e0472a8487e7466

From git at git.haskell.org  Mon Nov 23 15:11:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 15:11:53 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor's head updated: Merge
 remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
 (e6be9fd)
Message-ID: <20151123151153.08B2B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/spj-wildcard-refactor' now includes:

     7f77e4e Fix Windows builds after D1242
     d585073 RtsFlags: Fix const warning
     192dd06 Suppress conflicting types for builtins warnings
     6664ab8 Add DVarSet - a deterministic set of Vars
     2325bd4 Create a deterministic version of tyVarsOfType
     b98ff3c Function definition in GHCi
     a703fbc Remove accidentally added T10359 blob
     4976ab2 Follow-up fix to 3e2a4eefbed7002437c3f (re #11109)
     638fde5 Add comment to Parser.y re extra API Annotation
     64737f2 New expected test output for 32 bit platforms
     3df9563 ApiAnnotations: Make all RdrName occurences Located
     6393dd8 Make abstractVars deterministic in SetLevel
     02c689c build.mk.sample: Document meaning of WERROR
     5d6cfbc Rip out Papi configure check
     852dac2 Comments
     4bbdb64 Missing annotations: unicode foralls
     5e0727e Error message wibbles
     e6be9fd Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor

From git at git.haskell.org  Mon Nov 23 16:15:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:15:06 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Wibbles to merge with master
 (7ca1b27)
Message-ID: <20151123161506.E83033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/7ca1b27baec059157a4ba874019581a5bdda893e/ghc

>---------------------------------------------------------------

commit 7ca1b27baec059157a4ba874019581a5bdda893e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 16:11:05 2015 +0000

    Wibbles to merge with master


>---------------------------------------------------------------

7ca1b27baec059157a4ba874019581a5bdda893e
 compiler/deSugar/DsMeta.hs       | 4 ++--
 compiler/parser/RdrHsSyn.hs      | 2 +-
 compiler/rename/RnTypes.hs       | 8 ++++----
 compiler/typecheck/TcHsType.hs   | 2 +-
 compiler/typecheck/TcRnDriver.hs | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index 80b5785..8d701af 100644
--- a/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
@@ -769,7 +769,7 @@ rep_wc_ty_sig mk_sig loc sig_ty nm
   = do { nm1 <- lookupLOcc nm
        ; let rep_in_scope_tv tv = do { name <- lookupBinder (hsLTyVarName tv)
                                      ; repTyVarBndrWithKind tv name }
-             all_tvs = map (noLoc . UserTyVar) implicit_tvs ++ explicit_tvs
+             all_tvs = map (noLoc . UserTyVar . noLoc) implicit_tvs ++ explicit_tvs
        ; th_tvs  <- repList tyVarBndrTyConName rep_in_scope_tv all_tvs
        ; th_ctxt <- repLContext ctxt
        ; th_ty   <- repLTy ty
@@ -921,7 +921,7 @@ repHsSigWcType (HsIB { hsib_kvs  = implicit_kvs
                      , hsib_body = sig1 })
   | (explicit_tvs, ctxt, ty) <- splitLHsSigmaTy (hswc_body sig1)
   = addTyVarBinds (HsQTvs { hsq_kvs = implicit_kvs
-                          , hsq_tvs = map (noLoc . UserTyVar) implicit_tvs
+                          , hsq_tvs = map (noLoc . UserTyVar . noLoc) implicit_tvs
                                       ++ explicit_tvs })
                   $ \ th_tvs ->
     do { th_ctxt <- repLContext ctxt
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 8db41ec..4b744fe 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -942,7 +942,7 @@ checkPatBind msg lhs (L _ (_,grhss))
                     ([],[])) }
 
 checkValSigLhs :: LHsExpr RdrName -> P (Located RdrName)
-checkValSigLhs (L _ (HsVar lrdr@(L l v)))
+checkValSigLhs (L _ (HsVar lrdr@(L _ v)))
   | isUnqual v
   , not (isDataOcc (rdrNameOcc v))
   = return lrdr
diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs
index 401bd70..90aa942 100644
--- a/compiler/rename/RnTypes.hs
+++ b/compiler/rename/RnTypes.hs
@@ -591,7 +591,7 @@ rnWildCard _ (AnonWildCard _)
   = do { loc <- getSrcSpanM
        ; uniq <- newUnique
        ; let name = mkInternalName uniq (mkTyVarOcc "_") loc
-       ; return (AnonWildCard name) }
+       ; return (AnonWildCard (L loc name)) }
 
 rnWildCard ctxt wc@(NamedWildCard (L loc rdr_name))
   -- NB: The parser only generates NamedWildCard if -XNamedWildCards
@@ -599,7 +599,7 @@ rnWildCard ctxt wc@(NamedWildCard (L loc rdr_name))
   = do { mb_name <- lookupOccRn_maybe rdr_name
        ; traceRn (text "rnWildCard named" <+> (ppr rdr_name $$ ppr mb_name))
        ; case mb_name of
-           Just n  -> return (NamedWildCard n)
+           Just n  -> return (NamedWildCard (L loc n))
            Nothing -> do { addErr msg  -- I'm not sure how this can happen
                          ; return (NamedWildCard (L loc (mkUnboundNameRdr rdr_name))) } }
   where
@@ -704,11 +704,11 @@ newTyVarNameRn mb_assoc rdr_env loc rdr
 collectNamedWildCards :: LHsType RdrName -> [Located RdrName]
 collectNamedWildCards hs_ty
   = nubBy eqLocated $
-    [L l n | L l (NamedWildCard n) <- collectWildCards hs_ty ]
+    [n | L _ (NamedWildCard n) <- collectWildCards hs_ty ]
 
 collectAnonWildCards :: LHsType Name -> [Name]
 collectAnonWildCards hs_ty
-  = [n | L _ (AnonWildCard n) <- collectWildCards hs_ty ]
+  = [n | L _ (AnonWildCard (L _ n)) <- collectWildCards hs_ty ]
 
 collectWildCards :: LHsType name -> [Located (HsWildCardInfo name)]
 -- | Extract all wild cards from a type.
diff --git a/compiler/typecheck/TcHsType.hs b/compiler/typecheck/TcHsType.hs
index 4ebe834..105a1b8 100644
--- a/compiler/typecheck/TcHsType.hs
+++ b/compiler/typecheck/TcHsType.hs
@@ -1098,7 +1098,7 @@ tcHsTyVarBndr :: HsTyVarBndr Name -> TcM TcTyVar
 -- with a mutable kind in it.
 --
 -- Returned TcTyVar has the same name; no cloning
-tcHsTyVarBndr (UserTyVar name)
+tcHsTyVarBndr (UserTyVar (L _ name))
   = do { kind <- newMetaKindVar
        ; return (mkTcTyVar name kind (SkolemTv False)) }
 tcHsTyVarBndr (KindedTyVar (L _ name) kind)
diff --git a/compiler/typecheck/TcRnDriver.hs b/compiler/typecheck/TcRnDriver.hs
index c6236e4..b7af287 100644
--- a/compiler/typecheck/TcRnDriver.hs
+++ b/compiler/typecheck/TcRnDriver.hs
@@ -1762,7 +1762,7 @@ getGhciStepIO = do
         ghciM   = nlHsAppTy (nlHsTyVar ghciTy) (nlHsTyVar a_tv)
         ioM     = nlHsAppTy (nlHsTyVar ioTyConName) (nlHsTyVar a_tv)
 
-        step_ty = noLoc $ HsForAllTy { hst_bndrs = [noLoc $ UserTyVar a_tv]
+        step_ty = noLoc $ HsForAllTy { hst_bndrs = [noLoc $ UserTyVar (noLoc a_tv)]
                                      , hst_body  = nlHsFunTy ghciM ioM }
 
         stepTy :: LHsSigWcType Name


From git at git.haskell.org  Mon Nov 23 16:15:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:15:09 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Update submodule to
 origin/master (0887e9b)
Message-ID: <20151123161509.963473A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/0887e9b3754a2cc3ebf5a4a09b3aa43aba490cdb/ghc

>---------------------------------------------------------------

commit 0887e9b3754a2cc3ebf5a4a09b3aa43aba490cdb
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 16:13:58 2015 +0000

    Update submodule to origin/master


>---------------------------------------------------------------

0887e9b3754a2cc3ebf5a4a09b3aa43aba490cdb
 libraries/Cabal   | 2 +-
 libraries/array   | 2 +-
 libraries/hpc     | 2 +-
 libraries/process | 2 +-
 libraries/stm     | 2 +-
 utils/haddock     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 75d2807..4e11fb9 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 75d2807a2bb11762f4db70540d2cc9049e9c7968
+Subproject commit 4e11fb9f353ad78c862c4c123143a0e793fc22d5
diff --git a/libraries/array b/libraries/array
index dd75c73..4b43c95 160000
--- a/libraries/array
+++ b/libraries/array
@@ -1 +1 @@
-Subproject commit dd75c73d191b3f07209c38f78ebe9dcc26fc5ed4
+Subproject commit 4b43c95af80ed7e1567244527e5e459912d3e504
diff --git a/libraries/hpc b/libraries/hpc
index e20c61c..5123582 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit e20c61c358e749ea62f6687089ad2a878d5d1a66
+Subproject commit 5123582f48b46efc3d27424bc475125a1de78e2e
diff --git a/libraries/process b/libraries/process
index 7428b61..0edb978 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 7428b614841e6b6416e501453546b0af19a0cd1f
+Subproject commit 0edb97876c2f783b33f9a69089ca9d26a061e112
diff --git a/libraries/stm b/libraries/stm
index e917b59..9870cf1 160000
--- a/libraries/stm
+++ b/libraries/stm
@@ -1 +1 @@
-Subproject commit e917b5944ce0a5b4e32dcc8f00eaddbec1256e98
+Subproject commit 9870cf156e5e7e21785b236da41f2466bf9f4b29
diff --git a/utils/haddock b/utils/haddock
index c091ca8..95e4362 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit c091ca829c253dc7f12f3a816a083c39979130f1
+Subproject commit 95e4362d9200b31f3f26fe8d2f97b5565e5ab7b3


From git at git.haskell.org  Mon Nov 23 16:56:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:56:04 +0000 (UTC)
Subject: [commit: ghc] master: rts: Expose more libdw symbols (36b2139)
Message-ID: <20151123165604.233F63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/36b213903db2363c2153f93c78bce079083f3d68/ghc

>---------------------------------------------------------------

commit 36b213903db2363c2153f93c78bce079083f3d68
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Oct 23 09:15:20 2015 +0200

    rts: Expose more libdw symbols


>---------------------------------------------------------------

36b213903db2363c2153f93c78bce079083f3d68
 includes/rts/Libdw.h | 14 +++++++++-----
 rts/Libdw.c          | 22 ++++++++++++++++++----
 rts/Libdw.h          | 10 ----------
 rts/RtsSymbols.c     | 10 ++++++++++
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/includes/rts/Libdw.h b/includes/rts/Libdw.h
index e4fac7a..3c71ac7 100644
--- a/includes/rts/Libdw.h
+++ b/includes/rts/Libdw.h
@@ -77,14 +77,18 @@ typedef struct Location_ {
     StgWord32 colno;
 } __attribute__((packed)) Location;
 
-#ifdef USE_LIBDW
+struct LibdwSession_;
+typedef struct LibdwSession_ LibdwSession;
 
+/* Free a backtrace */
 void backtraceFree(Backtrace *bt);
 
-#else
+/* Request a backtrace of the current stack state.
+ * May return NULL if a backtrace can't be acquired. */
+Backtrace *libdwGetBacktrace(LibdwSession *session);
 
-INLINE_HEADER void backtraceFree(Backtrace *bt STG_UNUSED) { }
-
-#endif /* USE_LIBDW */
+/* Lookup Location information for the given address.
+ * Returns 0 if successful, 1 if address could not be found. */
+int libdwLookupLocation(LibdwSession *session, Location *loc, StgPtr pc);
 
 #endif /* RTS_LIBDW_H */
diff --git a/rts/Libdw.c b/rts/Libdw.c
index 61fefbd..1ef51b2 100644
--- a/rts/Libdw.c
+++ b/rts/Libdw.c
@@ -6,16 +6,16 @@
  *
  * --------------------------------------------------------------------------*/
 
+#include "Rts.h"
+#include "RtsUtils.h"
+#include "Libdw.h"
+
 #ifdef USE_LIBDW
 
 #include <elfutils/libdwfl.h>
 #include <dwarf.h>
 #include <unistd.h>
 
-#include "Rts.h"
-#include "Libdw.h"
-#include "RtsUtils.h"
-
 static BacktraceChunk *backtraceAllocChunk(BacktraceChunk *next) {
     BacktraceChunk *chunk = stgMallocBytes(sizeof(BacktraceChunk),
                                            "backtraceAllocChunk");
@@ -329,4 +329,18 @@ static const Dwfl_Thread_Callbacks thread_cbs = {
     .set_initial_registers = set_initial_registers,
 };
 
+#else /* !USE_LIBDW */
+
+void backtraceFree(Backtrace *bt STG_UNUSED) { }
+
+Backtrace *libdwGetBacktrace(LibdwSession *session STG_UNUSED) {
+    return NULL;
+}
+
+int libdwLookupLocation(LibdwSession *session STG_UNUSED,
+                        Location *loc STG_UNUSED,
+                        StgPtr pc STG_UNUSED) {
+    return 1;
+}
+
 #endif /* USE_LIBDW */
diff --git a/rts/Libdw.h b/rts/Libdw.h
index 76abebc..e5fa054 100644
--- a/rts/Libdw.h
+++ b/rts/Libdw.h
@@ -18,22 +18,12 @@
 
 #ifdef USE_LIBDW
 
-struct LibdwSession_;
-typedef struct LibdwSession_ LibdwSession;
-
 /* Begin a libdw session. A session is tied to a particular capability */
 LibdwSession *libdwInit(void);
 
 /* Free a session */
 void libdwFree(LibdwSession *session);
 
-/* Request a backtrace of the current stack state */
-Backtrace *libdwGetBacktrace(LibdwSession *session);
-
-/* Lookup Location information for the given address.
- * Returns 0 if successful, 1 if address could not be found. */
-int libdwLookupLocation(LibdwSession *session, Location *loc, StgPtr pc);
-
 /* Pretty-print a backtrace to std*/
 void libdwPrintBacktrace(LibdwSession *session, FILE *file, Backtrace *bt);
 
diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index bac2fc9..bfcc3cd 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -35,6 +35,15 @@
                                 SymI_HasProto(stg_makeStableNamezh)           \
                                 SymI_HasProto(stg_finalizzeWeakzh)
 
+#if defined(USE_LIBDW)
+#define RTS_LIBDW_SYMBOLS                       \
+      SymE_HasProto(backtraceFree)              \
+      SymE_HasProto(libdwGetBacktrace)          \
+      SymE_HasProto(libdwLookupLocation)
+#else
+#define RTS_LIBDW_SYMBOLS
+#endif /* USE_LIBDW */
+
 #if !defined (mingw32_HOST_OS)
 #define RTS_POSIX_ONLY_SYMBOLS                  \
       SymI_HasProto(__hscore_get_saved_termios) \
@@ -667,6 +676,7 @@
       Maybe_Stable_Names                                                \
       RTS_TICKY_SYMBOLS                                                 \
       RTS_PROF_SYMBOLS                                                  \
+      RTS_LIBDW_SYMBOLS                                                 \
       SymI_HasProto(StgReturn)                                          \
       SymI_HasProto(stg_gc_noregs)                                      \
       SymI_HasProto(stg_ret_v_info)                                     \


From git at git.haskell.org  Mon Nov 23 16:56:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:56:07 +0000 (UTC)
Subject: [commit: ghc] master: rts: Add simple resource pool (a3a8ce6)
Message-ID: <20151123165607.3F9403A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a3a8ce6e60466cb3742506c7d7bfa1a5b1012728/ghc

>---------------------------------------------------------------

commit a3a8ce6e60466cb3742506c7d7bfa1a5b1012728
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Oct 22 22:16:46 2015 +0200

    rts: Add simple resource pool


>---------------------------------------------------------------

a3a8ce6e60466cb3742506c7d7bfa1a5b1012728
 rts/Pool.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rts/Pool.h |  54 +++++++++++++++++++
 2 files changed, 234 insertions(+)

diff --git a/rts/Pool.c b/rts/Pool.c
new file mode 100644
index 0000000..6c23807
--- /dev/null
+++ b/rts/Pool.c
@@ -0,0 +1,180 @@
+/* ---------------------------------------------------------------------------
+ *
+ * (c) The GHC Team, 2014-2015
+ *
+ * A pool of lazily allocated things
+ *
+ * --------------------------------------------------------------------------*/
+
+#include "PosixSource.h"
+#include "Rts.h"
+#include "RtsUtils.h"
+#include "Pool.h"
+
+/* used to mark an entry as needing to be freed when released */
+#define FLAG_SHOULD_FREE (1 << 0)
+
+typedef struct PoolEntry_ {
+    struct PoolEntry_ *next;
+    void *thing;
+    StgWord flags;
+} PoolEntry;
+
+struct Pool_ {
+    /* the maximum number of allocated resources in the pool */
+    nat max_size;
+    /* the number of allocated resources to keep in the pool when idle */
+    nat desired_size;
+    /* how many things are currently allocated? (sum of lengths of available and
+     * taken lists) */
+    nat current_size;
+#ifdef THREADED_RTS
+    /* signaled when a thing is released */
+    Condition cond;
+#endif
+    alloc_thing_fn alloc_fn;
+    free_thing_fn free_fn;
+
+    PoolEntry *available;
+    PoolEntry *taken;
+#ifdef THREADED_RTS
+    /* protects entire data structure */
+    Mutex mutex;
+#endif
+};
+
+Pool *poolInit(nat max_size, nat desired_size,
+               alloc_thing_fn alloc_fn, free_thing_fn free_fn) {
+    Pool *pool = stgMallocBytes(sizeof(Pool), "pool_init");
+    pool->max_size = max_size == 0 ? (nat) -1 : max_size;
+    pool->desired_size = desired_size;
+    pool->current_size = 0;
+    pool->alloc_fn = alloc_fn;
+    pool->free_fn = free_fn;
+    pool->available = NULL;
+    pool->taken = NULL;
+#ifdef THREADED_RTS
+    initMutex(&pool->mutex);
+    initCondition(&pool->cond);
+#endif
+    return pool;
+}
+
+int poolFree(Pool *pool) {
+    if (pool->taken != NULL)
+        return 1;
+
+    poolSetMaxSize(pool, 0);
+#ifdef THREADED_RTS
+    closeCondition(&pool->cond);
+    closeMutex(&pool->mutex);
+#endif
+    free(pool);
+    return 0;
+}
+
+/* free available entries such that current_size <= size */
+static void free_available(Pool *pool, nat size) {
+    while (pool->current_size > size && pool->available != NULL) {
+        PoolEntry *ent = pool->available;
+        pool->free_fn(ent->thing);
+        pool->available = ent->next;
+        free(ent);
+        pool->current_size--;
+    }
+}
+
+void poolSetDesiredSize(Pool *pool, nat size) {
+    ACQUIRE_LOCK(&pool->mutex);
+    pool->desired_size = size;
+    free_available(pool, size);
+    RELEASE_LOCK(&pool->mutex);
+}
+
+void poolSetMaxSize(Pool *pool, nat size) {
+    ACQUIRE_LOCK(&pool->mutex);
+    if (size == 0)
+        size = (nat) -1;
+    pool->max_size = size;
+    if (pool->desired_size > pool->max_size) {
+        pool->desired_size = size;
+        free_available(pool, size);
+    }
+    RELEASE_LOCK(&pool->mutex);
+}
+
+nat poolGetMaxSize(Pool *pool) {
+    return pool->max_size;
+}
+
+nat poolGetDesiredSize(Pool *pool) {
+    return pool->desired_size;
+}
+
+void *poolTake(Pool *pool) {
+    PoolEntry *ent = NULL;
+    ACQUIRE_LOCK(&pool->mutex);
+    while (ent == NULL) {
+        if (pool->available != NULL) {
+            ent = pool->available;
+            pool->available = ent->next;
+        } else if (pool->current_size < pool->max_size) {
+            ent = stgMallocBytes(sizeof(PoolEntry), "pool_take");
+            ent->flags = 0;
+            ent->thing = pool->alloc_fn();
+            pool->current_size++;
+        } else {
+#ifdef THREADED_RTS
+            waitCondition(&pool->cond, &pool->mutex);
+#else
+            barf("Tried to take from an empty pool");
+#endif
+        }
+    }
+
+    ent->next = pool->taken;
+    pool->taken = ent;
+    RELEASE_LOCK(&pool->mutex);
+    return ent->thing;
+}
+
+void poolRelease(Pool *pool, void *thing) {
+    ACQUIRE_LOCK(&pool->mutex);
+    PoolEntry **last = &pool->taken;
+    PoolEntry *ent = pool->taken;
+    while (ent != NULL) {
+        if (ent->thing == thing) {
+            *last = ent->next;
+            if (pool->current_size > pool->desired_size
+                || ent->flags & FLAG_SHOULD_FREE) {
+                pool->free_fn(ent->thing);
+                free(ent);
+            } else {
+                ent->next = pool->available;
+                pool->available = ent;
+#ifdef THREADED_RTS
+                signalCondition(&pool->cond);
+#endif
+            }
+
+            RELEASE_LOCK(&pool->mutex);
+            return;
+        }
+
+        last = &ent->next;
+        ent = ent->next;
+    }
+
+    barf("pool_release: trying to release resource which doesn't belong to pool.");
+}
+
+void poolFlush(Pool *pool) {
+    ACQUIRE_LOCK(&pool->mutex);
+    free_available(pool, 0);
+    PoolEntry *ent = pool->taken;
+    while (ent != NULL) {
+        ent->flags |= FLAG_SHOULD_FREE;
+        ent = ent->next;
+    }
+    RELEASE_LOCK(&pool->mutex);
+}
diff --git a/rts/Pool.h b/rts/Pool.h
new file mode 100644
index 0000000..d1aeab5
--- /dev/null
+++ b/rts/Pool.h
@@ -0,0 +1,54 @@
+#include "Rts.h"
+
+/*
+ * Resource pools
+ *
+ * This module provides an implementation of a simple thread-safe resource pool.
+ * A pool is a shared set of resources, the size of which is bounded by a
+ * maximum size (0 indicates unbounded). Consumers can request a resource from
+ * the pool with pool_take and, when finished can return it to the pool with
+ * pool_release. Resources will be lazily allocated with alloc_fn as necessary.
+ * If the pool is already at its maximum size when a request is made, pool_take
+ * will block until a resource is freed.
+ *
+ * The pool will free resources such that there are at most desired_size
+ * resources in the pool when all resources have been released.
+ *
+ * invariant: desired_size <= max_size
+ *
+ */
+
+typedef void *(*alloc_thing_fn)(void);
+typedef void (*free_thing_fn)(void *);
+typedef struct Pool_ Pool;
+
+/* Create a pool of things. */
+Pool *poolInit(nat max_size, nat desired_size,
+               alloc_thing_fn alloc_fn, free_thing_fn free_fn);
+
+/* Free a pool. Returns 0 on success or 1 on failure due to things
+ * belonging to the pool currently being claimed. */
+int poolFree(Pool *pool);
+
+/* Set the maximum size of a pool (0 indicates unbounded). desired_size will be
+ * lowered if necessary. */
+void poolSetMaxSize(Pool *pool, nat size);
+
+/* Get the maximum size of a pool */
+nat poolGetMaxSize(Pool *pool);
+
+/* Set the desired size of a pool */
+void poolSetDesiredSize(Pool *pool, nat size);
+
+/* Get the desired size of a pool */
+nat poolGetDesiredSize(Pool *pool);
+
+/* Grab an available thing from a pool */
+void *poolTake(Pool *pool);
+
+/* Release a thing back to the pool from which it was taken */
+void poolRelease(Pool *pool, void *thing);
+
+/* Invalidate all currently allocated resources. Things which are currently
+ * taken will be freed upon release instead of being returned to the pool. */
+void poolFlush(Pool *pool);


From git at git.haskell.org  Mon Nov 23 16:56:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:56:10 +0000 (UTC)
Subject: [commit: ghc] master: rts: Add LibdwPool,
 a pool for libdw sessions (6fbf22d)
Message-ID: <20151123165610.6416F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6fbf22da47a18145daf59c8f262f46af2cb8cefb/ghc

>---------------------------------------------------------------

commit 6fbf22da47a18145daf59c8f262f46af2cb8cefb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Oct 22 22:17:11 2015 +0200

    rts: Add LibdwPool, a pool for libdw sessions
    
    Differential Revision: https://phabricator.haskell.org/D1198#40948


>---------------------------------------------------------------

6fbf22da47a18145daf59c8f262f46af2cb8cefb
 includes/Rts.h           |  1 +
 includes/rts/LibdwPool.h | 22 ++++++++++++++++++++++
 rts/LibdwPool.c          | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 rts/LibdwPool.h          | 30 ++++++++++++++++++++++++++++++
 rts/RtsStartup.c         |  4 ++++
 rts/RtsSymbols.c         |  5 ++++-
 6 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/includes/Rts.h b/includes/Rts.h
index 955cd53..6f4f33e 100644
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -239,6 +239,7 @@ INLINE_HEADER Time fsecondsToTime (double t)
 #include "rts/Main.h"
 #include "rts/StaticPtrTable.h"
 #include "rts/Libdw.h"
+#include "rts/LibdwPool.h"
 
 /* Misc stuff without a home */
 DLL_IMPORT_RTS extern char **prog_argv; /* so we can get at these from Haskell */
diff --git a/includes/rts/LibdwPool.h b/includes/rts/LibdwPool.h
new file mode 100644
index 0000000..3360192
--- /dev/null
+++ b/includes/rts/LibdwPool.h
@@ -0,0 +1,22 @@
+/* ---------------------------------------------------------------------------
+ *
+ * (c) The GHC Team, 2015-2016
+ *
+ * A pool of libdw sessions
+ *
+ * --------------------------------------------------------------------------*/
+
+#ifndef RTS_LIBDW_POOL_H
+#define RTS_LIBDW_POOL_H
+
+/* Claim a session from the pool */
+LibdwSession *libdwPoolTake(void);
+
+/* Return a session to the pool */
+void libdwPoolRelease(LibdwSession *sess);
+
+/* Free any sessions in the pool forcing a reload of any loaded debug
+ * information */
+void libdwPoolClear(void);
+
+#endif /* RTS_LIBDW_POOL_H */
diff --git a/rts/LibdwPool.c b/rts/LibdwPool.c
new file mode 100644
index 0000000..f625c0f
--- /dev/null
+++ b/rts/LibdwPool.c
@@ -0,0 +1,48 @@
+/* ---------------------------------------------------------------------------
+ *
+ * (c) The GHC Team, 2014-2015
+ *
+ * A pool of libdw sessions
+ *
+ * --------------------------------------------------------------------------*/
+
+#include "Rts.h"
+#include "RtsUtils.h"
+#include "LibdwPool.h"
+
+#ifdef USE_LIBDW
+
+#include <unistd.h>
+
+#include "Pool.h"
+
+static Pool *pool = NULL;
+static nat pool_size = 10; // TODO
+
+void libdwPoolInit(void) {
+    pool = poolInit(pool_size, pool_size,
+                    (alloc_thing_fn) libdwInit,
+                    (free_thing_fn) libdwFree);
+}
+
+LibdwSession *libdwPoolTake(void) {
+    return poolTake(pool);
+}
+
+void libdwPoolRelease(LibdwSession *sess) {
+    poolRelease(pool, sess);
+}
+
+void libdwPoolClear(void) {
+    poolFlush(pool);
+}
+
+#else /* !USE_LIBDW */
+
+LibdwSession *libdwPoolTake(void) { return NULL; }
+
+void libdwPoolRelease(LibdwSession *sess STG_UNUSED) { }
+
+void libdwPoolClear(void) { }
+
+#endif /* USE_LIBDW */
diff --git a/rts/LibdwPool.h b/rts/LibdwPool.h
new file mode 100644
index 0000000..a6b670e
--- /dev/null
+++ b/rts/LibdwPool.h
@@ -0,0 +1,30 @@
+/* ---------------------------------------------------------------------------
+ *
+ * (c) The GHC Team, 2015-2016
+ *
+ * A pool of libdw sessions
+ *
+ * --------------------------------------------------------------------------*/
+
+#ifndef LIBDW_POOL_H
+#define LIBDW_POOL_H
+
+#include "BeginPrivate.h"
+
+#include "Rts.h"
+#include "Libdw.h"
+
+#ifdef USE_LIBDW
+
+/* Initialize the pool */
+void libdwPoolInit(void);
+
+#else
+
+INLINE_HEADER void libdwPoolInit(void) {}
+
+#endif /* USE_LIBDW */
+
+#include "EndPrivate.h"
+
+#endif /* LIBDW_POOL_H */
diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index ac4460e..bd6a6ae 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -34,6 +34,7 @@
 #include "Globals.h"
 #include "FileLock.h"
 #include "LinkerInternals.h"
+#include "LibdwPool.h"
 
 #if defined(PROFILING)
 # include "ProfHeap.h"
@@ -164,6 +165,9 @@ hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config)
     initTracing();
 #endif
 
+    /* Initialise libdw session pool */
+    libdwPoolInit();
+
     /* initialise scheduler data structures (needs to be done before
      * initStorage()).
      */
diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index bfcc3cd..936dffc 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -39,7 +39,10 @@
 #define RTS_LIBDW_SYMBOLS                       \
       SymE_HasProto(backtraceFree)              \
       SymE_HasProto(libdwGetBacktrace)          \
-      SymE_HasProto(libdwLookupLocation)
+      SymE_HasProto(libdwLookupLocation)        \
+      SymE_HasProto(libdwPoolTake)              \
+      SymE_HasProto(libdwPoolRelease)           \
+      SymE_HasProto(libdwPoolClear)
 #else
 #define RTS_LIBDW_SYMBOLS
 #endif /* USE_LIBDW */


From git at git.haskell.org  Mon Nov 23 16:56:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:56:13 +0000 (UTC)
Subject: [commit: ghc] master: base: Add Haskell interface to ExecutionStack
 (bb249aa)
Message-ID: <20151123165613.C6E033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bb249aa749c82590823855e970bcc1c4d4b23523/ghc

>---------------------------------------------------------------

commit bb249aa749c82590823855e970bcc1c4d4b23523
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Aug 23 11:48:51 2015 +0200

    base: Add Haskell interface to ExecutionStack
    
    Differential Revision: https://phabricator.haskell.org/D1198#40948


>---------------------------------------------------------------

bb249aa749c82590823855e970bcc1c4d4b23523
 includes/rts/Libdw.h                           |   2 +
 libraries/base/GHC/ExecutionStack.hs           |  49 ++++++
 libraries/base/GHC/ExecutionStack/Internal.hsc | 234 +++++++++++++++++++++++++
 libraries/base/base.cabal                      |   2 +
 4 files changed, 287 insertions(+)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc bb249aa749c82590823855e970bcc1c4d4b23523

From git at git.haskell.org  Mon Nov 23 16:56:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:56:16 +0000 (UTC)
Subject: [commit: ghc] master: Support multiple debug output levels (7aaeaf8)
Message-ID: <20151123165616.809A83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7aaeaf81ea95c36fe1dc4da449cf6092a792fd09/ghc

>---------------------------------------------------------------

commit 7aaeaf81ea95c36fe1dc4da449cf6092a792fd09
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Sep 25 18:00:19 2015 +0200

    Support multiple debug output levels
    
    We now only strip block information from DebugBlocks when compiling with
    `-g1`, intended to be used when only minimal debug information is
    desired. `-g2` is assumed when `-g` is passed without any integer
    argument.
    
    Differential Revision: https://phabricator.haskell.org/D1281


>---------------------------------------------------------------

7aaeaf81ea95c36fe1dc4da449cf6092a792fd09
 compiler/cmm/CmmLayoutStack.hs           |  2 +-
 compiler/codeGen/StgCmmMonad.hs          |  4 ++--
 compiler/coreSyn/CoreLint.hs             |  6 +++---
 compiler/coreSyn/CorePrep.hs             |  2 +-
 compiler/deSugar/Coverage.hs             |  2 +-
 compiler/iface/TcIface.hs                |  4 ++--
 compiler/main/DynFlags.hs                | 10 ++++++----
 compiler/nativeGen/AsmCodeGen.hs         |  6 +++---
 compiler/nativeGen/Dwarf.hs              |  7 ++++---
 compiler/nativeGen/X86/Ppr.hs            |  6 +++---
 utils/mkUserGuidePart/Options/CodeGen.hs |  7 +++++++
 11 files changed, 33 insertions(+), 23 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 7aaeaf81ea95c36fe1dc4da449cf6092a792fd09

From git at git.haskell.org  Mon Nov 23 16:56:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:56:19 +0000 (UTC)
Subject: [commit: ghc] master: Dwarf: Ensure tick parentage is preserved
 (40be909)
Message-ID: <20151123165619.271353A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/40be9091a98e6ea56b845294d916d2324f6d5062/ghc

>---------------------------------------------------------------

commit 40be9091a98e6ea56b845294d916d2324f6d5062
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Oct 30 20:59:45 2015 +0100

    Dwarf: Ensure tick parentage is preserved
    
    Differential Revision: https://phabricator.haskell.org/D1387


>---------------------------------------------------------------

40be9091a98e6ea56b845294d916d2324f6d5062
 compiler/cmm/Debug.hs       |  3 +++
 compiler/nativeGen/Dwarf.hs | 50 +++++++++++++++++++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/compiler/cmm/Debug.hs b/compiler/cmm/Debug.hs
index 83db2a1..fa4d645 100644
--- a/compiler/cmm/Debug.hs
+++ b/compiler/cmm/Debug.hs
@@ -48,6 +48,8 @@ data DebugBlock =
   , dblLabel      :: !Label        -- ^ Hoopl label
   , dblCLabel     :: !CLabel       -- ^ Output label
   , dblHasInfoTbl :: !Bool         -- ^ Has an info table?
+  , dblParent     :: !(Maybe DebugBlock)
+    -- ^ The parent of this proc. See Note [Splitting DebugBlocks]
   , dblTicks      :: ![CmmTickish] -- ^ Ticks defined in this block
   , dblSourceTick
             :: !(Maybe CmmTickish) -- ^ Best source tick covering block
@@ -158,6 +160,7 @@ cmmDebugGen modLoc decls = map (blocksForScope Nothing) topScopes
                                    | g_entry graph == label -> entryLbl
                                    | otherwise              -> blockLbl label
                              , dblHasInfoTbl   = isJust info
+                             , dblParent       = Nothing
                              , dblTicks        = ticks
                              , dblPosition     = Nothing -- see cmmDebugLink
                              , dblUnwind       = unwind
diff --git a/compiler/nativeGen/Dwarf.hs b/compiler/nativeGen/Dwarf.hs
index 3903dd9..b19f534 100644
--- a/compiler/nativeGen/Dwarf.hs
+++ b/compiler/nativeGen/Dwarf.hs
@@ -122,18 +122,52 @@ compileUnitFooter unitU =
   in ppr cuEndLabel <> colon
 
 -- | Splits the blocks by procedures. In the result all nested blocks
--- will come from the same procedure as the top-level block.
+-- will come from the same procedure as the top-level block. See
+-- Note [Splitting DebugBlocks] for details.
 debugSplitProcs :: [DebugBlock] -> [DebugBlock]
-debugSplitProcs b = concat $ H.mapElems $ mergeMaps $ map split b
+debugSplitProcs b = concat $ H.mapElems $ mergeMaps $ map (split Nothing) b
   where mergeMaps = foldr (H.mapUnionWithKey (const (++))) H.mapEmpty
-        split :: DebugBlock -> H.LabelMap [DebugBlock]
-        split blk = H.mapInsert prc [blk {dblBlocks = own_blks}] nested
+        split :: Maybe DebugBlock -> DebugBlock -> H.LabelMap [DebugBlock]
+        split parent blk = H.mapInsert prc [blk'] nested
           where prc = dblProcedure blk
+                blk' = blk { dblBlocks = own_blks
+                           , dblParent = parent
+                           }
                 own_blks = fromMaybe [] $ H.mapLookup prc nested
-                nested = mergeMaps $ map split $ dblBlocks blk
-        -- Note that we are rebuilding the tree here, so tick scopes
-        -- might change. We could fix that - but we actually only care
-        -- about dblSourceTick in the result, so this is okay.
+                nested = mergeMaps $ map (split parent') $ dblBlocks blk
+                -- Figure out who should be the parent of nested blocks.
+                -- If @blk@ is optimized out then it isn't a good choice
+                -- and we just use its parent.
+                parent'
+                  | Nothing <- dblPosition blk = parent
+                  | otherwise                  = Just blk
+
+{-
+Note [Splitting DebugBlocks]
+
+DWARF requires that we break up the the nested DebugBlocks produced from
+the C-- AST. For instance, we begin with tick trees containing nested procs.
+For example,
+
+    proc A [tick1, tick2]
+      block B [tick3]
+        proc C [tick4]
+
+when producing DWARF we need to procs (which are represented in DWARF as
+TAG_subprogram DIEs) to be top-level DIEs. debugSplitProcs is responsible for
+this transform, pulling out the nested procs into top-level procs.
+
+However, in doing this we need to be careful to preserve the parentage of the
+nested procs. This is the reason DebugBlocks carry the dblParent field, allowing
+us to reorganize the above tree as,
+
+    proc A [tick1, tick2]
+      block B [tick3]
+    proc C [tick4] parent=B
+
+Here we have annotated the new proc C with an attribute giving its original
+parent, B.
+-}
 
 -- | Generate DWARF info for a procedure debug block
 procToDwarf :: DynFlags -> DebugBlock -> DwarfInfo


From git at git.haskell.org  Mon Nov 23 16:56:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 16:56:21 +0000 (UTC)
Subject: [commit: ghc] master: Output source notes in extended DWARF DIEs
 (9471562)
Message-ID: <20151123165621.D4EDD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/947156236aeced67bb53db7f963013594d3b7bc3/ghc

>---------------------------------------------------------------

commit 947156236aeced67bb53db7f963013594d3b7bc3
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Oct 23 10:52:12 2015 +0200

    Output source notes in extended DWARF DIEs
    
    In order to accomplish this we need to ensure that emit DIEs for all
    DebugBlocks, even those that have been optimized out, lest we end up
    with undefined symbols of parents at link time.
    
    Differential Revision: https://phabricator.haskell.org/D1279


>---------------------------------------------------------------

947156236aeced67bb53db7f963013594d3b7bc3
 compiler/cmm/CLabel.hs                |  6 +++
 compiler/nativeGen/Dwarf.hs           | 31 ++++++++-----
 compiler/nativeGen/Dwarf/Constants.hs | 35 ++++++++++++---
 compiler/nativeGen/Dwarf/Types.hs     | 82 +++++++++++++++++++++++++++++------
 4 files changed, 125 insertions(+), 29 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 947156236aeced67bb53db7f963013594d3b7bc3

From git at git.haskell.org  Mon Nov 23 17:21:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 17:21:59 +0000 (UTC)
Subject: [commit: ghc] master: Improve constraint-used-as-type error msg
 (5955510)
Message-ID: <20151123172159.44E0A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5955510e5f57464b1f4f42b510e3558d6e691380/ghc

>---------------------------------------------------------------

commit 5955510e5f57464b1f4f42b510e3558d6e691380
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 08:35:44 2015 +0000

    Improve constraint-used-as-type error msg
    
    This responds to Trac #11112 by improving the error message
    when the kind checker discovers something of kind Constraint
    used when a type is expected


>---------------------------------------------------------------

5955510e5f57464b1f4f42b510e3558d6e691380
 compiler/typecheck/TcHsType.hs                     | 60 ++++++++++++----------
 .../indexed-types/should_fail/SimpleFail14.stderr  |  4 +-
 testsuite/tests/typecheck/should_fail/T11112.hs    |  4 ++
 .../tests/typecheck/should_fail/T11112.stderr      |  4 ++
 testsuite/tests/typecheck/should_fail/T3540.stderr | 20 ++++----
 testsuite/tests/typecheck/should_fail/all.T        |  1 +
 .../tests/typecheck/should_fail/tcfail057.stderr   |  4 +-
 .../tests/typecheck/should_fail/tcfail146.stderr   |  4 +-
 8 files changed, 58 insertions(+), 43 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5955510e5f57464b1f4f42b510e3558d6e691380

From git at git.haskell.org  Mon Nov 23 17:22:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 17:22:01 +0000 (UTC)
Subject: [commit: ghc] master: Add tests/monadfail/Makefile (70efb62)
Message-ID: <20151123172201.F30583A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/70efb629291c2c4f7a969d18e84e084f76433404/ghc

>---------------------------------------------------------------

commit 70efb629291c2c4f7a969d18e84e084f76433404
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 17:20:51 2015 +0000

    Add tests/monadfail/Makefile


>---------------------------------------------------------------

70efb629291c2c4f7a969d18e84e084f76433404
 testsuite/tests/{ado => monadfail}/Makefile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/testsuite/tests/ado/Makefile b/testsuite/tests/monadfail/Makefile
similarity index 100%
copy from testsuite/tests/ado/Makefile
copy to testsuite/tests/monadfail/Makefile


From git at git.haskell.org  Mon Nov 23 17:34:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 17:34:04 +0000 (UTC)
Subject: [commit: ghc] master: Add the rest of the notes for Located RdrName
 (e587217)
Message-ID: <20151123173404.E244E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e587217b53a7bb1be1e629e3b71962142794b651/ghc

>---------------------------------------------------------------

commit e587217b53a7bb1be1e629e3b71962142794b651
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 23 19:33:34 2015 +0200

    Add the rest of the notes for Located RdrName


>---------------------------------------------------------------

e587217b53a7bb1be1e629e3b71962142794b651
 compiler/hsSyn/HsExpr.hs   | 12 ++++++++++++
 compiler/hsSyn/HsImpExp.hs |  2 ++
 compiler/hsSyn/HsPat.hs    |  3 ++-
 compiler/hsSyn/HsTypes.hs  |  3 ++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/compiler/hsSyn/HsExpr.hs b/compiler/hsSyn/HsExpr.hs
index af38f4b..7106b06 100644
--- a/compiler/hsSyn/HsExpr.hs
+++ b/compiler/hsSyn/HsExpr.hs
@@ -129,6 +129,8 @@ is Less Cool because
 data HsExpr id
   = HsVar     (Located id)   -- ^ Variable
 
+                             -- See Note [Located RdrNames]
+
   | HsUnboundVar OccName     -- ^ Unbound variable; also used for "holes" _, or _x.
                              -- Turned from HsVar to HsUnboundVar by the renamer, when
                              --   it finds an out-of-scope variable
@@ -592,6 +594,16 @@ P x = P False
 hence we need to provide the correct dictionaries to P on the RHS so that we can
 build the expression.
 
+Note [Located RdrNames]
+~~~~~~~~~~~~~~~~~~~~~~~
+A number of syntax elements have seemingly redundant locations attached to them.
+This is deliberate, to allow transformations making use of the API Annotations
+to easily correlate a Located Name in the RenamedSource with a Located RdrName
+in the ParsedSource.
+
+There are unfortunately enough differences between the ParsedSource and the
+RenamedSource that the API Annotations cannot be used directly with
+RenamedSource, so this allows a simple mapping to be used based on the location.
 -}
 
 instance OutputableBndr id => Outputable (HsExpr id) where
diff --git a/compiler/hsSyn/HsImpExp.hs b/compiler/hsSyn/HsImpExp.hs
index 429755e..b854b98 100644
--- a/compiler/hsSyn/HsImpExp.hs
+++ b/compiler/hsSyn/HsImpExp.hs
@@ -141,11 +141,13 @@ data IE name
         --             'ApiAnnotation.AnnType'
 
         -- For details on above see note [Api annotations] in ApiAnnotation
+        -- See Note [Located RdrNames] in HsExpr
   | IEThingAbs  (Located name)     -- ^ Class/Type (can't tell)
         --  - 'ApiAnnotation.AnnKeywordId's : 'ApiAnnotation.AnnPattern',
         --             'ApiAnnotation.AnnType','ApiAnnotation.AnnVal'
 
         -- For details on above see note [Api annotations] in ApiAnnotation
+        -- See Note [Located RdrNames] in HsExpr
   | IEThingAll  (Located name)     -- ^ Class/Type plus all methods/constructors
         --
         -- - 'ApiAnnotation.AnnKeywordId's : 'ApiAnnotation.AnnOpen',
diff --git a/compiler/hsSyn/HsPat.hs b/compiler/hsSyn/HsPat.hs
index 6d29ddf..3209562 100644
--- a/compiler/hsSyn/HsPat.hs
+++ b/compiler/hsSyn/HsPat.hs
@@ -74,7 +74,8 @@ data Pat id
         -- The sole reason for a type on a WildPat is to
         -- support hsPatType :: Pat Id -> Type
 
-  | VarPat      (Located id)            -- Variable
+  | VarPat      (Located id) -- Variable
+                             -- See Note [Located RdrNames] in HsExpr
   | LazyPat     (LPat id)               -- Lazy pattern
     -- ^ - 'ApiAnnotation.AnnKeywordId' : 'ApiAnnotation.AnnTilde'
 
diff --git a/compiler/hsSyn/HsTypes.hs b/compiler/hsSyn/HsTypes.hs
index e1ea86b..3fea396 100644
--- a/compiler/hsSyn/HsTypes.hs
+++ b/compiler/hsSyn/HsTypes.hs
@@ -226,7 +226,7 @@ instance OutputableBndr HsIPName where
 data HsTyVarBndr name
   = UserTyVar        -- no explicit kinding
          (Located name)
-
+        -- See Note [Located RdrNames] in HsExpr
   | KindedTyVar
          (Located name)
          (LHsKind name)  -- The user-supplied kind signature
@@ -268,6 +268,7 @@ data HsType name
   | HsTyVar    (Located name)
                   -- Type variable, type constructor, or data constructor
                   -- see Note [Promotions (HsTyVar)]
+                  -- See Note [Located RdrNames] in HsExpr
       -- ^ - 'ApiAnnotation.AnnKeywordId' : None
 
       -- For details on above see note [Api annotations] in ApiAnnotation


From git at git.haskell.org  Mon Nov 23 22:13:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 23 Nov 2015 22:13:56 +0000 (UTC)
Subject: [commit: ghc] master: rts: Always export Libdw* symbols (1c45f41)
Message-ID: <20151123221356.C74633A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1c45f4172f57baa1622c5a8421f9edacd0ccfe44/ghc

>---------------------------------------------------------------

commit 1c45f4172f57baa1622c5a8421f9edacd0ccfe44
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Nov 23 23:12:41 2015 +0100

    rts: Always export Libdw* symbols
    
    Otherwise we'll get link time failures as `base` always builds
    `GHC.ExecutionStack`.
    
    Test Plan: Validate
    
    Reviewers: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1519


>---------------------------------------------------------------

1c45f4172f57baa1622c5a8421f9edacd0ccfe44
 rts/RtsSymbols.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index 936dffc..8413d31 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -35,7 +35,6 @@
                                 SymI_HasProto(stg_makeStableNamezh)           \
                                 SymI_HasProto(stg_finalizzeWeakzh)
 
-#if defined(USE_LIBDW)
 #define RTS_LIBDW_SYMBOLS                       \
       SymE_HasProto(backtraceFree)              \
       SymE_HasProto(libdwGetBacktrace)          \
@@ -43,9 +42,6 @@
       SymE_HasProto(libdwPoolTake)              \
       SymE_HasProto(libdwPoolRelease)           \
       SymE_HasProto(libdwPoolClear)
-#else
-#define RTS_LIBDW_SYMBOLS
-#endif /* USE_LIBDW */
 
 #if !defined (mingw32_HOST_OS)
 #define RTS_POSIX_ONLY_SYMBOLS                  \


From git at git.haskell.org  Tue Nov 24 06:01:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 06:01:34 +0000 (UTC)
Subject: [commit: ghc] master: Add `PrelNames.thenAName` for `Applicative(*>)`
 (12dbc89)
Message-ID: <20151124060134.A12E73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/12dbc89228d9a13c011e4f399db1bdc0fa4681f0/ghc

>---------------------------------------------------------------

commit 12dbc89228d9a13c011e4f399db1bdc0fa4681f0
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 23 22:25:38 2015 +0100

    Add `PrelNames.thenAName` for `Applicative(*>)`
    
    This is needed to allow subsequent patches to refer to `*>`.
    
    While at it, this commit also groups together the `Applicative` definitions
    to reduce confusion.
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1513


>---------------------------------------------------------------

12dbc89228d9a13c011e4f399db1bdc0fa4681f0
 compiler/prelude/PrelNames.hs                      | 28 +++++++++++++---------
 .../should_fail/CustomTypeErrors02.stderr          |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/compiler/prelude/PrelNames.hs b/compiler/prelude/PrelNames.hs
index 1b1ffaa..cdf3df6 100644
--- a/compiler/prelude/PrelNames.hs
+++ b/compiler/prelude/PrelNames.hs
@@ -234,9 +234,8 @@ basicKnownKeyNames
         enumFromName, enumFromThenName,
         enumFromThenToName, enumFromToName,
 
-        -- Applicative/Alternative stuff
-        pureAName,
-        apAName,
+        -- Applicative stuff
+        pureAName, apAName, thenAName,
 
         -- Monad stuff
         thenIOName, bindIOName, returnIOName, failIOName, bindMName, thenMName,
@@ -927,9 +926,15 @@ monadFailClassName, failMName :: Name
 monadFailClassName = clsQual mONAD_FAIL (fsLit "MonadFail") monadFailClassKey
 failMName          = varQual mONAD_FAIL (fsLit "fail")      failMClassOpKey
 
--- Classes (Applicative, Foldable, Traversable)
-applicativeClassName, foldableClassName, traversableClassName :: Name
-applicativeClassName  = clsQual  gHC_BASE            (fsLit "Applicative") applicativeClassKey
+-- Class Applicative
+applicativeClassName, pureAName, apAName, thenAName :: Name
+applicativeClassName = clsQual gHC_BASE (fsLit "Applicative") applicativeClassKey
+apAName              = varQual gHC_BASE (fsLit "<*>")         apAClassOpKey
+pureAName            = varQual gHC_BASE (fsLit "pure")        pureAClassOpKey
+thenAName            = varQual gHC_BASE (fsLit "*>")          thenAClassOpKey
+
+-- Classes (Foldable, Traversable)
+foldableClassName, traversableClassName :: Name
 foldableClassName     = clsQual  dATA_FOLDABLE       (fsLit "Foldable")    foldableClassKey
 traversableClassName  = clsQual  dATA_TRAVERSABLE    (fsLit "Traversable") traversableClassKey
 
@@ -937,17 +942,18 @@ traversableClassName  = clsQual  dATA_TRAVERSABLE    (fsLit "Traversable") trave
 
 -- AMP additions
 
-joinMName,  apAName, pureAName, alternativeClassName :: Name
+joinMName, alternativeClassName :: Name
 joinMName            = varQual gHC_BASE (fsLit "join")        joinMIdKey
-apAName              = varQual gHC_BASE (fsLit "<*>")         apAClassOpKey
-pureAName            = varQual gHC_BASE (fsLit "pure")        pureAClassOpKey
 alternativeClassName = clsQual mONAD (fsLit "Alternative") alternativeClassKey
 
-joinMIdKey, apAClassOpKey, pureAClassOpKey, alternativeClassKey :: Unique
+--
+joinMIdKey, apAClassOpKey, pureAClassOpKey, thenAClassOpKey,
+    alternativeClassKey :: Unique
 joinMIdKey          = mkPreludeMiscIdUnique 750
 apAClassOpKey       = mkPreludeMiscIdUnique 751 -- <*>
 pureAClassOpKey     = mkPreludeMiscIdUnique 752
-alternativeClassKey = mkPreludeMiscIdUnique 753
+thenAClassOpKey     = mkPreludeMiscIdUnique 753
+alternativeClassKey = mkPreludeMiscIdUnique 754
 
 
 -- Functions for GHC extensions
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
index 9ca22ee..2fd9036 100644
--- a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
@@ -1,6 +1,6 @@
 
 CustomTypeErrors02.hs:17:1: error:
-    The type 'a_aES -> a_aES' cannot be represented as an integer.
+    The type 'a_aER -> a_aER' cannot be represented as an integer.
     When checking that ?err? has the inferred type
       err :: (TypeError ...)
 


From git at git.haskell.org  Tue Nov 24 11:48:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 11:48:48 +0000 (UTC)
Subject: [commit: ghc] master: Implement new
 `-fwarn-noncanonical-monad-instances` (f09f247)
Message-ID: <20151124114848.7DA033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f09f2470a76bb08b7f51d2f5663daa672b86f618/ghc

>---------------------------------------------------------------

commit f09f2470a76bb08b7f51d2f5663daa672b86f618
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 24 12:46:33 2015 +0100

    Implement new `-fwarn-noncanonical-monad-instances`
    
    Warn about incoherent/non-canonical 'Applicative'/'Monad' instance
    declarations. Specifically the following invariants are checked:
    
    In 'Monad' instances declarations warn if the any of the following
    conditions does not hold:
    
     * If `return` is overridden it must be canonical (i.e. `return = pure`).
     * If `(>>)` is overridden it must be canonical (i.e. `(>>) = (*>)`).
    
    In 'Applicative' instance declarations:
    
     * Warn if 'pure' is defined backwards (i.e. `pure = return`).
     * Warn if '(*>)' is defined backwards (i.e. `(*>) = (>>)`).
    
    NB, this warning flag is not enabled via `-Wall` nor `-Wcompat`.
    
    This addresses #11128
    
    Reviewers: quchen, austin, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1516


>---------------------------------------------------------------

f09f2470a76bb08b7f51d2f5663daa672b86f618
 compiler/main/DynFlags.hs                          |  3 +
 compiler/rename/RnSource.hs                        | 91 +++++++++++++++++++++-
 docs/users_guide/7.12.1-notes.rst                  |  4 +
 docs/users_guide/using-warnings.rst                | 22 ++++++
 testsuite/tests/warnings/should_compile/T11128.hs  | 50 ++++++++++++
 .../tests/warnings/should_compile/T11128.stderr    | 20 +++++
 testsuite/tests/warnings/should_compile/all.T      |  1 +
 utils/mkUserGuidePart/Options/Warnings.hs          |  9 +++
 8 files changed, 199 insertions(+), 1 deletion(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f09f2470a76bb08b7f51d2f5663daa672b86f618

From git at git.haskell.org  Tue Nov 24 13:02:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 13:02:54 +0000 (UTC)
Subject: [commit: ghc] master: Add -Wcompat warning flag group (6d14793)
Message-ID: <20151124130254.19FBB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6d147939628c8503d682ffbe2985ca435d7a7c1d/ghc

>---------------------------------------------------------------

commit 6d147939628c8503d682ffbe2985ca435d7a7c1d
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Tue Nov 24 12:45:00 2015 +0100

    Add -Wcompat warning flag group
    
    Reviewers: hvr, austin, thomie, bgamari
    
    Reviewed By: hvr, austin, thomie, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1495
    
    GHC Trac Issues: #11000


>---------------------------------------------------------------

6d147939628c8503d682ffbe2985ca435d7a7c1d
 compiler/main/DynFlags.hs                          | 31 +++++++++++++++-------
 docs/users_guide/7.12.1-notes.rst                  | 11 ++++++++
 docs/users_guide/using-warnings.rst                | 22 +++++++++++++--
 .../tests/wcompat-warnings/WCompatWarningsNotOn.hs | 12 +++++++++
 .../tests/wcompat-warnings/WCompatWarningsOff.hs   | 12 +++++++++
 .../tests/wcompat-warnings/WCompatWarningsOn.hs    | 12 +++++++++
 .../wcompat-warnings/WCompatWarningsOn.stderr      | 21 +++++++++++++++
 .../tests/wcompat-warnings/WCompatWarningsOnOff.hs | 12 +++++++++
 testsuite/tests/wcompat-warnings/all.T             |  4 +++
 utils/mkUserGuidePart/Options/Warnings.hs          |  7 +++++
 10 files changed, 133 insertions(+), 11 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6d147939628c8503d682ffbe2985ca435d7a7c1d

From git at git.haskell.org  Tue Nov 24 13:02:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 13:02:56 +0000 (UTC)
Subject: [commit: ghc] master: Rearrange error msgs and add section markers
 (Trac #11014). (c05fddd)
Message-ID: <20151124130256.D94453A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c05fdddec71f9dc8ebe62d751ccf03367128072a/ghc

>---------------------------------------------------------------

commit c05fdddec71f9dc8ebe62d751ccf03367128072a
Author: Evan Laforge <qdunkan at gmail.com>
Date:   Tue Nov 24 12:43:18 2015 +0100

    Rearrange error msgs and add section markers (Trac #11014).
    
    This puts the "Relevant bindings" section at the end.
    
    It uses a TcErrors.Report Monoid to divide messages by importance and
    then mappends them together.  This is not the most efficient way since
    there are various intermediate Reports and list appends, but it probably
    doesn't matter since error messages shouldn't get that large, and are
    usually prepended.  In practice, everything is `important` except
    `relevantBindings`, which is `supplementary`.
    
    ErrMsg's errMsgShortDoc and errMsgExtraInfo were extracted into ErrDoc,
    which has important, context, and suppelementary fields.  Each of those
    three sections is marked with a bullet character, '?' on unicode
    terminals and '*' on ascii terminals.  Since this breaks tons of tests,
    I also modified testlib.normalise_errmsg to strip out '?'s.
    
    --- Additional notes:
    
    To avoid prepending * to an empty doc, I needed to filter empty docs.
    This seemed less error-prone than trying to modify everyone who produces
    SDoc to instead produce Maybe SDoc.  So I added `Outputable.isEmpty`.
    Unfortunately it needs a DynFlags, which is kind of bogus, but otherwise
    I think I'd need another Empty case for SDoc, and then it couldn't be a
    newtype any more.
    
    ErrMsg's errMsgShortString is only used by the Show instance, which is
    in turn only used by Show HscTypes.SourceError, which is in turn only
    needed for the Exception instance.  So it's probably possible to get rid
    of errMsgShortString, but that would a be an unrelated cleanup.
    
    Fixes #11014.
    
    Test Plan: see above
    
    Reviewers: austin, simonpj, thomie, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: simonpj, nomeata, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1427
    
    GHC Trac Issues: #11014


>---------------------------------------------------------------

c05fdddec71f9dc8ebe62d751ccf03367128072a
 compiler/cmm/CmmLayoutStack.hs                     |   2 +-
 compiler/main/ErrUtils.hs                          |  80 ++++++----
 compiler/typecheck/TcErrors.hs                     | 166 ++++++++++++++-------
 compiler/typecheck/TcRnMonad.hs                    |  10 +-
 compiler/utils/Outputable.hs                       |   8 +-
 testsuite/driver/testlib.py                        |  12 +-
 testsuite/tests/arrows/should_fail/T5380.stderr    |   8 +-
 testsuite/tests/driver/T2507.stderr                |   6 +-
 testsuite/tests/driver/T6037.stderr                |   6 +-
 testsuite/tests/driver/T8959a.stderr               |   6 +-
 testsuite/tests/gadt/T3169.stderr                  |   4 +-
 testsuite/tests/gadt/T7558.stderr                  |   4 +-
 testsuite/tests/gadt/gadt-escape1.stderr           |   4 +-
 testsuite/tests/gadt/gadt13.stderr                 |   4 +-
 testsuite/tests/gadt/gadt7.stderr                  |   4 +-
 testsuite/tests/gadt/rw.stderr                     |  10 +-
 testsuite/tests/ghci/scripts/Defer02.stderr        |  24 +--
 testsuite/tests/ghci/scripts/ghci050.stderr        |   4 +-
 .../should_compile/PushedInAsGivens.stderr         |  10 +-
 .../indexed-types/should_compile/T3208b.stderr     |   6 +-
 .../indexed-types/should_fail/ExtraTcsUntch.stderr |  12 +-
 .../indexed-types/should_fail/GADTwrong1.stderr    |   4 +-
 .../indexed-types/should_fail/Overlap10.stderr     |   4 +-
 .../indexed-types/should_fail/Overlap11.stderr     |   4 +-
 .../indexed-types/should_fail/Overlap15.stderr     |   4 +-
 .../indexed-types/should_fail/Overlap6.stderr      |   4 +-
 .../indexed-types/should_fail/Overlap9.stderr      |   4 +-
 .../indexed-types/should_fail/SimpleFail16.stderr  |   4 +-
 .../indexed-types/should_fail/SimpleFail5a.stderr  |   4 +-
 .../tests/indexed-types/should_fail/T2544.stderr   |   8 +-
 .../tests/indexed-types/should_fail/T2664.stderr   |   6 +-
 .../tests/indexed-types/should_fail/T2693.stderr   |   4 +-
 .../tests/indexed-types/should_fail/T3330a.stderr  |  12 +-
 .../tests/indexed-types/should_fail/T3330c.stderr  |   4 +-
 .../tests/indexed-types/should_fail/T3440.stderr   |   4 +-
 .../tests/indexed-types/should_fail/T4093a.stderr  |   2 +-
 .../tests/indexed-types/should_fail/T4093b.stderr  |  18 +--
 .../tests/indexed-types/should_fail/T4099.stderr   |   8 +-
 .../tests/indexed-types/should_fail/T4174.stderr   |   8 +-
 .../tests/indexed-types/should_fail/T4179.stderr   |   4 +-
 .../tests/indexed-types/should_fail/T4272.stderr   |   6 +-
 .../tests/indexed-types/should_fail/T5439.stderr   |   4 +-
 .../tests/indexed-types/should_fail/T6123.stderr   |   2 +-
 .../tests/indexed-types/should_fail/T7194.stderr   |   4 +-
 .../tests/indexed-types/should_fail/T7354.stderr   |   4 +-
 .../tests/indexed-types/should_fail/T7354a.stderr  |   2 +-
 .../tests/indexed-types/should_fail/T7729.stderr   |   4 +-
 .../tests/indexed-types/should_fail/T7729a.stderr  |   4 +-
 .../tests/indexed-types/should_fail/T7786.stderr   |  18 +--
 .../tests/indexed-types/should_fail/T8129.stdout   |   2 +-
 .../tests/indexed-types/should_fail/T8227.stderr   |  10 +-
 .../tests/indexed-types/should_fail/T8518.stderr   |  16 +-
 .../tests/indexed-types/should_fail/T9662.stderr   |  24 +--
 testsuite/tests/module/mod71.stderr                |   6 +-
 testsuite/tests/parser/should_fail/T7848.stderr    |  26 ++--
 .../tests/parser/should_fail/readFail003.stderr    |   8 +-
 .../partial-sigs/should_compile/SplicesUsed.stderr |   8 +-
 .../partial-sigs/should_compile/T10438.stderr      |  10 +-
 .../partial-sigs/should_compile/T10463.stderr      |   4 +-
 .../partial-sigs/should_compile/TypedSplice.stderr |   8 +-
 .../should_fail/NamedWildcardsNotEnabled.stderr    |   8 +-
 .../tests/partial-sigs/should_fail/T10045.stderr   |   6 +-
 .../tests/partial-sigs/should_fail/T10615.stderr   |   4 +-
 .../partial-sigs/should_fail/Trac10045.stderr      |   6 +-
 .../WildcardsInPatternAndExprSig.stderr            |  36 ++---
 testsuite/tests/polykinds/T7230.stderr             |   6 +-
 testsuite/tests/polykinds/T7438.stderr             |   4 +-
 testsuite/tests/polykinds/T7594.stderr             |   2 +-
 .../tests/simplCore/should_compile/simpl017.stderr |  20 +--
 testsuite/tests/th/T10267.stderr                   |  12 +-
 testsuite/tests/th/T7276a.stdout                   |  28 ++--
 .../tests/typecheck/should_compile/FD1.stderr      |   2 +-
 .../tests/typecheck/should_compile/FD2.stderr      |   4 +-
 .../tests/typecheck/should_compile/FD3.stderr      |   4 +-
 .../tests/typecheck/should_compile/T2494.stderr    |   8 +-
 .../tests/typecheck/should_compile/T9497a.stderr   |   2 +-
 .../tests/typecheck/should_compile/T9834.stderr    |  12 +-
 .../tests/typecheck/should_compile/holes.stderr    |  14 +-
 .../tests/typecheck/should_compile/holes2.stderr   |   2 +-
 .../tests/typecheck/should_compile/holes3.stderr   |  14 +-
 .../tests/typecheck/should_compile/tc141.stderr    |   8 +-
 .../typecheck/should_fail/FDsFromGivens2.stderr    |   4 +-
 .../typecheck/should_fail/FrozenErrorTests.stderr  |  12 +-
 .../tests/typecheck/should_fail/T10285.stderr      |   4 +-
 .../tests/typecheck/should_fail/T10495.stderr      |   2 +-
 .../tests/typecheck/should_fail/T10534.stderr      |   4 +-
 .../tests/typecheck/should_fail/T10715b.stderr     |   2 +-
 testsuite/tests/typecheck/should_fail/T1899.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T2534.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T2688.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T2714.stderr |   8 +-
 testsuite/tests/typecheck/should_fail/T3950.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T5689.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T5853.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T7264.stderr |   4 +-
 .../tests/typecheck/should_fail/T7368a.stderr      |   4 +-
 testsuite/tests/typecheck/should_fail/T7453.stderr |  18 +--
 testsuite/tests/typecheck/should_fail/T7696.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T7734.stderr |   8 +-
 .../tests/typecheck/should_fail/T7748a.stderr      |  10 +-
 testsuite/tests/typecheck/should_fail/T7869.stderr |   8 +-
 testsuite/tests/typecheck/should_fail/T8044.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T8142.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T8262.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T8428.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T8450.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T9109.stderr |   2 +-
 .../tests/typecheck/should_fail/T9497d.stderr      |   2 +-
 testsuite/tests/typecheck/should_fail/T9605.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T9612.stderr |  10 +-
 .../typecheck/should_fail/TcCoercibleFail.stderr   |   4 +-
 testsuite/tests/typecheck/should_fail/mc22.stderr  |   2 +-
 testsuite/tests/typecheck/should_fail/mc23.stderr  |   2 +-
 testsuite/tests/typecheck/should_fail/mc24.stderr  |   2 +-
 testsuite/tests/typecheck/should_fail/mc25.stderr  |   2 +-
 .../tests/typecheck/should_fail/tcfail001.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail002.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail004.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail005.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail013.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail014.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail016.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail032.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail033.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail065.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail068.stderr   |  18 +--
 .../tests/typecheck/should_fail/tcfail076.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail099.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail103.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail122.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail131.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail140.stderr   |  12 +-
 .../tests/typecheck/should_fail/tcfail153.stderr   |   6 +-
 .../tests/typecheck/should_fail/tcfail174.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail175.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail178.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail179.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail182.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail198.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail200.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail201.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail206.stderr   |   8 +-
 testsuite/tests/typecheck/should_run/T10284.stdout |   6 +-
 testsuite/tests/typecheck/should_run/T7861.stderr  |   4 +-
 .../tests/typecheck/should_run/T9497a-run.stderr   |   4 +-
 .../tests/typecheck/should_run/T9497b-run.stderr   |   4 +-
 .../tests/typecheck/should_run/T9497c-run.stderr   |   4 +-
 .../tests/typecheck/should_run/tcrun035.stderr     |   4 +-
 148 files changed, 647 insertions(+), 547 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c05fdddec71f9dc8ebe62d751ccf03367128072a

From git at git.haskell.org  Tue Nov 24 13:02:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 13:02:59 +0000 (UTC)
Subject: [commit: ghc] master: Rewrite checkUniques and incorporate into
 validate (e506f02)
Message-ID: <20151124130259.D6A8F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e506f02dd2ff75857e975170eb1988b3c89ff190/ghc

>---------------------------------------------------------------

commit e506f02dd2ff75857e975170eb1988b3c89ff190
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Nov 24 12:45:27 2015 +0100

    Rewrite checkUniques and incorporate into validate
    
    This should catch duplicate uniques in the future before Bad Things
    happen.
    
    Test Plan: Introduce a duplicate unique and validate
    
    Reviewers: austin, hvr, thomie
    
    Reviewed By: hvr, thomie
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1521


>---------------------------------------------------------------

e506f02dd2ff75857e975170eb1988b3c89ff190
 utils/checkUniques/Makefile         |  14 +----
 utils/checkUniques/check-uniques.py |  48 +++++++++++++++
 utils/checkUniques/checkUniques.hs  | 113 ------------------------------------
 validate                            |   2 +
 4 files changed, 53 insertions(+), 124 deletions(-)

diff --git a/utils/checkUniques/Makefile b/utils/checkUniques/Makefile
index b017473..b53759c 100644
--- a/utils/checkUniques/Makefile
+++ b/utils/checkUniques/Makefile
@@ -1,16 +1,8 @@
+TOP = ../..
 
 GHC = ghc
 
-PREL_NAMES = ../../compiler/prelude/PrelNames.lhs
-DS_META = ../../compiler/deSugar/DsMeta.hs
-
 .PHONY: check
 
-check: checkUniques
-	./checkUniques mkPreludeClassUnique   $(PREL_NAMES)
-	./checkUniques mkPreludeTyConUnique   $(PREL_NAMES) $(DS_META)
-	./checkUniques mkPreludeDataConUnique $(PREL_NAMES)
-	./checkUniques mkPreludeMiscIdUnique  $(PREL_NAMES) $(DS_META)
-
-checkUniques: checkUniques.hs
-	$(GHC) -O -XHaskell2010 --make $@
+check:
+	./check-uniques.py $(TOP)
diff --git a/utils/checkUniques/check-uniques.py b/utils/checkUniques/check-uniques.py
new file mode 100755
index 0000000..42b375e
--- /dev/null
+++ b/utils/checkUniques/check-uniques.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+import os.path
+import sys
+import re
+import glob
+from collections import defaultdict
+
+# keyed on unique type, values are lists of (unique, name) pairs
+def find_uniques(source_files):
+    uniques = defaultdict(lambda: defaultdict(lambda: set()))
+    unique_re = re.compile(r"([\w\d]+)\s*=\s*mk([\w\d']+)Unique\s+(\d+)")
+    for f in source_files:
+        ms = unique_re.findall(open(f).read())
+        for m in ms:
+            name = m[0]
+            _type = m[1]
+            n = int(m[2])
+            uniques[_type][n].add(name)
+
+    return uniques
+
+def print_all(uniques):
+    for _type, uniqs in uniques.items():
+        print('{_type} uniques'.format(**locals()))
+        for n,names in uniqs.items():
+            all_names = ', '.join(names)
+            print('  {n} = {all_names}'.format(**locals()))
+
+def find_conflicts(uniques):
+    return [ (uniqueType, number, names)
+             for uniqueType, uniqs in uniques.items()
+             for number, names in uniqs.items()
+             if len(names) > 1
+           ]
+
+top_dir = sys.argv[1]
+uniques = find_uniques(glob.glob(os.path.join(top_dir, 'compiler', 'prelude', '*.hs')))
+#print_all(uniques)
+conflicts = find_conflicts(uniques)
+if len(conflicts) > 0:
+    print("Error: check-uniques: Found Unique conflict")
+    print()
+    for (ty, n, names) in conflicts:
+        print('    %s unique %d conflict: %s' % (ty, n, ', '.join(names)))
+    print()
+    sys.exit(1)
diff --git a/utils/checkUniques/checkUniques.hs b/utils/checkUniques/checkUniques.hs
deleted file mode 100644
index 2eda188..0000000
--- a/utils/checkUniques/checkUniques.hs
+++ /dev/null
@@ -1,113 +0,0 @@
--- Some things could be improved, e.g.:
--- * Check that each file given contains at least one instance of the
---   function
--- * Check that we are testing all functions
--- * If a problem is found, give better location information, e.g.
---   which problem the file is in
-
-module Main (main) where
-
-import Control.Concurrent
-import Control.Exception
-import Control.Monad
-import Control.Monad.State
-import Data.Char
-import Data.Set (Set)
-import qualified Data.Set as Set
-import System.Environment
-import System.Exit
-import System.IO
-import System.Process
-
-main :: IO ()
-main = do args <- getArgs
-          case args of
-              function : files ->
-                  doit function files
-
-die :: String -> IO a
-die err = do hPutStrLn stderr err
-             exitFailure
-
-type M = StateT St IO
-
-data St = St {
-              stSeen :: Set Int,
-              stLast :: Maybe Int,
-              stHadAProblem :: Bool
-          }
-
-emptyState :: St
-emptyState = St {
-                 stSeen = Set.empty,
-                 stLast = Nothing,
-                 stHadAProblem = False
-             }
-
-use :: Int -> M ()
-use n = do st <- get
-           let seen = stSeen st
-           put $ st { stSeen = Set.insert n seen, stLast = Just n }
-           if (n `Set.member` seen)
-               then problem ("Duplicate " ++ show n)
-               else case stLast st of
-                    Just l
-                     | (l > n) ->
-                        problem ("Decreasing order for " ++ show l
-                                               ++ " -> " ++ show n)
-                    _ ->
-                        return ()
-
-problem :: String -> M ()
-problem str = do lift $ putStrLn str
-                 st <- get
-                 put $ st { stHadAProblem = True }
-
-doit :: String -> [FilePath] -> IO ()
-doit function files
- = do (hIn, hOut, hErr, ph) <- runInteractiveProcess
-                                   "grep" ("-h" : function : files)
-                                   Nothing Nothing
-      hClose hIn
-      strOut <- hGetContents hOut
-      strErr <- hGetContents hErr
-      forkIO $ do evaluate (length strOut)
-                  return ()
-      forkIO $ do evaluate (length strErr)
-                  return ()
-      ec <- waitForProcess ph
-      case (ec, strErr) of
-          (ExitSuccess, "") ->
-              check function strOut
-          _ ->
-              error "grep failed"
-
-check :: String -> String -> IO ()
-check function str
-    = do let ls = lines str
-             -- filter out lines that start with whitespace. They're
-             -- from things like:
-             --     import M ( ...,
-             --                ..., <function>, ...
-             ls' = filter (not . all isSpace . take 1) ls
-         ns <- mapM (parseLine function) ls'
-         st <- execStateT (do mapM_ use ns
-                              st <- get
-                              when (Set.null (stSeen st)) $
-                                  problem "No values found")
-                          emptyState
-         when (stHadAProblem st) exitFailure
-
-parseLine :: String -> String -> IO Int
-parseLine function str
-    = -- words isn't necessarily quite right, e.g. we could have
-    -- "var=" rather than "var =", but it works for the code
-    -- we have
-    case words str of
-    _var : "=" : fun : numStr : rest
-     | fun == function,
-       null rest || "--" == head rest,
-       [(num, "")] <- reads numStr
-          -> return num
-    _ -> error ("Bad line: " ++ show str)
-
diff --git a/validate b/validate
index 4c123fe..3b21002 100755
--- a/validate
+++ b/validate
@@ -157,6 +157,8 @@ if [ $be_quiet -eq 1 ]; then
     make="$make -s"
 fi
 
+$make -C utils/checkUniques
+
 if [ $testsuite_only -eq 0 ]; then
 
 if [ $no_clean -eq 0 ]; then


From git at git.haskell.org  Tue Nov 24 13:03:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 13:03:02 +0000 (UTC)
Subject: [commit: ghc] master: DynFlags: Update comments to reflect new users
 guide (8c5fe53)
Message-ID: <20151124130302.9457D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8c5fe53b411d83279fea44f89538a7265b1275ff/ghc

>---------------------------------------------------------------

commit 8c5fe53b411d83279fea44f89538a7265b1275ff
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Nov 24 12:41:44 2015 +0100

    DynFlags: Update comments to reflect new users guide


>---------------------------------------------------------------

8c5fe53b411d83279fea44f89538a7265b1275ff
 compiler/main/DynFlags.hs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index f386d8d..39fb81a 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -211,10 +211,10 @@ import GHC.Foreign (withCString, peekCString)
 -- described in the User's Guide. Usually at least two sections need to be
 -- updated:
 --
---  * Flag Reference section in docs/users-guide/flags.xml lists all available
---    flags together with a short description
+--  * Flag Reference section generated from the modules in
+--    utils/mkUserGuidePart/Options
 --
---  * Flag description in docs/users_guide/using.xml provides a detailed
+--  * Flag description in docs/users_guide/using.rst provides a detailed
 --    explanation of flags' usage.
 
 -- Note [Supporting CLI completion]
@@ -3358,8 +3358,8 @@ impliedXFlags
 -- If you change the list of flags enabled for particular optimisation levels
 -- please remember to update the User's Guide. The relevant files are:
 --
---  * docs/users_guide/flags.xml
---  * docs/users_guide/using.xml
+--  * utils/mkUserGuidePart/Options/
+--  * docs/users_guide/using.rst
 --
 -- The first contains the Flag Refrence section, which breifly lists all
 -- available flags. The second contains a detailed description of the
@@ -3416,7 +3416,8 @@ optLevelFlags -- see Note [Documenting optimisation flags]
 -- If you change the list of warning enabled by default
 -- please remember to update the User's Guide. The relevant file is:
 --
---  * docs/users_guide/using.xml
+--  * utils/mkUserGuidePart/
+--  * docs/users_guide/using.rst
 
 -- | Warnings enabled unless specified otherwise
 standardWarnings :: [WarningFlag]


From git at git.haskell.org  Tue Nov 24 14:28:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 14:28:44 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T9858-typeable-spj' deleted
Message-ID: <20151124142844.06C273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Deleted branch: wip/T9858-typeable-spj

From git at git.haskell.org  Tue Nov 24 14:28:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 14:28:52 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T9858-typeable-ben' deleted
Message-ID: <20151124142852.E9BB83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Deleted branch: wip/T9858-typeable-ben

From git at git.haskell.org  Tue Nov 24 15:08:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 15:08:59 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (8dc6da8)
Message-ID: <20151124150859.A9C053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8dc6da83f43ceb5e595e00fc454111720fe02ec3/ghc

>---------------------------------------------------------------

commit 8dc6da83f43ceb5e595e00fc454111720fe02ec3
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Nov 24 13:25:51 2015 +0000

    Comments only


>---------------------------------------------------------------

8dc6da83f43ceb5e595e00fc454111720fe02ec3
 compiler/typecheck/TcSMonad.hs | 44 +++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/compiler/typecheck/TcSMonad.hs b/compiler/typecheck/TcSMonad.hs
index 7f2dd66..34e7843 100644
--- a/compiler/typecheck/TcSMonad.hs
+++ b/compiler/typecheck/TcSMonad.hs
@@ -714,7 +714,10 @@ Note that inertness is not the same as idempotence.  To apply S to a
 type, you may have to apply it recursive.  But inertness does
 guarantee that this recursive use will terminate.
 
----------- The main theorem --------------
+Note [Extending the inert equalities]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This is the main theorem!
+
    Suppose we have a "work item"
        a -fw-> t
    and an inert generalised substitution S,
@@ -724,6 +727,9 @@ guarantee that this recursive use will terminate.
       (T3) a not in t      -- No occurs check in the work item
 
       (K1) for every (a -fs-> s) in S, then not (fw >= fs)
+           Reason: the work item is fully rewritten by S, hence not (fs >= fw)
+                   but if (fw >= fs) then the work item could rewrite
+                   the inert item
 
       (K2) for every (b -fs-> s) in S, where b /= a, then
               (K2a) not (fs >= fs)
@@ -740,11 +746,16 @@ guarantee that this recursive use will terminate.
    then the extended substition T = S+(a -fw-> t)
    is an inert generalised substitution.
 
+Conditions (T1-T3) are established by the canonicaliser
+Conditions (K1-K3) are established by TcSMonad.kickOutRewriteable
+
 The idea is that
 * (T1-2) are guaranteed by exhaustively rewriting the work-item
   with S(fw,_).
 
 * T3 is guaranteed by a simple occurs-check on the work item.
+  This is done during canonicalisation, in canEqTyVar;
+  (invariant: a CTyEqCan never has an occurs check).
 
 * (K1-3) are the "kick-out" criteria.  (As stated, they are really the
   "keep" criteria.) If the current inert S contains a triple that does
@@ -761,6 +772,12 @@ The idea is that
   us to kick out an inert wanted that mentions a, because of (K2a).  This
   is a common case, hence good not to kick out.
 
+* Lemma (L2): if not (fw >= fw), then K1-K3 all hold.
+  Proof: using Definition [Can-rewrite relation], fw can't rewrite anything
+         and so K1-K3 hold.  Intuitivel, since fw can't rewrite anything,
+         adding it cannot cause any loops
+  This is a common case, because Wanteds cannot rewrite Wanteds.
+
 * Lemma (L1): The conditions of the Main Theorem imply that there is no
               (a -fs-> t) in S, s.t.  (fs >= fw).
   Proof. Suppose the contrary (fs >= fw).  Then because of (T1),
@@ -1304,6 +1321,7 @@ kickOutRewritable :: CtFlavourRole  -- Flavour and role of the equality that is
    -- take the substitution into account
 kickOutRewritable new_fr new_tv ics@(IC { inert_funeqs = funeqmap })
   | not (new_fr `eqCanRewriteFR` new_fr)
+    -- Lemma (L2) in Note [Extending the inert equalities]
   = if isFlattenTyVar new_tv
     then (emptyWorkList { wl_funeqs = feqs_out }, ics { inert_funeqs = feqs_in })
     else (emptyWorkList,                          ics)
@@ -1356,8 +1374,8 @@ kickOutRewritable new_fr new_tv (IC { inert_eqs      = tv_eqs
     (insols_out, insols_in) = partitionBag     kick_out_ct    insols
       -- Kick out even insolubles; see Note [Kick out insolubles]
 
-    can_rewrite :: CtEvidence -> Bool
-    can_rewrite = (new_fr `eqCanRewriteFR`) . ctEvFlavourRole
+    fr_can_rewrite :: CtEvidence -> Bool
+    fr_can_rewrite = (new_fr `eqCanRewriteFR`) . ctEvFlavourRole
 
     kick_out_ct :: Ct -> Bool
     kick_out_ct ct = kick_out_ctev (ctEvidence ct)
@@ -1368,12 +1386,12 @@ kickOutRewritable new_fr new_tv (IC { inert_eqs      = tv_eqs
     kick_out_fe _ = False  -- Can't happen
 
     kick_out_ctev :: CtEvidence -> Bool
-    kick_out_ctev ev =  can_rewrite ev
+    kick_out_ctev ev =  fr_can_rewrite ev
                      && new_tv `elemVarSet` tyVarsOfType (ctEvPred ev)
          -- See Note [Kicking out inert constraints]
 
     kick_out_irred :: Ct -> Bool
-    kick_out_irred ct =  can_rewrite (cc_ev ct)
+    kick_out_irred ct =  fr_can_rewrite (cc_ev ct)
                       && new_tv `elemVarSet` closeOverKinds (TcM.tyVarsOfCt ct)
           -- See Note [Kicking out Irreds]
 
@@ -1386,23 +1404,23 @@ kickOutRewritable new_fr new_tv (IC { inert_eqs      = tv_eqs
       where
         (eqs_in, eqs_out) = partition keep_eq eqs
 
-    -- implements criteria K1-K3 in Note [The inert equalities] in TcFlatten
+    -- Implements criteria K1-K3 in Note [Extending the inert equalities]
     keep_eq (CTyEqCan { cc_tyvar = tv, cc_rhs = rhs_ty, cc_ev = ev
                       , cc_eq_rel = eq_rel })
       | tv == new_tv
-      = not (can_rewrite ev)  -- (K1)
+      = not (fr_can_rewrite ev)  -- (K1)
 
       | otherwise
       = check_k2 && check_k3
       where
-        ev_fr = ctEvFlavourRole ev
-        check_k2 = not (ev_fr  `eqCanRewriteFR` ev_fr)
-                || not (new_fr `eqCanRewriteFR` ev_fr)
-                ||     (ev_fr  `eqCanRewriteFR` new_fr)
-                || not (new_tv `elemVarSet` tyVarsOfType rhs_ty)
+        fs = ctEvFlavourRole ev
+        check_k2 = not (fs  `eqCanRewriteFR` fs)                 -- (K2a)
+                ||     (fs  `eqCanRewriteFR` new_fr)             -- (K2b)
+                || not (new_fr `eqCanRewriteFR` fs)              -- (K2c)
+                || not (new_tv `elemVarSet` tyVarsOfType rhs_ty) -- (K2d)
 
         check_k3
-          | new_fr `eqCanRewriteFR` ev_fr
+          | new_fr `eqCanRewriteFR` fs
           = case eq_rel of
               NomEq  -> not (rhs_ty `eqType` mkTyVarTy new_tv)
               ReprEq -> not (isTyVarExposed new_tv rhs_ty)


From git at git.haskell.org  Tue Nov 24 15:09:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 15:09:02 +0000 (UTC)
Subject: [commit: ghc] master: Simplify the MonadFail code (5e04c38)
Message-ID: <20151124150902.64C173A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5e04c384b02c7418fcaaaa72721d27383f2d464f/ghc

>---------------------------------------------------------------

commit 5e04c384b02c7418fcaaaa72721d27383f2d464f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Nov 24 15:07:08 2015 +0000

    Simplify the MonadFail code
    
    Simplify and tidy up the MonadFail code.
    See TcMatches.tcMonadFailOp
    
    Less, code; and more robust.
    
    This incidentally fixes a bug; see the change
    to MonadFailErrors.stderr


>---------------------------------------------------------------

5e04c384b02c7418fcaaaa72721d27383f2d464f
 compiler/typecheck/TcMatches.hs                  |  96 ++++++++---------
 testsuite/tests/monadfail/MonadFailErrors.stderr | 130 +++++++++--------------
 2 files changed, 94 insertions(+), 132 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5e04c384b02c7418fcaaaa72721d27383f2d464f

From git at git.haskell.org  Tue Nov 24 15:56:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 15:56:44 +0000 (UTC)
Subject: [commit: ghc] master: DynFlags: Drop stale comment (76f3142)
Message-ID: <20151124155644.2D78A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/76f3142d6f712355c419dd78f3fffff01c15e85d/ghc

>---------------------------------------------------------------

commit 76f3142d6f712355c419dd78f3fffff01c15e85d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Nov 24 16:55:48 2015 +0100

    DynFlags: Drop stale comment


>---------------------------------------------------------------

76f3142d6f712355c419dd78f3fffff01c15e85d
 compiler/main/DynFlags.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 39fb81a..e005be2 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -3538,10 +3538,9 @@ glasgowExtsFlags = [
            , Opt_UnicodeSyntax
            , Opt_UnliftedFFITypes ]
 
--- Consult the RTS to find whether GHC itself has been built profiled
--- If so, you can't use Template Haskell
 foreign import ccall unsafe "rts_isProfiled" rtsIsProfiledIO :: IO CInt
 
+-- | Was the runtime system built with profiling enabled?
 rtsIsProfiled :: Bool
 rtsIsProfiled = unsafeDupablePerformIO rtsIsProfiledIO /= 0
 


From git at git.haskell.org  Tue Nov 24 17:32:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 17:32:02 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: More wibbles (1ac0476)
Message-ID: <20151124173202.026423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/1ac04767c708b82231a0f66e10e1f0eefd2a33aa/ghc

>---------------------------------------------------------------

commit 1ac04767c708b82231a0f66e10e1f0eefd2a33aa
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 17:18:06 2015 +0000

    More wibbles
    
    including haddock submodule update


>---------------------------------------------------------------

1ac04767c708b82231a0f66e10e1f0eefd2a33aa
 testsuite/tests/ghc-api/landmines/landmines.stdout |  9 +----
 .../partial-sigs/should_compile/T10403.stderr      | 45 ++--------------------
 .../partial-sigs/should_fail/Trac10045.stderr      | 38 ------------------
 testsuite/tests/polykinds/T9222.stderr             | 35 ++---------------
 utils/haddock                                      |  2 +-
 5 files changed, 9 insertions(+), 120 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1ac04767c708b82231a0f66e10e1f0eefd2a33aa

From git at git.haskell.org  Tue Nov 24 17:32:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 17:32:05 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch
 'origin/master' into wip/spj-wildcard-refactor (e7ac58a)
Message-ID: <20151124173205.9A6A33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/e7ac58ae415bd2e8de55585a99ff5d57f2db2ba1/ghc

>---------------------------------------------------------------

commit e7ac58ae415bd2e8de55585a99ff5d57f2db2ba1
Merge: 1ac0476 5e04c38
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Nov 24 17:28:50 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/hsSyn/HsExpr.hs
    	compiler/rename/RnSource.hs
    	testsuite/tests/arrows/should_fail/T5380.stderr
    	testsuite/tests/gadt/T3169.stderr
    	testsuite/tests/gadt/rw.stderr
    	testsuite/tests/ghci/scripts/Defer02.stderr
    	testsuite/tests/ghci/scripts/ghci050.stderr
    	testsuite/tests/indexed-types/should_compile/PushedInAsGivens.stderr
    	testsuite/tests/indexed-types/should_compile/T3208b.stderr
    	testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
    	testsuite/tests/indexed-types/should_fail/Overlap6.stderr
    	testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
    	testsuite/tests/indexed-types/should_fail/T3330a.stderr
    	testsuite/tests/indexed-types/should_fail/T3440.stderr
    	testsuite/tests/indexed-types/should_fail/T4093a.stderr
    	testsuite/tests/indexed-types/should_fail/T4093b.stderr
    	testsuite/tests/indexed-types/should_fail/T4174.stderr
    	testsuite/tests/indexed-types/should_fail/T4272.stderr
    	testsuite/tests/indexed-types/should_fail/T7194.stderr
    	testsuite/tests/indexed-types/should_fail/T9662.stderr
    	testsuite/tests/monadfail/MonadFailErrors.stderr
    	testsuite/tests/parser/should_fail/T7848.stderr
    	testsuite/tests/partial-sigs/should_compile/SplicesUsed.stderr
    	testsuite/tests/partial-sigs/should_compile/T10438.stderr
    	testsuite/tests/partial-sigs/should_fail/NamedWildcardsNotEnabled.stderr
    	testsuite/tests/partial-sigs/should_fail/T10045.stderr
    	testsuite/tests/partial-sigs/should_fail/T10615.stderr
    	testsuite/tests/partial-sigs/should_fail/Trac10045.stderr
    	testsuite/tests/polykinds/T7230.stderr
    	testsuite/tests/polykinds/T7438.stderr
    	testsuite/tests/th/T10267.stderr
    	testsuite/tests/typecheck/should_compile/FD1.stderr
    	testsuite/tests/typecheck/should_compile/FD2.stderr
    	testsuite/tests/typecheck/should_compile/FD3.stderr
    	testsuite/tests/typecheck/should_compile/tc141.stderr
    	testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
    	testsuite/tests/typecheck/should_fail/T10285.stderr
    	testsuite/tests/typecheck/should_fail/T10534.stderr
    	testsuite/tests/typecheck/should_fail/T1899.stderr
    	testsuite/tests/typecheck/should_fail/T3540.stderr
    	testsuite/tests/typecheck/should_fail/T7453.stderr
    	testsuite/tests/typecheck/should_fail/T7696.stderr
    	testsuite/tests/typecheck/should_fail/T7748a.stderr
    	testsuite/tests/typecheck/should_fail/T7869.stderr
    	testsuite/tests/typecheck/should_fail/T8450.stderr
    	testsuite/tests/typecheck/should_fail/tcfail032.stderr
    	testsuite/tests/typecheck/should_fail/tcfail057.stderr
    	testsuite/tests/typecheck/should_fail/tcfail065.stderr
    	testsuite/tests/typecheck/should_fail/tcfail068.stderr
    	testsuite/tests/typecheck/should_fail/tcfail076.stderr
    	testsuite/tests/typecheck/should_fail/tcfail131.stderr
    	testsuite/tests/typecheck/should_fail/tcfail175.stderr
    	testsuite/tests/typecheck/should_fail/tcfail179.stderr
    	testsuite/tests/typecheck/should_fail/tcfail201.stderr



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e7ac58ae415bd2e8de55585a99ff5d57f2db2ba1

From git at git.haskell.org  Tue Nov 24 17:32:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 24 Nov 2015 17:32:07 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor's head updated: Merge
 remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
 (e7ac58a)
Message-ID: <20151124173207.E90073A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/spj-wildcard-refactor' now includes:

     7c9a04d Add a note explaining why every RdrName is Located
     dbad0d5 Libdw: Fix build on 32-bit platforms
     70ee638 Libdw: Fix initial register collection on i386
     36b2139 rts: Expose more libdw symbols
     a3a8ce6 rts: Add simple resource pool
     6fbf22d rts: Add LibdwPool, a pool for libdw sessions
     bb249aa base: Add Haskell interface to ExecutionStack
     7aaeaf8 Support multiple debug output levels
     40be909 Dwarf: Ensure tick parentage is preserved
     9471562 Output source notes in extended DWARF DIEs
     1ac0476 More wibbles
     5955510 Improve constraint-used-as-type error msg
     70efb62 Add tests/monadfail/Makefile
     e587217 Add the rest of the notes for Located RdrName
     1c45f41 rts: Always export Libdw* symbols
     12dbc89 Add `PrelNames.thenAName` for `Applicative(*>)`
     f09f247 Implement new `-fwarn-noncanonical-monad-instances`
     c05fddd Rearrange error msgs and add section markers (Trac #11014).
     6d14793 Add -Wcompat warning flag group
     e506f02 Rewrite checkUniques and incorporate into validate
     8c5fe53 DynFlags: Update comments to reflect new users guide
     8dc6da8 Comments only
     5e04c38 Simplify the MonadFail code
     e7ac58a Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor

From git at git.haskell.org  Wed Nov 25 12:28:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 12:28:43 +0000 (UTC)
Subject: [commit: ghc] master: update link to MonadFail proposal (9032d05)
Message-ID: <20151125122843.235DF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9032d0565f6a6f1e63e6d0ba79ee2371b9d823fc/ghc

>---------------------------------------------------------------

commit 9032d0565f6a6f1e63e6d0ba79ee2371b9d823fc
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 13:22:47 2015 +0100

    update link to MonadFail proposal
    
    [skip ci]


>---------------------------------------------------------------

9032d0565f6a6f1e63e6d0ba79ee2371b9d823fc
 libraries/base/Control/Monad/Fail.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/base/Control/Monad/Fail.hs b/libraries/base/Control/Monad/Fail.hs
index 0bbe65b..9c5afbe 100644
--- a/libraries/base/Control/Monad/Fail.hs
+++ b/libraries/base/Control/Monad/Fail.hs
@@ -31,7 +31,8 @@
 --   fail = {- ...fail implementation... -}
 -- @
 --
--- See <https://wiki.haskell.org/MonadFail_Proposal> for more details.
+-- See <https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail>
+-- for more details.
 --
 -- @since 4.9.0.0
 --


From git at git.haskell.org  Wed Nov 25 13:22:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 13:22:00 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11028' created
Message-ID: <20151125132200.18D833A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New branch : wip/T11028
Referencing: 7403c41c4b41c4efe1f95bee7ae232436c17e7b9

From git at git.haskell.org  Wed Nov 25 13:22:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 13:22:02 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Starting on #11028 (7403c41)
Message-ID: <20151125132202.E225C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/7403c41c4b41c4efe1f95bee7ae232436c17e7b9/ghc

>---------------------------------------------------------------

commit 7403c41c4b41c4efe1f95bee7ae232436c17e7b9
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 23 22:59:27 2015 +0200

    Starting on #11028


>---------------------------------------------------------------

7403c41c4b41c4efe1f95bee7ae232436c17e7b9
 compiler/deSugar/DsMeta.hs         |  87 +++++++++++++++++++++-
 compiler/hsSyn/HsDecls.hs          |  51 +++++++++++--
 compiler/hsSyn/HsTypes.hs          |   4 +-
 compiler/hsSyn/HsUtils.hs          |  24 ++++++
 compiler/parser/Parser.y           |  11 ++-
 compiler/parser/RdrHsSyn.hs        |  48 +++++++-----
 compiler/rename/RnNames.hs         |  18 +++++
 compiler/rename/RnSource.hs        |  65 +++++++++++++++-
 compiler/rename/RnTypes.hs         |  14 ++--
 compiler/typecheck/TcHsType.hs     |   6 +-
 compiler/typecheck/TcTyClsDecls.hs | 148 ++++++++++++++++++++++++++++++++++++-
 11 files changed, 428 insertions(+), 48 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 7403c41c4b41c4efe1f95bee7ae232436c17e7b9

From git at git.haskell.org  Wed Nov 25 14:10:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 14:10:28 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Stage1 compiles now. (a901d7e)
Message-ID: <20151125141028.57DE63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/a901d7e42cb61ab67a30874f275b01055d2ea37f/ghc

>---------------------------------------------------------------

commit a901d7e42cb61ab67a30874f275b01055d2ea37f
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed Nov 25 16:10:32 2015 +0200

    Stage1 compiles now.


>---------------------------------------------------------------

a901d7e42cb61ab67a30874f275b01055d2ea37f
 compiler/typecheck/TcTyClsDecls.hs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 0b6a603..592f279 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -510,7 +510,7 @@ kcConDecl (ConDeclH98 { con_name = name, con_qvars = ex_tvs
          -- concept doesn't really apply here. We just need to bring the variables
          -- into scope!
     do { _ <- kcHsTyVarBndrs False ((fromMaybe (HsQTvs mempty []) ex_tvs) ::LHsQTyVars Name) $
-              do { _ <- tcHsContext (fromMaybe mempty ex_ctxt)
+              do { _ <- tcHsContext (fromMaybe (noLoc []) ex_ctxt)
                  ; mapM_ (tcHsOpenType . getBangType) (hsConDeclArgTys details)
                  ; return (panic "kcConDecl", ()) }
        ; return () }
@@ -1294,7 +1294,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; (ctxt, arg_tys, field_lbls, stricts)
            <- tcHsQTyVars (fromMaybe (HsQTvs [] []) hs_tvs) $ \ _ ->
               do { traceTc "tcConDecl" (ppr name <+> text "tvs:" <+> ppr hs_tvs)
-                 ; ctxt <- tcHsContext (fromMaybe mempty hs_ctxt)
+                 ; ctxt <- tcHsContext (fromMaybe (noLoc []) hs_ctxt)
                  ; btys <- tcConArgs new_or_data hs_details
                  ; field_lbls <- lookupConstructorFields (unLoc name)
                  ; let (arg_tys, stricts) = unzip btys
@@ -1325,7 +1325,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; traceTc "tcConDecl 2" (ppr name $$ ppr field_lbls)
        ; let
            buildOneDataCon (L _ name) = do
-             { is_infix <- tcConIsInfix name hs_details ResTyH98
+             { is_infix <- tcConIsInfixH98 name hs_details
              ; rep_nm   <- newTyConRepName name
 
              ; buildDataCon fam_envs name is_infix
@@ -1358,7 +1358,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
                  ; ty' <- tcHsLiftedType bty
                  ; field_lbls <- lookupConstructorFields (unLoc $ head names)
                  ; let (arg_tys, stricts) = unzip btys
-                 ; return (ctxt, arg_tys, ty, field_lbls, stricts)
+                 ; return (ctxt, arg_tys, ty', field_lbls, stricts)
                  }
 
              -- Generalise the kind variables (returning quantified TcKindVars)
@@ -1375,7 +1375,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; ctxt    <- zonkTcTypeToTypes ze ctxt
        ; res_ty  <- zonkTcTypeToType ze res_ty
 
-       ; let (univ_tvs, ex_tvs, eq_preds, res_ty') = rejigConRes tmpl_tvs res_tmpl qtkvs res_ty
+       ; let (univ_tvs, ex_tvs, eq_preds, res_ty') = rejigConRes tmpl_tvs res_tmpl qtkvs (ResTyGADT undefined res_ty)
              -- NB: this is a /lazy/ binding, so we pass four thunks to buildDataCon
              --     without yet forcing the guards in rejigConRes
              -- See Note [Checking GADT return types]
@@ -1387,7 +1387,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; let
            buildOneDataCon (L _ name) = do
              { let hs_details = gadtDeclDetails ty
-             ; is_infix <- tcConIsInfix name hs_details res_ty
+             ; is_infix <- tcConIsInfixGADT name hs_details
              ; rep_nm   <- newTyConRepName name
 
              ; buildDataCon fam_envs name is_infix
@@ -1470,15 +1470,18 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        }
 -}
 
-tcConIsInfix :: Name
+tcConIsInfixH98 :: Name
              -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
-             -> ResType Type
              -> TcM Bool
-tcConIsInfix _   details ResTyH98
+tcConIsInfixH98 _   details
   = case details of
            InfixCon {}  -> return True
            _            -> return False
-tcConIsInfix con details (ResTyGADT _ _)
+
+tcConIsInfixGADT :: Name
+             -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
+             -> TcM Bool
+tcConIsInfixGADT con details
   = case details of
            InfixCon {}  -> return True
            RecCon {}    -> return False


From git at git.haskell.org  Wed Nov 25 16:15:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 16:15:44 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Pattern Match Checking (Fixes #595)
 (b502ab8)
Message-ID: <20151125161544.115093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/b502ab89eceafa77826572bda3979b5d1265abcb/ghc

>---------------------------------------------------------------

commit b502ab89eceafa77826572bda3979b5d1265abcb
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Nov 25 16:39:57 2015 +0100

    Pattern Match Checking (Fixes #595)


>---------------------------------------------------------------

b502ab89eceafa77826572bda3979b5d1265abcb
 compiler/basicTypes/UniqSupply.hs   |    5 +-
 compiler/deSugar/Check.hs           | 1855 ++++++++++++++++++++++-------------
 compiler/deSugar/DsBinds.hs         |    8 +-
 compiler/deSugar/DsExpr.hs          |   18 +-
 compiler/deSugar/DsGRHSs.hs         |    2 +-
 compiler/deSugar/DsMonad.hs         |   60 +-
 compiler/deSugar/Match.hs           |  174 +---
 compiler/deSugar/Match.hs-boot      |    1 +
 compiler/deSugar/PmExpr.hs          |  387 ++++++++
 compiler/deSugar/TmOracle.hs        |  252 +++++
 compiler/ghc.cabal.in               |    2 +
 compiler/ghc.mk                     |    1 +
 compiler/hsSyn/HsLit.hs             |   22 +
 compiler/hsSyn/HsPat.hs             |   41 +-
 compiler/prelude/TysWiredIn.hs-boot |    2 +-
 compiler/typecheck/TcMType.hs       |   15 +
 compiler/typecheck/TcRnTypes.hs     |    5 +-
 compiler/typecheck/TcSMonad.hs      |    1 -
 compiler/typecheck/TcSimplify.hs    |   14 +
 compiler/typecheck/TcType.hs        |   42 +
 compiler/types/Type.hs              |   22 +-
 compiler/utils/Bag.hs               |   26 +-
 compiler/utils/MonadUtils.hs        |    6 +-
 23 files changed, 2121 insertions(+), 840 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b502ab89eceafa77826572bda3979b5d1265abcb

From git at git.haskell.org  Wed Nov 25 16:15:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 16:15:54 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm's head updated: Pattern Match Checking
 (Fixes #595) (b502ab8)
Message-ID: <20151125161554.8874E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/gadtpm' now includes:

     2d15dc7 Improve documentation of -fwarn-redundant-constraints
     43e5a22 Spelling error in comment
     9564bb8 Improve HsBang
     8adc015 Bump haddock.base according to whats observed on ghcspeed
     6d32c93 Recenter T6048 performance numbers
     ccef014 Add 'DeBruijn' constructor, which generalizes "key modulo alpha-renaming."
     0bef02e Apply GenMap to CoreMap and CoercionMap.
     327ce1d Return a [HsImplBang] from dataConImplBangs even with NoDataConRep
     dfe62eb Make TcRnMonad.reportWarning call makeIntoWarning
     4425ab9 A little tidying up in ErrUtils
     68a5a78 Update syntax of pattern synonym type signature in documentation (fixes #9967)
     6f818e0 Pattern synonyms do work in GHCi now (see #9900)
     ee4ced4 Comments only
     3d44911 A little tidying up in the flattener
     678df4c Fix up test for T7861
     5830fc4 Pattern synonym names need to be in scope before renaming bindings (#9889)
     dd3e1dd Fix Trac #9973 (buglet in -fwarn-redundant-constraints)
     c4e1ccb Miscellaneous improvements to TrieMap, from D608 code review.
     90dee6e Inline all of the .*[TCE] methods, and then rename .*[TCE]X to vacated name.
     944329a Newtype CoreMap and TypeMap so their keys are user-friendly.
     4ec7fcc Update pretty submodule to 1.1.2.0 release
     c506f25 More comments on HsBang
     fe0d289 inplace: Don't add empty component to LD_LIBRARY_PATH when it is empty
     a5bc257 Move libffi configuration after basic toolchain setup
     8464fa2 Update Cabal submodule to latest 1.22.0.1 snapshot
     0234399 Event Manager: Make one-shot a per-registration property
     0fa4240 aclocal.m4: fix == bashism in FIND_LLVM_PROG
     07ace5c add -th-file which generates a th.hs file
     099b767 Package environments
     7637810 Trac #9878: Have StaticPointers support dynamic loading.
     c9532f8 Fix panics of PartialTypeSignatures combined with extensions
     36df098 Dwarf generation fixed pt 2
     2a103c7 Improve documentation for -N and -qa (#9890)
     24bbc3e Allow the linker to run concurrently with the GC
     adc542d Compile the RTS with -g by default
     cf8e669 Optimise scavenge_large_srt_bitmap
     0afa37a Correct typos in comments to mkDataCon
     6b0cf0e Tighten up constraint solve order for RULES
     e4cb837 Tiny refactoring (shorter, simpler code)
     7884132 Refactor handling of SPECIALISE pragmas (Trac #5821)
     c823b73 Test Trac #5821
     c71fb84 Add Eq, Ord, Show, and Read instances for Const
     fb7c311 Repsect the package name when checking for self-import
     854e7b8 Fix a terrible bug in the canonicaliser which led to an infinite loop
     6392df0 Don't hardcode the name "ghc" in versionedAppDir
     fffbf06 Trac #9878: Make the static form illegal in interpreted mode.
     11881ec API Annotations tweaks.
     2edb4a7 Trac #9384: fix increasing capabilites number for eventlog.
     3ea40e3 Fix the 'builder' code for pattern synonyms with type signatures
     9a14582 Add missing argument in Match, a merge bug (apologies)
     ff4733f Update bytestring submodule
     1289048 Fix bad '... \\' escape in ghcversion.h generation
     8e774ba Improve documentation of pattern synonyms, to reflect conclusion of Trac #9953
     4cfd235 Test Trac #9867
     e1a4581 Revert "Fix undefined GHC.Real export with integer-simple"
     f006ed7 Revert "Add export lists to some modules."
     d839493 Make AutoDeriveTypeable work for associated datatypes (fix #9999)
     55199a9 Split stripTicks into expression editing and tick collection
     8ce3871 Update directory submodule to latest 1.2.2 snapshot
     960e3c9 Add missing test from previous commit (55199a97)
     851ed72 API Annotations documentation update, parsing issue, add example test
     cb65bdb Doc fix (follow up to #9957)
     d3c08ca Tidy up fix to Trac #9999
     1f15951 Respect package visibility when deciding wired in packages.
     c77eecd Upgrade Cabal submodule to latest HEAD, change to package key calculation.
     c024af1 Expose source locations via Implicit Parameters of type GHC.Location.Location
     d82f592 CMM: add a mechanism to import C .data labels
     9894f6a comments only
     6108d95 Make the linker_unload test less fragile
     cf0e100 Cosmetic: Fix all uses of the word 'worker' when referring to pattern synonym builders
     387f1d1 32-bit performance wibbles
     3992a6e Test Trac #9975
     bec932e Some simplification and refactoring of FunDeps
     f3e6271 cmm lex: drop unused 'align' token
     bef8b79 compiler/parser/cutils: drop unused 'ghc_memcmp_off' helper
     ca15376 Update Backpack document with examples [skip ci]
     79b0d0e Restore invariant in `Data (Ratio a)` instance
     22c4d60 Revert "Restore invariant in `Data (Ratio a)` instance"
     027acf6 Merge branch 'master' of ssh://git.haskell.org/ghc
     8a29493 Update a few performance numbers
     ccbe2b8 Revert "32-bit performance wibbles"
     e675664 32-bit performance wibbles (second attempt)
     3df429e Restore invariant in `Data (Ratio a)` instance
     f2867dc Update binary submodule to 0.7.3.0 release
     34d68d8 Update Haddock submodule
     febee92 Revert "Update Haddock submodule"
     f44bbc8 Revert zipWith strictification (re #9949)
     b906370 RTS : Fix StgRun for aarch64-linux (#9935).
     0af1b73 Add cost semantics for STG profiling.
     cecf036 Fix #10031 by inverting a critical test in kick_out.
     cf3e340 update submodule
     276da79 Improve error message on typed holes, and user manual (Tradc #10040)
     07ee96f Use strict atomicModifyIORef' (added in GHC 7.6).
     92c9354 Fix #10017
     daed18c Fix a profiling bug
     78216e2 fix _FILE_OFFSET_BITS redefined warning on Solaris/i386 platform
     c88e112 Bring Match m_fun_id_infix through the renamer.
     d4f25cb GRHS with empty wherebinds gets wrong SrcSpan
     ae39c5c Add packageName to GHC.Generics.Datatype
     7cf87fc Eta-expand argument to foldr in mapM_ for []
     73f976c Make -ddump-splices output to stdout (fixes #8796)
     2f13cd8 Comments only
     da78af3 Comments only
     111e587 Put parens around (ty :: kind) when pretty-printing TH syntax
     dda6528 Fix the nullary-type-class case for associated types
     0f75a3f Test Trac #10041
     43636e1 Fix Trac #10004: head [] exception when using recursive mdo
     9bc13c0 Remove the *o pattern in testsuite/.gitignore
     a741e69 Provide default implementation of `Monad(return)`
     83efb98 Replace .lhs with .hs in compiler comments
     e22282e Remove deprecated libraries/base/include/Typeable.h
     de9a836 Clarify the documentation for 'evaluate'
     a1db53c Add a workaround to allow older cabal-install to use ghc-7.10
     d5a80db Add Uniquable instances for InstalledPackageId/SourcePackageId/PackageName
     5d5abdc llvmGen: move to LLVM 3.6 exclusively
     78833ca Don't overwrite input file by default
     f46360e Refactor the handling of quasi-quotes
     1e651b9 Comments only
     12698ff More comments and white space
     1e58ed8 Add a couple of tcTraces around reify
     1d982ba Do not complain about missing fields in Trac #10047
     3568bf3 Do not share T9878.hs between test T9878 and T9878b
     6ff3db9 nameIsLocalOrFrom should include interactive modules
     befe2d7 Fix #10079 by recurring after flattening exposes a TyConApp.
     d5cd94d Fix egregious typo in checkTauTvUpdate.
     849e25c Propagate ReturnTvs in matchExpectedFunTys
     b45309f Comments and white space; plus structurally avoiding the previously "egregious bug"
     6be91dd Tiny refactoring; no change in behaviour
     b96db75 Refactor decideQuantification
     7fdded4 Improve documentation of 'trace'
     36f2ad5 Comments only
     5ab7518 Improve typechecking of RULEs, to account for type wildcard holes
     6fa285d Move comments about evaluating the message to the top of the module
     49d99eb Fix typo in error message
     555eef1 Remove RAWCPP_FLAGS (Task #9094)
     310b636 Add missing va_end to va_start
     a82364c Don't truncate traceEvents to 512 bytes (#8309)
     e7fab33 Improve outdated ghc-pkg cache warning (#9606)
     08102b3 Delete vestigial external core code (#9402)
     1b82619 Add configurable verbosity level to hpc
     91d9530 Revert "Eta-expand argument to foldr in mapM_ for []"
     9caf71a Do not clobber CPPFLAGS nor LDFLAGS, fixes #10093
     6d17125 runghc: be explicit about ghc version (#9054)
     32d1a8a Cleanup ghc-pkg
     35d464b Typo in function name
     e9d72ce Fix #10045
     ef391f8 Comments only
     3f30912 fix T7600 run on bigendian platform
     10fab31 Don't report instance constraints with fundeps as redundant
     9c78d09 Add a bizarre corner-case to cgExpr (Trac #9964)
     f3e5c30 Comments only
     5f675e5 Comments only
     5094719 Comments only
     547c40a [ci skip] comment typo
     d4b6453 Unbreak travis by installing llvm-3.6
     1f60d63 {Data,Generic(1),MonadZip} instances for Identity
     b2be772 fix bus errors on SPARC caused by unalignment access to alloc_limit (fixes #10043)
     0fa2072 Error out on `Main` without `main` in GHCi (#7765)
     bbb57a6 Make top-level "configure" accept and propagate --with-curses-{includes,libraries} to libraries
     fd581a7 Fix for ticket #10078: ensure that tcPluginStop is called even in case of type errors
     30dc59e Always ignore user-package-db when running tests
     a0ef626 Declare some Makefile targets to be PHONY
     a293925 rts/linker: ignore unknown PE sections
     47175e0 Show '#' on unboxed literals
     9a1c8d9 docs: add INSTALL.md to root dir (#9926)
     c3f9eb4 docs: Flatten MAKEHELP/SUBMAKEHELP
     266fa70 base: fix broken link (#10088)
     9004f0d Fix build bogons due to missing separator
     4f467b2 base: Fix (**) implementation for Data.Complex
     a5a4c25 Provide a faster implementation for the Read Integer instance
     d1d02e8 testsuite: update .gitignore
     bb3b71a System.IO.Error: Fix a documentation link to Control.Exception.Exception
     26a85bd Comment typo
     aead019 driver: split -fwarn-unused-binds into 3 flags (fixes #17)
     5be8ed4 Emulate GMP 5+ operations for GMP 4.x compat
     00c971e Update submodule to Cabal 1.22.1.0 release
     7a3d7c0 Fix comments, and a little reformatting
     ea3b4cf Axe ModFinderCache, folding it into a generalized FinderCache.
     b7f7889 AllocationLimitExceeded should be a child of SomeAsyncException
     1def53f Update process submodule to 1.2.3.0 snapshot
     c5977c2 Extend the docs for Data.List.transpose
     7727371 Comments only
     9b3239f Improve comments on coreView/tcView, and combine coreExpandTyCon/tcExpandTyCon
     104c0ad Test Trac #10112
     52dfa61 Comments only
     cabe174 Two kind-polymorphism fixes (Trac #10122)
     d2e6a3b Improve documentation of infinite inlining bug
     5692643 Show record construction/update without parens
     6cdccb4 fix typos in coreSyn
     1dfab7a Fix detection of llvm-x.x
     ca478ac Fix typecheck tests (--slow)
     31d4f2e `make test` in root directory now runs fulltest
     efbd3eb Removed unused constrained which causes build to fail with -Werror
     3197018 Typos in non-code
     c3eee14 Improve if-then-else tree for cases on literal values
     5bdfb9b Small emitCmmSwitch/emitCmmLitSwitch refactoring
     1da3bbd Give full-precision time for BEGIN_SAMPLE/END_SAMPLE.
     f6609b0 Cite the TrieMap idea [skip-ci]
     5200bde Replaced SEH handles with VEH handlers which should work uniformly across x86 and x64
     89458eb Pretty-print # on unboxed literals in core
     4e6bcc2 Add various instances to newtypes in Data.Monoid
     a0cea7b Don't use deriveUnique *twice* in flattenTys.
     6e77d45 Clarify some comments in Packages.hs [skip-ci]
     e673b84 Fix -Werror build failure in RtsMain
     ee56dc5 Tidy up and improve comments about one-shot info
     d058bc9 Some minor refactoring in TcHsType
     f66e0e6 A raft of small changes associated with -XConstrainedClassMethods
     ef2c7a7 Comments only
     3aa2519 Check for equality before deferring
     9dc0d63 Three other test updates following the fix to Trac #7854
     e73c0de travis: Get libstdc++ from a more sensible location
     8a5d320 Remove unused/undocumented flag `-fhpc-no-auto`
     56e0ac9 Add public rnf/hash operations to TypeRep/TyCon
     44b6bbd libraries: update deepseq submodule
     b833bc2 User manual section to document the principles of kind inference
     7b486a6 testsuite: accept updated output
     48f32a8 Typos in docs [ci skip]
     41df51d Update shift/reduce commentary in Parser.y
     91c11fe testsuite: format commands using config dict
     1965202 Drop redundant LANGUAGE pragmas
     eb3661f Re-export `<$>` from Prelude (#10113)
     479523f Re-export `<$` from Prelude (#10113)
     b359c88 Custom `Typeable` solver, that keeps track of kinds.
     34ba68c Add missed test (uuugh)
     504d8a4 Don't assume tools are in same directory as ghc in some cases
     76b1e11 Improve core linter so it catches unsafeCoerce problems (T9122)
     0fcc454 Dynamically link all loaded packages in new object
     e642de6 build: fix 'make help'
     68d4f47 Store renamings as (ModuleName, ModuleName) pairs.
     47b5b5c base: drop redundant Typeable derivings
     7a2d65a Define proper `MINIMAL` pragma for `class Ix`
     e76f866 Add `GHC.OldList` legacy module
     8b7534b Update process submodule
     2aef320 hsc2hs: update submodule
     c439af5 Refactor Digraph to use Data.Graph when possible
     d01844f Remove obsolete comment in cmmOffset
     f9344f3 Fix `ghc --make -fhpc` with imported lhs modules
     fe3cf4d Revert "Refactor Digraph to use Data.Graph when possible"
     6188d0a Refactor Digraph to use Data.Graph when possible
     74625d6 RTS/IOManager: fix trac issue #9722.
     c4ac3c9 Merge branch 'master' of git://git.haskell.org/ghc
     c1db477 Changes to Safe Haskell documentation from feedback (#10140).
     19440ae ghc-prim : Hide 64 bit primops when the word size is 32 bits (fixes #9886).
     fdb7283 Update submodule to Cabal 1.22.1.1 release
     0281c98 Update array submodule (min ver bump to 0.5.1.0)
     d2a5ea1 Sync up terminfo/haskeline submodule with ghc-7.10
     b03479d Update directory submodule to latest 1.2.2 snapshot
     8a91079 Documentation for PackageArg/ModRenaming/PackageFlag
     8cbd7f5 Refactor testsuite with normalise_version()
     838d804 Update Cabal submodule to latest 1.22 snapshot
     5f356f3 Update filepath submodule to filepath-1.4 snapshot
     842028b Rename ty{Con,peRep}Hash to ty{Con,peRep}Fingerprint
     5258566 Cleanup test framework string formatting
     41e8400 Update submodule hpc (includes fix for #9619)
     ec67f81 testsuite: use same flags for ghci way and scripts
     71fcc4c Use the gold linker for linux/ARM and android/ARM targets.
     cc07a0b Move the function strip_quotes to testutil.py
     1b7f597 Link temporary shared objects with `--no-as-needed`
     11314b9 We need to import 'cast' on Windows
     cbc7103 Update Haddock submodule
     14b78eb Update Cabal submodule to latest 1.22.1.2 snapshot
     e935a7f libraries/win32: update submodule
     817d2c3 Test Trac #10156
     beee618 Fix testsuite driver for a profiling compiler
     5166ee9 Dont call unsafeGlobalDynFlags if it is not set
     83afcd1 Fix build on amd64/solaris.
     9987c66 Fix Windows testsuite driver
     9c9e973 Refactor the extra-deps stuff for hs-boot
     cf6c307 Comments, white space, and small refactoring
     dbd9299 Move declaration of Rulebase from Rules to CoreSyn
     3f3782d Add more MonadZip instances
     ac14af3 Add release note entry for D716
     86eff3d Expose listPackageConfigMap
     801f4b9 hpc: use System.FilePath.(</>) instead of (++)
     6f40060 Typos in comments
     fad7bb0 Comments only
     3508b68 Remove mention of `-unreg` in error message
     6b3a7f4 Update filepath/hpc/process submodules
     c4aa959 Update Cabal submodule to 1.22 branch tip
     9d81980 Remove comments and flag for GranSim
     c718bd8 Refactor Linker.hs: use System.Directory.findFile
     d832b6b Refactor: follow hlint suggestions in Linker.hs
     3a0019e Improve `Typeable` solver.
     48ba1e5 win32/base: Remove redundant import
     2ff68c3 libraries: update win32 submodule
     a07ff3b Merge branch 'master' of git://git.haskell.org/ghc
     75ef8b3 Remove unused parameter to `EvTypeableTyCon`
     e02ef0e testsuite: add a regression test for #10011
     c2833d6 Update deepseq submodule to 1.4.1.1 tag
     76f385b Modify test th/T10019 to wobble less
     9dfdd16 Bump ghc-prim to 0.4.0.0
     6da18b8 Try to reconstruct a changelog for TH 2.10
     c746f01 Update bytestring submodule to 0.10.6.0 release tag
     d9e0e16 Update Cabal submodule to Cabal-v1.22.2.0 rls tag
     1cc46b1 Correct documentation in `Parser`.
     854fd12 testsuite: add test for #10177
     899cb3e Update haskeline submodule to 0.7.2.1 release tag
     5449b25 Clarify meaning of the RTS `taskCount` variable
     29f7c10 New lint check: exprIsHNF = True and alts = [] is bogus
     5119e09 Test case for #10176
     b4efac5 Trim Call Arity
     e25ad04 docs: make gen_contents_index --verbose more verbose
     12a03c4 fix bus error (misaligned data access) on SPARC in __decodeDouble_Int64
     a20cc3d rts: check arguments to flags that don't have any
     5ef5a18 Update integer-gmp2's changelog for release
     cab5b3a Fix integer-gmp source tarball distribution
     992040e Minor fix to Note [Trimming arity]
     f72074e Fix quasiquotation test (#4150)
     7035ff8 Minor bump `base` version to 4.8.1.0
     1a72886 Update base changelog regarding 4.8.1 changes
     0f03a84 Make testsuite driver Python 2.6 compatible again
     c1edbdf Do proper depth checking in the flattener to avoid looping.
     5673bfc exprIsBottom should look through type lambdas
     a0678f1 New Lint check: no alternatives implies bottoming expression
     567db32 New lint check: Check idArity invariants (#10181)
     8f08069 Add Note [No alternatives lint check]
     aef4de4 isEmptyTy: Improve comment
     42448e3 Do version specific detection of LLVM tools (#10170).
     fd17651 Fix bug in hs-libraries field munging.
     7062ebe exprIsBottom: Make use of isEmptyTy (#10186)
     9cdd2e6 Empty alternative lint check: Explain why there are two checks
     484d2b1 Delete DynFlag for NDP way
     6cf0c79 Some stress tests for the empty case linter
     8eaa70a Improve environment handling in TcBinds
     33cfa5f More comments (related to Trac #10180)
     9db005a Add Monad instance for `((,) a)` (#10190)
     5aa57d0 Fix Git-commit-id detection for RELEASE=YES
     90dd11b Remove some unimplemented GranSim primops
     af45feb Update list of primops that don't get wrappers (#10191)
     abde5da Rename driver phases C(obj)cpp to C(obj)cplusplus
     e2f1ffc Rename C(obj)cplusplus to C(obj)cxx
     a4656eb Doc typofix.
     e24f638 Renames some files to help with validation cleanup (#10212)
     de1160b Refactor the story around switches (#10137)
     c37ee4a Remove an unused include that doesn't exist on OS X (#10211)
     b1d6a60 Delete unused field `PipeEnv.pe_isHaskellishFile`
     5971ad5 Syntax check package-qualified imports (#9225)
     1f69f37 Add `integer-gmp` specific hint to build.mk.sample
     995e8c1 Drop old integer-gmp-0.5 from GHC source tree
     a3d0a7a Testsuite: suppress errors when running GS on bad.ps
     9e073ce Explicitly check for -C on registerised build (#7563)
     6981862 Don't throw exception when start_phase==stop_phase (#10219)
     da17f99 Don't treat .hcr and .raw_s as haskellish suffixes
     8757e2d Testsuite: redirect stderr to /dev/null when running GS on bad.ps
     694c4d5 uBackpack: simplified Backpack description.
     d4cf705 Don't `make accept` output of expect_broken tests
     7cec6c7 Change which files --make thinks are 'Haskellish' (#10220)
     3749c05 Reformat build flavours in build.mk.sample (#10223)
     43351ff Filter out `-Rghc-timing` for V=0 builds (#10223)
     f15dbc2 Indentation only.
     0721e55 Fake (->) fixity declaration (#10145)
     9b66a7f Do not set -fasm explicitly in build.mk.sample (#10223)
     4c1e1c8 Disable same warnings for normal builds as for validate (#10223)
     afcfb62 Change 'Tab character' warnings so there is one per file (#9723)
     47f821a libffi: backport noexecstack fix for x86/win32.S
     48977c8 Fix validate linenumber off-by-one
     13a0d5a clarify --no-as-needed is only needed on ELF
     78c79e3 docs: remove unused -ddump flags from users guide
     59f7a7b Restore unwind information generation
     012ea0b parser: allow type-level cons in prefix position
     3541f73 Data.Complex: Derive Generic
     2255c76 Remove an incorrect statement about -fwarn-tabs
     fd1099c Don't `make accept` output of `expect_broken_for` tests
     ab0743f Comments only, mostly typos
     a0c1c96 testsuite: fix failing amd64/Windows perf tests
     54b7dc5 rts/linker: make an error msg a debug msg
     b0ba054 testsuite: skip T10017 on Windows
     89eef44 Whitespace only
     a1404e8 Update hsc2hs submodule
     a838d1f CmmSwitch: Do not trip over a case with no (valid) branches
     8f07092 Test case for #10246
     fef4948 User's guide: .a files can be 2-2.5x larger with -split-objs
     c81e070 Stop profiling output from running together (#8811)
     22eecaf fix '&stg_interp_constr_entry' FFI type to be FunPtr
     7209290 fix typo
     a7ab161 Replace hooks by callbacks in RtsConfig (#8785)
     890461e Add +RTS -O<size> to control the minimum old gen size
     93f3a64 Add -n to the RTS help output
     f745b6e Typechecker: refactoring only
     0622970 testdriver: delete unused ways
     b972de0 Suggest how to fix .ghci when it is group writeable (#8248)
     9f0f99f Fix a long-standing bug in the demand analyser
     547c597 Reduce module qualifiers in pretty-printing
     c897613 Error msg wibbles from reduced module prefixes
     74d2c33 GHC.Prim.Constraint is not built-in syntax
     cfb6042 Do not quantify over the function itself in a RULE
     6ca7b84 Put quotes round a Name in an error message
     8b7ceec More aggressive Given/Wanted overlap check
     553c518 Look inside synonyms for foralls when unifying
     4f8e348 Replace endian test by 64-bit word access in T7600
     ab76b09 rts/Linker.c: distinct between DATA and CODE labels when importing
     cf1d975 Don't repeat package key with -dppr-debug when package info is missing.
     f1a4e42 The production for `pquals` is incorrect; the specifics are in D803.
     cf19640 The production for squals is incorrect; see D806 for specifics.
     eacda92 Test Trac #10148
     e6e0415 More error message wibbles
     a058ad6 Final error message wibble
     a7524ea Support for multiple signature files in scope.
     9e7802f Commit missing T10148 files and ignore the built executable.
     1d5c887 Axe one-shot sig-of
     3c6448c Ignore temporary ./configure files.
     53cc9af Test Trac #8030
     6b96eeb Fixes a compiler error with -DDEBUG (#10265)
     f536d89 Import rand using capi
     2d68aa6 Comments about AnyK
     d9b0be3 Comments in rejigConRes
     702fc77 Comments only
     fa46c59 Make the evidence in a CtGiven into an EvId
     9d16808 Typos in error messages and in comments
     485dba8 configure : LLVM and LD detections improvements (#10234).
     edc059a Fix autoconf's check for create_timer()
     a5745d2 Derive Generic instance for System.Exit.ExitCode
     c327393 Derive Generic instance for Data.Version.Version
     6109b31 use projectVersion from DynFlags rather than cProjectVersion for versionedAppDir
     8aefc9b parser: opt_kind_sig has incorrect SrcSpan
     9eab6fe parser: API Annotations : guardquals1 does not annotate commas properly
     919b511 parser : the API annotation on opt_sig is being discarded
     d261d4c Zap usage info in CSE (Trac #10218)
     25f2d68 Comments only
     a2ce3af Comments and white space only
     7febc2b Add "error:" prefix to error-messages
     79bfe27 Remove LlvmCodeGen panic variants.
     8dc2944 API Annotations : ExprWithTySig processing discards annotated spans
     5fded20 ApiAnnotations : lexer discards comment close in nested comment
     6dd2765 Implement -f[no-]print-unicode-syntax flag for unicode syntax output (#8959)
     7b042d5 Do not allow Typeable on constraints (Trac #9858)
     49d9b00 Fix fundep coverage-condition check for poly-kinds
     a9ca67f Improve Call Arity performance
     9654a7c Call Arity: Trade precision for performance in large mutually recursive groups
     1fb4dd3 Add exception for `KnownNat` and `KnownSymbol` in super classes.
     d8d541d Fixes (hopefully!) T9858
     e68e8ca Fix test output.
     ea579d9 Fix test output
     3b90d8c Rename tests so that they have a unique name.
     51af102 Better hints when RTS options not available (Trac #9579)
     2483644 Documentation for rnImports/rnImportDecl.
     2b3766b Comments only.
     ad6d6a7 Stub out pkgState with non-error, helps with debugging.
     619a324 Make T9579 parallel-safe and add build outputs to .gitignore
     88b8406 Test case for indirect dependencies in ghci linker (#10322)
     4bc925a Update Cabal submodule to 1.22.3.0 release
     d5773a4 Teach DmdAnal that coercions are value arguments!
     3bec1ac Teach DmdAnal about free coercion variables
     d12c7cb Spelling in comment
     f2d1b7f Support unboxing for GADT product types
     5c7e4db Wibble to DmdAnal
     b9f20bd GADTs now are CPR-able
     1e8c9b8 Enable SMP and GHCi support for Aarch64
     0bbc2ac Use the gold linker for aarch64/linux (#9673)
     3b932cc Add a blank line
     9b9fc4c Fix the boot dfun impedence-matching binding
     c0b5adb Do not decompose => (Trac #9858)
     1bb1ff2 Mark T8743 as passing
     1bd1cef Don't use self {-# SOURCE #-} import in test-cases.
     a2f9fef Fix #10182 by disallowing/avoiding self {-# SOURCE #-} imports
     646866f Fix superclass generation in an instance
     9d3bd3d Comments only
     c715166 Improve error reporting for impredicative types
     746f086 Better documetation of higher rank types
     932f086 Test Trac #9858 comment:101
     43d7137 Rename new T9858c to T9858d to avoid test name clash
     a55bfab Rename new T9858d to T9858e to avoid test name clash
     524ddbd Make sure GHC.List.last is memory-efficient
     6ab5da9 Rename role annotations w.r.t only local decls.
     a8d39a7 Fix #10285 by refusing to use NthCo on a newtype.
     414e20b Fix the formal operational semantics (#10121)
     d4cf559 Test #10321 in ghci/scripts/T10321
     dc587fe Test case for #10141
     72a9272 Change default roles in hs-boot files. (#9204)
     bbabb71 Updates to Backpack documentation based on recent visit to MSRC.
     c4e8097 Bump base version to 4.8.2.0
     75adc35 Add missing since-annotations for c024af131b9e2538
     9a0c179 base: Export GHC.Event(.Internal).Lifetime
     5f127fc Flesh out some more Backpack examples in the merging section.
     d0898ca Backpack docs: explain alternate merging scheme.
     541aa7f Full type checking Backpack details.
     21a37ca Backpack docs: merge backpack-shaping into algorithm, sigs no longer provide
     b61562f Seed SpecConstr from local calls
     168c883 A little outright bug in canEqTyVar2
     d9bb0ee Don't print evidence in TcFlatten
     a1275a7 Improve improvement in the constraint solver
     d4a926b Test Trac #10226
     54cefbd Typeset Backpack syntax in a figure
     b83160d Tidy up treatment of FlexibleContexts
     a3f7517 Typo fixes (mostly in comments)
     fe5ccbb Typeset Backpack semantic entities in figure, figure-ify all asides.
     bbfa0ca Comments only
     f6ab0f2 Refactor TyCon to eliminate TupleTyCon
     0d715db Update haddock submodule to track TyCon change
     b626cb0 Make Derived NomEq rewrite only Derived NomEq
     de5d022 Kill off the default types in ghc-prim
     2f6a0ac Move IP, Symbol, Nat to ghc-prim
     4efa421 Permit empty closed type families
     63a10bb arm: Force non-executable stack (#10369)
     f7dfcef Fix safeHaskell test for llvm backend
     bf4f3e6 Give a hint when a TH splice has a bad package key, partially fixes #10279
     cdba973 Documentation for Language.Haskell.TH.Quote.
     1a4374c arm: Force non-executable stack (part 2)
     341a766 Doc: checkCrossStageLifting, RnSplice/TcExpr is untyped/typed brackets (#10384)
     f7daf5a Normalise type families in the type of an expression
     458a97b Fix typo: identifer -> identifier
     03c4893 Retain ic_monad and ic_int_print from external packages after load
     477f514 rts: add "-no-rtsopts-suggestions" option
     fa0474d base: Fix confusing docs typo
     fb54b2c API Annotations : add Locations in hsSyn were layout occurs
     caeae1a Correct parsing of lifted empty list constructor
     15aafc7 ApiAnnotations : quoted type variables missing leading quote
     81030ed ApiAnnotations : Nested forall loses forall annotation
     f34c072 Revert "ApiAnnotations : Nested forall loses forall annotation"
     97d320f Revert "API Annotations : add Locations in hsSyn were layout occurs"
     d1295da Comments only
     931d014 A bit of refactoring RnSplice
     c3e6b3a Regression test for Trac #10390
     5bde9f7 ApiAnnotations : RdrHsSyn.isFunLhs discards parentheses
     cc9b788 Backpack docs: meditate on AvailTC with four examples.
     225df19 ApiAnnotations : AnnComma missing in TupleSection
     7136126 ApiAnnotations: misplaced AnnComma for squals production
     2601a43 Backpack docs: AvailInfo plan, and why selectors are hard.
     28257ca Support stage 1 Template Haskell (non-quasi) quotes, fixes #10382.
     21c72e7 Split off quotes/ from th/ for tests that can be done on stage1 compiler.
     eb0ed40 RnSplice's staging test should be applied for quotes in stage1.
     9a43b2c Always do polymorphic typed quote check, c.f. #10384
     3c70ae0 Quick fix: drop base bound on template-haskell.
     5c459ee Revert stage 1 template-haskell. This is a combination of 5 commits.
     811b72a Api Annotations: RdrHsSyn.mkAtDefault causes annotations to be disconnected.
     e4032b1 ApiAnnotations : mkGadtDecl discards annotations for HsFunTy
     27aa733 IdInfo comment update
     2666ba3 haddock: update submodule to fix #10206
     cf7573b More accurate allocation stats for :set +s
     9736c04 compiler: make sure we reject -O + HscInterpreted
     24707d7 ApiAnnotations : BooleanFormula construction discards original
     f35d621 Fix build breakage from 9736c042
     fe38195 ApiAnnotations : pquals production adds AnnVbar in the wrong place
     ecc3d6b ApiAnnotations : PatBind gives wrong SrcSpan for the pattern.
     f16ddce Support stage 1 Template Haskell (non-quasi) quotes, fixes #10382.
     b0784cc Backpack docs: more carefully describe unification versus unioning.
     b4f6c16 Ignore out and toc files.
     53409a7 Backpack docs: proper discourse on ModIface and ModDetails.
     eecef17 Fix safe haskell bug: instances in safe-inferred
     4fffbc3 New handling of overlapping inst in Safe Haskell
     ef7ed16 Make template-haskell build with GHC 7.6, fixes bootstrap build.
     c119a80 Use fmap instead of <$> (Fixes #10407)
     ca7c855 We need an empty boolFormula.stderr
     f5188f3 Fix weird behavior of -ignore-dot-ghci and -ghci-scipt
     6ee4b6f Turn off warnings when compiling boolFormula
     1b47692 Backpack docs: Consistently italicize metavariables.
     4432863 Update some tests for recent Safe Haskell change.
     a171cc1 Update Safe Haskell documentation.
     4b8b4ce Fix fragile T9579 tests
     8764a7e Revert D727
     8da785d Delete commented-out line
     130e93a Refactor tuple constraints
     5910a1b Change in capitalisation of error msg
     a154944 Two wibbles to fix the build
     a8493e0 Fix imports in HscMain (stage2)
     6e1174d Separate transCloVarSet from fixVarSet
     51cbad1 Update haddock submodule
     ca173aa Add a case to checkValidTyCon
     eb6ca85 Make the "matchable-given" check happen first
     c0aae6f Test Trac #10248
     a9ccd37 Test Trac #10403
     04a484e Test Trac #10359
     3cf8ecd Revert multiple commits
     3ef7fce Do not check dir perms when .ghci doesn't exist
     5972037 Backpack docs: Rewrite type checking section to have a more concrete plan.
     ab45de1 Failing test for #10420 using plugins.
     c256357 Speed up elimCommonBlocks by grouping blocks also by outgoing labels
     8e4dc8f Greatly speed up nativeCodeGen/seqBlocks
     73f836f CmmCommonBlockElim: Improve hash function
     3f42de5 Test Trac #10359
     f1f265d Test Trac #10403
     fa0bdd3 Test Trac #10248
     76024fd Delete commented-out line
     ffc2150 Refactor tuple constraints
     228ddb9 Make the "matchable-given" check happen first
     eaaa38b includes/stg/SMP.h: implement simple load_/store_load_barrier on armv6 and older
     85bf9e4 Add regression test for #10110.
     5cbac88 user guide: correct documentation for -Wall (fixes #10386)
     578d2ba Remove unneeded compatibility with LLVM < 3.6
     b03f074 ghci: Allow :back and :forward to take counts
     b0b11ad In ghci linker, link against all previous temp sos (#10322)
     b199536 compiler: make sure we reject -O + HscInterpreted
     470a949 Revert "In ghci linker, link against all previous temp sos (#10322)"
     753b156 Add a TODO FIXME w.r.t. D894
     fc8c5e7 Test Trac #8799, #8555
     edb8dc5 Revert "compiler: make sure we reject -O + HscInterpreted" (again)
     25d1a71 Fix error messages from open(Binary)TempFileWithDefaultPermissions
     c934914 Backpack docs: Clarifications from today's Skype call.
     9f968e9 Fix binary instance for IfaceLitTy
     c553e98 ApiAnnotations : AST version of nested forall loses forall annotation
     0df14b5 ApiAnnotations : parens around a context with wildcard loses annotations
     c488da8 ApiAnnotatons : AnnDcolon in wrong place for PatBind
     369dd0c White space layout only
     eae703a Reduce magic for seqId
     c89bd68 Fix quadratic behaviour in tidyOccName
     45d9a15 Fix a huge space leak in the mighty Simplifier
     7d519da testsuite: commit missing T4945 stdout
     4d6c0ee compiler: kill a stray pprTrace in OccName
     6694ccf testsuite: handle missing stats files gracefully (#10305)
     c00f051 Update .mailmap
     c04571d rts: Fix typo in comment
     326989e Add missing name for FFI import (fixes #9950)
     70f1ca4 Fix ghci-way tests of -XStaticPointers.
     71d1f01 Omit the static form error for variables not in scope.
     388448b Build system: don't install haddock .t files (#10410)
     c591147 ApiAnnotations tweaks
     ef90466 Testdriver: don't use os.popen in config/ghc
     ce166a3 Testdriver: do not interfer with MinGW path magic (#10449)
     640fe14 Remove unnecessary loadInterface for TH quoted name.
     e28462d base: fix #10298 & #7695
     b0d8ba3 Add liftData function.
     a138fa1 Testsuite: accept new output for T2507 and T8959a
     5ead7d1 Build system: make more targets PHONY
     4c7d177 Build system: remove toplevel target `fast`
     a065a3a Build system: use `mkdir -p` instead of `-mkdir`
     51aacde Build system: allow missing config.mk for target clean_%
     4de8028 Build system: check $CLEANING instead of $MAKECMDGOALS
     47e00ec Build system: don't set CLEANING=NO
     b0885e4 Build system: whitespace and comments only
     cd0e2f5 Build system: prevent "--version: Command not found"
     0bfd05e Build system: prevent "./Setup: Command not found"
     a49070e Build system: time's config files have moved
     48ed2f1 Build system: always allow me to clean haddock
     577d315 Build system: always use `make -r`
     0d20d76 Build system: make clean in utils/ghc-pkg should not delete inplace/lib/bin
     0a159e3 Build system: don't use supposedly local variable inside macro
     018fec0 Build system: also clean the inplace wrapper
     508a3a3 Build system: don't build runghc if GhcWithInterpreter=NO (#10261)
     7db2dec linker_unload working on Windows, fixes #8292.
     5a65da4 Don't run T9330fail on Windows, no clobber occurs. #9930
     94fff17 Travis: use validate --quiet to prevent hitting log file limits
     4756438 Catch canonicalizePath exceptions, fix #10101
     a52f144 In ghci linker, link against all previous temp sos (#10322)
     f5b43ce compiler/specialise: shut match_co up a bit
     f6ca695 rts: Fix aarch64 implementation of xchg
     e00910b ApiAnnotations : rationalise tests
     7dd0ea7 Update binary submodule to 0.7.5.0 release
     e6191d1 ApiAnnotations : strings in warnings do not return SourceText
     e8a7254 Add constraint creation functions to TcPluginM API
     1c38325 Fix dropped event registrations
     928f536 Use seq rather than (==) to force the size
     5eee6a1 Move seqExpr, seqIdInfo etc to CoreUtils
     20d8621 Add some missing seqs to Coercion.seqCo
     d245787 Use named fields in SimplCont.Select constructor
     403cfc9 Comments only
     931268a Replace tabs with spaces.
     98b0b2e Add information about allowed foreign prim args, see #10460.
     e5be846 Typofix: missing period. (#10460)
     a27fb46 Add (failing) test case for #7672.
     f82e866 Newline after type of allocate().
     dfdc50d Don't call DEAD_WEAK finalizer again on shutdown (#7170)
     34dcf8a Re-center perf numbers for T5631
     2f0011a White space only
     11d8f84 Treat pattern-synonym binders more consistently
     9b73cb1 Refactor the GlobalRdrEnv, fixing #7672
     90fde52 Mark sigof02 tests as expect_broken
     1189196 Re-do superclass solving (again); fixes #10423
     b095c97 Improve constraint tuples (Trac #10451)
     dbcdfe2 Set 32-bit perf figure
     d6c01fa Remove redundant import
     b1b2b44 Test Trac #10423
     8a38348 Test Trac #10451
     8e5f8cf Test Trac #10466
     b2b69b2 Test Trac #10438
     091944e compiler: make sure we reject -O + HscInterpreted
     e796026 build: make haddock a bit less chatty
     3758050 Improve FFI error reporting
     5688053 Detabify a programlisting in the User's Guide (#10425)
     942a074 testsuite: mark test T9938 (#9938) as passing again
     7a82b77 newTempName: Do not include pid in basename
     2c4c627 Typofixes
     6adfb88 Suggest -H to improve GC productivity, fixes #10474.
     7b6800c Remove outdated uBackpack docs.
     7ea156a Refactor RdrName.Provenance, to fix #7672
     cd9c5c6 Allow Any return in foreign prim, fixes #10460.
     08558a3 Move liftData and use it as a default definition for Lift.
     942cfa4 typo: 'Ture' / 'True'
     21d7c85 Travis: Send notifications to author and commiter
     c69b69d ghc-pkg support query by package-key, fixes #9507
     d8f66f1 Re-center perf numbers for haddock.compiler
     75c6e06 Build: make configure and ghc-pkg a bit less chatty
     14652b5 ghc-cabal: don't warn about missing cabal fields
     092082e Build: ./boot && ./configure && make sdist (#8723)
     cac68d0 Build: remove unnecessary CLEANING/=YES check
     5dd0286 Build: remove more unnecessary CLEANING/=YES checks
     d0063e8 Make validate more quiet
     e340f6e Testsuite: add/fix cleanup for certain tests
     07feab1 Testsuite: ignore `stdcall attribute ignored` (#1288)
     0686d76 Testsuite: don't show compile/link info for some tests
     7beb477 Travis: allow user forks
     761fb7c Fix #10488 by unwrapping type synonyms.
     53c1374 Minor code cleanup
     61b96a8 Fix #10489
     dcaaa98 docs: Fix #10416
     ae83a81 Testsuite: only show output diff when test is expected to pass
     328c212 Fix the sdist build
     89223ce Fix the build when SplitObjs=YES
     19ec6a8 Fix for CAF retention when dynamically loading & unloading code
     7944a68 Revert "docs: Fix #10416"
     058af6c Refactor wild card renaming
     a48167e build: Clean testsuite before sdist
     3b55659 Always force the exception in enqueued commands
     bb99671 Revert "The test runner now also works under the msys-native Python."
     43ebe24 Testsuite: delete expect_fail setups for hugs
     3445947 Testsuite: delete expect_fail setups for ghc < 7.1
     4a0b7a1 Build: run autoreconf jobs in parallel
     5828457 make sdist: distclean testsuite for real (#10406)
     ca39b96 docs: Fix #10416
     ddbb97d Another major improvement of "improvement"
     c0dc79f IndTypesPerfMerge no longer seems to requre -M20M
     a66ef35 Fix DWARF generation for MinGW (#10468)
     c1dc421 Update submodule process to master
     da84fd5 Testsuite Windows: fix T8172 (#8172)
     a765f72 Testsuite: mark tests as expect_broken on win64
     506522c Testsuite: mark T4945 as expect_broken (#4945)
     6cefeb3 Testsuite: mention the existence of ticket #10510
     5e66a69 Testsuite: change some expect_fail tests to expect_broken
     a4318c6 Travis: use apt-get -q
     0db0ac4 Removes all occurrences of __MINGW32__ (#10485)
     23582b0 Add failing test for #9562.
     28e04de Remove redundant tcg_visible_orphan_mods, it is recorded in imp_orphs.
     bac927b Revert "Support for multiple signature files in scope."
     c60704f Revert "Change loadSrcInterface to return a list of ModIface"
     ce53138 Delete _MSC_VER when not necessary, fix #10511
     016bbfd docs: Fix unicode alternatives table (fixes #10509).
     0ef7174 Squash typos in comments
     c14bd01 Testsuite: fix the little known CHECK_FILES_WRITTEN=1
     d20031d Add parseExpr and compileParsedExpr and use them in GHC API and GHCi
     892c3e9 Do not copy stack after stack overflow, refix #8435
     dd5cac7 Fix typo in `traceShowM` haddock comment (#10392)
     0a086c8 Docs: it's `gv --orientation=seascape` nowadays (#10497)
     b07dccc Docs: `-XTypeOperators` (#10175)
     e02a4f2 Add versioning section to Backpack docs.
     5ddd904 Testsuite: diff non-whitespace normalised output (#10152)
     6e542a6 Testsuite: add function compile_timeout_multiplier (#10345)
     a508455 UNREG: fix pprHexVal to emit zeros (#10518)
     1cf7fc0 add type annotations to SrcLoc functions
     dd3080f Increase constraint tuple limit to 62 (Trac #10451)
     a607011 Test Trac #10348
     77e5ec8 Demonstrate that inferring Typeable for type literals works
     efa136f Remove derived CFunEqCans after solving givens
     a3f6239 GHCi: fix scoping for record selectors
     a6cbf41 Spelling in comments
     855f56b Improved peak_megabytes_allocated
     2613271 Testsuite: fix framework failure
     89c7168 Fix #10534
     df63736 ghc.mk: Update instances of -auto-all
     1ff7f09 Lexer: Suggest adding 'let' on unexpected '=' token
     0d6c97b Lexer: Suggest adding 'let' on unexpected '=' token
     a90712b users_guide: Various spelling fixes
     d46fdf2 users_guide: Various spelling fixes
     681973c Encode alignment in MO_Memcpy and friends
     a0d158f Encode alignment in MO_Memcpy and friends
     c772f57 Fix #10494
     0de0b14 Fix #10495.
     ace8d4f Fix #10493.
     6644039 Test case for #10428.
     ff82387 Decompose wanted repr. eqs. when no matchable givens.
     93f97be (mostly) Comments only
     f108003 Testsuite wibble around decomposing newtypes.
     7eceffb Refactor handling of decomposition.
     9b105c6 Reimplement Unify.typesCantMatch in terms of apartness.
     298c424 Treat funTyCon like any other TyCon in can_eq_nc.
     a6b8b9c Fix typo in comment
     daf1eee Clarify some comments around injectivity.
     65d4b89 Add `Monoid` instance for `IO`
     f063656 Fix ghc-pkg reports cache out date (#10205)
     0760b84 Update foreign export docs, fixes #10467
     b98ca17 Make enum01/enum02/enum03 tests clang-compatible
     023a0ba Care with impossible-cons in combineIdenticalAlts
     5879d5a Report arity errors correctly despite kinds
     f4370c6 Comments only
     4a7a6c3 Rename getCtLoc, setCtLoc
     02bac02 Remove some horrible munging of origins for Coercible
     760b079 A bit more tracing
     0899911 Comments plus tiny refactoring
     ee64369 Refactor filterAlts into two parts
     5d98b68 Trac #4945 is working again
     72b21c3 Parser: commas_tup_tail duplicate SrcSpan on "Missing" value
     ba7c8e5 Test Trac #10503
     c45f8ce Elaborate test for Trac #10403
     40698fe Spelling in comments
     e283cec testsuite: mark T4945 as expect_broken
     440d1bc docs: Unbreak the PS/PDF builds for the User's Guide (#10509)
     7d5a845 should_run/allocLimit4: disable ghci way
     e491803 Amend tcrun024, tcrun025 after Trac #7854 fix
     7c2293a Amend tcrun037 after Trac #7854 fix
     2c6a041 Fix a couple of tests for GHCi/-O* (Trac #10052)
     5cc08eb Recognise 'hardhloat' as a valid vendor in a host tuple
     f2ffdc6 Updated output for test ghci024
     85d5397 Make GHC install libraries to e.g. xhtml-3000.2.1-0ACfOp3hebWD9jGWE4v4Gh.
     0cb1f5c Filter orphan rules based on imports, fixes #10294 and #10420.
     29bc13a Fix all.T for T8131/T8131b.
     15ef5fc Remove duplicate test.
     13ba87f Build system: unset HADDOCK when haddock is not found
     4854fce Change `Typeable` instance for type-lis to use the Known* classes.
     38f3745 Add parsePattern parser entry point
     b5a2e87 Documentation: add section on .haskeline file (#2531)
     e60dbf3 Check KnownSymbol => Typeable deduction
     f70fb68 Use -package-id to specify libraries on command line.
     6c5a66a Fix #10551 by using LIB_NAMES.
     01f7e44 Rename $1_$2_$3_LIB_NAME to LIB_FILE.
     55843f1 Further elaborate Trac #10403 test
     c084796 powerpc: add basic support for PLT relocations (#10402)
     73a6265 Make $1 in $1_$2_$3_FOO actually be directory.
     95d5031 Build system: delete unused variables in config.mk.in
     ece2c43 Drop prefix from package keys.
     aa26731 Clean outdated ext-core references in comments.
     4d1316a driver: pass '-fPIC' option to all CC invocations
     9a34864 Improve kind-checking for 'deriving' clauses
     c7b6fb5 Test Trac #10562
     a2f828a Be aware of overlapping global STG registers in CmmSink (#10521)
     a7eee0d Comments only
     3edc186 White space only
     9195927 Improve pretty-printing for CoPat
     ff8a671 Use a Representaional coercion for data families
     0b7e538 Allow recursive unwrapping of data families
     cc0dba1 Minor fix to free-vars in RnTypes
     9014a7e Fix addDataConStrictness
     b69dc73 Don't float out alpha[sig] ~ Int
     97e313c Add module header to test
     2f16a3b Get rid of irrlevant result type signature
     95fc6d5 Get rid of irrelevant impredicative polymoprhism
     fb7b692 Treat out-of-scope variables as holes
     b98ff25 Error message wibbles from out-of-scope changes
     0aaea5b Tiny refactor plus comments
     be0ce87 Fix for crash in setnumcapabilities001
     111ba4b Fix deadlock (#10545)
     7c8ffd3 GHCi docs: layout rule is respected inside :{ :}
     cbd9278 Comments only
     caf9d42 Small doc fixes
     0696fc6 Improve CPR behavior for strict constructors
     7c07cf1 closeOverKinds *before* oclose in coverage check
     614ba3c Kill off sizePred
     8e34783 Make fvType ignore kinds
     a64a26f Better tracing and tiny refactoring
     ceb3c84 Improve error message for Typeable k (T k)
     0e1e798 Test Trac #10524
     8d221bb Test #10582
     89834d6 Add -fcross-module-specialise flag
     302d937 Add -fcross-module-specialise flag
     bb0e462 Mask to avoid uncaught ^C exceptions
     9b5df2a Update performance numbers due to #10482
     c6bb2fc Correct BangPat SrcSpan calculation
     c495c67 Build system: remove unused variable CHECK_PACKAGES
     897a46c Testsuite: accept T2592.stderr (minor changes)
     6b9fc65 Testsuite: put extra_run_opts last on command line
     daa5097 Build system: prevent "warning: overriding commands for target..."
     bbf6078 disable check for .init_array section on OpenBSD
     9aa0e4b ghc-pkg: use read/writeUTF8File from Cabal
     bdd0b71 bin-package-db: copy paste writeFileAtomic from Cabal
     bdf7f13 Build system: rename bindist to bindist-list...
     d3c1dda Implement PowerPC 64-bit native code backend for Linux
     b5e1944 Use `+RTS -G1` for more stable residency measurements (#9675)
     1d6ead7 Enable using qualified field of constructor in GHCi
     f856383 Fix Trac #10519
     f07b7a8 Remove unnecessary OrdList from decl parser.
     6400c76 users_guide: Describe order-dependence of -f and -O flags
     e4bf4bf Remove redundant parser entry point
     8b55788 Add "since" column for LANGUAGE extensions in user guide
     39d83f2 Generalize traceM, traceShowM (fixes #10023)
     6b01d3c parser: Allow Lm (MODIFIER LETTER) category in identifiers
     889c81c Fix some validation errors.
     69beef5 Replace usages of `-w` by `-fno-warn`s
     b1d1c65 Support MO_{Add,Sub}IntC and MO_Add2 in the LLVM backend
     124f399 Testsuite: add -ignore-dot-ghci to some tests
     ced27de Remove dead code / overlapping pattern (#9723)
     a4b0342 Lexer: remove -fno-warn-unused-do-bind
     aa778c8 Comments only [skip ci]
     c875b08 Use -fno-warn-unused-imports instead of hiding `ord`
     8e12a21 Lexer.x and Parser.y: delete dead code
     5d48e67 Easy way to defer type errors (implements #8353)
     3fabb71 Fix typo [skip ci] (#10605)
     75de613 rts: fix incorrect checking start for -x arguments (#9839)
     edb2c54 Remove Hugs specific test setups (omit_compiler_type)
     7a3d85e Remove all *.stderr/stdout-hugs files
     4681f55 Specialise: Avoid unnecessary recomputation of free variable information
     2765fcf Remove warnings for -fwarn-incomplete-patterns
     a07898e Spelling in comments
     9180df1 Fix offset calculation in __stg_gc_fun
     aaa0cd2 Don't eagerly blackhole single-entry thunks (#10414)
     d27e7fd Add more discussion of black-holing logic for #10414
     d59cf4e Fix "CPP directive" in comment
     db530f1 Add Note [Warnings in code generated by Alex]
     37de4ad Build system: don't set GhcLibWays explicitly in build.mk.sample (#10536)
     62fcf05 Fix word repetitions in comments
     ebfc2fb Update comments around blackholes
     f753cf1 Allow deferred type error warnings to be suppressed
     31580e2 Fix todo in compiler/nativeGen: Rename Size to Format
     9a3e165 Deferred type errors now throw TypeError (#10284)
     5857e0a fix EBADF unqueueing in select backend (Trac #10590)
     6d69c3a Generalize `Control.Monad.forever`
     d03bcfa always use -fPIC on OpenBSD/AMD64 platform
     00c8d4d Fix #10596 by looking up 'Int' not 'Maybe Int' in the map.
     1967a52 Export more types from GHC.RTS.Flags (#9970)
     8800a73 Backpack: Flesh out more Cabal details
     d71b65f holePackageKey and isHoleModule utility functions.
     3d5f8e7 Unbreak Windows build: delete unusud throwIOIO
     6f9efcb Delete duplicate "Note [Unpack equality predicates]"
     f3bfa3b Broaden Outputable instance for Termination
     85b14a7 Comments only
     4f9d600 Fix Trac #10618 (out of scope operator)
     b29633f Bitmap: Fix thunk explosion
     889824d Document RULES and class methods
     c58dc1a White space only
     b5aabfb Infer types with flexible contexts
     7dcf86f users_guide: Fix errant "a" in RULES/class methods docs
     a6359f2 Add testcase for #10602
     6f1c076 Make mkQualPackage more robust when package key is bad.
     0a3c43f Comments only
     9e86bf1 Better type wildcard errors
     888026d Update .mailmap [skip ci]
     2d06a9f Improve error message for fundeps
     9b1ebba Delete the WayPar way
     d69dfba Fix self-contained handling of ASCII encoding
     ee28a79 T1969: Update max_bytes_used
     a846088 T876 (32-bit): Update bytes allocated
     de6597e perf/compiler: Switch to -G1 and update performance metrics
     b935497 T9872d: Update 32-bit allocations
     d073c77 Do not optimise RULE lhs in substRule
     e922847 Add Linting for Rules
     7da7b0e Make sure rule LHSs are simplified
     875723b Reformat a leading # in a comment
     d7335f7 Test Trac #10463
     02a6b29 Test Trac #10634
     946c8b1 Another comment with a leading # (sigh)
     2e52057 Build system: comments only [skip ci]
     ec197d3 Build system: add `make show!` command (#7810)
     f70f1b6 Build system: delete two unused files
     47ebe26 Build system: delete REGULAR_INSTALL_DYNLIBS and INSTALL_DYNLIBS
     392ff06 Build system: do not build stm and parallel by default
     5764ade Testsuite: delete unused with_namebase
     322ae32 Testsuite: delete remaining only_compiler_types(['ghc']) setups
     783b79b traivs: Use the new container based travis setup
     4dc3877 Testsuite: rename *.stderr-ghc to *.stderr
     ab5257b Testsuite: delete *.stderr-ghc-7.0 *.stdout-ghc-7.0
     4ee658a0 Mark test case for #10294 expect_broken on #10301
     0a40278 Flush stdout in test case for #10596
     8e6a503 Mark test case for #10294 conditionally expect_broken on #10301
     b1063b1 Testsuite: mark T10294 conditionally expect_broken on #10301
     348f5ca Build system: delete fingerprint.py [skip ci]
     a592e9f Remove all references to sync-all
     75fd5dc Don't get a new nursery if we exceeded large_alloc_lim
     9f978b6 Fix #10642.
     74a00bc initGroup: only initialize the first and last blocks of a group
     504c2ae Docs: `sortOn = sortBy (comparing f)` [skip ci]
     02897c5 Failing test case: idArity invariant check, #10181
     e29c2ac CoreUtils: Move seq* functions to CoreSeq
     ae0e340 CoreUtils: Move size utilities to CoreStats
     fa33f45 PprCore: Add size annotations for top-level bindings
     29f8225 CoreLint: Use size-annotated ppr variant
     82f1c78 Fix tests
     ae96c75 Implement -fprint-expanded-synonyms
     415351a Put Opt_Static into defaultFlags if not pc_DYNAMIC_BY_DEFAULT (#7478)
     2c5c297 DeriveFoldable for data types with existential constraints (#10447)
     2c9de9c Handle Char#, Addr# in TH quasiquoter (fixes #10620)
     a5e9da8 Fix off-by-one error in GHCi line reporting (Trac #10578)
     3448f98 Reduce non-determinism in ABI hashes with RULES and instance decls
     bc604bd Update assert to fix retc001 and retc002 (#9243)
     0d4b074 Travis: actually do debug builds
     ac0feec Testsuite: small test cleanups
     f607393 Testsuite: accept new stderr for T9497{a,b,c}-run (#10224)
     a0371c0 Build system: fail when encountering an unknown package tag
     dc6e556 Testsuite: mark T2497 expect_broken_for(#10657, ['optasm', 'optllvm'])
     dcaa486 Testsuite: mark T7919 expect_broken_for(#7919, ['optasm','dyn','optllvm'])
     11f8612 Testsuite: mark 3 tests expect_broken_for(#10181, ['optasm', 'optllvm'])
     16a8739 Testsuite: mark qq007 and qq008 expect_broken(#10181)
     cbb4d78 Testsuite: mark qq007 and qq008 expect_broken(#10047)
     43dafc9 Testsuite: mark gadt/termination expect_broken_for(#10658, ['optasm','optllvm'])
     34bb460 Testsuite: mark array001 and conc034 expect_broken_for(#10659, ['optasm',...])
     9834fea Add regression test for unused implicit parameter warning (#10632)
     4c96e7c Testsuite: add ImpredicativeTypes to T7861 (#7861)
     7f37274 Testsuite: add -XUndecidableInstances to T3500a
     029367e Testsuite: add regression test for missing class constraint
     82ffc80 LlvmCodeGen: add support for MO_U_Mul2 CallishMachOp
     49373ff Support wild cards in TH splices
     c526e09 primops: Add haddocks to BCO primops
     4cd008b Do not treat prim and javascript imports as C imports in TH and QQ
     96de809 Fix primops documentation syntax
     d71d9a9 Testsuite: fix concprog002 (AMP)
     2f18b197 Testsuite: mark concprog002 expect_broken_for(#10661, ['threaded2_hT'])
     d0cf8f1 Testsuite: simplify T8089 (#8089)
     b4ef8b8 Update submodule hpc with fix for #10529
     0c6c015 Revert "Revert "Change loadSrcInterface to return a list of ModIface""
     214596d Revert "Revert "Support for multiple signature files in scope.""
     9ade087 primops: Fix spelling mistake
     e0a3c44 Delete __GLASGOW_HASKELL__ ifdefs for stage0 < 7.8
     8f48fdc Use varToCoreExpr in mkWWcpr_help
     3fbf496 Comments only (superclasses and improvement)
     3509191 Refactor newSCWorkFromFlavoured
     7c0fff4 Improve strictness analysis for exceptions
     cd48797 Comments and white space only
     3c44a46 Refactor self-boot info
     efa7b3a Add NOINLINE for hs-boot functions
     aa78cd6 Documents -dsuppress-unfoldings
     0df2348 Comments and layout only
     a0e8bb7 Implement -dsuppress-unfoldings
     b5c1400 Comments and white space only
     f1d0480 Avoid out-of-scope top-level Ids
     7a6ed66 Comments only
     55754ea Fix test T2497 to avoid infinite loop in RULES
     feaa095 Do occurrence analysis on result of BuiltInRule
     00f3187 Make seq-of-cast rule generate a case
     35eb736 T4945 is working again
     f519cb5 testsuite: Show killed command line on timeout
     97a50d5 configure: Bump minimum bootstrap GHC version to 7.8
     dbe6dac When iconv is unavailable, use an ASCII encoding to encode ASCII
     18c6ee2 Travis: use ghc-7.8.4 as stage0 to fix the build
     d941a89 Validate: by default do show commands
     a7e0326 Validate: document --quiet [skip ci]
     1224bb5 Add utility function isHoleName.
     50b9a7a Revert "Trac #4945 is working again"
     1b76997 Testsuite: recenter haddock.base allocation numbers
     b949c96 Eliminate zero_static_objects_list()
     0d1a8d0 Two step allocator for 64-bit systems
     e3df1b1 Validate: explain THREADS instead of CPUS in --help
     cf57f8f Travis: do pass `--quiet` to validate
     0b12aca Switch from recording IsBootInterface to recording full HscSource.
     adea827 Add ExceptionMonad instance for IOEnv.
     144096e Give more informative panic for checkFamInstConsistency.
     4a9b40d Export alwaysQualifyPackages and neverQualifyPackages.
     939f1b2 Some utility functions for testing IfaceType equality.
     dd365b1 Use lookupIfaceTop for loading IfaceDecls.
     5c3fc92 Fix Trac #10670
     9851275 Comments only
     d784bde Lexer: support consecutive references to Haddock chunks (#10398)
     d2b4df1 Generate .dyn_o files for .hsig files with -dynamic-too
     76e2341 Accept next-docstrings on GADT constructors.
     e78841b Update encoding001 to test the full range of non-surrogate code points
     b5c9426 Parenthesise TypeOperator in import hints
     1852c3d DataCon: Fix redundant import
     4c8e69e rts/sm: Add missing argument names in function definitions
     7ec07e4 Slight refactoring to the fix for #4012
     608e76c Document type functions in the Paterson conditions
     e809ef5 ghci: fixity declarations for infix data constructors (#10018)
     5ff4dad Add a few comments from SPJ on fixity declarations
     f9687ca Library names, with Cabal submodule update
     45c319f Fix line number in T10018 testcase
     30d8349 Comments only
     e161634 Comments about stricteness of catch#
     d53d808 Refactoring around FunDeps
     6e618d7 Improve instanceCantMatch
     09d0505 RetainerProfile: Add missing UNTAG_STATIC_LIST_PTR
     b04bed0 renamer: fix module-level deprecation message
     070f76a -include-pkg-deps takes only one hyphen.
     7e70c06 Use isTrue# around primitive comparisons in integer-gmp
     c55f61c Add missing parentheses in eqBigNatWord#
     474d4cc Comment tweaks only
     f842ad6 Implementation of StrictData language extension
     2178273 Add UInfixT to TH types (fixes #10522)
     81fffc4 Remove runSTRep from PrelNames
     bc4b64c Do not inline or apply rules on LHS of rules
     2d88a53 Improve warnings for rules that might not fire
     09925c3 Revert "RetainerProfile: Add missing UNTAG_STATIC_LIST_PTR"
     a1e8620 Revert "Eliminate zero_static_objects_list()"
     e343c0a Test case for #10698
     a1dd7dd Fallout from more assiduous RULE warnings
     f83aab9 Eliminate zero_static_objects_list()
     2dbb01a Add a missing check for -fcpr-off
     fac11f8 Comments only
     4e8d74d Deal with phantom type variables in rules
     92d2567 Define DsUtils.mkCastDs and use it
     fa915af Spit out a little more info with -dppr-debug
     e4114c8 Fix an outright error in competesWith
     499b926 Fix Trac #10694: CPR analysis
     918dcf8 The parallel package has warnings
     2e33b9c Modify spec002 to be less trivial
     72d23c3 Better treatment of signatures in cls/inst
     24afe6d Fix missing files
     5a8a8a6 Don't allowInterrupt inside uninterruptibleMask
     9f7cdfe Make configure error out on missing ghc-tarballs on Windows
     e7c331a Make headers C++ compatible (fixes #10700)
     26315ed Fix misspelled function name in a comment
     4f80ec0 Improve error message for newtypes and deriving clauses
     e9ad42d Typos in comments and strings
     d7c2b01 Fix comment that confused Haddock
     b5097fe Testsuite: rename rename/should_fail/T5001 to T5001b (#5001)
     e273c67 Testsuite: mark tests recently fixed as passing + accept new stderr
     756fa0a Testsuite: skip T10489 unless compiler_debugged (#10489)
     6880277 Testsuite: add arrows/should_compile/T5333 (#5333)
     58b5f04 Testsuite: add typecheck/should_fail/T9260 (#9260)
     58986c4 Testsuite: add typecheck/should_fail/T8034 (#8034)
     aee19d0 Testsuite: T10245 is passing for WAY=ghci (#10245)
     36bbfbd Backpack docs on renamer and depsolver, also s/package/unit/.
     a442800 Build system: remove function keyword from configure.ac (#10705)
     a66e1ba User's guide: delete ancient "Core syntax" example
     7cf87df Fix #7919 (again)
     353db30 Remove checked-in PDFs.
     8f81af9 Typos in comments
     ad089f5 Give raise# a return type of open kind (#10481)
     75504f3 Typos in comments
     15dd700 Replace (SourceText,FastString) with StringLiteral data type
     d9b618f Typo in comment
     37227d3 Make BranchFlag a new kind
     92f5385 Support MO_U_QuotRem2 in LLVM backend
     948e03e Update parallel submodule, and re-enable warnings
     b38ee89 Fix incorrect stack pointer usage in StgRun() on x86_64
     4d8859c Typos in comments
     d7ced09 Minor improvement to user guide
     30b32f4 Test Trac #10134
     697079f 4 reduce/reduce parser conflicts resolved
     d9d2102 Support wild cards in data/type family instances
     7ec6ffc Typos in comments [skip ci]
     64b6733 CmmParse: Don't force alignment in memcpy-ish operations
     30c981e Removed deprecated syntax for GADT constuctors.
     f063bd5 Fix #10713.
     b5f1c85 Test #9233 in perf/compiler/T9233
     d7b053a Pretty: reformat using style from libraries/pretty (#10735)
     9d24b06 Pretty: rename variables to the ones used by libraries/pretty (#10735)
     25bc406 Pretty: improve error messages (#10735)
     53484d3 Pretty: remove superfluous parenthesis (#10735)
     2d1eae2 Pretty: kill code that has been dead since 1997 (#10735)
     6f6d082 Pretty: Args of NilAbove/TextBeside/Nest/Union are always RDocs (#10735)
     926e428 Pretty: use BangPatterns instead of manual unboxing Ints (#10735)
     f951ffc Pretty: mimic pretty API more closely (#10735)
     85179b5 Pretty: use replicate for spaces and multi_ch (#10735)
     dd7e188 Add framework flags when linking a dynamic library
     4c55f14 users_guide: Add note about #367 to Bugs section
     6029748 Drop custom mapM impl for []
     ecb1752 Make -fcpr-off a dynamic flag
     b12dba7 Make Exception datatypes into newtypes
     22bbc1c Make sure that `all`, `any`, `and`, and `or` fuse (#9848)
     fd6b24f Additions to users' guide and release notes
     575abf4 Add Fixity info for infix types
     e2b5738 Allow proper errors/warnings in core2core passes
     617f696 Do not complain about SPECIALISE for INLINE
     a426154 Warn about missed specialisations for imports
     49615d9 Comments only
     ab98860 Minor refactor to use filterInScope
     9536481 Tidy up and refactor wildcard handling
     28096b2 Fix quantification for inference with sigs
     75f5f23 Coments only
     cc07c40 Comments only
     294553e T8968-1 and -3 should pass
     64dba51 Test Trac #10742
     eca9a1a Ensure DynFlags are consistent
     97843d0 base: Add instances
     600b153 llvmGen: Rework LLVM mangler
     aa23054 Add test for #10600 (exhaustiveness check with --make and -fno-code)
     bc43d23 Rejigger OSMem.my_mmap to allow building on Mac
     a1c934c base: Add missing Traversable instance for ZipList
     6cab3af Big batch of Backpack documentation edits.
     79e0a10 Test Trac #10753
     a192d6b Comments only
     f1b4864 Sync base/changelog.md with GHC 7.10.2 release
     590aa0f Make oneShot open-kinded
     92f35cd cmmCreateSwitchPlan: Handle singletons up-front
     2c4a7d3 Update transformers submodule to 0.4.3.0 release
     f04c7be Fix unused-matches warnings in CmmLex.x
     a40ec75 Update testsuite/.gitignore [skip ci]
     b4ed130 Replace HsBang type with HsSrcBang and HsImplBang
     2da06d7 User manual update, as prodded by #10760.
     2b4710b Add missing </para> to User's guide to fix the build
     8cce7e4 Bump template-haskell to new major version 2.11
     67576dd Pretty: bugfix fillNB (#10735)
     bcfae08 Pretty: fix potential bad formatting of error message (#10735)
     5d57087 Pretty: fix a broken invariant (#10735)
     85bf76a Pretty: show rational as is (#10735)
     f903949 Pretty: improving the space/time performance of vcat, hsep, hcat (#10735)
     b0dee61 template-haskell: Add changelog entry to infix type operators
     7b211b4 Upgrade GCC to 5.2.0 for Windows x86 and x86_64
     e415369 Update mingw tarball location
     8c5b087 SysTools: Fix whitespace in error message
     d2dd5af DynFlags: Prohibit hpc and byte-code interpreter
     ec68618 Name: Show NameSort in warning
     1857191 Testsuite: mark T8089 expect_broken(#7325) on Windows
     8906037 Testsuite: mark encoding005 expect_broken(#10623) on Windows
     ca85442 Testsuite: recenter 2 performance tests on Windows
     744ff88 Testsuite: speedup running a single test
     e367e27 Travis: prevent 10' no output, by setting VERBOSE=2
     74897de Make rts/ThreadLabels.c threadsafe for debug runtime.
     22aca53 Transliterate unknown characters at output
     ab9403d Dump files always use UTF8 encoding #10762
     b17ec56 Fix rdynamic flag and test on Windows
     ebca3f8 rts/Printer.c: speed up '-Da' printer for 'LIBBFD' build
     18a1567 Add selectors for common fields (DataCon/PatSyn) to ConLike
     d97e60f Comments reformating/corrections
     b6be81b Build system: delete half-baked Cygwin support
     98f8c9e Delete sync-all
     a146b28 GhcMake: Fix spelling in comment
     0d0e651 Bag: Add Foldable instance
     9e8562a Implement getSizeofMutableByteArrayOp primop
     3452473 Delete FastBool
     2f29ebb Refactor: delete most of the module FastTypes
     47493e6 Build system: simplify install.mk.in
     a1c008b Build system: delete unused distrib/Makefile
     a5061a9 Check options before warning about source imports.
     37a0b50 Delete ExtsCompat46 (#8330)
     b78494e fix 64bit two-stage allocator on Solaris/AMD64 platform (#10790)
     fba724c configure.ac: Allow disabling of large-address-space
     1c643ba Fix algorithm.tex build and update with some new info.
     0f3335f Comments and white space
     816d48a Implement lookupGlobal in TcEnv, and use it
     711e0bf tcRnDeclsi can use tcRnSrcDecls
     ac0d052 TcDeriv: Kill dead code
     de476e9 PrelNames: Clean up list a bit
     89d25b9 BinIface: Clean up whitespace
     7924469 Clean up handling of knownKeyNames
     a8601a8 Revert "Clean up handling of knownKeyNames"
     28ad98e PrelNames: introduce dcQual in place of conName
     211b349 Move newImplicitBinder to from IfaceEnv to BuildTyCl
     70ea94c IfaceEnv: Clean up updNameCache a bit
     f6035bc MkIface: Introduce PatSynId, ReflectionId, DefMethId
     7bd8f8f TysWiredIn: Shuffle code around
     15c63d2 base: Remove a redundant 'return'
     38c98e4 RTS: Reduce MBLOCK_SPACE_SIZE on AArch64
     15cb83d Add testcase for #7411
     a6826c5 Make Generic (Proxy t) instance poly-kinded (fixes #10775)
     1b56c40 Respect GHC_CHARENC environment variable #10762
     81ae26d Dwarf: Fix DW_AT_use_UTF8 attribute
     cbf58a2 Dwarf: Produce {low,high}_pc attributes for compilation units
     8476ce2 Dwarf: Produce .dwarf_aranges section
     0c823af Fix identifier parsing in hp2ps
     cd2dc9e ghc-pkg --enable-multi-instance should not complain about case sensitivity.
     c7f0626 integer-gmp: optimise bitBigNat
     c1d7b4b StgCmmHeap: Re-add check for large static allocations
     60120d2 Fix 7.10 validate
     12098c2 Fix typo in pattern synonym documentation.
     10a0775 Anchor type family instances deterministically
     ad26c54 Testsuite: refactoring only
     6740d70 Use IP based CallStack in error and undefined
     010e187 Fix trac #10413
     ff9432f Add test for updating a record with existentially quantified fields.
     296bc70 Use a response file for linker command line arguments #10777
     ba5554e Allow annotations though addTopDecls (#10486)
     c8f623e Expand declaration QQs first (#10047)
     28ac9d3 Improve the error messages for class instance errors
     3cc8f07 stm: Fix test case
     5d7a873 Testsuite: don't warn about missing specialisations
     e0b3ff0 Testsuite: update expected output
     3b23379 Testsuite: mark 4 tests expect_broken_for(#10712, opt_ways)
     32a9ead Fix some tests that were broken by D861
     c43c8e2 Testsuite: by default run all tests for a single way
     bd16e0b Testsuite: delete dead code
     3744578 Injective type families
     5dc88b7 Add test for T10836 (expected broken)
     34b106f Accept underscores in the module parser. (Thanks spinda for the fix.)
     b639c97 Testsuite: fix tcfail220 - Maybe is wired-in now
     e1293bb Testsuite: only print msg when timeout kills process unexpectedly
     79cdb25 Testsuite: ignore line number differences in call stacks (#10834)
     85915e9 Make Data.List.foldr1 inline
     19c6049 Fix T6018th test failure
     64761ce Build system: implement `make install-strip` (#1851)
     5c372fe ghc-pkg: don't print ignored errors when verbosity=0
     c60c462 user-guide: Add missing <para> tags around <listitem> body
     96b986b EventLog: Factor out ensureRoomFor*Event
     062feee tracing: Kill EVENT_STARTUP
     2c24fd7 Build system: put each BuildFlavour in a separate file (#10223)
     b40e559 Build system: simplify *-llvm BuildFlavours (#10223)
     1abbacd Build system: cleanup utils/ghc-pkg/ghc.mk
     dc671a1 SPECIALIZE strictMinimum for Int and Integer
     c6b82e9 Further simplify the story around minimum/maximum
     554be5e Build system: detect when user cloned from GitHub
     864a9c4 Build system: remove hack for Mac OSX in configure.ac (#10476)
     a158607 Build system: delete the InstallExtraPackages variable
     330fbbd Build system: make *-cross BuildFlavours consistent (#10223)
     8be43dd Build system: cleanup BUILD_DIRS + add lots of Notes
     e4a73f4 Move GeneralCategory et al to GHC.Unicode
     1b8eca1 Build system: check for inconsistent settings (#10157)
     dbb4e41 HeapStackCheck: Small refactoring
     4356dac Forbid annotations when Safe Haskell safe mode is enabled.
     23a301a Testsuite: comment out `setnumcapabilities001` (#10860)
     cdca31e Don't check in autogenerated hs files for recomp013.
     3a71d78 Comments on oneShot
     a870738 Improve rejigConRes (again)
     487c90e Add a test for Trac #10806
     a7f6909 A CFunEqCan can be Derived
     377395e Improve documentation for transform list-comps
     50d1c72 Fix broken links in documentation
     413fa95 Improve documentation of comprehensions
     f30a492 Testsuite cleanup
     8c0eca3 Add assertions
     18759cc Remove redundant language extensions
     195af2d Dead code removal, export cleanup
     4275028 Code movement
     7ad4b3c s/StgArrWords/StgArrBytes/
     89324b8 Testsuite: normalise slashes in callstack output
     37081ac Testsuite: mark enum01-enum03 expect_broken(#9399) on Windows
     3ec205a CodeGen: fix typo in error message
     08af42f hpc: use `takeDirectory` instead of `dropWhileEnd (/= '/')`
     c8d438f Testsuite: mark T6037 expect_fail on Windows (#6037)
     12b0bb6 Account for stack allocation in the thread's allocation counter
     14c4090 Pretty: fix unicode arrow operators.
     325efac Fix `hp2ps -i-`
     e66daec DynFlags: remove unused sPgm_sysman (#8689)
     8d89d80 Testsuite: add test for #10781
     43eb1dc Show minimal complete definitions in ghci (#10847)
     8ecf6d8 ApplicativeDo transformation
     77662e1 Add namePackage function to template-haskell
     48746ff Docs: make sure all libs are included in index.html (#10879)
     a8406f8 Pass TEST_HC_OPTS in bug1465 and T5792.
     2d4db40 Fix #10815 by kind-checking type patterns against known kinds.
     8ee2b95 Polish some error messages.
     b89c491 Always run explicitly requested ways (extra_ways) for fast runs.
     c738b12 Replace [PostTc id Type] with PostTc id [Type]
     e156361 Put stable pointer names in the name cache.
     1637e4d Driver: --make -o without Main should be an error (#10895)
     1a13551 Test #10347
     d19a77a Update user guide, fixing #10772
     d7f2ab0 Test #10770
     79b8e89 Print associated types a bit better.
     1292c17 Allow TH quoting of assoc type defaults.
     27f9186 Clarify parsing infelicity.
     93fafe0 Re-polish error messages around injective TFs.
     6a20920 Small improvement in pretty-printing constructors.
     cbcad85 Fix typo in test for #10347.
     2f9809e Slightly better `Coercible` errors.
     e27b267 Perform a validity check on assoc type defaults.
     8e8b9ed Run simplifier only when the env is clean.
     cd2840a Refactor BranchLists.
     c234acb `_ <- mapM` --> `mapM_`
     3f13c20 Revert "Revert "Revert "Support for multiple signature files in scope."""
     09d214d Revert "Revert "Revert "Change loadSrcInterface to return a list of ModIface"""
     06d46b1 Unify hsig and hs-boot; add preliminary "hs-boot" merging.
     d516d2e Fix build failure, I think.
     07f6418 Remove graphFromVerticesAndAdjacency
     5a8b055 TcDeriv: Use a NameEnv instead of association list
     83e23c1 Remove (now bogus) assert.
     0b852fc base: use Show for ErrorCall in uncaughtExceptionHandler
     d4d34a7 Make derived names deterministic
     089b72f DeriveLift extension (#1830)
     4cdab73 HscMain: Place CPP macro invocation on one line
     79f5732 testsuite: attempt fixing fallout from 089b72f52
     c6bdf4f Remove references to () from types of mkWeak# and friends
     65bf7ba DsBinds: Avoid using String when desugaring CallStack construction
     939a7d6 Annotate CmmBranch with an optional likely target
     cf90a1e Add constant-folding rule for Data.Bits.bit
     73921df Update Cabal to recognize DeriveLift
     453cdbf base: export allocation counter/limit API from System.Mem
     5c11523 reify associated types when reifying typeclasses
     39a262e Revert "reify associated types when reifying typeclasses"
     2440e3c Fix a bug with mallocForeignPtr and finalizers (#10904)
     b08a533d Fix DeriveGeneric for types with same OccName (#10487)
     4f9ee91 Testsuite: update expected output for T8832 on 32-bit systems (#8832)
     5883b56 Testsuite: properly fix T8832.stdout-ws-32 (#8832)
     1395185 Testsuite: add test for #10767
     fb40926 Weak: Don't require wrapping/unwrapping of finalizers
     a98815a Dwarf: Rename binding to avoid shadowing ppr
     a0b1f41 Dwarf: Ensure block length is encoded correctly
     f7fd864 Skip a possible BOM in utf8 encoding
     3fbf8f4 Debug: Remove extraneous LANGUAGE CPP
     988b2ba rts: Clean up whitespace in Trace.h
     b4d43b4 reify associated types when reifying typeclasses(#10891)
     78053f4 Allow enumDeltaIntegerFB to be inlined
     2eddcd9 Lexer: delete dead code for binary character literals
     23baa65 .gitignore update for some test files.
     e3ab25a Typos in comments
     03b3804 Add Data.Semigroup and Data.List.NonEmpty (re #10365)
     f2a174a Update nofib submodule
     a52db23 Update nofib submodule again
     eb975d2 Fix treatment of -0.0
     57e3742 Document peculiarities of `traceM`.
     b29f20e nativeGen PPC: fix > 16 bit offsets in stack handling
     bd41eb2 LLVM: Implement atomic operations in terms of LLVM primitives
     9539408 LLVM: Factor out accumulation of LLVM statements and variables
     7442434 Move CallStack back to base
     e3d2bab Fix signature of atomic builtins
     9ed700b Don't use old linkable for hs-boot files.
     4fd6207 Move user's guide to ReStructuredText
     93e21b9 docs: Fix ghc_config.py.in
     b6f76b9 Prevent GHC from silently dying when preprocessor is not found
     c4d7df0 Fix broken validation Build 6564 and accepting a few other test results
     a3c78ab Build system: add mk/validate.mk.sample
     a96f1ac Testsuite: update expected output for T8602
     6cde981 Make GHC generics capable of handling unboxed types
     0eb8fcd Enable `Enumeration is empty` warnings for `Integer`
     2f74be9 Fill in associated type defaults with DeriveAnyClass
     d2fb532 testsuite: Bump up haddock.base expected allocations
     620fc6f Make Windows linker more robust to unknown sections
     aecf4a5 Build system: don't create mk/are-validating.mk
     c0bdfee Testsuite: only add -fno-warn-missed-specialisations for ghc>=7.11
     7fcfee1 A few typos in comments
     5ca1d31 Testsuite: make driver python 2.6 compatible again
     427f8a1 Deduplicate one-shot/make compile paths.
     8c1866a Comments only
     0e169a8 Fix kind-var abstraction in SimplUtils.abstractFloats
     ca816c6 Remove dead code: ruleLhsOrphNames
     7da3d30 Comments only
     3833e71 Comments about TcLevel assignment
     59883ae Documentation for FrontendResult
     36811bf AsmCodeGen: Ensure LLVM .line directives are sorted
     ea4df12 Ensure shiftL/shiftR arguments aren't negative
     7b443bb Improve error messages for ambiguous type variables
     69a6e42 Allow non-operator infix pattern synonyms
     e2b579e Parser: revert some error messages to what they were before 7.10
     f64f7c3 Tests for #10945 and #10946
     931d0a7 Move orphan instance/rule warnings to typechecker/desugarer.
     e99e6db Extra files to ignore from the new Restructured documentation.
     0ead0ca Disable man building for most quick build styles.
     c7ab799 Ignore __pycache__.
     e5baf62 Simplify type of ms_srcimps and ms_textual_imps.
     5dc3db7 Switch to LLVM version 3.7
     80602af Revert "Switch to LLVM version 3.7"
     e331392 Fix error msg: ghci can't be used with -prof or -static (#10936)
     5d84110 Add short library names support to Windows linker
     182c44d Keep `shift{L,R}` on `Integer` from segfaulting
     840df33 Rename SpecInfo to RuleInfo (upon SPJ's advice).
     fa5eabe sphinx: Don't share doctrees between targets
     614ce4b Testsuite: T3333 still fails on non-linux statically linked ghci (#3333)
     bbad4f6 Delete ShPackageKey for now.
     f002340 compiler/nativeGen/PPC/Ppr.hs: Whitespace
     4bd58c1 PPC: Fix right shift by 32 bits #10870
     e737a51 base: MRP-refactoring of AMP instances
     6b7bad9 Test Trac #10931
     f8fbf38 Reinstate monomorphism-restriction warnings
     dcc3428 Don't inline/apply other rules when simplifying a rule RHS.
     330ba6a testsuite: attempt fixing T10935 output
     94ef79a Slightly wibble TcSimplify documentation
     d2f9972 Make dataToQa aware of Data instances which use functions to implement toConstr
     1818b48 Fix incorrect import warnings when methods with identical names are imported
     e5bfd70 docs: overhaul Derive{Functor,Foldable,Traversable} notes
     dec5cd4 base: Add forkOSWithUnmask
     e8c8173 Allow arr ? (first ? (***)) as minimal definition of Arrow instance
     29310b6 Switch to LLVM version 3.7
     7756161 travis: use LLVM 3.7
     933adc0 Fix GHCi on Arm (#10375).
     729bf08 User should use -package-id flag if value in question is IPID.
     5b0191f Update Cabal to HEAD, IPID renamed to Component ID.
     b92a51f Rename package key to unit ID, and installed package ID to component ID.
     6338a1c Rename PACKAGE_KEY and LIB_NAME in build system.
     20e30d5 Minor stylistic update.
     04e8366 ELF/x86_64: map object file sections separately into the low 2GB
     78c9dea Fix windows build after D975
     4d6844a rts/Linker.c : Fix armhf build (#10977)
     808bbdf Remove dead function patSynTyDetails
     b1884b0 Implement DuplicateRecordFields
     75492e7 Add typed holes support in Template Haskell.
     6a8ca65 Allow left ? (+++) as minimal definition of ArrowChoice instance
     e7c076d base: changelog entries for Arrow/ArrowChoice
     324e0ac base: MINIMAL pragmas for Arrow/ArrowChoice
     3340fe0 Build system: fix `make -j1` (#10973)
     603a369 Silence the linker on Windows so tests pass
     fff0254 Move Control.Monad.IO.Class to base from transformers
     a6a3dab Libdw: Add libdw-based stack unwinding
     40cbf9a Signals: Print backtrace on SIGUSR2
     e8ed213 Make Monad/Applicative instances MRP-friendly
     6638bfd CmmParse: Clarify description of calling convention
     d990b5f Signals: Always install SIGUSR2 handler
     75c7cda ghc-pkg: Express return-method in terms of pure
     c6781a5 template-haskell: MRP-refactor Applicative/Monad instances
     1e34f62 MRP-refactor `GHCi` Applicative/Monad instance
     d6d421c template-haskell: set explicit return=pure
     40235c3 fix RTS linker compilation failure on Solaris
     7bbb61b Driver: `ghci -e` should behave like `ghc -e` (#9360)
     2b25a58 base: Have the argument of mask restore the state.
     96dc041 Systools.hs: Improve detection of GCC and Clang
     ae4acbd Testsuite Windows: don't use forward slashes in topdir path
     1750ebc Reject top-level typed TH splices. Fixes #10945
     bb7e93c Extended default rules now specialize Foldable, Traversable to [] (#10971)
     68a084f Testsuite: add test for #10997
     2bc6efc Fix caching of pagesize
     7855afb Fix breakage in the GHCi debugger
     e3e5a96 Remove old trace statement
     d77c404 Stop the pipeline when it doesn't need to be run.
     c633f71 Add another test for #10549
     1e8d1f1 Suggest enabling PatternSynonyms (#10943)
     9ec5996 rts/Schedule.c: remove unused variable
     0499aa7 Add missing stderr file
     9cb192c Make stronglyConnCompFromEdgedVertices deterministic
     0ae6a43 Suggest chmod 755 instead of 644
     fa7d582 Quote GHC path in configure so we can deal with multiple spaces.
     8f5ad1a Quote GHC_PKG in Makefile.
     fdb08e2 Add testcase for #10426
     0afba67 arclint: ReST doesn't need ArcanistMergeConflictLinter
     fd63ea5 base: Note platform dependence of registerFd
     7dae074 Verify minimum required version of sphinx-build
     67284a0 gitignore: Ignore sphinx doctrees directories
     2866dfb Fix broken .arclint
     4e40340 Support more sphinx-build versions in configure script
     ec14392 typo in comments: s/selectg/select/
     798d2e2 configure.ac: Fix autotool warnings
     7aea0cf use Proxy instead of undefined -- we already dropped support for 7.6
     ca12c24 Update example GHCi startup
     abc214b rts/Linker.c:  Split RTS symbols out into separate file
     3ed4b80 rts/Linker.c: Convert #if/#else to if/else
     898f34c rts/RtsSymbols.c: Fix Windows build
     43751b2 Provide a utility to check API Annotations
     c2fab84 Add testcase for #10370
     86e5eb9 Remove redundant typedef
     0b79aa1 base: Add Haddocks to GHC.RTS.Flags
     73c273a Fix a typo in the User's Guide ReST intro
     23e344b Remove cygwin32_HOST_OS #ifdefs
     499ce29 Add flag to reverse errors in GHC/GHCi
     a9c93bd Implement MIN_VERSION and VERSION macros natively in GHC.
     c10c01c Build system: comments only [skip ci]
     f86fb5e Add regression tests for #10045, #10999
     6831815 Comments only
     0ce858e Zonk properly when checkig pattern synonyms
     adc3d17 manpage: Mark as orphan document
     d1d8704 Use correct documentation flag for freverse-errors
     158d2a9 Make it possible to have different UniqSupply strategies
     079dd12 Fix "Use correct documentation flag for freverse-errors"
     dc13467 DynFlags: Fix more merge errors
     ffcdd84 Sort field labels before fingerprint hashing
     166c597 DynFlags: Yet one more fix
     31704ad Make worker-wrapper optional
     9efa56d Fix the DYNAMIC_GHC_PROGRAMS=NO build on Mac/Windows
     19354fb Make T10970a non-dependent on GCC version.
     7c2ab6f Testsuite: accept output for T10999 (#10999)
     d1ab6fc PrelNames: Fix duplicate unique
     9fc2d77 Build system: don't add ALL_HC_OPTS when linking
     04b0a73 Pattern synonyms: swap provided/required
     de27bed Update haskeline/terminfo submodules
     c1e1584 Update `deepseq` submodule
     776d55c rts/Linker.c: Drop support for legacy OS X dyn loading
     ce2416b Fix rts/T9579 tests on OS X
     08f5c4e Backpack documentation updates for component IDs [no-ci]
     032be43 Testsuite: report and error out on unfound tests
     a051788 Revert "Build system: don't add ALL_HC_OPTS when linking"
     2a74a64 Record pattern synonyms
     fa58731 Revert "Build system: don't create mk/are-validating.mk"
     e31113f Move mkDefaultMethodIds, mkRecSelBinds from TcTyClsDecls to TcTyDecls
     d25fa86 TcTyDecls: Remove redundant import of Applicative
     40e6214 DynFlags: Add (another) missing hunk from D1360
     bef2f03 Generate Typeable info at definition sites
     bbaf76f Revert "Generate Typeable info at definition sites"
     e272ab9 x86 codegen: don't generate location comments
     8ddf417 Linker: Fix type in m32_free_internal
     9b3a058 Swap prov/req in variable naming in Parser.y
     9376249 Fix unused-import stuff in a better way
     3e94842 Record usage information using GlobalRdrElt
     da58d15 Kill redundant import
     268aa9a integerConstantFolding: when(compiler_debugged(), expect_broken(#11006))
     0a16374 Disambiguate record selectors by type signature
     1f1c7c6 Build system: rename runghc.hs to Main.hs
     b05ab1a Build system: cleanup a few .cabal files
     314395e Build system: cabalise deriveConstants + genprimopcode
     2624298 Fix segfault due to reading non-existent memory
     42e8528 CmmParse: Expose popcnt operations
     3e2c227 Linker: Clean up USE_MMAP usage
     1c80db5 Insert an empty line between two STG definitions in dump output.
     56f9ef4 Unify: Add Outputable instance for UnifyResultM
     aa289d2 Move win32 tarball download logic to script
     f78b477 driver: use PROGBITS type for .debug-ghc-link-info section
     59e728b Testsuite: suggest quoting $(TEST_HC)
     91c6b1f Generate Typeable info at definition sites
     39b71e8 Reimplement shadowing on a per database basis.
     f5974c8 rts: Make MBLOCK_SPACE_SIZE dynamic
     fce758c Add failing test for #11039
     a5cb27f Make type-class dictionary let binds deterministic
     e03e22c testsuite: performGC requires SMP support for 'qg' option
     d9d201c testsuite: 'threaded2' tests require '-N' RTS option support
     e0071c3 unreg: handle CmmStack in C codegen (unbreaks '-g')
     8995865 Update primitive/vector submodules
     62f0fbc Update parallel submodule
     8160f42 Add subWordC# on x86ish
     7a48e6c Make ghc-cabal's `System.Directory` import more robust
     6bef55c Fix documentation build on windows
     e2a78ee Signals: Ensure libdw session is freed
     8f02baa Remove Data.List.NonEmpty.{words,unwords,lines,unlines}
     bc7cc25 disable large address space on OpenBSD
     da1a8da llvmGen: Fix build with Clang
     8fd5cff llvmGen: Really fix build with Clang
     3021cc0 Add rts/Linker support for more than 64k sections
     31bcf9b Apply WERROR only to stage2 HC options
     c3b0215 Provide a utility to check API Annotations docs
     4ad2a8f rts/posix: Reduce heap allocation amount on mmap failure
     c8e866a Enforce linkage with pthread library on OpenBSD
     184dfce Linker: More uint64_t to uintptr_t fixes
     9f0ecb4 ghc-prim: Fix hs_ctz64 for powerpc
     62e1b35 Update array/stm/hpc/haddock submodules
     d2a7fb9 Update directory submodule
     12abc77 Update filepath submodule
     de8443c Update process submodule
     3238ef7 Update unix submodule
     32f92a3 Update hoopl submodule
     f8ba4b5 Bump `base` version to 4.9.0.0 (closes #11026)
     4b8b934 ghc-prim: add API delta as changelog (re #11043)
     84bf1eb Bump ghc-prim version to 0.5.0.0 (closes #11043)
     f16827f ApiAnnotations: BooleanFormula is not properly Located
     5a48180 keepCAFsForGHCi was broken
     677d768 DynFlags: -freverse-errors should be defFlag
     3431ad6 Update Cabal submodule
     6fb0ba6 Dwarf: Preserve stack pointer register
     76611d7 Dwarf.Types: Fix comment style
     159a1a2 cmm: Expose machine's stack and return address register
     d9f8862 StgStartup: Setup unwinding for stg_stop_thread
     bb446b2 Libdw: Remove special treatment for stg_stop_thread
     b8df858 Dwarf.Constants: Introduce Haddock sections
     52c6e3d Libdw: Fix symbol naming
     e9bfb3f Minor simplification in unariser pass:
     65f3c4c Change sphinx for documentation building on windows to the python3 version
     f46f32b EventLog: Loop fwrite if necessary during flush
     9fe5497 rts: Produce stack trace on fatal error
     1e2259b Update process submodule to process-1.4 release
     c00c5e5 get rid of Elf32/Elf64_Section as this is a non-portable Linux-ism.
     130ca3e Update filepath submodule for proper version
     5065cf4 base: Update `@since 4.8.2` annotations (re #11026)
     0bc8c6a base: GHC.RTS.Flags symbols really were introduced in 4.8.2
     83fd2ba base: Add changelog entry for 4.8.2.0
     8c80dcc base: Add new Control.Monad.Fail module (re #10751)
     b62605e Add `MonadPlus IO` and `Alternative IO` instances
     334fe45 rts/Hash: Constify HashTable* in lookupHashTable
     987d542 Build system: renable -Wall on validate (base)
     0e21678 Cabal-level sanity check to enforce Cabal flag-invariant
     22fcf9c Tweak settings for LLVM tests
     e547954 Use full name of LLVM program in error message
     10647d4 Linker: #ifdef cleanup
     a58eeb7 Call Arity: In "e x", the result of "x" is not shared
     ce1f160 Make GHCi & TH work when the compiler is built with -prof
     6e6438e Allow the GHCi Linker to resolve related dependencies when loading DLLs
     be88585 fix #10734 by adding braces to pretty-printing of let inside do
     2208011 Remove PatSynBuilderId
     d9c1450 Build system: use stage0 to build dll-split
     8262c95 Parser: allow empty multi-line deprecation warnings
     bd69f6f minor: use unless instead of (when . not)
     932d503 Replace freeVarsOf scrut with scrut_fvs to avoid repetition
     80d7ce8 Add pprSTrace for debugging with call stacks
     0e40c01 Quote file paths in linker scripts
     2b7d9c2 Add OpenBSD specific RTS symbols
     f405632 Fix sporadic failing ghci/Linker/Dyn tests
     3cfe60a Abstract TFs can have injectivity information
     96621b1 Associate pattern synonyms with types in module exports
     5eb56ed Fix link in documentation
     fbc2537 OPTIONS_GHC compiler flags may contain spaces (#4931)
     ea8c116 Remove unused field in ConDecl
     f0f9365 Remove fun_infix from Funbind, as it is now in Match
     109d7ce Systools: read ELF section without calling readelf
     fa61edd Improve documentation of Data.List.lines:
     0f49508 Put kind variables before type variables when specializing
     badf5d5 Detect invalid foreign imports in bytecode compiler
     fb0d512 nativeGen.PPC: Fix shift arith. right > 31 bits
     afbd30b mkGadtDecl no longer in P monad
     63cad5d Rename bundled pattern synonym tests to reflect new terminology
     a038b72 Remove redundant test.
     9bea234 fix RTS Linker on platforms without SHN_XINDEX support
     4a32bf9 Implement function-sections for Haskell code, #8405
     e090f1b Change demand information for foreign calls
     8755719 rules/haddock: Set __HADDOCK_VERSION__
     351de16 New magic function for applying realWorld#
     ac2e1e5 T10678: Fix bytes allocated statistic
     5d6133b Ignore comments in getOptions
     2290c8b APIAnnotations:add Locations in hsSyn for layout
     e66f79d Give helpful advice when a fully qualified name is not in scope
     b8d263d Turn ImportedModsVal into a data type
     5a86292 Remove imv_empty from ImportedModsVal
     8868ff3 Update note for Parent to explain PatternSynonym.
     8988be8 Make 'error' include the CCS call stack when profiled
     3353f62 Rip out __HADDOCK__ references
     5488422 Fix bootstrapping with GHC 7.10.1
     46a03fb Implement the Strict language extension
     fe95463 ApiAnnotations: Add SourceText for unicode tokens
     ee91482 ApiAnnotations : ITopenExpQuote needs SourceText
     83b214d RtsFlags: Clean up stale CPP
     b8a849b users-guide: Limit column width
     69822f0 RtsFlags: Refactor some of the deeper switches
     7485d0c ghc.mk: Make install_docs rule sh-compatible
     82cf672 haddock.mk: Use \{1,\} instead of \+
     3773e91 Use TcM instead of it's expanded form, in TcSplice
     741cf18 Weaken monadic list operations to Applicative
     e2d9821 Data.List.isSubsequenceOf documentation clarification
     2d1a563 Implement support for user-defined type errors.
     3d88e89 s/FrontendMerge/FrontendInterface/g
     9193629 Move usage calculation to desugaring, simplifying ModGuts.
     ac1a379 Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."
     df8169c Bump process submodule
     4e74ef9 T9181: Fix testsuite output
     615ba5f Remove orphan Functor instance of Data.Graph.SCC
     7c9cbfd template-haskell: drop `TemplateHaskell` requirement
     b3d6c0f Update Cabal submodule for new known extension
     8ad9e74 Make `timer_create(CLOCK_REALTIME)` autoconf test more reliable
     acce37f Fix archive loading on Windows by the runtime loader
     7b962ba Implement OverloadedLabels
     233d131 MonadFail proposal, phase 1
     98a4fa5 DynFlags: Don't list TemplateHaskell as supported if it's not
     11e336e More import related hints
     f405e1e Disable failed specialisation warnings by default & update documentation.
     f9e17fd Add -fwarn-missing-monadfail-instance to mkUserGuidePart
     6b3d5b5 rts: Kill PAPI support
     c945c90 base: Documentation for TypeError
     112ce87 docs: Ignore Sphinx doctrees produced by manpage build
     3ee0c14 Improve MonadFail errors by mentioning the pattern
     2f7e895 users-guide: Give links more contrast
     a0f977e relnotes: Update base version
     8eefdf0 users-guide: Use tango pygments style
     02eb44d users-guide: Fix typo in conf.py
     2d0e1db Comments only
     8e8d26a Comments on TcRnTypes.canDischarge
     07eb258 Refactor HsExpr.RecordCon, RecordUpd
     c61759d Fix inconsistent pretty-printing of type families
     cc79dd1 users-guide: Move <h1> outside of <a> tag
     971f2c9 Correct &gt; to > in user's guide
     a41830f Mention "-XMonadFailDesugaring" in the docs
     a586622 Release Notes: Mention out-of-scope error message improvements
     2442038 Fix interaction of DuplicateRecordFields and GHC.Generics
     3e2a4ee Fix broken build-system when libffi uses install-sh
     65d7ff0 Make `derivedConstants` more crosscompile-friendly
     7dfde0e derivedConstants: Add support for AIX
     c5d8162 Make GHC aware of OSAIX and AixLD
     75036aa Set AIX specific CFLAGS flags
     fce0465 Unbreak Text.Read.Lex.lex on Unicode symbols
     d732ce0 Bump process submodule
     b72ca3e Pattern Synonym Documentation
     a689c8e ghci: don't let ctags/etags overwrite source files
     1994304 user's guide: Fix some accidental triple-` quote
     998c371 users-guide: Fix version number
     7e6dcf4 base: Delete errant GHC/Stack.hsc
     f40fe62 Follow-up fixup to c5d8162d230c373
     7f77e4e Fix Windows builds after D1242
     d585073 RtsFlags: Fix const warning
     192dd06 Suppress conflicting types for builtins warnings
     6664ab8 Add DVarSet - a deterministic set of Vars
     2325bd4 Create a deterministic version of tyVarsOfType
     b98ff3c Function definition in GHCi
     a703fbc Remove accidentally added T10359 blob
     4976ab2 Follow-up fix to 3e2a4eefbed7002437c3f (re #11109)
     638fde5 Add comment to Parser.y re extra API Annotation
     64737f2 New expected test output for 32 bit platforms
     3df9563 ApiAnnotations: Make all RdrName occurences Located
     6393dd8 Make abstractVars deterministic in SetLevel
     02c689c build.mk.sample: Document meaning of WERROR
     5d6cfbc Rip out Papi configure check
     7c9a04d Add a note explaining why every RdrName is Located
     dbad0d5 Libdw: Fix build on 32-bit platforms
     70ee638 Libdw: Fix initial register collection on i386
     36b2139 rts: Expose more libdw symbols
     a3a8ce6 rts: Add simple resource pool
     6fbf22d rts: Add LibdwPool, a pool for libdw sessions
     bb249aa base: Add Haskell interface to ExecutionStack
     7aaeaf8 Support multiple debug output levels
     40be909 Dwarf: Ensure tick parentage is preserved
     9471562 Output source notes in extended DWARF DIEs
     5955510 Improve constraint-used-as-type error msg
     70efb62 Add tests/monadfail/Makefile
     e587217 Add the rest of the notes for Located RdrName
     1c45f41 rts: Always export Libdw* symbols
     12dbc89 Add `PrelNames.thenAName` for `Applicative(*>)`
     f09f247 Implement new `-fwarn-noncanonical-monad-instances`
     c05fddd Rearrange error msgs and add section markers (Trac #11014).
     6d14793 Add -Wcompat warning flag group
     e506f02 Rewrite checkUniques and incorporate into validate
     8c5fe53 DynFlags: Update comments to reflect new users guide
     8dc6da8 Comments only
     5e04c38 Simplify the MonadFail code
     76f3142 DynFlags: Drop stale comment
     9032d05 update link to MonadFail proposal
     b502ab8 Pattern Match Checking (Fixes #595)

From git at git.haskell.org  Wed Nov 25 16:30:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 16:30:36 +0000 (UTC)
Subject: [commit: ghc] master: Refactor default methods (Trac #11105) (924f851)
Message-ID: <20151125163036.7C37B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/924f851700ca9ba7e0e7483b7ca4de62a4a74e15/ghc

>---------------------------------------------------------------

commit 924f851700ca9ba7e0e7483b7ca4de62a4a74e15
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 25 16:26:23 2015 +0000

    Refactor default methods (Trac #11105)
    
    This patch does some signficant refactoring to the treatment
    of default methods in class declarations, and more generally
    to the type checking of type/class decls.
    
    Highlights:
    
    * When the class has a generic-default method, such as
         class C a where
           op :: a -> a -> Bool
           default op :: Ord a => a -> a -> a
      the ClassOpItem records the type of the generic-default,
      in this case the type (Ord a => a -> a -> a)
    
    * I killed off Class.DefMeth in favour of the very-similar
      BasicTypes.DefMethSpec.  However it turned out to be better
      to use a Maybe, thus
          Maybe (DefMethSpec Type)
      with Nothing meaning "no default method".
    
    * In TcTyClsDecls.tcTyClGroup, we used to accumulate a [TyThing],
      but I found a way to make it much simpler, accumulating only
      a [TyCon].  Much less wrapping and unwrapping.
    
    * On the way I also fixed Trac #10896 in a better way. Instead
      of killing off all ambiguity checks whenever there are any type
      errors (the fix in commit 8e8b9ed), I instead recover in
      TcTyClsDecls.checkValidTyCl.
    
    There was a lot of associated simplification all round


>---------------------------------------------------------------

924f851700ca9ba7e0e7483b7ca4de62a4a74e15
 compiler/basicTypes/BasicTypes.hs                  |  16 +-
 compiler/hsSyn/HsDecls.hs                          |   7 +-
 compiler/iface/BuildTyCl.hs                        |  14 +-
 compiler/iface/IfaceSyn.hs                         |  36 ++--
 compiler/iface/IfaceType.hs                        |  13 +-
 compiler/iface/MkIface.hs                          |   9 +-
 compiler/iface/TcIface.hs                          |  18 +-
 compiler/main/HscTypes.hs                          |   3 +-
 compiler/typecheck/TcClassDcl.hs                   |  64 +++---
 compiler/typecheck/TcDeriv.hs                      |   6 +-
 compiler/typecheck/TcEnv.hs                        |  19 +-
 compiler/typecheck/TcInstDcls.hs                   |  28 +--
 compiler/typecheck/TcRnDriver.hs                   |   6 +-
 compiler/typecheck/TcSplice.hs                     |   7 +-
 compiler/typecheck/TcTyClsDecls.hs                 | 220 ++++++++++-----------
 compiler/typecheck/TcTyDecls.hs                    |  55 +++---
 compiler/typecheck/TcTypeable.hs                   |   4 +-
 compiler/typecheck/TcValidity.hs                   |   6 +-
 compiler/types/Class.hs                            |  35 ++--
 compiler/types/TyCon.hs                            |  25 ++-
 compiler/utils/Binary.hs                           |  11 --
 compiler/vectorise/Vectorise/Type/TyConDecl.hs     |   6 +-
 testsuite/tests/th/T9064.stderr                    |   5 +-
 testsuite/tests/typecheck/should_fail/T5300.stderr |  45 +++--
 testsuite/tests/typecheck/should_fail/T8030.stderr |  31 ++-
 25 files changed, 386 insertions(+), 303 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 924f851700ca9ba7e0e7483b7ca4de62a4a74e15

From git at git.haskell.org  Wed Nov 25 16:30:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 16:30:39 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (e9a4c09)
Message-ID: <20151125163039.1EA0E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e9a4c0995ad1f3c4bbe6252af7e3146dc740bb31/ghc

>---------------------------------------------------------------

commit e9a4c0995ad1f3c4bbe6252af7e3146dc740bb31
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 25 16:26:58 2015 +0000

    Comments only


>---------------------------------------------------------------

e9a4c0995ad1f3c4bbe6252af7e3146dc740bb31
 compiler/coreSyn/CoreArity.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compiler/coreSyn/CoreArity.hs b/compiler/coreSyn/CoreArity.hs
index 79e3463..30bc962 100644
--- a/compiler/coreSyn/CoreArity.hs
+++ b/compiler/coreSyn/CoreArity.hs
@@ -826,7 +826,6 @@ So the costs of evaluating 'e' (not 'e y') are attributed to "foo"
 
 Note [Eta expansion and source notes]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 CorePrep puts floatable ticks outside of value applications, but not
 type applications. As a result we might be trying to eta-expand an
 expression like


From git at git.haskell.org  Wed Nov 25 16:30:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 16:30:41 +0000 (UTC)
Subject: [commit: ghc] master: Add a simplifier trace for eta-expansion
 (e913676)
Message-ID: <20151125163041.B66543A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e9136762ee984451c45cd1067a41d7b7d5be0e19/ghc

>---------------------------------------------------------------

commit e9136762ee984451c45cd1067a41d7b7d5be0e19
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 25 16:27:45 2015 +0000

    Add a simplifier trace for eta-expansion


>---------------------------------------------------------------

e9136762ee984451c45cd1067a41d7b7d5be0e19
 compiler/simplCore/SimplUtils.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs
index 1577efd..4a56041 100644
--- a/compiler/simplCore/SimplUtils.hs
+++ b/compiler/simplCore/SimplUtils.hs
@@ -1302,7 +1302,10 @@ mkLam bndrs body cont
       , let body_arity = exprEtaExpandArity dflags body
       , body_arity > 0
       = do { tick (EtaExpansion (head bndrs))
-           ; return (mkLams bndrs (etaExpand body_arity body)) }
+           ; let res = mkLams bndrs (etaExpand body_arity body)
+           ; traceSmpl "eta expand" (vcat [text "before" <+> ppr (mkLams bndrs body)
+                                          , text "after" <+> ppr res])
+           ; return res }
 
       | otherwise
       = return (mkLams bndrs body)


From git at git.haskell.org  Wed Nov 25 19:56:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 19:56:16 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Progress,
 but does not generate correct res_ty (ff2978c)
Message-ID: <20151125195617.009573A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/ff2978cac0cd133c2434480e311bed6aea72c6f1/ghc

>---------------------------------------------------------------

commit ff2978cac0cd133c2434480e311bed6aea72c6f1
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed Nov 25 21:53:37 2015 +0200

    Progress, but does not generate correct res_ty
    
    This commit fails with
    
    libraries/hoopl/src/Compiler/Hoopl/Block.hs:66:3: error:
        ? Data constructor ?JustO? returns type ?t -> MaybeO O t?
            instead of an instance of its parent type ?MaybeO ex t?
        ? In the definition of data constructor ?JustO?
          In the data type declaration for ?MaybeO?


>---------------------------------------------------------------

ff2978cac0cd133c2434480e311bed6aea72c6f1
 compiler/deSugar/DsMeta.hs         |  4 ++--
 compiler/hsSyn/HsDecls.hs          |  5 +++++
 compiler/parser/RdrHsSyn.hs        | 10 +++++-----
 compiler/rename/RnSource.hs        |  2 +-
 compiler/typecheck/TcRnDriver.hs   |  2 +-
 compiler/typecheck/TcTyClsDecls.hs | 12 ++++++------
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index caff5c4..74f066b 100644
--- a/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
@@ -304,7 +304,7 @@ repDataDefn tc bndrs opt_tys tv_names
                              _cs -> failWithDs (ptext
                                      (sLit "Multiple constructors for newtype:")
                                       <+> pprQuotedList
-                                                (con_names $ unLoc $ head cons))
+                                                (getConNames $ unLoc $ head cons))
                           }
            DataType -> do { consL <- concatMapM (repC tv_names) cons
                           ; cons1 <- coreList conQTyConName consL
@@ -658,7 +658,7 @@ repC tvs (L _ (ConDeclGADT { con_names = cons
        ; b <- dsExtendMetaEnv (mkNameEnv binds) $ -- Binds some of the con_tvs
          addTyVarBinds ex_tvs $ \ ex_bndrs ->   -- Binds the remaining con_tvs
     do { cons1     <- mapM lookupLOcc cons -- See Note [Binders and occurrences]
-       ; let details = gadtDeclDetails res_ty
+       ; let (details,_,_) = gadtDeclDetails res_ty
        ; c'        <- mapM (\c -> repConstr c details) cons1
        ; ctxt'     <- repContext eq_ctxt
        ; rep2 forallCName ([unC ex_bndrs, unC ctxt'] ++ (map unC c')) }
diff --git a/compiler/hsSyn/HsDecls.hs b/compiler/hsSyn/HsDecls.hs
index 63d8d90..ef4ae8f 100644
--- a/compiler/hsSyn/HsDecls.hs
+++ b/compiler/hsSyn/HsDecls.hs
@@ -62,6 +62,7 @@ module HsDecls (
   -- ** Data-constructor declarations
   ConDecl(..), LConDecl, ResType(..),
   HsConDeclDetails, hsConDeclArgTys,
+  getConNames,
   -- ** Document comments
   DocDecl(..), LDocDecl, docDeclDoc,
   -- ** Deprecations
@@ -1097,6 +1098,10 @@ deriving instance (DataId name) => Data (ConDecl name)
 type HsConDeclDetails name
    = HsConDetails (LBangType name) (Located [LConDeclField name])
 
+getConNames :: ConDecl name -> [Located name]
+getConNames (ConDeclH98  {con_name  = name})  = [name]
+getConNames (ConDeclGADT {con_names = names}) = names
+
 hsConDeclArgTys :: HsConDeclDetails name -> [LBangType name]
 hsConDeclArgTys (PrefixCon tys)    = tys
 hsConDeclArgTys (InfixCon ty1 ty2) = [ty1,ty2]
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 0ff5c31..9678735 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -542,15 +542,15 @@ mkGadtDecl' names lbody_ty@(L loc body_ty)
 -}
 
 -- AZ:TODO: this probably belongs in a different module
-gadtDeclDetails :: LHsSigType name -> HsConDeclDetails name
-gadtDeclDetails (HsIB {hsib_body = lbody_ty}) = details
+gadtDeclDetails :: LHsSigType name -> (HsConDeclDetails name,LHsType name,LHsContext name)
+gadtDeclDetails (HsIB {hsib_body = lbody_ty}) = (details,res_ty,cxt)
   where
     (tvs, cxt, tau) = splitLHsSigmaTy lbody_ty
-    details           -- See Note [Sorting out the result type]
+    (details, res_ty)           -- See Note [Sorting out the result type]
       = case tau of
           L _ (HsFunTy (L l (HsRecTy flds)) res_ty)
-                  -> RecCon (L l flds)
-          _other  -> PrefixCon []
+                  -> (RecCon (L l flds), res_ty)
+          _other  -> (PrefixCon [], tau)
 
 tyConToDataCon :: SrcSpan -> RdrName -> P (Located RdrName)
 tyConToDataCon loc tc
diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index 450ad82..6e16234 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1454,7 +1454,7 @@ depAnalTyClDecls ds_w_fvs
         DataDecl { tcdLName = L _ data_name
                  , tcdDataDefn = HsDataDefn { dd_cons = cons } }
           -> do L _ dc <- cons
-                return $ zip (map unLoc $ con_names dc) (repeat data_name)
+                return $ zip (map unLoc $ getConNames dc) (repeat data_name)
         _ -> []
 
 {-
diff --git a/compiler/typecheck/TcRnDriver.hs b/compiler/typecheck/TcRnDriver.hs
index b7af287..593170b 100644
--- a/compiler/typecheck/TcRnDriver.hs
+++ b/compiler/typecheck/TcRnDriver.hs
@@ -1249,7 +1249,7 @@ tcTyClsInstDecls tycl_decls inst_decls deriv_decls
 
     get_fi_cons :: DataFamInstDecl Name -> [Name]
     get_fi_cons (DataFamInstDecl { dfid_defn = HsDataDefn { dd_cons = cons } })
-      = map unLoc $ concatMap (con_names . unLoc) cons
+      = map unLoc $ concatMap (getConNames . unLoc) cons
 
 {-
 Note [AFamDataCon: not promoting data family constructors]
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 592f279..55619e7 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -389,7 +389,7 @@ getInitialKind decl@(DataDecl { tcdLName = L _ name
               ; return (res_k, ()) }
        ; let main_pr = (name, AThing decl_kind)
              inner_prs = [ (unLoc con, APromotionErr RecDataConPE)
-                         | L _ con' <- cons, con <- con_names con' ]
+                         | L _ con' <- cons, con <- getConNames con' ]
        ; return (main_pr : inner_prs) }
 
 getInitialKind (FamDecl { tcdFam = decl })
@@ -1351,16 +1351,16 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; (ctxt, arg_tys, res_ty, field_lbls, stricts)
            <- tcHsQTyVars hs_tvs $ \ _ ->
               do { traceTc "tcConDecl" (ppr names <+> text "tvs:" <+> ppr hs_tvs)
-                 ; ctxt <- tcHsContext (noLoc []) -- AZ: can remove this, in time
-                 ; let hs_details = gadtDeclDetails ty
+                 ; let (hs_details,res_ty,cxt) = gadtDeclDetails ty
+                 ; traceTc "tcConDecl:" (text "res_ty:" <+> ppr res_ty)
+                 ; ctxt <- tcHsContext cxt
                  ; btys <- tcConArgs new_or_data hs_details
                  -- ; res_ty  <- tcConRes hs_res_ty
-                 ; ty' <- tcHsLiftedType bty
+                 ; ty' <- tcHsLiftedType res_ty
                  ; field_lbls <- lookupConstructorFields (unLoc $ head names)
                  ; let (arg_tys, stricts) = unzip btys
                  ; return (ctxt, arg_tys, ty', field_lbls, stricts)
                  }
-
              -- Generalise the kind variables (returning quantified TcKindVars)
              -- and quantify the type variables (substituting their kinds)
              -- REMEMBER: 'tkvs' are:
@@ -1386,7 +1386,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; traceTc "tcConDecl 2" (ppr names $$ ppr field_lbls)
        ; let
            buildOneDataCon (L _ name) = do
-             { let hs_details = gadtDeclDetails ty
+             { let (hs_details,_,_) = gadtDeclDetails ty
              ; is_infix <- tcConIsInfixGADT name hs_details
              ; rep_nm   <- newTyConRepName name
 


From git at git.haskell.org  Wed Nov 25 23:32:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 23:32:26 +0000 (UTC)
Subject: [commit: ghc] master: Note STM's vulnerability to non-allocating
 loops (9aa9458)
Message-ID: <20151125233226.9C0143A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9aa94586fde73e818e32e5cc0e6420f6ed36a80b/ghc

>---------------------------------------------------------------

commit 9aa94586fde73e818e32e5cc0e6420f6ed36a80b
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Nov 26 00:24:42 2015 +0100

    Note STM's vulnerability to non-allocating loops
    
    Test Plan: Read it
    
    Reviewers: austin, fryguybob
    
    Reviewed By: austin
    
    Subscribers: thomie, fryguybob
    
    Differential Revision: https://phabricator.haskell.org/D1523
    
    GHC Trac Issues: #10639, #367


>---------------------------------------------------------------

9aa94586fde73e818e32e5cc0e6420f6ed36a80b
 docs/users_guide/bugs.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/users_guide/bugs.rst b/docs/users_guide/bugs.rst
index 944925a..55551ea 100644
--- a/docs/users_guide/bugs.rst
+++ b/docs/users_guide/bugs.rst
@@ -372,12 +372,14 @@ Bugs in GHC
 -  GHC's runtime system implements cooperative multitasking, with
    context switching potentially occurring only when a program
    allocates. This means that programs that do not allocate may never
-   context switch. See :ghc-ticket:`367` for further discussion.
+   context switch. This is especially true of programs using STM, which
+   may deadlock after observing inconsistent state. See :ghc-ticket:`367`
+   for further discussion.
 
    If you are hit by this, you may want to compile the affected module
-   with ``-fno-omit-yields``. This flag ensures that yield points are
-   inserted at every function entrypoint (at the expense of a bit of
-   performance).
+   with ``-fno-omit-yields`` (see :ref:`options-f`). This flag ensures that
+   yield points are inserted at every function entrypoint (at the expense of a
+   bit of performance).
 
 -  GHC can warn about non-exhaustive or overlapping patterns (see
    :ref:`options-sanity`), and usually does so correctly. But not


From git at git.haskell.org  Wed Nov 25 23:32:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 23:32:29 +0000 (UTC)
Subject: [commit: ghc] master: User's Guide: Add links to MFP wiki page
 (c7a058f)
Message-ID: <20151125233229.412EB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c7a058fb8fa4e9dea55692924b49057d63b2fffd/ghc

>---------------------------------------------------------------

commit c7a058fb8fa4e9dea55692924b49057d63b2fffd
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Nov 26 00:26:23 2015 +0100

    User's Guide: Add links to MFP wiki page
    
    Test Plan: IIAM
    
    Reviewers: austin, bgamari, quchen
    
    Reviewed By: bgamari, quchen
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1529
    
    GHC Trac Issues: #10751


>---------------------------------------------------------------

c7a058fb8fa4e9dea55692924b49057d63b2fffd
 docs/users_guide/7.12.1-notes.rst   | 3 ++-
 docs/users_guide/glasgow_exts.rst   | 3 ++-
 docs/users_guide/using-warnings.rst | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index 4456454..6fac019 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -161,7 +161,8 @@ Compiler
 -  Added the ``-fwarn-missing-monadfail-instance`` flag. When enabled, this
    will issue a warning if a failable pattern is used in a context that does
    not have a ``MonadFail`` constraint. This flag represents phase 1 of the
-   MonadFail proposal (MFP).
+   `MonadFail Proposal (MFP)
+   <https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail>`__.
 
 GHCi
 ~~~~
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 2289440..725ed2b 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -1818,7 +1818,8 @@ New monadic failure desugaring mechanism
 The ``-XMonadFailDesugaring`` extension switches the desugaring of
 ``do``-blocks to use ``MonadFail.fail`` instead of ``Monad.fail``. This will
 eventually be the default behaviour in a future GHC release, under the
-MonadFail Proposal (MFP).
+`MonadFail Proposal (MFP)
+<https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail>`__.
 
 This extension is temporary, and will be deprecated in a future release. It is
 included so that library authors have a hard check for whether their code
diff --git a/docs/users_guide/using-warnings.rst b/docs/users_guide/using-warnings.rst
index 5bec157..4c2bc88 100644
--- a/docs/users_guide/using-warnings.rst
+++ b/docs/users_guide/using-warnings.rst
@@ -242,7 +242,8 @@ command line.
 
     Being part of the ``-Wcompat`` option group, this warning is off by
     default, but will be switched on in a future GHC release, as part of
-    the MFP (MonadFail Proposal).
+    the `MonadFail Proposal (MFP)
+    <https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail>`__.
 
 ``-fwarn-deprecated-flags``
     .. index::


From git at git.haskell.org  Wed Nov 25 23:32:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 23:32:31 +0000 (UTC)
Subject: [commit: ghc] master: User documentation for DuplicateRecordFields
 (5699ac9)
Message-ID: <20151125233231.E31923A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5699ac94e5d180066b44c442a773c311b9ea6c61/ghc

>---------------------------------------------------------------

commit 5699ac94e5d180066b44c442a773c311b9ea6c61
Author: Adam Gundry <adam at well-typed.com>
Date:   Thu Nov 26 00:28:32 2015 +0100

    User documentation for DuplicateRecordFields
    
    This is a first draft of the user manual documentation for
    DuplicateRecordFields. Feedback welcome. I've intentionally made this a
    minimal change, but I wonder if it might make sense to pull out all the
    subsections on record system extensions ("Traditional record syntax",
    and "Record field disambiguation" through to "Record wildcards") into a
    new section? That is, is it worth breaking down the rather monolithic
    "Syntactic extensions" section?
    
    Test Plan: n/a
    
    Reviewers: simonpj, bgamari, austin
    
    Reviewed By: bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1522


>---------------------------------------------------------------

5699ac94e5d180066b44c442a773c311b9ea6c61
 docs/users_guide/glasgow_exts.rst | 1004 +++++++++++++++++++++----------------
 1 file changed, 582 insertions(+), 422 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5699ac94e5d180066b44c442a773c311b9ea6c61

From git at git.haskell.org  Wed Nov 25 23:32:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 25 Nov 2015 23:32:34 +0000 (UTC)
Subject: [commit: ghc] master: Note #11108 in the bugs section of users guide
 (d2a2d5e)
Message-ID: <20151125233234.83A683A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d2a2d5ebb08caedcd2a2a7a9e06ed6f4cbba96e7/ghc

>---------------------------------------------------------------

commit d2a2d5ebb08caedcd2a2a7a9e06ed6f4cbba96e7
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 26 00:32:21 2015 +0100

    Note #11108 in the bugs section of users guide


>---------------------------------------------------------------

d2a2d5ebb08caedcd2a2a7a9e06ed6f4cbba96e7
 docs/users_guide/bugs.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/users_guide/bugs.rst b/docs/users_guide/bugs.rst
index 55551ea..b287378 100644
--- a/docs/users_guide/bugs.rst
+++ b/docs/users_guide/bugs.rst
@@ -463,6 +463,11 @@ Bugs in GHC
    libraries that come with GHC are probably built without this option,
    unless you built GHC yourself.
 
+-  There is known to be maleficent interactions between weak references and
+   laziness. Particularly, it has been observed that placing a thunk containing
+   a reference to a weak reference inside of another weak reference may cause
+   runtime crashes. See :ghc-ticket:`11108` for details.
+
 .. _bugs-ghci:
 
 Bugs in GHCi (the interactive GHC)


From git at git.haskell.org  Thu Nov 26 00:00:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 00:00:12 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: users guide: Add note about #11108 to bugs
 section (2ee1e69)
Message-ID: <20151126000012.D0D073A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/2ee1e694b63846b179712ecd3aa019aea0a8b5cd/ghc

>---------------------------------------------------------------

commit 2ee1e694b63846b179712ecd3aa019aea0a8b5cd
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 26 00:21:13 2015 +0100

    users guide: Add note about #11108 to bugs section


>---------------------------------------------------------------

2ee1e694b63846b179712ecd3aa019aea0a8b5cd
 docs/users_guide/bugs.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/users_guide/bugs.xml b/docs/users_guide/bugs.xml
index 3eb5304..858291f 100644
--- a/docs/users_guide/bugs.xml
+++ b/docs/users_guide/bugs.xml
@@ -564,6 +564,14 @@ checking for duplicates.  The reason for this is efficiency, pure and simple.
         </para>
       </listitem>
 
+      <listitem>
+        <para>There is known to be maleficent interactions between weak
+        references and laziness. Particularly, it has been observed that placing a thunk
+        containing a reference to a weak reference inside of another weak reference may
+        cause runtime crashes. See <ulink
+        href="https://ghc.haskell.org/trac/ghc/ticket/11108">Trac #11108</ulink>
+        for details.</para>
+      </listitem>
     </itemizedlist>
   </sect2>
 


From git at git.haskell.org  Thu Nov 26 00:00:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 00:00:15 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: rts: Re-export mingw printf/scanf variants
 (bbbf79b)
Message-ID: <20151126000015.720A13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/bbbf79b91747dbb5ab284f075927d1e1e27aba95/ghc

>---------------------------------------------------------------

commit bbbf79b91747dbb5ab284f075927d1e1e27aba95
Author: Luke Iannini <lukexi at me.com>
Date:   Thu Nov 26 00:39:54 2015 +0100

    rts: Re-export mingw printf/scanf variants
    
    This is a workaround for the regression documented in #10726 comments 31
    and after. We'll hopefully have a better fix for master.


>---------------------------------------------------------------

bbbf79b91747dbb5ab284f075927d1e1e27aba95
 rts/Linker.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rts/Linker.c b/rts/Linker.c
index 68f1f59..a939e35 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -525,6 +525,11 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(isalnum)                             \
       SymI_HasProto(isascii)                             \
       RTS___MINGW_VFPRINTF_SYM                           \
+      SymI_HasProto(__mingw_vsscanf)                     \
+      SymI_HasProto(__mingw_vprintf)                     \
+      SymI_HasProto(__mingw_vsprintf)                    \
+      SymI_HasProto(__ms_vsnprintf)                      \
+      SymI_HasProto(strdup)                              \
       SymI_HasProto(strcmp)                              \
       SymI_HasProto(memmove)                             \
       SymI_HasProto(realloc)                             \


From git at git.haskell.org  Thu Nov 26 08:21:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 08:21:29 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Progress,
 but getting "Record syntax is illegal here" (0041f27)
Message-ID: <20151126082129.E0DB93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/0041f276acc83548d4717758351cf13caee93e33/ghc

>---------------------------------------------------------------

commit 0041f276acc83548d4717758351cf13caee93e33
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Thu Nov 26 10:21:10 2015 +0200

    Progress, but getting "Record syntax is illegal here"


>---------------------------------------------------------------

0041f276acc83548d4717758351cf13caee93e33
 compiler/rename/RnSource.hs        |  3 +++
 compiler/typecheck/TcTyClsDecls.hs | 54 +++++++++++++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index 6e16234..b99fa3d 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1649,6 +1649,8 @@ rnConDecl decl@(ConDecl { con_names = names, con_qvars = qtvs
       where
         (free_kvs, free_tvs) = get_rdr_tvs (ty : arg_tys)
 -}
+
+-- AZ:TODO: remove this function, it is no longer used
 rnConResult :: HsDocContext -> [Name]
             -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
             -> ResType (LHsType RdrName)
@@ -1694,6 +1696,7 @@ rnConDeclDetails con doc (RecCon (L l fields))
         ; return (RecCon (L l new_fields), fvs) }
 
 -------------------------------------------------
+-- AZ:TODO: remove this when it is no longer used in RnSource
 badRecResTy :: HsDocContext -> SDoc
 badRecResTy ctxt = withHsDocContext ctxt $
                    ptext (sLit "Malformed constructor signature")
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 55619e7..bc9774e 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -516,9 +516,26 @@ kcConDecl (ConDeclH98 { con_name = name, con_qvars = ex_tvs
        ; return () }
 
 kcConDecl (ConDeclGADT { con_names = names
-                       , con_type = res_ty })
+                       , con_type = ty@(HsIB { hsib_kvs = kvs, hsib_tvs = tvs, hsib_body = bty}) })
   = addErrCtxt (dataConCtxtName names) $
-      kcHsSigType names res_ty
+      kcHsSigType names ty
+    {-
+         -- the 'False' says that the existentials don't have a CUSK, as the
+         -- concept doesn't really apply here. We just need to bring the variables
+         -- into scope!
+    do { let ex_tvs = HsQTvs { hsq_kvs = kvs, hsq_tvs = map (noLoc . UserTyVar . noLoc) tvs }
+       ; let (details,res_ty,ex_cxt) = gadtDeclDetails ty
+       ; _ <- kcHsTyVarBndrs False ex_tvs $
+              do { traceTc "kcConDecl:ex_cxt" (ppr ex_cxt)
+                 ; _ <- tcHsContext ex_cxt
+                 ; traceTc "kcConDecl:after ex_cxt" (ppr ex_cxt)
+                 ; mapM_ (tcHsOpenType . getBangType) (hsConDeclArgTys details)
+                 ; traceTc "kcConDecl:after ex_cxt2" (ppr ex_cxt)
+                 ; _ <- tcConRes (ResTyGADT undefined res_ty)
+                 ; traceTc "kcConDecl:after tcConRes" (ppr ex_cxt)
+                 ; return (panic "kcConDecl", ()) }
+       ; return () }
+    -}
 
 {- old
 kcConDecl (ConDecl { con_names = names, con_qvars = ex_tvs
@@ -1348,10 +1365,12 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
   = addErrCtxt (dataConCtxtName names) $
     do { traceTc "tcConDecl 1" (ppr names)
        ; let hs_tvs = HsQTvs { hsq_kvs = kvs, hsq_tvs = map (noLoc . UserTyVar . noLoc) tvs }
+       ; let (hs_details',res_ty',cxt) = gadtDeclDetails ty
+       ; let doc = ppr names -- AZ:TODO make this something reasonable
+       ; (hs_details,res_ty) <- tcUpdateConResult doc hs_details' res_ty'
        ; (ctxt, arg_tys, res_ty, field_lbls, stricts)
            <- tcHsQTyVars hs_tvs $ \ _ ->
               do { traceTc "tcConDecl" (ppr names <+> text "tvs:" <+> ppr hs_tvs)
-                 ; let (hs_details,res_ty,cxt) = gadtDeclDetails ty
                  ; traceTc "tcConDecl:" (text "res_ty:" <+> ppr res_ty)
                  ; ctxt <- tcHsContext cxt
                  ; btys <- tcConArgs new_or_data hs_details
@@ -1470,6 +1489,35 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        }
 -}
 
+tcUpdateConResult :: SDoc
+            -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
+                    -- Original details
+            -> LHsType Name -- The original result type
+            -> TcM (HsConDetails (LHsType Name) (Located [LConDeclField Name]),
+                    LHsType Name)
+tcUpdateConResult doc details ty
+  = do {  let (arg_tys, res_ty) = splitHsFunType ty
+                -- We can finally split it up,
+                -- now the renamer has dealt with fixities
+                -- See Note [Sorting out the result type] in RdrHsSyn
+
+       ; case details of
+           InfixCon {}  -> pprPanic "tcUpdateConResult" (ppr ty)
+           -- See Note [Sorting out the result type] in RdrHsSyn
+
+           RecCon {}    -> do { unless (null arg_tys)
+                                       (failWithTc (badRecResTy doc))
+                                -- AZ: This error used to be reported during
+                                --     renaming, will now be reported in type
+                                --     checking. Is this a problem?
+                              ; return (details, res_ty) }
+
+           PrefixCon {} -> return (PrefixCon arg_tys, res_ty)}
+    where
+        badRecResTy :: SDoc -> SDoc
+        badRecResTy ctxt = ctxt <+>
+                        ptext (sLit "Malformed constructor signature")
+
 tcConIsInfixH98 :: Name
              -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
              -> TcM Bool


From git at git.haskell.org  Thu Nov 26 14:11:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 14:11:40 +0000 (UTC)
Subject: [commit: ghc] master: rts/Pool: Add poolTryTake (c4308b4)
Message-ID: <20151126141140.098C23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c4308b468c7fe723b6f0a1009b233a55260de503/ghc

>---------------------------------------------------------------

commit c4308b468c7fe723b6f0a1009b233a55260de503
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 26 12:02:33 2015 +0100

    rts/Pool: Add poolTryTake


>---------------------------------------------------------------

c4308b468c7fe723b6f0a1009b233a55260de503
 rts/Pool.c | 41 ++++++++++++++++++++++++++++++-----------
 rts/Pool.h | 10 +++++++++-
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/rts/Pool.c b/rts/Pool.c
index 6c23807..b3e3446 100644
--- a/rts/Pool.c
+++ b/rts/Pool.c
@@ -111,19 +111,40 @@ nat poolGetDesiredSize(Pool *pool) {
     return pool->desired_size;
 }
 
+// Try taking a PoolEntry with an item from a pool,
+// returning NULL if no items are available.
+static PoolEntry *poolTryTake_(Pool *pool) {
+    PoolEntry *ent = NULL;
+    if (pool->available != NULL) {
+        ent = pool->available;
+        pool->available = ent->next;
+    } else if (pool->current_size < pool->max_size) {
+        ent = stgMallocBytes(sizeof(PoolEntry), "pool_take");
+        ent->flags = 0;
+        ent->thing = pool->alloc_fn();
+        pool->current_size++;
+    } else {
+        return NULL;
+    }
+
+    ent->next = pool->taken;
+    pool->taken = ent;
+    return ent;
+}
+
+void *poolTryTake(Pool *pool) {
+    ACQUIRE_LOCK(&pool->mutex);
+    PoolEntry *ent = poolTryTake_(pool);
+    RELEASE_LOCK(&pool->mutex);
+    return ent ? ent->thing : NULL;
+}
+
 void *poolTake(Pool *pool) {
     PoolEntry *ent = NULL;
     ACQUIRE_LOCK(&pool->mutex);
     while (ent == NULL) {
-        if (pool->available != NULL) {
-            ent = pool->available;
-            pool->available = ent->next;
-        } else if (pool->current_size < pool->max_size) {
-            ent = stgMallocBytes(sizeof(PoolEntry), "pool_take");
-            ent->flags = 0;
-            ent->thing = pool->alloc_fn();
-            pool->current_size++;
-        } else {
+        ent = poolTryTake_(pool);
+        if (!ent) {
 #ifdef THREADED_RTS
             waitCondition(&pool->cond, &pool->mutex);
 #else
@@ -132,8 +153,6 @@ void *poolTake(Pool *pool) {
         }
     }
 
-    ent->next = pool->taken;
-    pool->taken = ent;
     RELEASE_LOCK(&pool->mutex);
     return ent->thing;
 }
diff --git a/rts/Pool.h b/rts/Pool.h
index d1aeab5..dd00412 100644
--- a/rts/Pool.h
+++ b/rts/Pool.h
@@ -43,7 +43,15 @@ void poolSetDesiredSize(Pool *pool, nat size);
 /* Get the desired size of a pool */
 nat poolGetDesiredSize(Pool *pool);
 
-/* Grab an available thing from a pool */
+/* Try to grab an available thing from a pool, returning NULL if no things
+ * are available.
+ */
+void *poolTryTake(Pool *pool);
+
+/* Grab an available thing from a pool. This will block if no elements are
+ * available in the case of a threaded runtime or abort in a single-threaded
+ * environment.
+ */
 void *poolTake(Pool *pool);
 
 /* Release a thing back to the pool from which it was taken */


From git at git.haskell.org  Thu Nov 26 14:11:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 14:11:42 +0000 (UTC)
Subject: [commit: ghc] master: LibdwPool: Use poolTryTake (1712a9e)
Message-ID: <20151126141142.9F90D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1712a9ed333dfa2fc9ce7d55acab08a8d278fb5b/ghc

>---------------------------------------------------------------

commit 1712a9ed333dfa2fc9ce7d55acab08a8d278fb5b
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 26 12:02:47 2015 +0100

    LibdwPool: Use poolTryTake


>---------------------------------------------------------------

1712a9ed333dfa2fc9ce7d55acab08a8d278fb5b
 rts/LibdwPool.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/rts/LibdwPool.c b/rts/LibdwPool.c
index f625c0f..b0de8ac 100644
--- a/rts/LibdwPool.c
+++ b/rts/LibdwPool.c
@@ -16,6 +16,23 @@
 
 #include "Pool.h"
 
+/*
+ * Note [libdw session pool]
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * Building a libdw session requires a number of rather expensive steps,
+ *
+ *   - Examine the object files mapped into the address space
+ *   - Find them on disk
+ *   - Open them and map their debugging information
+ *   - Build various index structures necessary for quick lookup
+ *
+ * The time to setup a session can be several milliseconds. In order to avoid
+ * incurring this cost too often, we keep a pool of warm sessions around which
+ * can be shared between capabilities.
+ *
+ */
+
 static Pool *pool = NULL;
 static nat pool_size = 10; // TODO
 
@@ -26,7 +43,7 @@ void libdwPoolInit(void) {
 }
 
 LibdwSession *libdwPoolTake(void) {
-    return poolTake(pool);
+    return poolTryTake(pool);
 }
 
 void libdwPoolRelease(LibdwSession *sess) {


From git at git.haskell.org  Thu Nov 26 14:11:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 14:11:45 +0000 (UTC)
Subject: [commit: ghc] master: Libdw: Handle failure to grab session for
 location lookup (ba14f04)
Message-ID: <20151126141145.4D0093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ba14f04dae398c102209e3374bea882ebf823257/ghc

>---------------------------------------------------------------

commit ba14f04dae398c102209e3374bea882ebf823257
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 26 12:12:32 2015 +0100

    Libdw: Handle failure to grab session for location lookup
    
    This one slipped through testing.


>---------------------------------------------------------------

ba14f04dae398c102209e3374bea882ebf823257
 libraries/base/GHC/ExecutionStack.hs           |  5 +++--
 libraries/base/GHC/ExecutionStack/Internal.hsc | 14 +++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libraries/base/GHC/ExecutionStack.hs b/libraries/base/GHC/ExecutionStack.hs
index 245b996..11f8c9e 100644
--- a/libraries/base/GHC/ExecutionStack.hs
+++ b/libraries/base/GHC/ExecutionStack.hs
@@ -36,14 +36,15 @@ module GHC.ExecutionStack (
   , showStackTrace
   ) where
 
+import Control.Monad (join)
 import GHC.ExecutionStack.Internal
 
 -- | Get a trace of the current execution stack state.
 --
 -- Returns @Nothing@ if stack trace support isn't available on host machine.
 getStackTrace :: IO (Maybe [Location])
-getStackTrace = fmap stackFrames `fmap` collectStackTrace
+getStackTrace = (join . fmap stackFrames) `fmap` collectStackTrace
 
 -- | Get a string representation of the current execution stack state.
 showStackTrace :: IO (Maybe String)
-showStackTrace = fmap (flip showStackFrames "") `fmap` getStackTrace
+showStackTrace = fmap (\st -> showStackFrames st "") `fmap` getStackTrace
diff --git a/libraries/base/GHC/ExecutionStack/Internal.hsc b/libraries/base/GHC/ExecutionStack/Internal.hsc
index 7a30fea..e966e17 100644
--- a/libraries/base/GHC/ExecutionStack/Internal.hsc
+++ b/libraries/base/GHC/ExecutionStack/Internal.hsc
@@ -31,6 +31,7 @@ module GHC.ExecutionStack.Internal (
   , invalidateDebugCache
   ) where
 
+import Control.Monad (join)
 import Data.Word
 import Foreign.C.Types
 import Foreign.C.String (peekCString, CString)
@@ -66,11 +67,14 @@ newtype StackTrace = StackTrace (ForeignPtr StackTrace)
 -- | An address
 type Addr = Ptr ()
 
-withSession :: (ForeignPtr Session -> IO a) -> IO a
+withSession :: (ForeignPtr Session -> IO a) -> IO (Maybe a)
 withSession action = do
     ptr <- libdw_pool_take
-    fptr <- newForeignPtr libdw_pool_release ptr
-    action fptr
+    if | nullPtr == ptr -> return Nothing
+       | otherwise      -> do
+           fptr <- newForeignPtr libdw_pool_release ptr
+           ret <- action fptr
+           return $ Just ret
 
 -- | How many stack frames in the given 'StackTrace'
 stackDepth :: StackTrace -> Int
@@ -126,7 +130,7 @@ locationSize :: Int
 locationSize = (#const sizeof(Location))
 
 -- | List the frames of a stack trace.
-stackFrames :: StackTrace -> [Location]
+stackFrames :: StackTrace -> Maybe [Location]
 stackFrames st@(StackTrace fptr) = unsafePerformIO $ withSession $ \sess -> do
     chunks <- chunksList st
     go sess (reverse chunks)
@@ -197,7 +201,7 @@ foreign import ccall unsafe "&backtraceFree"
 
 -- | Get an execution stack.
 collectStackTrace :: IO (Maybe StackTrace)
-collectStackTrace = withSession $ \sess -> do
+collectStackTrace = fmap join $ withSession $ \sess -> do
     st <- withForeignPtr sess libdw_get_backtrace
     if | st == nullPtr -> return Nothing
        | otherwise     -> Just . StackTrace <$> newForeignPtr backtrace_free st


From git at git.haskell.org  Thu Nov 26 15:34:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 15:34:39 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Next problem: strictness annotation not
 stripped out (2e7bc34)
Message-ID: <20151126153439.62AD03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/2e7bc34e5ee43d4ce3f722545016e99e89ffb703/ghc

>---------------------------------------------------------------

commit 2e7bc34e5ee43d4ce3f722545016e99e89ffb703
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Thu Nov 26 17:34:06 2015 +0200

    Next problem: strictness annotation not stripped out
    
    Fails with
    
    compiler/cmm/CmmNode.hs:47:15: error:
        ? Unexpected strictness annotation: {-# UNPACK #-} !Label
        ? In the type signature:
            CmmEntry :: {-# UNPACK #-} !Label -> CmmTickScope -> CmmNode C O
          In the definition of data constructor ?CmmEntry?
          In the data declaration for ?CmmNode?


>---------------------------------------------------------------

2e7bc34e5ee43d4ce3f722545016e99e89ffb703
 compiler/rename/RnEnv.hs    |  4 +++-
 compiler/rename/RnNames.hs  |  4 +++-
 compiler/rename/RnSource.hs |  9 ++++++---
 compiler/rename/RnTypes.hs  | 25 +++++++++++++++++++++----
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/compiler/rename/RnEnv.hs b/compiler/rename/RnEnv.hs
index c90b556..57890aa 100644
--- a/compiler/rename/RnEnv.hs
+++ b/compiler/rename/RnEnv.hs
@@ -2123,6 +2123,8 @@ checkTupSize tup_size
 ************************************************************************
 -}
 
+-- AZ:TODO: Change these all to be Name instead of RdrName.
+--          Merge TcType.UserTypeContext in to it.
 data HsDocContext
   = TypeSigCtx SDoc
   | PatCtx
@@ -2135,7 +2137,7 @@ data HsDocContext
   | TySynCtx (Located RdrName)
   | TyFamilyCtx (Located RdrName)
   | FamPatCtx (Located RdrName)    -- The patterns of a type/data family instance
-  | ConDeclCtx [Located RdrName]
+  | ConDeclCtx [Located Name]
   | ClassDeclCtx (Located RdrName)
   | ExprWithTySigCtx
   | TypBrCtx
diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs
index 4153b08..de2704b 100644
--- a/compiler/rename/RnNames.hs
+++ b/compiler/rename/RnNames.hs
@@ -615,11 +615,13 @@ getLocalNonValBinders fixity_env
             = map (\ (L _ rdr) -> ( find_con_name rdr
                                   , concatMap find_con_decl_flds (unLoc cdflds)))
                   [rdrs] -- AZ:TODO remove map
-        find_con_flds (L _ (ConDeclGADT { con_names = rdrs, con_type = HsIB { hsib_body = res_ty}}))
+        find_con_flds (L _ (ConDeclGADT { con_names = rdrs, con_type = ty@(HsIB { hsib_body = res_ty})}))
             = map (\ (L _ rdr) -> ( find_con_name rdr
                                   , concatMap find_con_decl_flds cdflds))
                   rdrs
             where
+              -- (hs_details',res_ty',_cxt) = gadtDeclDetails ty
+              -- (arg_tys, res_ty) = splitHsFunType ty
               -- AZ:TODO: extract a function to pull fields out of a ConDecl
               (tvs, cxt, tau) = splitLHsSigmaTy res_ty
               cdflds = case tau of
diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index b99fa3d..5ef76b8 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1548,6 +1548,7 @@ rnConDecl decl@(ConDeclH98 { con_name = name, con_qvars = qtvs
                            , con_doc = mb_doc })
   = do  { _ <- addLocM checkConName name
         ; new_name     <- lookupLocatedTopBndrRn name
+        ; let doc = ConDeclCtx [new_name]
         ; mb_doc'      <- rnMbLHsDoc mb_doc
         ; let (kvs, qtvs') = get_con_qtvs qtvs (hsConDeclArgTys details)
 
@@ -1572,7 +1573,6 @@ rnConDecl decl@(ConDeclH98 { con_name = name, con_qvars = qtvs
                        , con_doc = mb_doc' },
                   all_fvs) }}
  where
-    doc = ConDeclCtx [name]
     cxt = maybe [] unLoc mcxt
     get_rdr_tvs tys = extractHsTysRdrTyVars (cxt ++ tys)
 
@@ -1589,6 +1589,7 @@ rnConDecl decl@(ConDeclGADT { con_names = names, con_type = ty
                         , con_doc = mb_doc })
   = do  { mapM_ (addLocM checkConName) names
         ; new_names    <- mapM lookupLocatedTopBndrRn names
+        ; let doc = ConDeclCtx new_names
         ; mb_doc'      <- rnMbLHsDoc mb_doc
 
         ; (ty', fvs) <- rnHsSigType doc ty
@@ -1597,8 +1598,6 @@ rnConDecl decl@(ConDeclGADT { con_names = names, con_type = ty
         ; return (decl { con_names = new_names, con_type = ty'
                        , con_doc = mb_doc' },
                   fvs) }
- where
-    doc = ConDeclCtx names
 
 {- old
 rnConDecl :: ConDecl RdrName -> RnM (ConDecl Name, FreeVars)
@@ -1681,18 +1680,22 @@ rnConDeclDetails
    -> RnM (HsConDetails (LHsType Name) (Located [LConDeclField Name]), FreeVars)
 rnConDeclDetails _ doc (PrefixCon tys)
   = do { (new_tys, fvs) <- rnLHsTypes doc tys
+       ; traceRn (text "rnConDeclDetails:PrefixCon:" <+> ppr tys)
        ; return (PrefixCon new_tys, fvs) }
 
 rnConDeclDetails _ doc (InfixCon ty1 ty2)
   = do { (new_ty1, fvs1) <- rnLHsType doc ty1
        ; (new_ty2, fvs2) <- rnLHsType doc ty2
+       ; traceRn (text "rnConDeclDetails:InfixCon:" <+> ppr [ty1,ty2])
        ; return (InfixCon new_ty1 new_ty2, fvs1 `plusFV` fvs2) }
 
 rnConDeclDetails con doc (RecCon (L l fields))
   = do  { fls <- lookupConstructorFields con
+        ; traceRn (text "rnConDeclDetails:RecCon fields:" <+> ppr (map (cd_fld_names . unLoc) fields))
         ; (new_fields, fvs) <- rnConDeclFields fls doc fields
                 -- No need to check for duplicate fields
                 -- since that is done by RnNames.extendGlobalRdrEnvRn
+        ; traceRn (text "rnConDeclDetails:RecCon new_fields:" <+> ppr (map (cd_fld_names . unLoc) new_fields))
         ; return (RecCon (L l new_fields), fvs) }
 
 -------------------------------------------------
diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs
index ee9abd9..56f86ee 100644
--- a/compiler/rename/RnTypes.hs
+++ b/compiler/rename/RnTypes.hs
@@ -385,10 +385,25 @@ rnHsTyKi _ doc (HsBangTy b ty)
   = do { (ty', fvs) <- rnLHsType doc ty
        ; return (HsBangTy b ty', fvs) }
 
+rnHsTyKi _ doc@(ConDeclCtx names) ty@(HsRecTy flds)
+  = do { -- AZ:TODO: move this test into the type checker
+         -- addErr (hang (ptext (sLit "Record syntax is illegal here:"))
+         --            2 (ppr ty))
+         traceRn (text "rnHsTyKi:HsRecTy:flds" <+> (ppr ty) <+> text "doc:" <+> pprHsDocContext doc)
+       ; flss <- mapM (lookupConstructorFields . unLoc) names
+       ; let fls = concat flss
+       ; (flds', fvs) <- rnConDeclFields fls doc flds
+       ; traceRn (text "rnHsTyKi:HsRecTy:flds'" <+> (ppr $ HsRecTy flds'))
+       ; return (HsRecTy flds', fvs) }
+
 rnHsTyKi _ doc ty@(HsRecTy flds)
-  = do { addErr (hang (ptext (sLit "Record syntax is illegal here:"))
-                    2 (ppr ty))
+  = do { -- AZ:TODO: move this test into the type checker
+         -- addErr (hang (ptext (sLit "Record syntax is illegal here:"))
+         --            2 (ppr ty))
+         traceRn (text "rnHsTyKi:HsRecTy:flds" <+> (ppr ty) <+> text "doc:" <+> pprHsDocContext doc)
+       -- ; fls <- lookupConstructorFields con
        ; (flds', fvs) <- rnConDeclFields [] doc flds
+       ; traceRn (text "rnHsTyKi:HsRecTy:flds'" <+> (ppr $ HsRecTy flds'))
        ; return (HsRecTy flds', fvs) }
 
 rnHsTyKi what doc (HsFunTy ty1 ty2)
@@ -765,7 +780,8 @@ rnConDeclFields fls doc fields = mapFvRn (rnField fl_env doc) fields
 rnField :: FastStringEnv FieldLabel -> HsDocContext -> LConDeclField RdrName
         -> RnM (LConDeclField Name, FreeVars)
 rnField fl_env doc (L l (ConDeclField names ty haddock_doc))
-  = do { let new_names = map (fmap lookupField) names
+  = do { traceRn (text "rnField:names:" <+> ppr names <+> text ",fl_env:" <+> ppr fl_env)
+       ; let new_names = map (fmap lookupField) names
        ; (new_ty, fvs) <- rnLHsType doc ty
        ; new_haddock_doc <- rnMbLHsDoc haddock_doc
        ; return (L l (ConDeclField new_names new_ty new_haddock_doc), fvs) }
@@ -774,7 +790,8 @@ rnField fl_env doc (L l (ConDeclField names ty haddock_doc))
     lookupField (FieldOcc rdr _) = FieldOcc rdr (flSelector fl)
       where
         lbl = occNameFS $ rdrNameOcc rdr
-        fl  = expectJust "rnField" $ lookupFsEnv fl_env lbl
+        -- fl  = expectJust "rnField" $ lookupFsEnv fl_env lbl
+        fl  = expectJust ("rnField:" ++ (showSDocUnsafe $ ppr rdr)) $ lookupFsEnv fl_env lbl
 
 
 {-


From git at git.haskell.org  Thu Nov 26 15:36:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 15:36:18 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch
 'origin/master' into wip/spj-wildcard-refactor (0c60c0e)
Message-ID: <20151126153618.A21D33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/0c60c0e602da6c5a6515f87ffc10daad37ec9330/ghc

>---------------------------------------------------------------

commit 0c60c0e602da6c5a6515f87ffc10daad37ec9330
Merge: e7ac58a d2a2d5e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Nov 26 15:36:07 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/typecheck/TcClassDcl.hs
    	compiler/typecheck/TcTyClsDecls.hs
    	compiler/typecheck/TcTyDecls.hs
    	compiler/typecheck/TcTypeable.hs
    	compiler/typecheck/TcValidity.hs
    	testsuite/tests/typecheck/should_fail/T5300.stderr
    	testsuite/tests/typecheck/should_fail/T8030.stderr



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 0c60c0e602da6c5a6515f87ffc10daad37ec9330

From git at git.haskell.org  Thu Nov 26 15:36:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 15:36:20 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor's head updated: Merge
 remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
 (0c60c0e)
Message-ID: <20151126153620.D67003A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/spj-wildcard-refactor' now includes:

     76f3142 DynFlags: Drop stale comment
     9032d05 update link to MonadFail proposal
     924f851 Refactor default methods (Trac #11105)
     e9a4c09 Comments only
     e913676 Add a simplifier trace for eta-expansion
     9aa9458 Note STM's vulnerability to non-allocating loops
     c7a058f User's Guide: Add links to MFP wiki page
     5699ac9 User documentation for DuplicateRecordFields
     d2a2d5e Note #11108 in the bugs section of users guide
     0c60c0e Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor

From git at git.haskell.org  Thu Nov 26 16:45:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 16:45:43 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Pattern Match Checking (Fixes #595)
 (e84c1ba)
Message-ID: <20151126164543.064FA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/e84c1ba5830a809516b4d9e93fe1e24134bcb9e2/ghc

>---------------------------------------------------------------

commit e84c1ba5830a809516b4d9e93fe1e24134bcb9e2
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Thu Nov 26 13:36:45 2015 +0100

    Pattern Match Checking (Fixes #595)


>---------------------------------------------------------------

e84c1ba5830a809516b4d9e93fe1e24134bcb9e2
 compiler/basicTypes/UniqSupply.hs   |    5 +-
 compiler/deSugar/Check.hs           | 1854 ++++++++++++++++++++++-------------
 compiler/deSugar/DsBinds.hs         |    8 +-
 compiler/deSugar/DsExpr.hs          |   18 +-
 compiler/deSugar/DsGRHSs.hs         |    2 +-
 compiler/deSugar/DsMonad.hs         |   60 +-
 compiler/deSugar/Match.hs           |  174 +---
 compiler/deSugar/Match.hs-boot      |    1 +
 compiler/deSugar/PmExpr.hs          |  387 ++++++++
 compiler/deSugar/TmOracle.hs        |  252 +++++
 compiler/ghc.cabal.in               |    2 +
 compiler/ghc.mk                     |    1 +
 compiler/hsSyn/HsLit.hs             |   22 +
 compiler/hsSyn/HsPat.hs             |   41 +-
 compiler/prelude/TysWiredIn.hs-boot |    2 +-
 compiler/typecheck/TcMType.hs       |   15 +
 compiler/typecheck/TcRnTypes.hs     |    5 +-
 compiler/typecheck/TcSMonad.hs      |    1 -
 compiler/typecheck/TcSimplify.hs    |   14 +
 compiler/typecheck/TcType.hs        |   42 +
 compiler/types/Type.hs              |   22 +-
 compiler/utils/Bag.hs               |   26 +-
 compiler/utils/MonadUtils.hs        |    6 +-
 23 files changed, 2120 insertions(+), 840 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e84c1ba5830a809516b4d9e93fe1e24134bcb9e2

From git at git.haskell.org  Thu Nov 26 16:45:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 16:45:45 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Comments (53c3cce)
Message-ID: <20151126164545.A67F73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/53c3ccef273452a12038e0157f89f0ae0958b9ba/ghc

>---------------------------------------------------------------

commit 53c3ccef273452a12038e0157f89f0ae0958b9ba
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Thu Nov 26 15:19:36 2015 +0100

    Comments


>---------------------------------------------------------------

53c3ccef273452a12038e0157f89f0ae0958b9ba
 compiler/deSugar/Check.hs    | 58 ++++++++++++------------------
 compiler/deSugar/DsBinds.hs  |  6 ++--
 compiler/deSugar/DsMonad.hs  |  4 +++
 compiler/deSugar/PmExpr.hs   | 57 ++++++++++++++---------------
 compiler/deSugar/TmOracle.hs | 85 +++++++++++++++-----------------------------
 5 files changed, 85 insertions(+), 125 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 53c3ccef273452a12038e0157f89f0ae0958b9ba

From git at git.haskell.org  Thu Nov 26 16:45:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 16:45:47 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm's head updated: Comments (53c3cce)
Message-ID: <20151126164547.DEADB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/gadtpm' now includes:

     924f851 Refactor default methods (Trac #11105)
     e9a4c09 Comments only
     e913676 Add a simplifier trace for eta-expansion
     9aa9458 Note STM's vulnerability to non-allocating loops
     c7a058f User's Guide: Add links to MFP wiki page
     5699ac9 User documentation for DuplicateRecordFields
     d2a2d5e Note #11108 in the bugs section of users guide
     e84c1ba Pattern Match Checking (Fixes #595)
     53c3cce Comments

From git at git.haskell.org  Thu Nov 26 20:44:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 26 Nov 2015 20:44:39 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Compiles stage2,
 but not yet haddock. (609f50b)
Message-ID: <20151126204439.D7EA83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/609f50b3d51c0f9dffbb735f4d2ed455cd099583/ghc

>---------------------------------------------------------------

commit 609f50b3d51c0f9dffbb735f4d2ed455cd099583
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Thu Nov 26 22:44:08 2015 +0200

    Compiles stage2, but not yet haddock.
    
    Still incredibly messy, though.


>---------------------------------------------------------------

609f50b3d51c0f9dffbb735f4d2ed455cd099583
 compiler/deSugar/DsMeta.hs         | 17 +++++++++--------
 compiler/hsSyn/Convert.hs          | 13 ++++++-------
 compiler/hsSyn/HsDecls.hs          |  9 ++++++---
 compiler/hsSyn/HsUtils.hs          |  4 ++--
 compiler/parser/RdrHsSyn.hs        |  2 +-
 compiler/rename/RnNames.hs         |  4 ++--
 compiler/rename/RnSource.hs        |  6 +++++-
 compiler/typecheck/TcTyClsDecls.hs | 36 +++++++++++++++++++++++++++++++++---
 8 files changed, 64 insertions(+), 27 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 609f50b3d51c0f9dffbb735f4d2ed455cd099583

From git at git.haskell.org  Fri Nov 27 11:38:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 11:38:31 +0000 (UTC)
Subject: [commit: ghc] master: Update transformers submodule (d25f853)
Message-ID: <20151127113831.DFE3E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d25f8535a0178984f29178f983536ab40cc471a8/ghc

>---------------------------------------------------------------

commit d25f8535a0178984f29178f983536ab40cc471a8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Nov 27 12:12:59 2015 +0100

    Update transformers submodule
    
    Most notably this pulls in `MonadFail` instances
    (see also #10751)
    
    - add MonadFail instance for ContT
    - re-order methods for consistency
    - Add `MonadFail` instances
    - Canonicalise Monad instances
    - instance Bifunctor Constant


>---------------------------------------------------------------

d25f8535a0178984f29178f983536ab40cc471a8
 libraries/transformers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/transformers b/libraries/transformers
index 5ccb747..34fba39 160000
--- a/libraries/transformers
+++ b/libraries/transformers
@@ -1 +1 @@
-Subproject commit 5ccb747e67d579e3f212fd3526469c35282e532e
+Subproject commit 34fba39b1279936a739ca8857e9592cc9a44c34e


From git at git.haskell.org  Fri Nov 27 14:58:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 14:58:43 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Progress,
 but getting "Record syntax is illegal here" (d73c000)
Message-ID: <20151127145843.9ABA43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/d73c00076c879a9e228fc9492067709348e8dcab/ghc

>---------------------------------------------------------------

commit d73c00076c879a9e228fc9492067709348e8dcab
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Thu Nov 26 10:21:10 2015 +0200

    Progress, but getting "Record syntax is illegal here"


>---------------------------------------------------------------

d73c00076c879a9e228fc9492067709348e8dcab
 compiler/rename/RnSource.hs        |  3 +++
 compiler/typecheck/TcTyClsDecls.hs | 54 +++++++++++++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index 6e16234..b99fa3d 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1649,6 +1649,8 @@ rnConDecl decl@(ConDecl { con_names = names, con_qvars = qtvs
       where
         (free_kvs, free_tvs) = get_rdr_tvs (ty : arg_tys)
 -}
+
+-- AZ:TODO: remove this function, it is no longer used
 rnConResult :: HsDocContext -> [Name]
             -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
             -> ResType (LHsType RdrName)
@@ -1694,6 +1696,7 @@ rnConDeclDetails con doc (RecCon (L l fields))
         ; return (RecCon (L l new_fields), fvs) }
 
 -------------------------------------------------
+-- AZ:TODO: remove this when it is no longer used in RnSource
 badRecResTy :: HsDocContext -> SDoc
 badRecResTy ctxt = withHsDocContext ctxt $
                    ptext (sLit "Malformed constructor signature")
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index fed0a2e..fd6bc57 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -510,9 +510,26 @@ kcConDecl (ConDeclH98 { con_name = name, con_qvars = ex_tvs
        ; return () }
 
 kcConDecl (ConDeclGADT { con_names = names
-                       , con_type = res_ty })
+                       , con_type = ty@(HsIB { hsib_kvs = kvs, hsib_tvs = tvs, hsib_body = bty}) })
   = addErrCtxt (dataConCtxtName names) $
-      kcHsSigType names res_ty
+      kcHsSigType names ty
+    {-
+         -- the 'False' says that the existentials don't have a CUSK, as the
+         -- concept doesn't really apply here. We just need to bring the variables
+         -- into scope!
+    do { let ex_tvs = HsQTvs { hsq_kvs = kvs, hsq_tvs = map (noLoc . UserTyVar . noLoc) tvs }
+       ; let (details,res_ty,ex_cxt) = gadtDeclDetails ty
+       ; _ <- kcHsTyVarBndrs False ex_tvs $
+              do { traceTc "kcConDecl:ex_cxt" (ppr ex_cxt)
+                 ; _ <- tcHsContext ex_cxt
+                 ; traceTc "kcConDecl:after ex_cxt" (ppr ex_cxt)
+                 ; mapM_ (tcHsOpenType . getBangType) (hsConDeclArgTys details)
+                 ; traceTc "kcConDecl:after ex_cxt2" (ppr ex_cxt)
+                 ; _ <- tcConRes (ResTyGADT undefined res_ty)
+                 ; traceTc "kcConDecl:after tcConRes" (ppr ex_cxt)
+                 ; return (panic "kcConDecl", ()) }
+       ; return () }
+    -}
 
 {- old
 kcConDecl (ConDecl { con_names = names, con_qvars = ex_tvs
@@ -1335,10 +1352,12 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
   = addErrCtxt (dataConCtxtName names) $
     do { traceTc "tcConDecl 1" (ppr names)
        ; let hs_tvs = HsQTvs { hsq_kvs = kvs, hsq_tvs = map (noLoc . UserTyVar . noLoc) tvs }
+       ; let (hs_details',res_ty',cxt) = gadtDeclDetails ty
+       ; let doc = ppr names -- AZ:TODO make this something reasonable
+       ; (hs_details,res_ty) <- tcUpdateConResult doc hs_details' res_ty'
        ; (ctxt, arg_tys, res_ty, field_lbls, stricts)
            <- tcHsQTyVars hs_tvs $ \ _ ->
               do { traceTc "tcConDecl" (ppr names <+> text "tvs:" <+> ppr hs_tvs)
-                 ; let (hs_details,res_ty,cxt) = gadtDeclDetails ty
                  ; traceTc "tcConDecl:" (text "res_ty:" <+> ppr res_ty)
                  ; ctxt <- tcHsContext cxt
                  ; btys <- tcConArgs new_or_data hs_details
@@ -1457,6 +1476,35 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        }
 -}
 
+tcUpdateConResult :: SDoc
+            -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
+                    -- Original details
+            -> LHsType Name -- The original result type
+            -> TcM (HsConDetails (LHsType Name) (Located [LConDeclField Name]),
+                    LHsType Name)
+tcUpdateConResult doc details ty
+  = do {  let (arg_tys, res_ty) = splitHsFunType ty
+                -- We can finally split it up,
+                -- now the renamer has dealt with fixities
+                -- See Note [Sorting out the result type] in RdrHsSyn
+
+       ; case details of
+           InfixCon {}  -> pprPanic "tcUpdateConResult" (ppr ty)
+           -- See Note [Sorting out the result type] in RdrHsSyn
+
+           RecCon {}    -> do { unless (null arg_tys)
+                                       (failWithTc (badRecResTy doc))
+                                -- AZ: This error used to be reported during
+                                --     renaming, will now be reported in type
+                                --     checking. Is this a problem?
+                              ; return (details, res_ty) }
+
+           PrefixCon {} -> return (PrefixCon arg_tys, res_ty)}
+    where
+        badRecResTy :: SDoc -> SDoc
+        badRecResTy ctxt = ctxt <+>
+                        ptext (sLit "Malformed constructor signature")
+
 tcConIsInfixH98 :: Name
              -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
              -> TcM Bool


From git at git.haskell.org  Fri Nov 27 14:58:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 14:58:46 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Starting on #11028 (38d2b70)
Message-ID: <20151127145846.4FA313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/38d2b70e6485df7145d1244a8e18ac5ba84585c2/ghc

>---------------------------------------------------------------

commit 38d2b70e6485df7145d1244a8e18ac5ba84585c2
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 23 22:59:27 2015 +0200

    Starting on #11028


>---------------------------------------------------------------

38d2b70e6485df7145d1244a8e18ac5ba84585c2
 compiler/deSugar/DsMeta.hs         |  87 +++++++++++++++++++++-
 compiler/hsSyn/HsDecls.hs          |  51 +++++++++++--
 compiler/hsSyn/HsTypes.hs          |   4 +-
 compiler/hsSyn/HsUtils.hs          |  24 ++++++
 compiler/parser/Parser.y           |  11 ++-
 compiler/parser/RdrHsSyn.hs        |  48 +++++++-----
 compiler/rename/RnNames.hs         |  18 +++++
 compiler/rename/RnSource.hs        |  65 +++++++++++++++-
 compiler/rename/RnTypes.hs         |  14 ++--
 compiler/typecheck/TcHsType.hs     |   6 +-
 compiler/typecheck/TcTyClsDecls.hs | 148 ++++++++++++++++++++++++++++++++++++-
 11 files changed, 428 insertions(+), 48 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 38d2b70e6485df7145d1244a8e18ac5ba84585c2

From git at git.haskell.org  Fri Nov 27 14:58:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 14:58:48 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Progress,
 but does not generate correct res_ty (2f831e3)
Message-ID: <20151127145848.ED1F83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/2f831e3b10da094216f553f2865cb02909c4ef28/ghc

>---------------------------------------------------------------

commit 2f831e3b10da094216f553f2865cb02909c4ef28
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed Nov 25 21:53:37 2015 +0200

    Progress, but does not generate correct res_ty
    
    This commit fails with
    
    libraries/hoopl/src/Compiler/Hoopl/Block.hs:66:3: error:
        ? Data constructor ?JustO? returns type ?t -> MaybeO O t?
            instead of an instance of its parent type ?MaybeO ex t?
        ? In the definition of data constructor ?JustO?
          In the data type declaration for ?MaybeO?


>---------------------------------------------------------------

2f831e3b10da094216f553f2865cb02909c4ef28
 compiler/deSugar/DsMeta.hs         |  4 ++--
 compiler/hsSyn/HsDecls.hs          |  5 +++++
 compiler/parser/RdrHsSyn.hs        | 10 +++++-----
 compiler/rename/RnSource.hs        |  2 +-
 compiler/typecheck/TcRnDriver.hs   |  2 +-
 compiler/typecheck/TcTyClsDecls.hs | 12 ++++++------
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index caff5c4..74f066b 100644
--- a/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
@@ -304,7 +304,7 @@ repDataDefn tc bndrs opt_tys tv_names
                              _cs -> failWithDs (ptext
                                      (sLit "Multiple constructors for newtype:")
                                       <+> pprQuotedList
-                                                (con_names $ unLoc $ head cons))
+                                                (getConNames $ unLoc $ head cons))
                           }
            DataType -> do { consL <- concatMapM (repC tv_names) cons
                           ; cons1 <- coreList conQTyConName consL
@@ -658,7 +658,7 @@ repC tvs (L _ (ConDeclGADT { con_names = cons
        ; b <- dsExtendMetaEnv (mkNameEnv binds) $ -- Binds some of the con_tvs
          addTyVarBinds ex_tvs $ \ ex_bndrs ->   -- Binds the remaining con_tvs
     do { cons1     <- mapM lookupLOcc cons -- See Note [Binders and occurrences]
-       ; let details = gadtDeclDetails res_ty
+       ; let (details,_,_) = gadtDeclDetails res_ty
        ; c'        <- mapM (\c -> repConstr c details) cons1
        ; ctxt'     <- repContext eq_ctxt
        ; rep2 forallCName ([unC ex_bndrs, unC ctxt'] ++ (map unC c')) }
diff --git a/compiler/hsSyn/HsDecls.hs b/compiler/hsSyn/HsDecls.hs
index 6f2510b..0a629ac 100644
--- a/compiler/hsSyn/HsDecls.hs
+++ b/compiler/hsSyn/HsDecls.hs
@@ -62,6 +62,7 @@ module HsDecls (
   -- ** Data-constructor declarations
   ConDecl(..), LConDecl, ResType(..),
   HsConDeclDetails, hsConDeclArgTys,
+  getConNames,
   -- ** Document comments
   DocDecl(..), LDocDecl, docDeclDoc,
   -- ** Deprecations
@@ -1098,6 +1099,10 @@ deriving instance (DataId name) => Data (ConDecl name)
 type HsConDeclDetails name
    = HsConDetails (LBangType name) (Located [LConDeclField name])
 
+getConNames :: ConDecl name -> [Located name]
+getConNames (ConDeclH98  {con_name  = name})  = [name]
+getConNames (ConDeclGADT {con_names = names}) = names
+
 hsConDeclArgTys :: HsConDeclDetails name -> [LBangType name]
 hsConDeclArgTys (PrefixCon tys)    = tys
 hsConDeclArgTys (InfixCon ty1 ty2) = [ty1,ty2]
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 0ff5c31..9678735 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -542,15 +542,15 @@ mkGadtDecl' names lbody_ty@(L loc body_ty)
 -}
 
 -- AZ:TODO: this probably belongs in a different module
-gadtDeclDetails :: LHsSigType name -> HsConDeclDetails name
-gadtDeclDetails (HsIB {hsib_body = lbody_ty}) = details
+gadtDeclDetails :: LHsSigType name -> (HsConDeclDetails name,LHsType name,LHsContext name)
+gadtDeclDetails (HsIB {hsib_body = lbody_ty}) = (details,res_ty,cxt)
   where
     (tvs, cxt, tau) = splitLHsSigmaTy lbody_ty
-    details           -- See Note [Sorting out the result type]
+    (details, res_ty)           -- See Note [Sorting out the result type]
       = case tau of
           L _ (HsFunTy (L l (HsRecTy flds)) res_ty)
-                  -> RecCon (L l flds)
-          _other  -> PrefixCon []
+                  -> (RecCon (L l flds), res_ty)
+          _other  -> (PrefixCon [], tau)
 
 tyConToDataCon :: SrcSpan -> RdrName -> P (Located RdrName)
 tyConToDataCon loc tc
diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index 450ad82..6e16234 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1454,7 +1454,7 @@ depAnalTyClDecls ds_w_fvs
         DataDecl { tcdLName = L _ data_name
                  , tcdDataDefn = HsDataDefn { dd_cons = cons } }
           -> do L _ dc <- cons
-                return $ zip (map unLoc $ con_names dc) (repeat data_name)
+                return $ zip (map unLoc $ getConNames dc) (repeat data_name)
         _ -> []
 
 {-
diff --git a/compiler/typecheck/TcRnDriver.hs b/compiler/typecheck/TcRnDriver.hs
index 5b607d0..2a48490 100644
--- a/compiler/typecheck/TcRnDriver.hs
+++ b/compiler/typecheck/TcRnDriver.hs
@@ -1253,7 +1253,7 @@ tcTyClsInstDecls tycl_decls inst_decls deriv_decls
 
     get_fi_cons :: DataFamInstDecl Name -> [Name]
     get_fi_cons (DataFamInstDecl { dfid_defn = HsDataDefn { dd_cons = cons } })
-      = map unLoc $ concatMap (con_names . unLoc) cons
+      = map unLoc $ concatMap (getConNames . unLoc) cons
 
 {-
 Note [AFamDataCon: not promoting data family constructors]
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 634c6ed..fed0a2e 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -383,7 +383,7 @@ getInitialKind decl@(DataDecl { tcdLName = L _ name
               ; return (res_k, ()) }
        ; let main_pr = (name, AThing decl_kind)
              inner_prs = [ (unLoc con, APromotionErr RecDataConPE)
-                         | L _ con' <- cons, con <- con_names con' ]
+                         | L _ con' <- cons, con <- getConNames con' ]
        ; return (main_pr : inner_prs) }
 
 getInitialKind (FamDecl { tcdFam = decl })
@@ -1338,16 +1338,16 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; (ctxt, arg_tys, res_ty, field_lbls, stricts)
            <- tcHsQTyVars hs_tvs $ \ _ ->
               do { traceTc "tcConDecl" (ppr names <+> text "tvs:" <+> ppr hs_tvs)
-                 ; ctxt <- tcHsContext (noLoc []) -- AZ: can remove this, in time
-                 ; let hs_details = gadtDeclDetails ty
+                 ; let (hs_details,res_ty,cxt) = gadtDeclDetails ty
+                 ; traceTc "tcConDecl:" (text "res_ty:" <+> ppr res_ty)
+                 ; ctxt <- tcHsContext cxt
                  ; btys <- tcConArgs new_or_data hs_details
                  -- ; res_ty  <- tcConRes hs_res_ty
-                 ; ty' <- tcHsLiftedType bty
+                 ; ty' <- tcHsLiftedType res_ty
                  ; field_lbls <- lookupConstructorFields (unLoc $ head names)
                  ; let (arg_tys, stricts) = unzip btys
                  ; return (ctxt, arg_tys, ty', field_lbls, stricts)
                  }
-
              -- Generalise the kind variables (returning quantified TcKindVars)
              -- and quantify the type variables (substituting their kinds)
              -- REMEMBER: 'tkvs' are:
@@ -1373,7 +1373,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; traceTc "tcConDecl 2" (ppr names $$ ppr field_lbls)
        ; let
            buildOneDataCon (L _ name) = do
-             { let hs_details = gadtDeclDetails ty
+             { let (hs_details,_,_) = gadtDeclDetails ty
              ; is_infix <- tcConIsInfixGADT name hs_details
              ; rep_nm   <- newTyConRepName name
 


From git at git.haskell.org  Fri Nov 27 14:58:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 14:58:51 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Next problem: strictness annotation not
 stripped out (76bda99)
Message-ID: <20151127145851.9291A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/76bda99d0e9e271bcb6618b13a659420126831e6/ghc

>---------------------------------------------------------------

commit 76bda99d0e9e271bcb6618b13a659420126831e6
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Thu Nov 26 17:34:06 2015 +0200

    Next problem: strictness annotation not stripped out
    
    Fails with
    
    compiler/cmm/CmmNode.hs:47:15: error:
        ? Unexpected strictness annotation: {-# UNPACK #-} !Label
        ? In the type signature:
            CmmEntry :: {-# UNPACK #-} !Label -> CmmTickScope -> CmmNode C O
          In the definition of data constructor ?CmmEntry?
          In the data declaration for ?CmmNode?


>---------------------------------------------------------------

76bda99d0e9e271bcb6618b13a659420126831e6
 compiler/rename/RnEnv.hs    |  4 +++-
 compiler/rename/RnNames.hs  |  4 +++-
 compiler/rename/RnSource.hs |  9 ++++++---
 compiler/rename/RnTypes.hs  | 25 +++++++++++++++++++++----
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/compiler/rename/RnEnv.hs b/compiler/rename/RnEnv.hs
index c90b556..57890aa 100644
--- a/compiler/rename/RnEnv.hs
+++ b/compiler/rename/RnEnv.hs
@@ -2123,6 +2123,8 @@ checkTupSize tup_size
 ************************************************************************
 -}
 
+-- AZ:TODO: Change these all to be Name instead of RdrName.
+--          Merge TcType.UserTypeContext in to it.
 data HsDocContext
   = TypeSigCtx SDoc
   | PatCtx
@@ -2135,7 +2137,7 @@ data HsDocContext
   | TySynCtx (Located RdrName)
   | TyFamilyCtx (Located RdrName)
   | FamPatCtx (Located RdrName)    -- The patterns of a type/data family instance
-  | ConDeclCtx [Located RdrName]
+  | ConDeclCtx [Located Name]
   | ClassDeclCtx (Located RdrName)
   | ExprWithTySigCtx
   | TypBrCtx
diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs
index 4153b08..de2704b 100644
--- a/compiler/rename/RnNames.hs
+++ b/compiler/rename/RnNames.hs
@@ -615,11 +615,13 @@ getLocalNonValBinders fixity_env
             = map (\ (L _ rdr) -> ( find_con_name rdr
                                   , concatMap find_con_decl_flds (unLoc cdflds)))
                   [rdrs] -- AZ:TODO remove map
-        find_con_flds (L _ (ConDeclGADT { con_names = rdrs, con_type = HsIB { hsib_body = res_ty}}))
+        find_con_flds (L _ (ConDeclGADT { con_names = rdrs, con_type = ty@(HsIB { hsib_body = res_ty})}))
             = map (\ (L _ rdr) -> ( find_con_name rdr
                                   , concatMap find_con_decl_flds cdflds))
                   rdrs
             where
+              -- (hs_details',res_ty',_cxt) = gadtDeclDetails ty
+              -- (arg_tys, res_ty) = splitHsFunType ty
               -- AZ:TODO: extract a function to pull fields out of a ConDecl
               (tvs, cxt, tau) = splitLHsSigmaTy res_ty
               cdflds = case tau of
diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index b99fa3d..5ef76b8 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1548,6 +1548,7 @@ rnConDecl decl@(ConDeclH98 { con_name = name, con_qvars = qtvs
                            , con_doc = mb_doc })
   = do  { _ <- addLocM checkConName name
         ; new_name     <- lookupLocatedTopBndrRn name
+        ; let doc = ConDeclCtx [new_name]
         ; mb_doc'      <- rnMbLHsDoc mb_doc
         ; let (kvs, qtvs') = get_con_qtvs qtvs (hsConDeclArgTys details)
 
@@ -1572,7 +1573,6 @@ rnConDecl decl@(ConDeclH98 { con_name = name, con_qvars = qtvs
                        , con_doc = mb_doc' },
                   all_fvs) }}
  where
-    doc = ConDeclCtx [name]
     cxt = maybe [] unLoc mcxt
     get_rdr_tvs tys = extractHsTysRdrTyVars (cxt ++ tys)
 
@@ -1589,6 +1589,7 @@ rnConDecl decl@(ConDeclGADT { con_names = names, con_type = ty
                         , con_doc = mb_doc })
   = do  { mapM_ (addLocM checkConName) names
         ; new_names    <- mapM lookupLocatedTopBndrRn names
+        ; let doc = ConDeclCtx new_names
         ; mb_doc'      <- rnMbLHsDoc mb_doc
 
         ; (ty', fvs) <- rnHsSigType doc ty
@@ -1597,8 +1598,6 @@ rnConDecl decl@(ConDeclGADT { con_names = names, con_type = ty
         ; return (decl { con_names = new_names, con_type = ty'
                        , con_doc = mb_doc' },
                   fvs) }
- where
-    doc = ConDeclCtx names
 
 {- old
 rnConDecl :: ConDecl RdrName -> RnM (ConDecl Name, FreeVars)
@@ -1681,18 +1680,22 @@ rnConDeclDetails
    -> RnM (HsConDetails (LHsType Name) (Located [LConDeclField Name]), FreeVars)
 rnConDeclDetails _ doc (PrefixCon tys)
   = do { (new_tys, fvs) <- rnLHsTypes doc tys
+       ; traceRn (text "rnConDeclDetails:PrefixCon:" <+> ppr tys)
        ; return (PrefixCon new_tys, fvs) }
 
 rnConDeclDetails _ doc (InfixCon ty1 ty2)
   = do { (new_ty1, fvs1) <- rnLHsType doc ty1
        ; (new_ty2, fvs2) <- rnLHsType doc ty2
+       ; traceRn (text "rnConDeclDetails:InfixCon:" <+> ppr [ty1,ty2])
        ; return (InfixCon new_ty1 new_ty2, fvs1 `plusFV` fvs2) }
 
 rnConDeclDetails con doc (RecCon (L l fields))
   = do  { fls <- lookupConstructorFields con
+        ; traceRn (text "rnConDeclDetails:RecCon fields:" <+> ppr (map (cd_fld_names . unLoc) fields))
         ; (new_fields, fvs) <- rnConDeclFields fls doc fields
                 -- No need to check for duplicate fields
                 -- since that is done by RnNames.extendGlobalRdrEnvRn
+        ; traceRn (text "rnConDeclDetails:RecCon new_fields:" <+> ppr (map (cd_fld_names . unLoc) new_fields))
         ; return (RecCon (L l new_fields), fvs) }
 
 -------------------------------------------------
diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs
index ee9abd9..56f86ee 100644
--- a/compiler/rename/RnTypes.hs
+++ b/compiler/rename/RnTypes.hs
@@ -385,10 +385,25 @@ rnHsTyKi _ doc (HsBangTy b ty)
   = do { (ty', fvs) <- rnLHsType doc ty
        ; return (HsBangTy b ty', fvs) }
 
+rnHsTyKi _ doc@(ConDeclCtx names) ty@(HsRecTy flds)
+  = do { -- AZ:TODO: move this test into the type checker
+         -- addErr (hang (ptext (sLit "Record syntax is illegal here:"))
+         --            2 (ppr ty))
+         traceRn (text "rnHsTyKi:HsRecTy:flds" <+> (ppr ty) <+> text "doc:" <+> pprHsDocContext doc)
+       ; flss <- mapM (lookupConstructorFields . unLoc) names
+       ; let fls = concat flss
+       ; (flds', fvs) <- rnConDeclFields fls doc flds
+       ; traceRn (text "rnHsTyKi:HsRecTy:flds'" <+> (ppr $ HsRecTy flds'))
+       ; return (HsRecTy flds', fvs) }
+
 rnHsTyKi _ doc ty@(HsRecTy flds)
-  = do { addErr (hang (ptext (sLit "Record syntax is illegal here:"))
-                    2 (ppr ty))
+  = do { -- AZ:TODO: move this test into the type checker
+         -- addErr (hang (ptext (sLit "Record syntax is illegal here:"))
+         --            2 (ppr ty))
+         traceRn (text "rnHsTyKi:HsRecTy:flds" <+> (ppr ty) <+> text "doc:" <+> pprHsDocContext doc)
+       -- ; fls <- lookupConstructorFields con
        ; (flds', fvs) <- rnConDeclFields [] doc flds
+       ; traceRn (text "rnHsTyKi:HsRecTy:flds'" <+> (ppr $ HsRecTy flds'))
        ; return (HsRecTy flds', fvs) }
 
 rnHsTyKi what doc (HsFunTy ty1 ty2)
@@ -765,7 +780,8 @@ rnConDeclFields fls doc fields = mapFvRn (rnField fl_env doc) fields
 rnField :: FastStringEnv FieldLabel -> HsDocContext -> LConDeclField RdrName
         -> RnM (LConDeclField Name, FreeVars)
 rnField fl_env doc (L l (ConDeclField names ty haddock_doc))
-  = do { let new_names = map (fmap lookupField) names
+  = do { traceRn (text "rnField:names:" <+> ppr names <+> text ",fl_env:" <+> ppr fl_env)
+       ; let new_names = map (fmap lookupField) names
        ; (new_ty, fvs) <- rnLHsType doc ty
        ; new_haddock_doc <- rnMbLHsDoc haddock_doc
        ; return (L l (ConDeclField new_names new_ty new_haddock_doc), fvs) }
@@ -774,7 +790,8 @@ rnField fl_env doc (L l (ConDeclField names ty haddock_doc))
     lookupField (FieldOcc rdr _) = FieldOcc rdr (flSelector fl)
       where
         lbl = occNameFS $ rdrNameOcc rdr
-        fl  = expectJust "rnField" $ lookupFsEnv fl_env lbl
+        -- fl  = expectJust "rnField" $ lookupFsEnv fl_env lbl
+        fl  = expectJust ("rnField:" ++ (showSDocUnsafe $ ppr rdr)) $ lookupFsEnv fl_env lbl
 
 
 {-


From git at git.haskell.org  Fri Nov 27 14:58:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 14:58:54 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Stage1 compiles now. (5f8b07f)
Message-ID: <20151127145854.32D9B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f8b07fd86f6d414c0a78301d2ade25eebcf97f7/ghc

>---------------------------------------------------------------

commit 5f8b07fd86f6d414c0a78301d2ade25eebcf97f7
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed Nov 25 16:10:32 2015 +0200

    Stage1 compiles now.


>---------------------------------------------------------------

5f8b07fd86f6d414c0a78301d2ade25eebcf97f7
 compiler/typecheck/TcTyClsDecls.hs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 252e579..634c6ed 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -504,7 +504,7 @@ kcConDecl (ConDeclH98 { con_name = name, con_qvars = ex_tvs
          -- concept doesn't really apply here. We just need to bring the variables
          -- into scope!
     do { _ <- kcHsTyVarBndrs False ((fromMaybe (HsQTvs mempty []) ex_tvs) ::LHsQTyVars Name) $
-              do { _ <- tcHsContext (fromMaybe mempty ex_ctxt)
+              do { _ <- tcHsContext (fromMaybe (noLoc []) ex_ctxt)
                  ; mapM_ (tcHsOpenType . getBangType) (hsConDeclArgTys details)
                  ; return (panic "kcConDecl", ()) }
        ; return () }
@@ -1281,7 +1281,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; (ctxt, arg_tys, field_lbls, stricts)
            <- tcHsQTyVars (fromMaybe (HsQTvs [] []) hs_tvs) $ \ _ ->
               do { traceTc "tcConDecl" (ppr name <+> text "tvs:" <+> ppr hs_tvs)
-                 ; ctxt <- tcHsContext (fromMaybe mempty hs_ctxt)
+                 ; ctxt <- tcHsContext (fromMaybe (noLoc []) hs_ctxt)
                  ; btys <- tcConArgs new_or_data hs_details
                  ; field_lbls <- lookupConstructorFields (unLoc name)
                  ; let (arg_tys, stricts) = unzip btys
@@ -1312,7 +1312,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; traceTc "tcConDecl 2" (ppr name $$ ppr field_lbls)
        ; let
            buildOneDataCon (L _ name) = do
-             { is_infix <- tcConIsInfix name hs_details ResTyH98
+             { is_infix <- tcConIsInfixH98 name hs_details
              ; rep_nm   <- newTyConRepName name
 
              ; buildDataCon fam_envs name is_infix
@@ -1345,7 +1345,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
                  ; ty' <- tcHsLiftedType bty
                  ; field_lbls <- lookupConstructorFields (unLoc $ head names)
                  ; let (arg_tys, stricts) = unzip btys
-                 ; return (ctxt, arg_tys, ty, field_lbls, stricts)
+                 ; return (ctxt, arg_tys, ty', field_lbls, stricts)
                  }
 
              -- Generalise the kind variables (returning quantified TcKindVars)
@@ -1362,7 +1362,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; ctxt    <- zonkTcTypeToTypes ze ctxt
        ; res_ty  <- zonkTcTypeToType ze res_ty
 
-       ; let (univ_tvs, ex_tvs, eq_preds, res_ty') = rejigConRes tmpl_tvs res_tmpl qtkvs res_ty
+       ; let (univ_tvs, ex_tvs, eq_preds, res_ty') = rejigConRes tmpl_tvs res_tmpl qtkvs (ResTyGADT undefined res_ty)
              -- NB: this is a /lazy/ binding, so we pass four thunks to buildDataCon
              --     without yet forcing the guards in rejigConRes
              -- See Note [Checking GADT return types]
@@ -1374,7 +1374,7 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; let
            buildOneDataCon (L _ name) = do
              { let hs_details = gadtDeclDetails ty
-             ; is_infix <- tcConIsInfix name hs_details res_ty
+             ; is_infix <- tcConIsInfixGADT name hs_details
              ; rep_nm   <- newTyConRepName name
 
              ; buildDataCon fam_envs name is_infix
@@ -1457,15 +1457,18 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        }
 -}
 
-tcConIsInfix :: Name
+tcConIsInfixH98 :: Name
              -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
-             -> ResType Type
              -> TcM Bool
-tcConIsInfix _   details ResTyH98
+tcConIsInfixH98 _   details
   = case details of
            InfixCon {}  -> return True
            _            -> return False
-tcConIsInfix con details (ResTyGADT _ _)
+
+tcConIsInfixGADT :: Name
+             -> HsConDetails (LHsType Name) (Located [LConDeclField Name])
+             -> TcM Bool
+tcConIsInfixGADT con details
   = case details of
            InfixCon {}  -> return True
            RecCon {}    -> return False


From git at git.haskell.org  Fri Nov 27 14:58:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 14:58:56 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Compiles stage2,
 but not yet haddock. (6fcca26)
Message-ID: <20151127145856.DFE2A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/6fcca26558e181a8facad5b9407606a1264acc8e/ghc

>---------------------------------------------------------------

commit 6fcca26558e181a8facad5b9407606a1264acc8e
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Thu Nov 26 22:44:08 2015 +0200

    Compiles stage2, but not yet haddock.
    
    Still incredibly messy, though.


>---------------------------------------------------------------

6fcca26558e181a8facad5b9407606a1264acc8e
 compiler/deSugar/DsMeta.hs         | 17 +++++++--------
 compiler/hsSyn/Convert.hs          | 13 ++++++------
 compiler/hsSyn/HsDecls.hs          |  9 +++++---
 compiler/hsSyn/HsUtils.hs          |  4 ++--
 compiler/parser/RdrHsSyn.hs        |  2 +-
 compiler/rename/RnNames.hs         |  4 ++--
 compiler/rename/RnSource.hs        |  6 +++++-
 compiler/typecheck/TcTyClsDecls.hs | 42 ++++++++++++++++++++++++++++++++++----
 8 files changed, 69 insertions(+), 28 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6fcca26558e181a8facad5b9407606a1264acc8e

From git at git.haskell.org  Fri Nov 27 14:58:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 14:58:59 +0000 (UTC)
Subject: [commit: ghc] wip/T11028's head updated: Compiles stage2,
 but not yet haddock. (6fcca26)
Message-ID: <20151127145859.408CE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/T11028' now includes:

     76f3142 DynFlags: Drop stale comment
     9032d05 update link to MonadFail proposal
     924f851 Refactor default methods (Trac #11105)
     e9a4c09 Comments only
     e913676 Add a simplifier trace for eta-expansion
     9aa9458 Note STM's vulnerability to non-allocating loops
     c7a058f User's Guide: Add links to MFP wiki page
     5699ac9 User documentation for DuplicateRecordFields
     d2a2d5e Note #11108 in the bugs section of users guide
     0c60c0e Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
     38d2b70 Starting on #11028
     5f8b07f Stage1 compiles now.
     2f831e3 Progress, but does not generate correct res_ty
     d73c000 Progress, but getting "Record syntax is illegal here"
     76bda99 Next problem: strictness annotation not stripped out
     6fcca26 Compiles stage2, but not yet haddock.

From git at git.haskell.org  Fri Nov 27 15:04:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 15:04:55 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Update haddock commit (b78cb63)
Message-ID: <20151127150455.43F423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/b78cb63acec7d8aed2858cee7c4db000931e4002/ghc

>---------------------------------------------------------------

commit b78cb63acec7d8aed2858cee7c4db000931e4002
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri Nov 27 17:04:57 2015 +0200

    Update haddock commit


>---------------------------------------------------------------

b78cb63acec7d8aed2858cee7c4db000931e4002
 utils/haddock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/haddock b/utils/haddock
index 42b2cfc..bb1f980 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 42b2cfc595f1ee62d1c1b8513c5df1d92709c06a
+Subproject commit bb1f9806d88c16ce772f506eff48ae3d5588d173


From git at git.haskell.org  Fri Nov 27 15:18:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 15:18:16 +0000 (UTC)
Subject: [commit: ghc] master: Check arity on default decl for assoc types
 (49aae12)
Message-ID: <20151127151816.87D963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/49aae125686db914a73199d4f789370313892f8f/ghc

>---------------------------------------------------------------

commit 49aae125686db914a73199d4f789370313892f8f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 27 15:16:17 2015 +0000

    Check arity on default decl for assoc types
    
    Fixes Trac #11136.  We should check arity before
    doing tcTyClTyVars, because the latter crahes if
    the arity isn't right.


>---------------------------------------------------------------

49aae125686db914a73199d4f789370313892f8f
 compiler/typecheck/TcTyClsDecls.hs                 | 25 +++++++++++++++-------
 .../tests/indexed-types/should_fail/T11136.hs      |  7 ++++++
 .../tests/indexed-types/should_fail/T11136.stderr  |  5 +++++
 testsuite/tests/indexed-types/should_fail/all.T    |  1 +
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 05a79e2..8e42ff2 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -476,7 +476,7 @@ kcTyClDecl (ClassDecl { tcdLName = L _ name, tcdTyVars = hs_tvs
                        , tcdCtxt = ctxt, tcdSigs = sigs })
   = kcTyClTyVars name hs_tvs $
     do  { _ <- tcHsContext ctxt
-        ; mapM_ (wrapLocM kc_sig)     sigs }
+        ; mapM_ (wrapLocM kc_sig) sigs }
   where
     kc_sig (TypeSig _ op_ty _)  = discardResult (tcHsLiftedType op_ty)
     kc_sig (GenericSig _ op_ty) = discardResult (tcHsLiftedType op_ty)
@@ -922,19 +922,28 @@ tcDefaultAssocDecl fam_tc [L loc (TyFamEqn { tfe_tycon = L _ tc_name
                                            , tfe_rhs = rhs })]
   = setSrcSpan loc $
     tcAddFamInstCtxt (ptext (sLit "default type instance")) tc_name $
-    tcTyClTyVars tc_name hs_tvs $ \ tvs rhs_kind ->
     do { traceTc "tcDefaultAssocDecl" (ppr tc_name)
-       ; checkTc (isTypeFamilyTyCon fam_tc) (wrongKindOfFamily fam_tc)
        ; let (fam_name, fam_pat_arity, _) = famTyConShape fam_tc
+             fam_tc_tvs                   = tyConTyVars fam_tc
+
+       -- Kind of family check
+       ; checkTc (isTypeFamilyTyCon fam_tc) (wrongKindOfFamily fam_tc)
+
+       -- Arity check
        ; ASSERT( fam_name == tc_name )
          checkTc (length (hsQTvBndrs hs_tvs) == fam_pat_arity)
                  (wrongNumberOfParmsErr fam_pat_arity)
-       ; rhs_ty <- tcCheckLHsType rhs rhs_kind
+
+       -- Typecheck RHS
+       -- NB: the tcTyClTYVars call is here, /after/ the arity check
+       -- If the arity isn't right, tcTyClTyVars crashes (Trac #11136)
+       ; (tvs, rhs_ty) <- tcTyClTyVars tc_name hs_tvs $ \ tvs rhs_kind ->
+                          do { rhs_ty <- tcCheckLHsType rhs rhs_kind
+                             ; return (tvs, rhs_ty) }
        ; rhs_ty <- zonkTcTypeToType emptyZonkEnv rhs_ty
-       ; let fam_tc_tvs = tyConTyVars fam_tc
-             subst = zipTopTvSubst tvs (mkTyVarTys fam_tc_tvs)
-       ; return ( ASSERT( equalLength fam_tc_tvs tvs )
-                  Just (substTy subst rhs_ty, loc) ) }
+       ; let subst = ASSERT( equalLength tvs fam_tc_tvs )
+                     zipTopTvSubst tvs (mkTyVarTys fam_tc_tvs)
+       ; return ( Just (substTy subst rhs_ty, loc) ) }
     -- We check for well-formedness and validity later, in checkValidClass
 
 -------------------------
diff --git a/testsuite/tests/indexed-types/should_fail/T11136.hs b/testsuite/tests/indexed-types/should_fail/T11136.hs
new file mode 100644
index 0000000..5e821ee
--- /dev/null
+++ b/testsuite/tests/indexed-types/should_fail/T11136.hs
@@ -0,0 +1,7 @@
+{-# LANGUAGE TypeFamilies #-}
+
+module T11136 where
+
+class C a where
+  type D a
+  type instance D a x = x
diff --git a/testsuite/tests/indexed-types/should_fail/T11136.stderr b/testsuite/tests/indexed-types/should_fail/T11136.stderr
new file mode 100644
index 0000000..12a4ec0
--- /dev/null
+++ b/testsuite/tests/indexed-types/should_fail/T11136.stderr
@@ -0,0 +1,5 @@
+
+T11136.hs:7:3: error:
+    ? Number of parameters must match family declaration; expected 1
+    ? In the default type instance declaration for ?D?
+      In the class declaration for ?C?
diff --git a/testsuite/tests/indexed-types/should_fail/all.T b/testsuite/tests/indexed-types/should_fail/all.T
index 722a4d3..fa76360 100644
--- a/testsuite/tests/indexed-types/should_fail/all.T
+++ b/testsuite/tests/indexed-types/should_fail/all.T
@@ -138,3 +138,4 @@ test('T9554', normal, compile_fail, [''])
 test('T10141', normal, compile_fail, [''])
 test('T10817', normal, compile_fail, [''])
 test('T10899', normal, compile_fail, [''])
+test('T11136', normal, compile_fail, [''])


From git at git.haskell.org  Fri Nov 27 16:27:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 16:27:27 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: addressed some comments from bgamari and
 thomie (bc054c8)
Message-ID: <20151127162727.384973A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/bc054c8ea1c8b54c53c70b70b4f526b7493fa318/ghc

>---------------------------------------------------------------

commit bc054c8ea1c8b54c53c70b70b4f526b7493fa318
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Nov 27 16:52:19 2015 +0100

    addressed some comments from bgamari and thomie


>---------------------------------------------------------------

bc054c8ea1c8b54c53c70b70b4f526b7493fa318
 compiler/deSugar/Check.hs    | 102 ++++++++++++++++++-------------------------
 compiler/deSugar/Match.hs    |   6 +--
 compiler/deSugar/PmExpr.hs   |  46 +++++++++----------
 compiler/deSugar/TmOracle.hs |  40 ++++++++---------
 4 files changed, 85 insertions(+), 109 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc bc054c8ea1c8b54c53c70b70b4f526b7493fa318

From git at git.haskell.org  Fri Nov 27 16:27:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 16:27:29 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: added tests (bug reports) for pm check
 (3152f2c)
Message-ID: <20151127162729.EC8E43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/3152f2cfd2140051be68d2bc9eb172bd52e90ceb/ghc

>---------------------------------------------------------------

commit 3152f2cfd2140051be68d2bc9eb172bd52e90ceb
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Nov 27 16:57:23 2015 +0100

    added tests (bug reports) for pm check


>---------------------------------------------------------------

3152f2cfd2140051be68d2bc9eb172bd52e90ceb
 testsuite/tests/{ado => pmcheck}/Makefile          |  0
 .../should_compile/Makefile                        |  0
 testsuite/tests/pmcheck/should_compile/T2006.hs    | 13 ++++
 .../tests/pmcheck/should_compile/T2006.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T2204.hs    |  9 +++
 .../tests/pmcheck/should_compile/T2204.stderr      | 14 ++++
 testsuite/tests/pmcheck/should_compile/T3078.hs    | 12 ++++
 .../tests/pmcheck/should_compile/T3078.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T322.hs     | 29 +++++++++
 .../tests/pmcheck/should_compile/T322.stderr       |  0
 testsuite/tests/pmcheck/should_compile/T366.hs     | 10 +++
 .../tests/pmcheck/should_compile/T366.stderr       |  0
 testsuite/tests/pmcheck/should_compile/T3927.hs    | 13 ++++
 .../tests/pmcheck/should_compile/T3927.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T3927a.hs   | 15 +++++
 .../tests/pmcheck/should_compile/T3927a.stderr     |  0
 testsuite/tests/pmcheck/should_compile/T3927b.hs   | 75 ++++++++++++++++++++++
 .../tests/pmcheck/should_compile/T3927b.stderr     | 39 +++++++++++
 testsuite/tests/pmcheck/should_compile/T4139.hs    | 28 ++++++++
 .../tests/pmcheck/should_compile/T4139.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T6124.hs    | 14 ++++
 .../tests/pmcheck/should_compile/T6124.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T7669.hs    |  9 +++
 .../tests/pmcheck/should_compile/T7669.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T8970.hs    | 22 +++++++
 .../tests/pmcheck/should_compile/T8970.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T9951.hs    | 10 +++
 .../tests/pmcheck/should_compile/T9951.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T9951b.hs   |  7 ++
 .../tests/pmcheck/should_compile/T9951b.stderr     |  9 +++
 testsuite/tests/pmcheck/should_compile/all.T       | 19 ++++++
 31 files changed, 347 insertions(+)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3152f2cfd2140051be68d2bc9eb172bd52e90ceb

From git at git.haskell.org  Fri Nov 27 16:27:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 16:27:33 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: added more tests for pattern matching
 (ae06d93)
Message-ID: <20151127162733.BC5D23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/ae06d93da29bbcad1d0a0bc736176883bf758805/ghc

>---------------------------------------------------------------

commit ae06d93da29bbcad1d0a0bc736176883bf758805
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Nov 27 17:08:49 2015 +0100

    added more tests for pattern matching


>---------------------------------------------------------------

ae06d93da29bbcad1d0a0bc736176883bf758805
 testsuite/tests/pmcheck/should_compile/pmc001.hs   | 22 ++++++++++++++++++++
 .../tests/pmcheck/should_compile/pmc001.stderr     | 17 +++++++++++++++
 testsuite/tests/pmcheck/should_compile/pmc002.hs   |  7 +++++++
 .../tests/pmcheck/should_compile/pmc002.stderr     |  0
 testsuite/tests/pmcheck/should_compile/pmc003.hs   |  9 ++++++++
 .../tests/pmcheck/should_compile/pmc003.stderr     |  3 +++
 testsuite/tests/pmcheck/should_compile/pmc004.hs   | 16 +++++++++++++++
 .../tests/pmcheck/should_compile/pmc004.stderr     |  3 +++
 testsuite/tests/pmcheck/should_compile/pmc005.hs   | 12 +++++++++++
 .../tests/pmcheck/should_compile/pmc005.stderr     |  7 +++++++
 testsuite/tests/pmcheck/should_compile/pmc006.hs   | 22 ++++++++++++++++++++
 .../tests/pmcheck/should_compile/pmc006.stderr     |  0
 testsuite/tests/pmcheck/should_compile/pmc007.hs   | 20 ++++++++++++++++++
 .../tests/pmcheck/should_compile/pmc007.stderr     | 24 ++++++++++++++++++++++
 14 files changed, 162 insertions(+)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ae06d93da29bbcad1d0a0bc736176883bf758805

From git at git.haskell.org  Fri Nov 27 16:42:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 16:42:49 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: enabled the new tests (6327bd2)
Message-ID: <20151127164249.9EFDA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/6327bd24e23d483d79a30b22a5c5175ba3368742/ghc

>---------------------------------------------------------------

commit 6327bd24e23d483d79a30b22a5c5175ba3368742
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Nov 27 17:42:52 2015 +0100

    enabled the new tests


>---------------------------------------------------------------

6327bd24e23d483d79a30b22a5c5175ba3368742
 testsuite/tests/pmcheck/should_compile/all.T | 30 +++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/testsuite/tests/pmcheck/should_compile/all.T b/testsuite/tests/pmcheck/should_compile/all.T
index f4185ac..3aac879 100644
--- a/testsuite/tests/pmcheck/should_compile/all.T
+++ b/testsuite/tests/pmcheck/should_compile/all.T
@@ -7,13 +7,29 @@ def f( name, opts ):
 
 setTestOpts(f)
 
-# Overloaded Lists
-test('T9951a', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns'])
+# Bug reports / feature requests
+test('T2006', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T2204', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T3078', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T322',  only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T366',  only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T3927a',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T3927b',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T3927', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T4139', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T6124', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T7669', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T8970', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T9951b',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T9951', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 
-# Overloaded Strings
-test('T9951b', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns'])
+# Other tests
+test('pmc001', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('pmc002', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('pmc003', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('pmc004', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('pmc005', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('pmc006', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('pmc007', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 
-# other examples..
-# test('ds002', normal, compile, [''])
-# test('ds003', normal, compile, [''])
 


From git at git.haskell.org  Fri Nov 27 17:32:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 17:32:13 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11067' created
Message-ID: <20151127173213.1668C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New branch : wip/T11067
Referencing: 00b15941cfed5abc5d62d9b8f2477aec2d6f6cf5

From git at git.haskell.org  Fri Nov 27 17:32:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 17:32:15 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Add mapAccumBagL (7788f82)
Message-ID: <20151127173215.AF3013A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/7788f825d17c27009795a5f2862e7d250051b20a/ghc

>---------------------------------------------------------------

commit 7788f825d17c27009795a5f2862e7d250051b20a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 27 14:28:12 2015 +0000

    Add mapAccumBagL


>---------------------------------------------------------------

7788f825d17c27009795a5f2862e7d250051b20a
 compiler/utils/Bag.hs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/compiler/utils/Bag.hs b/compiler/utils/Bag.hs
index 09fc00a..2ac05e7 100644
--- a/compiler/utils/Bag.hs
+++ b/compiler/utils/Bag.hs
@@ -20,7 +20,7 @@ module Bag (
         listToBag, bagToList,
         foldrBagM, foldlBagM, mapBagM, mapBagM_,
         flatMapBagM, flatMapBagPairM,
-        mapAndUnzipBagM, mapAccumBagLM
+        mapAndUnzipBagM, mapAccumBagL, mapAccumBagLM
     ) where
 
 import Outputable
@@ -28,7 +28,7 @@ import Util
 
 import MonadUtils
 import Data.Data
-import Data.List ( partition )
+import Data.List ( partition, mapAccumL )
 import qualified Data.Foldable as Foldable
 
 infixr 3 `consBag`
@@ -241,6 +241,18 @@ mapAndUnzipBagM f (ListBag xs)    = do ts <- mapM f xs
                                        let (rs,ss) = unzip ts
                                        return (ListBag rs, ListBag ss)
 
+mapAccumBagL ::(acc -> x -> (acc, y)) -- ^ combining funcction
+            -> acc                    -- ^ initial state
+            -> Bag x                  -- ^ inputs
+            -> (acc, Bag y)           -- ^ final state, outputs
+mapAccumBagL _ s EmptyBag        = (s, EmptyBag)
+mapAccumBagL f s (UnitBag x)     = let (s1, x1) = f s x in (s1, UnitBag x1)
+mapAccumBagL f s (TwoBags b1 b2) = let (s1, b1') = mapAccumBagL f s  b1
+                                       (s2, b2') = mapAccumBagL f s1 b2
+                                   in (s2, TwoBags b1' b2')
+mapAccumBagL f s (ListBag xs)    = let (s', xs') = mapAccumL f s xs
+                                   in (s', ListBag xs')
+
 mapAccumBagLM :: Monad m
             => (acc -> x -> m (acc, y)) -- ^ combining funcction
             -> acc                      -- ^ initial state


From git at git.haskell.org  Fri Nov 27 17:32:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 17:32:18 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Recursive superclasses -- yay (bf84ebb)
Message-ID: <20151127173218.5D10A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/bf84ebbe339680c2d7cf9e0e93d48ab9c2be9a60/ghc

>---------------------------------------------------------------

commit bf84ebbe339680c2d7cf9e0e93d48ab9c2be9a60
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 27 14:29:08 2015 +0000

    Recursive superclasses -- yay
    
    Work in progres with Dimitrios


>---------------------------------------------------------------

bf84ebbe339680c2d7cf9e0e93d48ab9c2be9a60
 compiler/typecheck/TcCanonical.hs                  | 72 +++++++++-------------
 compiler/typecheck/TcErrors.hs                     |  2 +-
 compiler/typecheck/TcInteract.hs                   | 26 +++++---
 compiler/typecheck/TcRnTypes.hs                    |  8 ++-
 compiler/typecheck/TcSMonad.hs                     | 35 +++++++++--
 compiler/typecheck/TcSimplify.hs                   | 66 ++++++++++++--------
 compiler/typecheck/TcTyClsDecls.hs                 |  8 ++-
 compiler/typecheck/TcTyDecls.hs                    | 40 +++++++++++-
 compiler/typecheck/TcType.hs                       | 58 ++++++++++-------
 .../indexed-types/should_compile/T3017.stderr      |  2 +-
 .../indexed-types/should_compile/T8889.stderr      |  4 +-
 .../tests/indexed-types/should_fail/T1897b.stderr  | 22 +++----
 12 files changed, 220 insertions(+), 123 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc bf84ebbe339680c2d7cf9e0e93d48ab9c2be9a60

From git at git.haskell.org  Fri Nov 27 17:32:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 17:32:21 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Wibbles (00b1594)
Message-ID: <20151127173221.0F7753A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/00b15941cfed5abc5d62d9b8f2477aec2d6f6cf5/ghc

>---------------------------------------------------------------

commit 00b15941cfed5abc5d62d9b8f2477aec2d6f6cf5
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 27 17:31:56 2015 +0000

    Wibbles


>---------------------------------------------------------------

00b15941cfed5abc5d62d9b8f2477aec2d6f6cf5
 compiler/main/DynFlags.hs                          |   2 +
 compiler/typecheck/TcSimplify.hs                   |   6 +-
 compiler/typecheck/TcTyClsDecls.hs                 |  13 +-
 compiler/typecheck/TcTyDecls.hs                    | 170 ++++++++-------------
 libraries/ghc-prim/GHC/Classes.hs                  |   3 +-
 .../tests/simplCore/should_compile/T4398.stderr    |  20 +--
 testsuite/tests/typecheck/should_compile/T10100.hs |   1 +
 testsuite/tests/typecheck/should_compile/T10109.hs |   1 +
 testsuite/tests/typecheck/should_compile/T10564.hs |   1 +
 .../tests/typecheck/should_compile/T9939.stderr    |  31 ++--
 testsuite/tests/typecheck/should_compile/tc256.hs  |   2 +-
 .../should_fail/CustomTypeErrors02.stderr          |  12 +-
 testsuite/tests/typecheck/should_fail/T5853.stderr |  30 ++--
 testsuite/tests/typecheck/should_fail/T8883.stderr |  12 +-
 testsuite/tests/typecheck/should_fail/T9415.stderr |  16 +-
 testsuite/tests/typecheck/should_fail/T9739.stderr |  18 ++-
 .../tests/typecheck/should_fail/tcfail027.stderr   |  16 +-
 .../tests/typecheck/should_fail/tcfail216.stderr   |   7 +-
 .../tests/typecheck/should_fail/tcfail217.stderr   |   7 +-
 19 files changed, 164 insertions(+), 204 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 00b15941cfed5abc5d62d9b8f2477aec2d6f6cf5

From git at git.haskell.org  Fri Nov 27 17:45:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 17:45:24 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Wibbles (60e4a58)
Message-ID: <20151127174524.6A94F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/60e4a5860773ed0030131141a98aa3d30a6a894f/ghc

>---------------------------------------------------------------

commit 60e4a5860773ed0030131141a98aa3d30a6a894f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 27 17:45:43 2015 +0000

    Wibbles


>---------------------------------------------------------------

60e4a5860773ed0030131141a98aa3d30a6a894f
 compiler/typecheck/TcTyDecls.hs                    | 64 ++++++++--------------
 .../tests/indexed-types/should_compile/T10318.hs   | 35 ++++++++++++
 testsuite/tests/indexed-types/should_compile/all.T |  1 +
 3 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/compiler/typecheck/TcTyDecls.hs b/compiler/typecheck/TcTyDecls.hs
index 3813d5f..080808d 100644
--- a/compiler/typecheck/TcTyDecls.hs
+++ b/compiler/typecheck/TcTyDecls.hs
@@ -165,48 +165,30 @@ exmaple, is fine
 even though C's full definition uses C.
 
 Making the check static also makes it conservative.  Eg
+  type family F a
+  class F a => C a
+Here an instance of (F a) might mention C:
+  type instance F [a] = C a
+and now we'd have a loop.
+
+The static check works like this, starting with C
+  * Look at C's superclass predicates
+  * If any is a type-function application, fail
+  * If any has C at the head, fail
+  * If any has a type class D at the head,
+    make the same test with D
+
+A tricky point is: what if there is a type variable at the head:
   class f a => C f a
-  class C a => D a
-Here if we produced a constraint (C D a), then its
-superclass would be (D a)
-
-
-We want definitions such as:
-
-  class C cls a where cls a => a -> a
-  class C D a => D a where
-
-to be accepted, even though a naive acyclicity check would reject the
-program as having a cycle between D and its superclass.  Why? Because
-when we instantiate
-     D ty1
-we get the superclas
-     C D ty1
-and C has no superclasses, so we have terminated with a finite set.
-
-More precisely, the rule is this: the superclasses sup_C of a class C
-are rejected iff:
-
-  C \elem expand(sup_C)
-
-Where expand is defined as follows:
-
-(1)  expand(a ty1 ... tyN) = expand(ty1) \union ... \union expand(tyN)
-
-(2)  expand(D ty1 ... tyN) = {D}
-                             \union sup_D[ty1/x1, ..., tyP/xP]
-                             \union expand(ty(P+1)) ... \union expand(tyN)
-           where (D x1 ... xM) is a class, P = min(M,N)
-
-(3)  expand(T ty1 ... tyN) = expand(ty1) \union ... \union expand(tyN)
-        where T is not a class
-
-Eqn (1) is conservative; when there's a type variable at the head,
-look in all the argument types.  Eqn (2) expands superclasses; the
-third component of the union is like Eqn (1).  Eqn (3) happens mainly
-when the context is a (constraint) tuple, such as (Eq a, Show a).
-
-Furthermore, expand always looks through type synonyms.
+Can this loop with some instantation of C? Well, no. You might try
+  C C a
+to instantiate 'f' with 'C', but that's ill kinded.  So what about
+  C (C ?) a
+To make it loop you'd need an infinte thing
+  C (C (C ... )) a
+
+So I don't think we can make a loop through a type variable in
+the head.
 -}
 
 checkClassCycles :: Class -> Maybe SDoc
diff --git a/testsuite/tests/indexed-types/should_compile/T10318.hs b/testsuite/tests/indexed-types/should_compile/T10318.hs
new file mode 100644
index 0000000..04a2ca1
--- /dev/null
+++ b/testsuite/tests/indexed-types/should_compile/T10318.hs
@@ -0,0 +1,35 @@
+{-# LANGUAGE FlexibleContexts, TypeSynonymInstances,
+             FlexibleInstances, TypeFamilies,
+             UndecidableSuperClasses #-}
+
+module T10318 where
+
+-- | Product of non-zero elements always non-zero.
+-- Every integral domain has a field of fractions.
+-- The field of fractions of any field is itself.
+class (Frac (Frac a) ~ Frac a, Fractional (Frac a), IntegralDomain (Frac a))
+  => IntegralDomain a where
+  type Frac a :: *
+  embed :: a -> Frac a
+
+instance IntegralDomain Integer where
+  type Frac Integer = Rational
+  embed = fromInteger
+
+instance IntegralDomain Rational where
+  type Frac Rational = Rational
+  embed = id
+
+g :: IntegralDomain a => a -> a
+g x = g x
+
+h :: a -> Frac a
+h x = h x
+
+-- This is the test function
+
+f :: IntegralDomain a => a -> Frac a
+f x = g (h (h x))
+  -- Given: IntegralDomain (Frac a)
+  -- Wanted: IntegralDomain (Frac (Frac a))
+
diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T
index 39b8a3a..7eea00e 100644
--- a/testsuite/tests/indexed-types/should_compile/all.T
+++ b/testsuite/tests/indexed-types/should_compile/all.T
@@ -265,3 +265,4 @@ test('T10753', normal, compile, [''])
 test('T10806', normal, compile_fail, [''])
 test('T10815', normal, compile, [''])
 test('T10931', normal, compile, [''])
+test('T10318', normal, compile, [''])


From git at git.haskell.org  Fri Nov 27 18:18:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 27 Nov 2015 18:18:30 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Use the HsTyVarBndrs in type checking
 (0c35b36)
Message-ID: <20151127181830.82CCA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/0c35b3641b0520df9edda6aae80e77361b315337/ghc

>---------------------------------------------------------------

commit 0c35b3641b0520df9edda6aae80e77361b315337
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri Nov 27 20:18:19 2015 +0200

    Use the HsTyVarBndrs in type checking


>---------------------------------------------------------------

0c35b3641b0520df9edda6aae80e77361b315337
 compiler/deSugar/DsMeta.hs         | 2 +-
 compiler/parser/RdrHsSyn.hs        | 7 ++++---
 compiler/rename/RnSource.hs        | 2 +-
 compiler/typecheck/TcTyClsDecls.hs | 8 +++-----
 utils/haddock                      | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index 176447c..d6699fe 100644
--- a/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
@@ -659,7 +659,7 @@ repC tvs (L _ (ConDeclGADT { con_names = cons
        ; b <- dsExtendMetaEnv (mkNameEnv binds) $ -- Binds some of the con_tvs
          addTyVarBinds ex_tvs $ \ ex_bndrs ->   -- Binds the remaining con_tvs
     do { cons1     <- mapM lookupLOcc cons -- See Note [Binders and occurrences]
-       ; let (details,_,_) = gadtDeclDetails res_ty
+       ; let (details,_,_,_) = gadtDeclDetails res_ty
        ; c'        <- mapM (\c -> repConstr c details) cons1
        ; ctxt'     <- repContext eq_ctxt
        ; rep2 forallCName ([unC ex_bndrs, unC ctxt'] ++ (map unC c')) }
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index baf4bb6..b3175dd 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -542,10 +542,11 @@ mkGadtDecl' names lbody_ty@(L loc body_ty)
 -}
 
 -- AZ:TODO: this probably belongs in a different module
-gadtDeclDetails :: LHsSigType name -> (HsConDeclDetails name,LHsType name,LHsContext name)
-gadtDeclDetails (HsIB {hsib_body = lbody_ty}) = (details,res_ty,cxt)
+gadtDeclDetails :: LHsSigType name
+                -> (HsConDeclDetails name,LHsType name,LHsContext name,[LHsTyVarBndr name])
+gadtDeclDetails (HsIB {hsib_body = lbody_ty}) = (details,res_ty,cxt,tvs)
   where
-    (_tvs, cxt, tau) = splitLHsSigmaTy lbody_ty
+    (tvs, cxt, tau) = splitLHsSigmaTy lbody_ty
     (details, res_ty)           -- See Note [Sorting out the result type]
       = case tau of
           L _ (HsFunTy (L l (HsRecTy flds)) res_ty)
diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index 3a7e8b8..fce2ed7 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1586,7 +1586,7 @@ rnConDecl decl@(ConDeclH98 { con_name = name, con_qvars = qtvs
         (free_kvs, _) = get_rdr_tvs arg_tys
 
 rnConDecl decl@(ConDeclGADT { con_names = names, con_type = ty
-                        , con_doc = mb_doc })
+                            , con_doc = mb_doc })
   = do  { mapM_ (addLocM checkConName) names
         ; new_names    <- mapM lookupLocatedTopBndrRn names
         ; let doc = ConDeclCtx new_names
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 6bdcc27..c5c7c45 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -513,7 +513,6 @@ kcConDecl (ConDeclGADT { con_names = names
                        , con_type = ty })
   = addErrCtxt (dataConCtxtName names) $
     do { traceTc "kcConDecl:GADT:" (ppr ty)
-       -- ; kcHsSigType names ty
        ; _ <- tcGadtSigType (ppr names) (unLoc $ head names) ty
        ; traceTc "kcConDecl:GADT done:" (ppr ty)
        }
@@ -1401,7 +1400,7 @@ tcConDecl _new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; traceTc "tcConDecl 2" (ppr names $$ ppr field_lbls)
        ; let
            buildOneDataCon (L _ name) = do
-             { let (hs_details,_,_) = gadtDeclDetails ty
+             { let (hs_details,_,_,_tvs) = gadtDeclDetails ty
              ; is_infix <- tcConIsInfixGADT name hs_details
              ; rep_nm   <- newTyConRepName name
 
@@ -1423,10 +1422,9 @@ tcConDecl _new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
 tcGadtSigType :: SDoc -> Name -> LHsSigType Name
               -> TcM ([PredType],[HsSrcBang], [FieldLabel], [Type], Type)
 tcGadtSigType doc name ty@(HsIB { hsib_kvs = kvs, hsib_tvs = tvs, hsib_body = _bty})
-  = do {
-       ; let hs_tvs = HsQTvs { hsq_kvs = kvs, hsq_tvs = map (noLoc . UserTyVar . noLoc) tvs }
-       ; let (hs_details',res_ty',cxt) = gadtDeclDetails ty
+  = do { let (hs_details',res_ty',cxt,gtvs) = gadtDeclDetails ty
        ; (hs_details,res_ty) <- tcUpdateConResult doc hs_details' res_ty'
+       ; let hs_tvs = HsQTvs { hsq_kvs = kvs, hsq_tvs = gtvs ++ map (noLoc . UserTyVar . noLoc) tvs }
        ; (ctxt, arg_tys, res_ty, field_lbls, stricts)
            <- tcHsQTyVars hs_tvs $ \ _ ->
               do { traceTc "tcConDecl" (doc <+> text "tvs:" <+> ppr hs_tvs)
diff --git a/utils/haddock b/utils/haddock
index bb1f980..628c804 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit bb1f9806d88c16ce772f506eff48ae3d5588d173
+Subproject commit 628c80444e55289cfb74823555f80e1dabfa82ee


From git at git.haskell.org  Sat Nov 28 14:44:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 14:44:01 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Fixing tests (01f6e5f)
Message-ID: <20151128144401.327D33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/01f6e5f59ab42d60714712fe3eac855012c35d85/ghc

>---------------------------------------------------------------

commit 01f6e5f59ab42d60714712fe3eac855012c35d85
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri Nov 27 21:33:39 2015 +0200

    Fixing tests


>---------------------------------------------------------------

01f6e5f59ab42d60714712fe3eac855012c35d85
 compiler/typecheck/TcTyClsDecls.hs                 | 4 ++--
 testsuite/tests/ghc-api/annotations/T10399.stdout  | 2 --
 testsuite/tests/ghc-api/annotations/all.T          | 2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index c5c7c45..d40d3a4 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -1427,8 +1427,8 @@ tcGadtSigType doc name ty@(HsIB { hsib_kvs = kvs, hsib_tvs = tvs, hsib_body = _b
        ; let hs_tvs = HsQTvs { hsq_kvs = kvs, hsq_tvs = gtvs ++ map (noLoc . UserTyVar . noLoc) tvs }
        ; (ctxt, arg_tys, res_ty, field_lbls, stricts)
            <- tcHsQTyVars hs_tvs $ \ _ ->
-              do { traceTc "tcConDecl" (doc <+> text "tvs:" <+> ppr hs_tvs)
-                 ; traceTc "tcConDecl:" (text "res_ty:" <+> ppr res_ty)
+              do { traceTc "tcGadtSigType" (doc <+> text "tvs:" <+> ppr hs_tvs)
+                 ; traceTc "tcGadtSigType:" (text "res_ty:" <+> ppr res_ty)
                  ; ctxt <- tcHsContext cxt
                  ; btys <- tcConArgs DataType hs_details
                  ; ty' <- tcHsLiftedType res_ty
diff --git a/testsuite/tests/ghc-api/annotations/T10399.stdout b/testsuite/tests/ghc-api/annotations/T10399.stdout
index 58a4093..612ecfd 100644
--- a/testsuite/tests/ghc-api/annotations/T10399.stdout
+++ b/testsuite/tests/ghc-api/annotations/T10399.stdout
@@ -44,9 +44,7 @@
 ((Test10399.hs:15:45-46,AnnBang), [Test10399.hs:15:45]),
 ((Test10399.hs:15:45-46,AnnRarrow), [Test10399.hs:15:48-49]),
 ((Test10399.hs:15:45-64,AnnRarrow), [Test10399.hs:15:48-49]),
-((Test10399.hs:(16,5)-(17,69),AnnCloseP), [Test10399.hs:17:69]),
 ((Test10399.hs:(16,5)-(17,69),AnnDcolon), [Test10399.hs:16:12-13]),
-((Test10399.hs:(16,5)-(17,69),AnnOpenP), [Test10399.hs:16:27]),
 ((Test10399.hs:(16,15)-(17,69),AnnDot), [Test10399.hs:16:25]),
 ((Test10399.hs:(16,15)-(17,69),AnnForall), [Test10399.hs:16:15-20]),
 ((Test10399.hs:(16,27)-(17,69),AnnCloseP), [Test10399.hs:17:69]),
diff --git a/testsuite/tests/ghc-api/annotations/all.T b/testsuite/tests/ghc-api/annotations/all.T
index 4104bce..c7c8542 100644
--- a/testsuite/tests/ghc-api/annotations/all.T
+++ b/testsuite/tests/ghc-api/annotations/all.T
@@ -16,7 +16,7 @@ test('T10358',      normal, run_command, ['$MAKE -s --no-print-directory T10358'
 test('T10278',      normal, run_command, ['$MAKE -s --no-print-directory T10278'])
 test('T10354',      normal, run_command, ['$MAKE -s --no-print-directory T10354'])
 test('T10396',      normal, run_command, ['$MAKE -s --no-print-directory T10396'])
-test('T10399',      expect_broken(11028), run_command, ['$MAKE -s --no-print-directory T10399'])
+test('T10399',      normal, run_command, ['$MAKE -s --no-print-directory T10399'])
 test('T10313',      normal, run_command, ['$MAKE -s --no-print-directory T10313'])
 test('T11018',      normal, run_command, ['$MAKE -s --no-print-directory T11018'])
 test('bundle-export', normal, run_command, ['$MAKE -s --no-print-directory bundle-export'])
diff --git a/testsuite/tests/ghc-api/landmines/landmines.stdout b/testsuite/tests/ghc-api/landmines/landmines.stdout
index db0b651..551b2cf 100644
--- a/testsuite/tests/ghc-api/landmines/landmines.stdout
+++ b/testsuite/tests/ghc-api/landmines/landmines.stdout
@@ -1,4 +1,4 @@
 (12,12,7)
-(66,62,0)
+(63,63,0)
 (13,13,7)
 (10,10,7)


From git at git.haskell.org  Sat Nov 28 14:44:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 14:44:03 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Down to 7 failure,
 all related to bad ppr (8a10538)
Message-ID: <20151128144403.DB1423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/8a105381fc25212fbc08ea55f0ce244ce771b349/ghc

>---------------------------------------------------------------

commit 8a105381fc25212fbc08ea55f0ce244ce771b349
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sat Nov 28 16:43:21 2015 +0200

    Down to 7 failure, all related to bad ppr
    
    6 show forall when they shouldn't or vice versa, one does not do
    InfixCon correctly.


>---------------------------------------------------------------

8a105381fc25212fbc08ea55f0ce244ce771b349
 compiler/deSugar/DsMeta.hs         | 114 ++++++++++++-------------------
 compiler/hsSyn/Convert.hs          |   6 +-
 compiler/hsSyn/HsDecls.hs          |   2 -
 compiler/hsSyn/HsUtils.hs          |  13 ----
 compiler/rename/RnNames.hs         |  11 ---
 compiler/rename/RnSource.hs        |   4 --
 compiler/rename/RnTypes.hs         |  22 ++----
 compiler/typecheck/TcHsType.hs     |   4 +-
 compiler/typecheck/TcTyClsDecls.hs | 136 ++-----------------------------------
 9 files changed, 63 insertions(+), 249 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8a105381fc25212fbc08ea55f0ce244ce771b349

From git at git.haskell.org  Sat Nov 28 17:42:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 17:42:54 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Fix Linux to Windows
 cross-compile (194b201)
Message-ID: <20151128174254.7F6C83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/194b201b2bd3eaf003fa89ca8a566f518f0e1142

>---------------------------------------------------------------

commit 194b201b2bd3eaf003fa89ca8a566f518f0e1142
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Thu Oct 29 09:11:38 2015 +1100

    Fix Linux to Windows cross-compile
    
    The #include of <Shlobj.h> doesn't work when cross-compiling from
    Linux to Windows because the Linux file system is case sensitive and
    on Linux the file is <shlobj.h>. This change should not affect Windows
    builds because the Windows file system is case insensitive.


>---------------------------------------------------------------

194b201b2bd3eaf003fa89ca8a566f518f0e1142
 System/Console/Haskeline/Directory.hsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Console/Haskeline/Directory.hsc b/System/Console/Haskeline/Directory.hsc
index b2deb22..9eb0952 100644
--- a/System/Console/Haskeline/Directory.hsc
+++ b/System/Console/Haskeline/Directory.hsc
@@ -19,7 +19,7 @@ import qualified System.Directory
 #endif
 
 #include <windows.h>
-#include <Shlobj.h>
+#include <shlobj.h>
 
 ##if defined(i386_HOST_ARCH)
 ## define WINDOWS_CCONV stdcall


From git at git.haskell.org  Sat Nov 28 17:42:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 17:42:56 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Merge pull request #29 from
 erikd/master (b9fc9e9)
Message-ID: <20151128174256.852F73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/b9fc9e97dab5e70e8d6daa940df7b28e3e914ba9

>---------------------------------------------------------------

commit b9fc9e97dab5e70e8d6daa940df7b28e3e914ba9
Merge: fb5b288 194b201
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Thu Oct 29 08:06:10 2015 -0700

    Merge pull request #29 from erikd/master
    
    Fix Linux to Windows cross-compile



>---------------------------------------------------------------

b9fc9e97dab5e70e8d6daa940df7b28e3e914ba9
 System/Console/Haskeline/Directory.hsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sat Nov 28 17:42:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 17:42:58 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Generalise constraints for
 InputT instances (7289f1f)
Message-ID: <20151128174258.8AADA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/7289f1f65311f6072e7cb4321cf01e0fa81d3dae

>---------------------------------------------------------------

commit 7289f1f65311f6072e7cb4321cf01e0fa81d3dae
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 23 08:55:21 2015 +0100

    Generalise constraints for InputT instances
    
    I'm not sure why the code was written the way it was, but it seems we
    can do better by letting GHC directly reuse `ReaderT`'s instances as
    well as relaxing the constraints from
    
        instance Monad m       => Functor     (InputT m)
        instance Monad m       => Applicative (InputT m)
        instance Monad m       => Monad       (InputT m)
    
    to
    
        instance Functor     m => Functor     (InputT m)
        instance Applicative m => Applicative (InputT m)
        instance Monad       m => Monad       (InputT m)
    
    This looks the same on GHC 7.8 (pre-AMP) as well as GHC 7.10 (post-AMP)


>---------------------------------------------------------------

7289f1f65311f6072e7cb4321cf01e0fa81d3dae
 System/Console/Haskeline/InputT.hs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/System/Console/Haskeline/InputT.hs b/System/Console/Haskeline/InputT.hs
index 383cf5f..c1ee55e 100644
--- a/System/Console/Haskeline/InputT.hs
+++ b/System/Console/Haskeline/InputT.hs
@@ -47,19 +47,12 @@ newtype InputT m a = InputT {unInputT ::
                                 (ReaderT (IORef KillRing)
                                 (ReaderT Prefs
                                 (ReaderT (Settings m) m)))) a}
-                            deriving (Monad, MonadIO, MonadException)
+                            deriving (Functor, Applicative, Monad, MonadIO, MonadException)
                 -- NOTE: we're explicitly *not* making InputT an instance of our
                 -- internal MonadState/MonadReader classes.  Otherwise haddock
                 -- displays those instances to the user, and it makes it seem like
                 -- we implement the mtl versions of those classes.
 
-instance Monad m => Functor (InputT m) where
-    fmap = liftM
-
-instance Monad m => Applicative (InputT m) where
-    pure = return
-    (<*>) = ap
-
 instance MonadTrans InputT where
     lift = InputT . lift . lift . lift . lift . lift
 


From git at git.haskell.org  Sat Nov 28 17:43:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 17:43:00 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Canonicalise AMP instances
 (b366b10)
Message-ID: <20151128174300.8FE653A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/b366b10867c351097ce94b58c3bc637f41acc5e1

>---------------------------------------------------------------

commit b366b10867c351097ce94b58c3bc637f41acc5e1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 23 09:03:52 2015 +0100

    Canonicalise AMP instances
    
    This flips the AMP instance definitions into canonical form and makes
    the code a bit more future proof.


>---------------------------------------------------------------

b366b10867c351097ce94b58c3bc637f41acc5e1
 System/Console/Haskeline/Command.hs | 4 ++--
 System/Console/Haskeline/Monads.hs  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/System/Console/Haskeline/Command.hs b/System/Console/Haskeline/Command.hs
index 986fd42..1a0d915 100644
--- a/System/Console/Haskeline/Command.hs
+++ b/System/Console/Haskeline/Command.hs
@@ -66,11 +66,11 @@ instance Monad m => Functor (CmdM m) where
     fmap = liftM
 
 instance Monad m => Applicative (CmdM m) where
-    pure  = return
+    pure  = Result
     (<*>) = ap
 
 instance Monad m => Monad (CmdM m) where
-    return = Result
+    return = pure
 
     GetKey km >>= g = GetKey $ fmap (>>= g) km
     DoEffect e f >>= g = DoEffect e (f >>= g)
diff --git a/System/Console/Haskeline/Monads.hs b/System/Console/Haskeline/Monads.hs
index 6668e96..d5fc1bb 100644
--- a/System/Console/Haskeline/Monads.hs
+++ b/System/Console/Haskeline/Monads.hs
@@ -77,11 +77,11 @@ instance Monad m => Functor (StateT s m) where
     fmap  = liftM
 
 instance Monad m => Applicative (StateT s m) where
-    pure  = return
+    pure x = StateT $ \s -> return $ \f -> f x s
     (<*>) = ap
 
 instance Monad m => Monad (StateT s m) where
-    return x = StateT $ \s -> return $ \f -> f x s
+    return = pure
     StateT f >>= g = StateT $ \s -> do
         useX <- f s
         useX $ \x s' -> getStateTFunc (g x) s'


From git at git.haskell.org  Sat Nov 28 17:43:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 17:43:02 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Merge pull request #32 from
 hvr/pr/canonical-monad-instance (5c0f472)
Message-ID: <20151128174302.961013A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/5c0f472bded385c0347116370ef3ef659b49f5ed

>---------------------------------------------------------------

commit 5c0f472bded385c0347116370ef3ef659b49f5ed
Merge: b9fc9e9 b366b10
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Mon Nov 23 07:41:48 2015 -0800

    Merge pull request #32 from hvr/pr/canonical-monad-instance
    
    Canonicalise AMP instances



>---------------------------------------------------------------

5c0f472bded385c0347116370ef3ef659b49f5ed
 System/Console/Haskeline/Command.hs | 4 ++--
 System/Console/Haskeline/Monads.hs  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


From git at git.haskell.org  Sat Nov 28 17:43:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 17:43:04 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Merge pull request #31 from
 hvr/pr/generalise-inputt (06349b7)
Message-ID: <20151128174304.9C4C53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/06349b7ffc503ba0c8bdf0293d1adc6026da97bd

>---------------------------------------------------------------

commit 06349b7ffc503ba0c8bdf0293d1adc6026da97bd
Merge: 5c0f472 7289f1f
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Mon Nov 23 07:43:19 2015 -0800

    Merge pull request #31 from hvr/pr/generalise-inputt
    
    Generalise constraints for InputT instances



>---------------------------------------------------------------

06349b7ffc503ba0c8bdf0293d1adc6026da97bd
 System/Console/Haskeline/InputT.hs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)


From git at git.haskell.org  Sat Nov 28 17:43:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 17:43:16 +0000 (UTC)
Subject: [commit: packages/terminfo] master: Canonicalise Monad instance
 (632c4bf)
Message-ID: <20151128174316.B001B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/terminfo

On branch  : master
Link       : http://git.haskell.org/packages/terminfo.git/commitdiff/632c4bf0d7390b44ea818b7530bed1869da27788

>---------------------------------------------------------------

commit 632c4bf0d7390b44ea818b7530bed1869da27788
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 23 09:25:29 2015 +0100

    Canonicalise Monad instance
    
    This refactors the Monad instance of `Capability` into the recommended
    canonical form and makes the code a bit more future proof.


>---------------------------------------------------------------

632c4bf0d7390b44ea818b7530bed1869da27788
 System/Console/Terminfo/Base.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Console/Terminfo/Base.hs b/System/Console/Terminfo/Base.hs
index 87ac774..1f60679 100644
--- a/System/Console/Terminfo/Base.hs
+++ b/System/Console/Terminfo/Base.hs
@@ -198,11 +198,11 @@ instance Functor Capability where
     fmap f (Capability g) = Capability $ \t -> fmap (fmap f) (g t)
 
 instance Applicative Capability where
-    pure  = return
+    pure = Capability . const . pure . Just
     (<*>) = ap
 
 instance Monad Capability where
-    return = Capability . const . return . Just
+    return = pure
     Capability f >>= g = Capability $ \t -> do
         mx <- f t
         case mx of


From git at git.haskell.org  Sat Nov 28 17:43:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 17:43:18 +0000 (UTC)
Subject: [commit: packages/terminfo] master: Merge pull request #10 from
 hvr/pr/canonical-monad-instance (15ca1cb)
Message-ID: <20151128174318.B5FB73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/terminfo

On branch  : master
Link       : http://git.haskell.org/packages/terminfo.git/commitdiff/15ca1cb3b1e1b0d410544abd69e7ffcf727fc970

>---------------------------------------------------------------

commit 15ca1cb3b1e1b0d410544abd69e7ffcf727fc970
Merge: 68e88c4 632c4bf
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Mon Nov 23 07:41:05 2015 -0800

    Merge pull request #10 from hvr/pr/canonical-monad-instance
    
    Canonicalise Monad instance



>---------------------------------------------------------------

15ca1cb3b1e1b0d410544abd69e7ffcf727fc970
 System/Console/Terminfo/Base.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


From git at git.haskell.org  Sat Nov 28 18:50:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 18:50:30 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Moved the UniqSupply-specific functions
 from Check to UniqSupply (4cfc381)
Message-ID: <20151128185030.198C73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/4cfc381775da75449fa869e417ebd2dc31951392/ghc

>---------------------------------------------------------------

commit 4cfc381775da75449fa869e417ebd2dc31951392
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sat Nov 28 14:38:42 2015 +0100

    Moved the UniqSupply-specific functions from Check to UniqSupply


>---------------------------------------------------------------

4cfc381775da75449fa869e417ebd2dc31951392
 compiler/basicTypes/UniqSupply.hs | 21 +++++++++++++++++++++
 compiler/deSugar/Check.hs         | 18 ------------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/compiler/basicTypes/UniqSupply.hs b/compiler/basicTypes/UniqSupply.hs
index 67a7281..16734bc 100644
--- a/compiler/basicTypes/UniqSupply.hs
+++ b/compiler/basicTypes/UniqSupply.hs
@@ -15,6 +15,7 @@ module UniqSupply (
 
         mkSplitUniqSupply,
         splitUniqSupply, listSplitUniqSupply,
+        splitUniqSupply3, splitUniqSupply4,
 
         -- * Unique supply monad and its abstraction
         UniqSM, MonadUnique(..), liftUs,
@@ -22,6 +23,7 @@ module UniqSupply (
         -- ** Operations on the monad
         initUs, initUs_,
         lazyThenUs, lazyMapUs,
+        getUniqueSupplyM3,
 
         -- * Set supply strategy
         initUniqSupply
@@ -97,6 +99,22 @@ uniqFromSupply  (MkSplitUniqSupply n _ _)  = mkUniqueGrimily n
 uniqsFromSupply (MkSplitUniqSupply n _ s2) = mkUniqueGrimily n : uniqsFromSupply s2
 takeUniqFromSupply (MkSplitUniqSupply n s1 _) = (mkUniqueGrimily n, s1)
 
+-- | Build three 'UniqSupply' from a single one,
+-- each of which can supply its own unique
+splitUniqSupply3 :: UniqSupply -> (UniqSupply, UniqSupply, UniqSupply)
+splitUniqSupply3 us = (us1, us2, us3)
+  where
+    (us1, us') = splitUniqSupply us
+    (us2, us3) = splitUniqSupply us'
+
+-- | Build four 'UniqSupply' from a single one,
+-- each of which can supply its own unique
+splitUniqSupply4 :: UniqSupply -> (UniqSupply, UniqSupply, UniqSupply, UniqSupply)
+splitUniqSupply4 us = (us1, us2, us3, us4)
+  where
+    (us1, us2, us') = splitUniqSupply3 us
+    (us3, us4)      = splitUniqSupply us'
+
 {-
 ************************************************************************
 *                                                                      *
@@ -185,6 +203,9 @@ instance MonadUnique UniqSM where
     getUniqueM  = getUniqueUs
     getUniquesM = getUniquesUs
 
+getUniqueSupplyM3 :: MonadUnique m => m (UniqSupply, UniqSupply, UniqSupply)
+getUniqueSupplyM3 = liftM3 (,,) getUniqueSupplyM getUniqueSupplyM getUniqueSupplyM
+
 liftUs :: MonadUnique m => UniqSM a -> m a
 liftUs m = getUniqueSupplyM >>= return . flip initUs_ m
 
diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 57ce45d..57343ff 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -495,24 +495,6 @@ process_guards us  gs
         (css, uss, dss) = go us4 us gvs
 
 -- ----------------------------------------------------------------------------
--- | Getting some more uniques
-
-splitUniqSupply3 :: UniqSupply -> (UniqSupply, UniqSupply, UniqSupply)
-splitUniqSupply3 us = (us1, us2, us3)
-  where
-    (us1, us') = splitUniqSupply us
-    (us2, us3) = splitUniqSupply us'
-
-splitUniqSupply4 :: UniqSupply -> (UniqSupply, UniqSupply, UniqSupply, UniqSupply)
-splitUniqSupply4 us = (us1, us2, us3, us4)
-  where
-    (us1, us2, us') = splitUniqSupply3 us
-    (us3, us4)      = splitUniqSupply us'
-
-getUniqueSupplyM3 :: MonadUnique m => m (UniqSupply, UniqSupply, UniqSupply)
-getUniqueSupplyM3 = liftM3 (,,) getUniqueSupplyM getUniqueSupplyM getUniqueSupplyM
-
--- ----------------------------------------------------------------------------
 -- | Basic utilities
 
 patternType :: Pattern -> Type


From git at git.haskell.org  Sat Nov 28 18:50:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 18:50:32 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: More haddock-compatible comments (d1f8a3f)
Message-ID: <20151128185032.B03493A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/d1f8a3fe30560c703047b3d275cb1b19087f6b4a/ghc

>---------------------------------------------------------------

commit d1f8a3fe30560c703047b3d275cb1b19087f6b4a
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sat Nov 28 14:50:13 2015 +0100

    More haddock-compatible comments


>---------------------------------------------------------------

d1f8a3fe30560c703047b3d275cb1b19087f6b4a
 compiler/deSugar/Check.hs | 56 ++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 57343ff..6fb673c 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -71,9 +71,9 @@ The algorithm used is described in the paper:
 
 type PmM a = DsM a
 
-data PmConstraint = TmConstraint Id PmExpr -- Term equalities: x ~ e
-                  | TyConstraint [EvVar]   -- Type equalities
-                  | BtConstraint Id        -- Strictness constraints: x ~ _|_
+data PmConstraint = TmConstraint Id PmExpr -- ^ Term equalities: x ~ e
+                  | TyConstraint [EvVar]   -- ^ Type equalities
+                  | BtConstraint Id        -- ^ Strictness constraints: x ~ _|_
 
 -- The *arity* of a PatVec [p1,..,pn] is
 -- the number of p1..pn that are not Guards
@@ -91,8 +91,8 @@ data PmPat p = PmCon { pm_con_con     :: DataCon
 --     MkT :: forall p q. (Eq p, Ord q) => p -> q -> T [p]
 -- or  MkT :: forall p q r. (Eq p, Ord q, [p] ~ r) => p -> q -> T r
 
-data Pattern = PmGuard PatVec PmExpr      -- Guard Patterns
-             | NonGuard (PmPat Pattern)   -- Other Patterns
+data Pattern = PmGuard PatVec PmExpr      -- ^ Guard Patterns
+             | NonGuard (PmPat Pattern)   -- ^ Other Patterns
 
 newtype ValAbs = VA (PmPat ValAbs) -- Value Abstractions
 
@@ -111,15 +111,15 @@ data ValSetAbs   -- Reprsents a set of value vector abstractions
   -- INVARIANT VsaInvariant: an empty ValSetAbs is always represented by Empty
   -- INVARIANT VsaArity: the number of Cons's in any path to a leaf is the same
   -- The *arity* of a ValSetAbs is the number of Cons's in any path to a leaf
-  = Empty                               -- {}
-  | Union ValSetAbs ValSetAbs           -- S1 u S2
-  | Singleton                           -- { |- empty |> empty }
-  | Constraint [PmConstraint] ValSetAbs -- Extend Delta
-  | Cons ValAbs ValSetAbs               -- map (ucon u) vs
+  = Empty                               -- ^ {}
+  | Union ValSetAbs ValSetAbs           -- ^ S1 u S2
+  | Singleton                           -- ^ { |- empty |> empty }
+  | Constraint [PmConstraint] ValSetAbs -- ^ Extend Delta
+  | Cons ValAbs ValSetAbs               -- ^ map (ucon u) vs
 
-type PmResult = ( [[LPat Id]] -- redundant clauses
-                , [[LPat Id]] -- clauses with inaccessible rhs
-                , [([PmExpr], [ComplexEq])] ) -- missing
+type PmResult = ( [[LPat Id]] -- ^ redundant clauses
+                , [[LPat Id]] -- ^ clauses with inaccessible rhs
+                , [([PmExpr], [ComplexEq])] ) -- ^ missing
 
 {-
 %************************************************************************
@@ -182,7 +182,7 @@ initial_uncovered vars = do
 -}
 
 -- -----------------------------------------------------------------------
--- | Utilities
+-- * Utilities
 
 nullaryConPattern :: DataCon -> Pattern
 -- Nullary data constructor and nullary type constructor
@@ -234,16 +234,18 @@ oStrToHsLit_mb olit
   | otherwise = Nothing
 
 -- -----------------------------------------------------------------------
--- | Transform a Pat Id into a list of (PmPat Id) -- Note [Translation to PmPat]
+-- * Transform (Pat Id) into of (PmPat Id)
 
 translatePat :: Pat Id -> UniqSM PatVec
 translatePat pat = case pat of
   WildPat ty         -> mkPatternVarsSM [ty]
   VarPat  id         -> return [idPatternVar (unLoc id)]
   ParPat p           -> translatePat (unLoc p)
-  LazyPat _          -> mkPatternVarsSM [hsPatType pat] -- translatePat (unLoc p) -- COMEHERE: We ignore laziness   for now
-  BangPat p          -> translatePat (unLoc p)                                    -- COMEHERE: We ignore strictness for now
-                                                                                  -- This might affect the divergence checks?
+  LazyPat _          -> mkPatternVarsSM [hsPatType pat]
+
+  -- ignore strictness annotations for now
+  BangPat p          -> translatePat (unLoc p)
+
   AsPat lid p -> do
     ps <- translatePat (unLoc p)
     let [e] = map valAbsToPmExpr (coercePatVec ps) -- Note [Translating As Patterns]
@@ -371,7 +373,7 @@ translateConPatVec  univ_tys  ex_tvs c (RecCon (HsRecFields fs _))
         pvec <- translatePat pat
         return (x, pvec)
 
-      let zipped = zip orig_lbls [ x | NonGuard (PmVar x) <- arg_var_pats ] -- [(Name, Id)]
+      let zipped = zip orig_lbls [ x | NonGuard (PmVar x) <- arg_var_pats ]
           guards = map (\(name,pvec) -> case lookup name zipped of
                             Just x  -> PmGuard pvec (PmExprVar x)
                             Nothing -> panic "translateConPatVec: lookup")
@@ -407,7 +409,7 @@ translateMatch (L _ (Match _ lpats _ grhss)) = do
     guards = map extractGuards (grhssGRHSs grhss)
 
 -- -----------------------------------------------------------------------
--- | Transform source guards (GuardStmt Id) to PmPats (Pattern)
+-- * Transform source guards (GuardStmt Id) to PmPats (Pattern)
 
 translateGuards :: [GuardStmt Id] -> UniqSM PatVec
 translateGuards guards = do
@@ -436,6 +438,7 @@ translateGuards guards = do
       | isNotPmExprOther e = True  -- expensive but we want it
     shouldKeep _other_pat  = False -- let the rest..
 
+-- | Translate a guard statement to Pattern
 translateGuard :: GuardStmt Id -> UniqSM PatVec
 translateGuard (BodyStmt   e _ _ _) = translateBoolGuard e
 translateGuard (LetStmt      binds) = translateLet (unLoc binds)
@@ -446,17 +449,20 @@ translateGuard (TransStmt       {}) = panic "translateGuard TransStmt"
 translateGuard (RecStmt         {}) = panic "translateGuard RecStmt"
 translateGuard (ApplicativeStmt {}) = panic "translateGuard ApplicativeLastStmt"
 
+-- | Translate let-bindings
 translateLet :: HsLocalBinds Id -> UniqSM PatVec
 translateLet _binds = return [] -- NOT CORRECT: A let cannot fail so in a way we
   -- are fine with it but it can bind things which we do not bring in scope.
   -- Hence, they are free while they shouldn't. More constraints would make it
-  -- more expressive but omitting some is always safe (Is it? Make sure it is)
+  -- more expressive but omitting some is always safe
 
+-- | Translate a pattern guard
 translateBind :: LPat Id -> LHsExpr Id -> UniqSM PatVec
 translateBind (L _ p) e = do
   ps <- translatePat p
   return [mkGuard ps (unLoc e)]
 
+-- | Translate a boolean guard
 translateBoolGuard :: LHsExpr Id -> UniqSM PatVec
 translateBoolGuard e
   | isJust (isTrueLHsExpr e) = return []
@@ -474,7 +480,7 @@ translateBoolGuard e
 -}
 
 -- ----------------------------------------------------------------------------
--- | Process a vector
+-- * Process a vector
 
 -- Covered, Uncovered, Divergent
 process_guards :: UniqSupply -> [PatVec] -> (ValSetAbs, ValSetAbs, ValSetAbs)
@@ -495,7 +501,7 @@ process_guards us  gs
         (css, uss, dss) = go us4 us gvs
 
 -- ----------------------------------------------------------------------------
--- | Basic utilities
+-- * Basic utilities
 
 patternType :: Pattern -> Type
 patternType (PmGuard pv _) = ASSERT (patVecArity pv == 1) (patternType p)
@@ -652,7 +658,7 @@ mkPmId2FormsSM ty = do
   return (idPatternVar x, noLoc (HsVar (noLoc x)))
 
 -- ----------------------------------------------------------------------------
--- | Converting between Value Abstractions, Patterns and PmExpr
+-- * Converting between Value Abstractions, Patterns and PmExpr
 
 valAbsToPmExpr :: ValAbs -> PmExpr
 valAbsToPmExpr (VA va) = pmPatToPmExpr va
@@ -826,7 +832,7 @@ uncovered us gvsa vec vsa = pmTraverse us gvsa uMatcher vec vsa
 divergent us gvsa vec vsa = pmTraverse us gvsa dMatcher vec vsa
 
 -- ----------------------------------------------------------------------------
--- | Generic traversal function
+-- * Generic traversal function
 --
 -- | Because we represent Value Set Abstractions as a different datatype, more
 -- cases than the ones described in the paper appear. Since they are the same


From git at git.haskell.org  Sat Nov 28 18:50:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 18:50:35 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Updated previous tests' stderrs (still some
 left to change) (8c04e84)
Message-ID: <20151128185035.5BA603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/8c04e8474443067988075961a1f446a2365f3448/ghc

>---------------------------------------------------------------

commit 8c04e8474443067988075961a1f446a2365f3448
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sat Nov 28 19:37:14 2015 +0100

    Updated previous tests' stderrs (still some left to change)


>---------------------------------------------------------------

8c04e8474443067988075961a1f446a2365f3448
 .../tests/deSugar/should_compile/T2395.stderr      |  4 ++--
 testsuite/tests/deSugar/should_compile/all.T       |  1 -
 .../tests/deSugar/should_compile/ds002.stderr      |  4 ++--
 .../tests/deSugar/should_compile/ds003.stderr      |  2 +-
 .../tests/deSugar/should_compile/ds019.stderr      |  2 +-
 .../tests/deSugar/should_compile/ds020.stderr      |  8 +++----
 .../tests/deSugar/should_compile/ds043.stderr      |  6 +++---
 .../tests/deSugar/should_compile/ds056.stderr      |  4 ++--
 .../tests/deSugar/should_compile/ds058.stderr      |  6 +++---
 testsuite/tests/deSugar/should_compile/ds060.hs    | 25 ----------------------
 testsuite/tests/driver/werror.stderr               |  2 +-
 testsuite/tests/gadt/Gadt17_help.hs                |  1 -
 testsuite/tests/gadt/T7294.stderr                  |  4 ++++
 testsuite/tests/ghci/scripts/Defer02.stderr        |  8 +++++++
 14 files changed, 31 insertions(+), 46 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8c04e8474443067988075961a1f446a2365f3448

From git at git.haskell.org  Sat Nov 28 20:02:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 28 Nov 2015 20:02:33 +0000 (UTC)
Subject: [commit: ghc] master: Update haskeline & terminfo submodules (583867b)
Message-ID: <20151128200233.D43CC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/583867b907ddac8c2777e96a5ad8d600ba559569/ghc

>---------------------------------------------------------------

commit 583867b907ddac8c2777e96a5ad8d600ba559569
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Nov 28 18:40:44 2015 +0100

    Update haskeline & terminfo submodules
    
    Differential Revision: https://phabricator.haskell.org/D1542


>---------------------------------------------------------------

583867b907ddac8c2777e96a5ad8d600ba559569
 libraries/haskeline | 2 +-
 libraries/terminfo  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/haskeline b/libraries/haskeline
index fb5b288..06349b7 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit fb5b2884dd00843f6d2fbbeca87b241822088b83
+Subproject commit 06349b7ffc503ba0c8bdf0293d1adc6026da97bd
diff --git a/libraries/terminfo b/libraries/terminfo
index 68e88c4..15ca1cb 160000
--- a/libraries/terminfo
+++ b/libraries/terminfo
@@ -1 +1 @@
-Subproject commit 68e88c453237763084f5032d133ee7347980f8b2
+Subproject commit 15ca1cb3b1e1b0d410544abd69e7ffcf727fc970


From git at git.haskell.org  Sun Nov 29 11:57:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 11:57:43 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: separate and cleaner NPat translation
 (218241b)
Message-ID: <20151129115743.F0FB43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/218241b604623dabc427e34e694e08a5048626f9/ghc

>---------------------------------------------------------------

commit 218241b604623dabc427e34e694e08a5048626f9
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Nov 29 00:26:21 2015 +0100

    separate and cleaner NPat translation


>---------------------------------------------------------------

218241b604623dabc427e34e694e08a5048626f9
 compiler/deSugar/Check.hs                          | 43 ++++++++++------------
 compiler/deSugar/PmExpr.hs                         |  2 +-
 .../tests/deSugar/should_compile/T5117.stderr      |  2 +-
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 6fb673c..ecbaed5 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -217,22 +217,6 @@ mkListPatVec ty xs ys = [NonGuard $ PmCon { pm_con_con = consDataCon
 mkLitPattern :: HsLit -> Pattern
 mkLitPattern lit = NonGuard $ PmLit { pm_lit_lit = PmSLit lit }
 
-mkPosLitPattern :: HsOverLit Id -> Pattern
-mkPosLitPattern lit = NonGuard $ PmLit { pm_lit_lit = PmOLit False lit }
-
-mkNegLitPattern :: HsOverLit Id -> Pattern
-mkNegLitPattern lit = NonGuard $ PmLit { pm_lit_lit = PmOLit True lit }
-
--- Specifically for overloaded strings. If we know that an overloaded x is a
--- string, we can remove the fromString function since we know that it is the
--- identity.
-oStrToHsLit_mb :: HsOverLit Id -> Maybe HsLit
-oStrToHsLit_mb olit
-  | ol_type olit == stringTy
-  , HsIsString src fs <- ol_val olit
-  = Just (HsString src fs)
-  | otherwise = Nothing
-
 -- -----------------------------------------------------------------------
 -- * Transform (Pat Id) into of (PmPat Id)
 
@@ -315,10 +299,7 @@ translatePat pat = case pat of
                               , pm_con_dicts   = dicts
                               , pm_con_args    = args }]
 
-  NPat (L _ lit) mb_neg _eq
-    | Just hs_lit <- oStrToHsLit_mb lit -> translatePat (LitPat hs_lit) -- overloaded string
-    | Just _  <- mb_neg -> return [mkNegLitPattern lit] -- negated literal
-    | Nothing <- mb_neg -> return [mkPosLitPattern lit] -- non-negated literal
+  NPat (L _ ol) mb_neg _eq -> translateNPat ol mb_neg
 
   LitPat lit
       -- If it is a string then convert it to a list of characters
@@ -339,9 +320,25 @@ translatePat pat = case pat of
 
   -- --------------------------------------------------------------------------
   -- Not supposed to happen
-  ConPatIn {}      -> panic "Check.translatePat: ConPatIn"
-  SplicePat {}     -> panic "Check.translatePat: SplicePat"
-  SigPatIn {}      -> panic "Check.translatePat: SigPatIn"
+  ConPatIn  {} -> panic "Check.translatePat: ConPatIn"
+  SplicePat {} -> panic "Check.translatePat: SplicePat"
+  SigPatIn  {} -> panic "Check.translatePat: SigPatIn"
+
+-- replicate of tidyNPat
+translateNPat :: HsOverLit Id -> Maybe (SyntaxExpr Id) -> UniqSM PatVec
+translateNPat (OverLit val False _ ty) mb_neg
+  | isStringTy ty, HsIsString src s <- val, Nothing <- mb_neg
+  = translatePat (LitPat (HsString src s))
+  | isIntTy    ty, HsIntegral src i <- val
+  = translatePat (mk_num_lit HsInt src i)
+  | isWordTy   ty, HsIntegral src i <- val
+  = translatePat (mk_num_lit HsWordPrim src i)
+  where
+    mk_num_lit c src i = LitPat $ case mb_neg of
+      Nothing -> c src i
+      Just _  -> c src (-i)
+translateNPat ol mb_neg
+  = return [NonGuard $ PmLit { pm_lit_lit = PmOLit (isJust mb_neg) ol }]
 
 translatePatVec :: [Pat Id] -> UniqSM [PatVec] -- Do not concatenate them (sometimes we need them separately)
 translatePatVec pats = mapM translatePat pats
diff --git a/compiler/deSugar/PmExpr.hs b/compiler/deSugar/PmExpr.hs
index 02ae3db..aa566fb 100644
--- a/compiler/deSugar/PmExpr.hs
+++ b/compiler/deSugar/PmExpr.hs
@@ -71,7 +71,7 @@ eqPmLit :: PmLit -> PmLit -> Maybe Bool
 eqPmLit (PmSLit    l1) (PmSLit l2   ) = Just (l1 == l2) -- check the instances too for lits and olits
 eqPmLit (PmOLit b1 l1) (PmOLit b2 l2) = if res then Just True else Nothing
   where res = b1 == b2 && l1 == l2
-eqPmLit _ _ = Nothing
+eqPmLit _ _ = Just False -- this should not even happen I think
 
 nubPmLit :: [PmLit] -> [PmLit]
 nubPmLit []     = []
diff --git a/testsuite/tests/deSugar/should_compile/T5117.stderr b/testsuite/tests/deSugar/should_compile/T5117.stderr
index 93de2cf..954844d 100644
--- a/testsuite/tests/deSugar/should_compile/T5117.stderr
+++ b/testsuite/tests/deSugar/should_compile/T5117.stderr
@@ -1,4 +1,4 @@
 
 T5117.hs:15:1: Warning:
-    Pattern match(es) are overlapped
+    Pattern match(es) are redundant
     In an equation for ?f3?: f3 (MyString "a") = ...


From git at git.haskell.org  Sun Nov 29 11:57:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 11:57:46 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: literals: more expressive term oracle
 (07ebe60)
Message-ID: <20151129115746.9B09F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/07ebe600304bd8817b644277ad4768ebee38e144/ghc

>---------------------------------------------------------------

commit 07ebe600304bd8817b644277ad4768ebee38e144
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Nov 29 00:27:42 2015 +0100

    literals: more expressive term oracle


>---------------------------------------------------------------

07ebe600304bd8817b644277ad4768ebee38e144
 compiler/deSugar/TmOracle.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/deSugar/TmOracle.hs b/compiler/deSugar/TmOracle.hs
index f218b36..75aa649 100644
--- a/compiler/deSugar/TmOracle.hs
+++ b/compiler/deSugar/TmOracle.hs
@@ -114,7 +114,7 @@ solveComplexEq solver_state@(standby, (unhandled, env)) eq@(e1, e2) = case eq of
 -- | Extend the substitution and solve the (possibly updated) constraints.
 extendSubstAndSolve :: Id -> PmExpr -> TmState -> Maybe TmState
 extendSubstAndSolve x e (standby, (unhandled, env))
-  = foldlM solveComplexEq new_incr_state changed
+  = foldlM solveComplexEq new_incr_state (map simplifyComplexEq changed)
   where
     -- Apply the substitution to the worklist and partition them to the ones
     -- that had some progress and the rest. Then, recurse over the ones that


From git at git.haskell.org  Sun Nov 29 11:57:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 11:57:49 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Updated more previous tests' stderrs
 (ccb5283)
Message-ID: <20151129115749.68F493A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/ccb5283a33400cbec621d8839d0f956c88f6b21a/ghc

>---------------------------------------------------------------

commit ccb5283a33400cbec621d8839d0f956c88f6b21a
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Nov 29 12:56:13 2015 +0100

    Updated more previous tests' stderrs


>---------------------------------------------------------------

ccb5283a33400cbec621d8839d0f956c88f6b21a
 testsuite/tests/deSugar/should_compile/ds051.stderr | 6 +++---
 testsuite/tests/driver/werror.stderr                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testsuite/tests/deSugar/should_compile/ds051.stderr b/testsuite/tests/deSugar/should_compile/ds051.stderr
index 76bc4d3..4777dfc 100644
--- a/testsuite/tests/deSugar/should_compile/ds051.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds051.stderr
@@ -1,12 +1,12 @@
 
 ds051.hs:6:1: Warning:
-    Pattern match(es) are overlapped
+    Pattern match(es) are redundant
     In an equation for ?f1?: f1 "ab" = ...
 
 ds051.hs:11:1: Warning:
-    Pattern match(es) are overlapped
+    Pattern match(es) are redundant
     In an equation for ?f2?: f2 ('a' : 'b' : []) = ...
 
 ds051.hs:16:1: Warning:
-    Pattern match(es) are overlapped
+    Pattern match(es) are redundant
     In an equation for ?f3?: f3 "ab" = ...
diff --git a/testsuite/tests/driver/werror.stderr b/testsuite/tests/driver/werror.stderr
index 37692d2..20770fa 100644
--- a/testsuite/tests/driver/werror.stderr
+++ b/testsuite/tests/driver/werror.stderr
@@ -24,7 +24,7 @@ werror.hs:10:1: Warning:
 
 werror.hs:10:1: Warning:
     Pattern match(es) are non-exhaustive
-    In an equation for ?f?: Patterns not matched: _ : _
+    In an equation for ?f?: Patterns not matched: (_:_)
 
 <no location info>: 
 Failing due to -Werror.


From git at git.haskell.org  Sun Nov 29 11:57:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 11:57:52 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: literals: more expressive laziness oracle
 (0370621)
Message-ID: <20151129115752.1B5B93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/0370621c94692fcc881c6b44941e1bb9be312b55/ghc

>---------------------------------------------------------------

commit 0370621c94692fcc881c6b44941e1bb9be312b55
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Nov 29 12:57:08 2015 +0100

    literals: more expressive laziness oracle


>---------------------------------------------------------------

0370621c94692fcc881c6b44941e1bb9be312b55
 compiler/deSugar/Check.hs    |  6 ++++--
 compiler/deSugar/TmOracle.hs | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index ecbaed5..188a11c 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -763,9 +763,11 @@ pruneVSABound n v = pruneVSABound' n init_cs emptylist v
               False -> []
           Constraint cs vsa -> case splitConstraints cs of
             (new_ty_cs, new_tm_cs, new_bot_ct) -> case tmOracle tm_env new_tm_cs of
-                Just (new_tm_env@(residual, (expr_eqs, subst))) ->
+                Just new_tm_env ->
                   let bot = mergeBotCs new_bot_ct bot_ct
-                      ans = isNothing bot || notNull residual || expr_eqs || notForced (fromJust bot) subst
+                      ans = case bot of
+                              Nothing -> True                    -- covered
+                              Just b  -> canDiverge b new_tm_env -- divergent
                   in  case ans of
                         True  -> pruneVSABound' n (new_ty_cs++ty_cs, new_tm_env, bot) vec vsa
                         False -> return []
diff --git a/compiler/deSugar/TmOracle.hs b/compiler/deSugar/TmOracle.hs
index 75aa649..781e4a2 100644
--- a/compiler/deSugar/TmOracle.hs
+++ b/compiler/deSugar/TmOracle.hs
@@ -10,7 +10,7 @@ module TmOracle (
 
         -- re-exported from PmExpr
         PmExpr(..), PmLit(..), SimpleEq, ComplexEq, PmVarEnv, falsePmExpr,
-        notForced, eqPmLit, filterComplex, isNotPmExprOther, runPmPprM,
+        canDiverge, eqPmLit, filterComplex, isNotPmExprOther, runPmPprM,
         pprPmExprWithParens, lhsExprToPmExpr, hsExprToPmExpr,
 
         -- the term oracle
@@ -50,12 +50,33 @@ type PmVarEnv = Map.Map Id PmExpr
 --     2. A substitution we extend with every step and return as a result.
 type TmOracleEnv = (Bool, PmVarEnv)
 
--- | Check whether a variable has been refined to (at least) a WHNF (Could be
--- improved in terms of expressivity. Too conservative at the moment.).
-notForced :: Id -> PmVarEnv -> Bool
-notForced x env = case varDeepLookup env x of
-  PmExprVar _ -> True
-  _other_expr -> False
+-- | Check whether a constraint (x ~ BOT) can succeed,
+-- given the resulting state of the term oracle.
+canDiverge :: Id -> TmState -> Bool
+canDiverge x (standby, (_unhandled, env))
+  -- If the variable seems not evaluated, there is a possibility for
+  -- constraint x ~ BOT to be satisfiable.
+  | PmExprVar y <- varDeepLookup env x -- seems not forced
+  -- If it is involved (directly or indirectly) in any equality in the
+  -- worklist, we can assume that it is already indirectly evaluated,
+  -- as a side-effect of equality checking. If not, then we can assume
+  -- that the constraint is satisfiable.
+  = not $ any (isForcedByEq x) standby || any (isForcedByEq y) standby
+  -- Variable x is already in WHNF so the constraint is non-satisfiable
+  | otherwise = False
+
+  where
+    isForcedByEq :: Id -> ComplexEq -> Bool
+    isForcedByEq y (e1, e2) = varIn y e1 || varIn y e2
+
+-- | Check whether a variable is in the free variables of an expression
+varIn :: Id -> PmExpr -> Bool
+varIn x e = case e of
+  PmExprVar y    -> x == y
+  PmExprCon _ es -> any (x `varIn`) es
+  PmExprLit _    -> False
+  PmExprEq e1 e2 -> (x `varIn` e1) || (x `varIn` e2)
+  PmExprOther _  -> False
 
 -- | Flatten the DAG (Could be improved in terms of performance.).
 flattenPmVarEnv :: PmVarEnv -> PmVarEnv
@@ -88,7 +109,7 @@ solveComplexEq solver_state@(standby, (unhandled, env)) eq@(e1, e2) = case eq of
     Just False -> Nothing                     -- we are sure: not equal
     -- Maybe just drop. We use this boolean to check also whether something is forced and I know
     -- that nothing is if both are literals. Hence, just assume true and give (Just solver_state)?
-    Nothing    -> Just (standby, (True, env)) -- no clue (and won't get one)!
+    Nothing    -> Just (standby, (unhandled, env)) -- no clue (and won't get one)!
 
   (PmExprCon c1 ts1, PmExprCon c2 ts2)
     | c1 == c2  -> foldlM solveComplexEq solver_state (zip ts1 ts2)


From git at git.haskell.org  Sun Nov 29 12:22:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 12:22:01 +0000 (UTC)
Subject: [commit: ghc] master: GHCi should not defer typed holes (71c0cc1)
Message-ID: <20151129122201.3723D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/71c0cc1531c3e548e47f435432ed31cb79512607/ghc

>---------------------------------------------------------------

commit 71c0cc1531c3e548e47f435432ed31cb79512607
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Nov 27 16:19:24 2015 +0100

    GHCi should not defer typed holes
    
    In the function `tcUserStmt` in compiler/typecheck/TcRnDriver.hs, before
    going over the different ways ('plans') to lift an expression typed at
    the prompt into the GHCi monad, `Opt_DeferTypeErrors` is disabled. Here is
    the accompanying comment:
    
    ```
    -- Ensure that type errors don't get deferred when type checking the
    -- naked expression. Deferring type errors here is unhelpful because the
    -- expression gets evaluated right away anyway. It also would potentially
    -- emit redundant type-error warnings, one from each plan.
    ; plan <- unsetGOptM Opt_DeferTypeErrors $
    ```
    
    Since `Opt_DeferTypeErrors` implies `Opt_DeferTypedHoles`,
    `Opt_DeferTypedHoles` should be disabled here as well. This improves
    the error message for T10248 (it doesn't mention ghciStepIO anymore).
    This is a partial fix for #10249, and a complete fix for #11130.
    
    Depends on D1526
    
    Reviewers: simonpj, austin, bgamari
    
    Reviewed By: simonpj
    
    Subscribers: simonpj
    
    Differential Revision: https://phabricator.haskell.org/D1527
    
    GHC Trac Issues: #10249, #11130


>---------------------------------------------------------------

71c0cc1531c3e548e47f435432ed31cb79512607
 compiler/typecheck/TcRnDriver.hs           |  3 ++-
 testsuite/tests/ghci/scripts/T10248.stderr | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/compiler/typecheck/TcRnDriver.hs b/compiler/typecheck/TcRnDriver.hs
index fb27c26..3c68dcf 100644
--- a/compiler/typecheck/TcRnDriver.hs
+++ b/compiler/typecheck/TcRnDriver.hs
@@ -1641,7 +1641,8 @@ tcUserStmt (L loc (BodyStmt expr _ _ _))
         -- naked expression. Deferring type errors here is unhelpful because the
         -- expression gets evaluated right away anyway. It also would potentially
         -- emit two redundant type-error warnings, one from each plan.
-        ; plan <- unsetGOptM Opt_DeferTypeErrors $ runPlans [
+        ; plan <- unsetGOptM Opt_DeferTypeErrors $
+                  unsetGOptM Opt_DeferTypedHoles $ runPlans [
                     -- Plan A
                     do { stuff@([it_id], _) <- tcGhciStmts [bind_stmt, print_it]
                        ; it_ty <- zonkTcType (idType it_id)
diff --git a/testsuite/tests/ghci/scripts/T10248.stderr b/testsuite/tests/ghci/scripts/T10248.stderr
index 59b0b29..86b8c8d 100644
--- a/testsuite/tests/ghci/scripts/T10248.stderr
+++ b/testsuite/tests/ghci/scripts/T10248.stderr
@@ -1,16 +1,14 @@
 
-<interactive>:2:10: warning:
-    Found hole: _ :: IO ()
+<interactive>:2:10: error:
+    Found hole: _ :: f a
+    Where: ?f? is a rigid type variable bound by
+               the inferred type of it :: Functor f => f (Maybe a)
+               at <interactive>:2:1
+           ?a? is a rigid type variable bound by
+               the inferred type of it :: Functor f => f (Maybe a)
+               at <interactive>:2:1
     In the second argument of ?(<$>)?, namely ?_?
-    In the first argument of ?ghciStepIO :: IO a -> IO a?, namely
-      ?Just <$> _?
-    In a stmt of an interactive GHCi command:
-      it <- ghciStepIO :: IO a -> IO a (Just <$> _)
-*** Exception: <interactive>:2:10: error:
-    Found hole: _ :: IO ()
-    In the second argument of ?(<$>)?, namely ?_?
-    In the first argument of ?ghciStepIO :: IO a -> IO a?, namely
-      ?Just <$> _?
-    In a stmt of an interactive GHCi command:
-      it <- ghciStepIO :: IO a -> IO a (Just <$> _)
-(deferred type error)
+    In the expression: Just <$> _
+    In an equation for ?it?: it = Just <$> _
+    Relevant bindings include
+      it :: f (Maybe a) (bound at <interactive>:2:1)


From git at git.haskell.org  Sun Nov 29 12:22:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 12:22:04 +0000 (UTC)
Subject: [commit: ghc] master: ghci: Add support for prompt functions (72e3620)
Message-ID: <20151129122204.066D83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/72e362076e7ce823678797a162d0645e088cd594/ghc

>---------------------------------------------------------------

commit 72e362076e7ce823678797a162d0645e088cd594
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Nov 27 14:26:32 2015 +0100

    ghci: Add support for prompt functions
    
    This is an updated version of @jlengyel's original patch adding support
    for prompt functions.


>---------------------------------------------------------------

72e362076e7ce823678797a162d0645e088cd594
 ghc/GhciMonad.hs     |  14 +++++--
 ghc/InteractiveUI.hs | 109 +++++++++++++++++++++++++++++----------------------
 2 files changed, 73 insertions(+), 50 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 72e362076e7ce823678797a162d0645e088cd594

From git at git.haskell.org  Sun Nov 29 12:22:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 12:22:06 +0000 (UTC)
Subject: [commit: ghc] master: Implement new -XTemplateHaskellQuotes pragma
 (85fcd03)
Message-ID: <20151129122206.D25E83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/85fcd035f73679927a0539d5f6c9b919517365e1/ghc

>---------------------------------------------------------------

commit 85fcd035f73679927a0539d5f6c9b919517365e1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Nov 27 13:39:18 2015 +0100

    Implement new -XTemplateHaskellQuotes pragma
    
    Since f16ddcee0c64a92ab911a7841a8cf64e3ac671fd / D876, `ghc-stage1`
    supports a subset of `-XTemplateHaskell`, but since we need Cabal to be
    able detect (so `.cabal` files can be specified accordingly, see also
    GHC #11102 which omits `TemplateHaskell` from `--supported-extensions`)
    whether GHC provides full or only partial `-XTemplateHaskell` support,
    the proper way to accomplish this is to split off the
    quotation/non-splicing `TemplateHaskell` feature-subset into a new
    language pragma `TemplateHaskellQuotes`.
    
    Moreover, `-XTemplateHaskellQuotes` is considered safe under SafeHaskell
    
    This addresses #11121
    
    Reviewers: goldfire, ezyang, dterei, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1511
    
    GHC Trac Issues: #11121


>---------------------------------------------------------------

85fcd035f73679927a0539d5f6c9b919517365e1
 compiler/main/DynFlags.hs                          | 28 ++++++++++++++++++----
 compiler/parser/Lexer.x                            | 22 ++++++++++-------
 compiler/rename/RnSplice.hs                        |  9 +++----
 docs/users_guide/7.12.1-notes.rst                  | 10 ++++----
 docs/users_guide/glasgow_exts.rst                  | 13 ++++++----
 testsuite/tests/driver/T4437.hs                    |  1 +
 testsuite/tests/quotes/T10384.hs                   |  2 +-
 testsuite/tests/quotes/all.T                       |  2 +-
 .../safeHaskell/safeLanguage/SafeLang12.stderr     | 11 ++++-----
 utils/mkUserGuidePart/Options/Language.hs          |  7 ++++++
 10 files changed, 71 insertions(+), 34 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 85fcd035f73679927a0539d5f6c9b919517365e1

From git at git.haskell.org  Sun Nov 29 12:22:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 12:22:09 +0000 (UTC)
Subject: [commit: ghc] master: ghc-pkg: print version when verbose (55c737f)
Message-ID: <20151129122209.978663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/55c737fdeca666c0a6ee898bd368d4d11a47499a/ghc

>---------------------------------------------------------------

commit 55c737fdeca666c0a6ee898bd368d4d11a47499a
Author: Adam Sandberg Eriksson <adam at sandbergericsson.se>
Date:   Fri Nov 27 16:16:23 2015 +0100

    ghc-pkg: print version when verbose
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1534


>---------------------------------------------------------------

55c737fdeca666c0a6ee898bd368d4d11a47499a
 utils/ghc-pkg/Main.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 13e6d6f..993aa12 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -337,6 +337,8 @@ data PackageArg
 runit :: Verbosity -> [Flag] -> [String] -> IO ()
 runit verbosity cli nonopts = do
   installSignalHandlers -- catch ^C and clean up
+  when (verbosity >= Verbose)
+    (putStr ourCopyright)
   prog <- getProgramName
   let
         force


From git at git.haskell.org  Sun Nov 29 12:22:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 12:22:12 +0000 (UTC)
Subject: [commit: ghc] master: Remove deprecated quasiquoter syntax. (399a5b4)
Message-ID: <20151129122212.574C03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/399a5b46591dfbee0499d6afa1bb80ad2fd52598/ghc

>---------------------------------------------------------------

commit 399a5b46591dfbee0499d6afa1bb80ad2fd52598
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Fri Nov 27 16:16:39 2015 +0100

    Remove deprecated quasiquoter syntax.
    
    In spirit, this reverts 9ba922ee06b048774d7a82964867ff768a78126e
    
    The syntax has been deprecated with a warning since 2010.
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1530


>---------------------------------------------------------------

399a5b46591dfbee0499d6afa1bb80ad2fd52598
 compiler/parser/Lexer.x                           |  4 ----
 compiler/rename/RnSplice.hs                       | 19 -------------------
 testsuite/tests/quasiquotation/qq008/Test.hs      |  2 +-
 testsuite/tests/quasiquotation/qq008/qq008.stderr |  4 ----
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 9e57b4b..32f4254 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -383,10 +383,6 @@ $tab          { warnTab }
   "$("        / { ifExtension thEnabled } { token ITparenEscape }
   "$$("       / { ifExtension thEnabled } { token ITparenTyEscape }
 
--- For backward compatibility, accept the old dollar syntax
-  "[$" @varid "|"  / { ifExtension qqEnabled }
-                     { lex_quasiquote_tok }
-
   "[" @varid "|"  / { ifExtension qqEnabled }
                      { lex_quasiquote_tok }
 
diff --git a/compiler/rename/RnSplice.hs b/compiler/rename/RnSplice.hs
index 95c5462..2093312 100644
--- a/compiler/rename/RnSplice.hs
+++ b/compiler/rename/RnSplice.hs
@@ -46,7 +46,6 @@ import Var              ( Id )
 import THNames          ( quoteExpName, quotePatName, quoteDecName, quoteTypeName
                         , decsQTyConName, expQTyConName, patQTyConName, typeQTyConName, )
 import RnTypes          ( collectWildCards )
-import Util
 
 import {-# SOURCE #-} TcExpr   ( tcMonoExpr )
 import {-# SOURCE #-} TcSplice ( runMetaD, runMetaE, runMetaP, runMetaT, tcTopSpliceExpr )
@@ -373,17 +372,6 @@ rnSplice (HsQuasiQuote splice_name quoter q_loc quote)
         ; loc  <- getSrcSpanM
         ; splice_name' <- newLocalBndrRn (L loc splice_name)
 
-          -- Drop the leading "$" from the quoter name, if present
-          -- This is old-style syntax, now deprecated
-          -- NB: when removing this backward-compat, remove
-          --     the matching code in Lexer.x (around line 310)
-        ; let occ_str = occNameString (rdrNameOcc quoter)
-        ; quoter <- if ASSERT( not (null occ_str) )  -- Lexer ensures this
-                       head occ_str /= '$'
-                    then return quoter
-                    else do { addWarn (deprecatedDollar quoter)
-                            ; return (mkRdrUnqual (mkVarOcc (tail occ_str))) }
-
           -- Rename the quoter; akin to the HsVar case of rnExpr
         ; quoter' <- lookupOccRn quoter
         ; this_mod <- getModule
@@ -392,13 +380,6 @@ rnSplice (HsQuasiQuote splice_name quoter q_loc quote)
 
         ; return (HsQuasiQuote splice_name' quoter' q_loc quote, unitFV quoter') }
 
-deprecatedDollar :: RdrName -> SDoc
-deprecatedDollar quoter
-  = hang (ptext (sLit "Deprecated syntax:"))
-       2 (ptext (sLit "quasiquotes no longer need a dollar sign:")
-          <+> ppr quoter)
-
-
 ---------------------
 rnSpliceExpr :: HsSplice RdrName -> RnM (HsExpr Name, FreeVars)
 rnSpliceExpr splice
diff --git a/testsuite/tests/quasiquotation/qq008/Test.hs b/testsuite/tests/quasiquotation/qq008/Test.hs
index c04f427..fbaa80e 100644
--- a/testsuite/tests/quasiquotation/qq008/Test.hs
+++ b/testsuite/tests/quasiquotation/qq008/Test.hs
@@ -6,7 +6,7 @@ import QQ
 f :: [pq| foo |]    -- Expands to Int -> Int
 [pq| blah |]        -- Expands to f x = x
 
-h [pq| foo |] = f [$pq| blah |] * 8
+h [pq| foo |] = f [pq| blah |] * 8
 -- Expands to h (Just x) = f (x+1) * 8
 
 
diff --git a/testsuite/tests/quasiquotation/qq008/qq008.stderr b/testsuite/tests/quasiquotation/qq008/qq008.stderr
deleted file mode 100644
index b13e999..0000000
--- a/testsuite/tests/quasiquotation/qq008/qq008.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Test.hs:9:19:
-    Warning: Deprecated syntax:
-               quasiquotes no longer need a dollar sign: $pq


From git at git.haskell.org  Sun Nov 29 15:18:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 15:18:36 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: inconclusive equality on overloaded
 literals remains unhandled (5336c96)
Message-ID: <20151129151836.45AEC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/5336c96e63c48d3d88683e64b878ed2f49f75bf5/ghc

>---------------------------------------------------------------

commit 5336c96e63c48d3d88683e64b878ed2f49f75bf5
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Nov 29 16:15:35 2015 +0100

    inconclusive equality on overloaded literals remains unhandled


>---------------------------------------------------------------

5336c96e63c48d3d88683e64b878ed2f49f75bf5
 compiler/deSugar/TmOracle.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/deSugar/TmOracle.hs b/compiler/deSugar/TmOracle.hs
index 781e4a2..35db7d7 100644
--- a/compiler/deSugar/TmOracle.hs
+++ b/compiler/deSugar/TmOracle.hs
@@ -109,7 +109,7 @@ solveComplexEq solver_state@(standby, (unhandled, env)) eq@(e1, e2) = case eq of
     Just False -> Nothing                     -- we are sure: not equal
     -- Maybe just drop. We use this boolean to check also whether something is forced and I know
     -- that nothing is if both are literals. Hence, just assume true and give (Just solver_state)?
-    Nothing    -> Just (standby, (unhandled, env)) -- no clue (and won't get one)!
+    Nothing    -> Just (standby, (True, env)) -- no clue (and won't get one)!
 
   (PmExprCon c1 ts1, PmExprCon c2 ts2)
     | c1 == c2  -> foldlM solveComplexEq solver_state (zip ts1 ts2)


From git at git.haskell.org  Sun Nov 29 16:52:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 16:52:42 +0000 (UTC)
Subject: [commit: ghc] master: Update containers submodule (54a9456)
Message-ID: <20151129165242.ABE1A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/54a94564451bde7250780f76bea952595bf8e612/ghc

>---------------------------------------------------------------

commit 54a94564451bde7250780f76bea952595bf8e612
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 29 16:42:30 2015 +0100

    Update containers submodule
    
    Differential Revision: https://phabricator.haskell.org/D1545


>---------------------------------------------------------------

54a94564451bde7250780f76bea952595bf8e612
 libraries/containers                         | 2 +-
 testsuite/tests/cabal/cabal07/cabal07.stderr | 2 +-
 testsuite/tests/driver/T10970.stdout         | 2 +-
 testsuite/tests/package/package01e.stderr    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/containers b/libraries/containers
index 924fafe..6405653 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit 924fafe1030301ee1d62d7acd576e86b50251157
+Subproject commit 6405653480afa675eec804616547b8625244bc7c
diff --git a/testsuite/tests/cabal/cabal07/cabal07.stderr b/testsuite/tests/cabal/cabal07/cabal07.stderr
index b1b90c1..097f23f 100644
--- a/testsuite/tests/cabal/cabal07/cabal07.stderr
+++ b/testsuite/tests/cabal/cabal07/cabal07.stderr
@@ -1,6 +1,6 @@
 
 Q.hs:3:8: error:
     Could not find module ?Data.Set?
-    It is a member of the hidden package ?containers-0.5.6.2 at containers-0.5.6.2?.
+    It is a member of the hidden package ?containers-0.5.6.3 at containers-0.5.6.3?.
     Perhaps you need to add ?containers? to the build-depends in your .cabal file.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout
index 2a28356..9476b7c 100644
--- a/testsuite/tests/driver/T10970.stdout
+++ b/testsuite/tests/driver/T10970.stdout
@@ -1,2 +1,2 @@
-0.5.6.2
+0.5.6.3
 OK
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index 5b169aa..33e2deb 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,10 +1,10 @@
 
 package01e.hs:2:1:
     Failed to load interface for ?Data.Map?
-    It is a member of the hidden package ?containers-0.5.6.2?.
+    It is a member of the hidden package ?containers-0.5.6.3?.
     Use -v to see a list of the files searched for.
 
 package01e.hs:3:1:
     Failed to load interface for ?Data.IntMap?
-    It is a member of the hidden package ?containers-0.5.6.2?.
+    It is a member of the hidden package ?containers-0.5.6.3?.
     Use -v to see a list of the files searched for.


From git at git.haskell.org  Sun Nov 29 16:52:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 16:52:45 +0000 (UTC)
Subject: [commit: ghc] master: Update deepseq submodule (616aceb)
Message-ID: <20151129165245.4B5923A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/616acebaba08b260d35a6f81cfe315c28f17bd51/ghc

>---------------------------------------------------------------

commit 616acebaba08b260d35a6f81cfe315c28f17bd51
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 29 17:52:31 2015 +0100

    Update deepseq submodule
    
    This pulls in new NFData instances for NonEmpty and Semigroup newtype wrappers
    
    Differential Revision: https://phabricator.haskell.org/D1546


>---------------------------------------------------------------

616acebaba08b260d35a6f81cfe315c28f17bd51
 libraries/deepseq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/deepseq b/libraries/deepseq
index 36bfcd2..40d4db0 160000
--- a/libraries/deepseq
+++ b/libraries/deepseq
@@ -1 +1 @@
-Subproject commit 36bfcd2a6236f2e019de76c256b05ee670492373
+Subproject commit 40d4db0a4e81a07ecd0f1bc77b8772088e75e478


From git at git.haskell.org  Sun Nov 29 16:54:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 16:54:00 +0000 (UTC)
Subject: [commit: ghc] master: Remove redundant `#if`s (5897213)
Message-ID: <20151129165400.669DC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/589721318f0f545de33e306d0358bfc2ea738237/ghc

>---------------------------------------------------------------

commit 589721318f0f545de33e306d0358bfc2ea738237
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 29 17:53:56 2015 +0100

    Remove redundant `#if`s
    
    `#if __GLASGOW_HASKELL__ > xxx` macros make little sense inside `base`
    currently.
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1541


>---------------------------------------------------------------

589721318f0f545de33e306d0358bfc2ea738237
 libraries/base/Text/ParserCombinators/ReadP.hs    | 7 -------
 libraries/base/Text/ParserCombinators/ReadPrec.hs | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/libraries/base/Text/ParserCombinators/ReadP.hs b/libraries/base/Text/ParserCombinators/ReadP.hs
index 3908b24..7bdb97c 100644
--- a/libraries/base/Text/ParserCombinators/ReadP.hs
+++ b/libraries/base/Text/ParserCombinators/ReadP.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE DeriveFunctor #-}
@@ -77,9 +76,7 @@ import GHC.Unicode ( isSpace )
 import GHC.List ( replicate, null )
 import GHC.Base hiding ( many )
 
-#if __GLASGOW_HASKELL__ > 710
 import Control.Monad.Fail
-#endif
 
 infixr 5 +++, <++
 
@@ -124,10 +121,8 @@ instance Monad P where
 
   fail _ = Fail
 
-#if __GLASGOW_HASKELL__ > 710
 instance MonadFail P where
   fail _ = Fail
-#endif
 
 instance Alternative P where
   empty = Fail
@@ -176,10 +171,8 @@ instance Monad ReadP where
   fail _    = R (\_ -> Fail)
   R m >>= f = R (\k -> m (\a -> let R m' = f a in m' k))
 
-#if __GLASGOW_HASKELL__ > 710
 instance MonadFail ReadP where
   fail _    = R (\_ -> Fail)
-#endif
 
 instance Alternative ReadP where
     empty = mzero
diff --git a/libraries/base/Text/ParserCombinators/ReadPrec.hs b/libraries/base/Text/ParserCombinators/ReadPrec.hs
index a1ce920..136b8ae 100644
--- a/libraries/base/Text/ParserCombinators/ReadPrec.hs
+++ b/libraries/base/Text/ParserCombinators/ReadPrec.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE CPP #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -65,9 +64,7 @@ import qualified Text.ParserCombinators.ReadP as ReadP
 import GHC.Num( Num(..) )
 import GHC.Base
 
-#if __GLASGOW_HASKELL__ > 710
 import qualified Control.Monad.Fail as MonadFail
-#endif
 
 -- ---------------------------------------------------------------------------
 -- The readPrec type
@@ -87,10 +84,8 @@ instance Monad ReadPrec where
   fail s    = P (\_ -> fail s)
   P f >>= k = P (\n -> do a <- f n; let P f' = k a in f' n)
 
-#if __GLASGOW_HASKELL__ > 710
 instance MonadFail.MonadFail ReadPrec where
   fail s    = P (\_ -> fail s)
-#endif
 
 instance MonadPlus ReadPrec where
   mzero = pfail


From git at git.haskell.org  Sun Nov 29 20:20:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 20:20:42 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: All test pass except T5331 and T7064
 (23c3317)
Message-ID: <20151129202042.3DBB63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/23c3317c26709ccc6251d90720320a98e53d05b4/ghc

>---------------------------------------------------------------

commit 23c3317c26709ccc6251d90720320a98e53d05b4
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Nov 29 22:20:21 2015 +0200

    All test pass except T5331 and T7064


>---------------------------------------------------------------

23c3317c26709ccc6251d90720320a98e53d05b4
 compiler/hsSyn/HsDecls.hs                       | 11 ++++++++---
 compiler/rename/RnTypes.hs                      |  7 +++----
 compiler/typecheck/TcHsType.hs                  |  5 ++---
 compiler/typecheck/TcTyClsDecls.hs              | 12 ++++++------
 testsuite/tests/rename/should_fail/T7943.stderr |  6 +++++-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/compiler/hsSyn/HsDecls.hs b/compiler/hsSyn/HsDecls.hs
index 5bd8bd7..5356059 100644
--- a/compiler/hsSyn/HsDecls.hs
+++ b/compiler/hsSyn/HsDecls.hs
@@ -107,6 +107,7 @@ import SrcLoc
 import FastString
 
 import Bag
+import Data.Maybe ( fromMaybe )
 import Data.Data        hiding (TyCon,Fixity)
 #if __GLASGOW_HASKELL__ < 709
 import Data.Foldable ( Foldable )
@@ -1161,17 +1162,21 @@ instance (OutputableBndr name) => Outputable (ConDecl name) where
 
 pprConDecl :: OutputableBndr name => ConDecl name -> SDoc
 pprConDecl (ConDeclH98 { con_name = L _ con
-                       -- , con_qvars = tvs
-                       -- , con_cxt = cxt
+                       , con_qvars = mtvs
+                       , con_cxt = mcxt
                        , con_details = details
                        , con_doc = doc })
-  = sep [ppr_mbDoc doc, ppr_details details]
+  = sep [ppr_mbDoc doc, pprHsForAll tvs cxt, ppr_details details]
   where
     ppr_details (InfixCon t1 t2) = hsep [ppr t1, pprInfixOcc con, ppr t2]
     ppr_details (PrefixCon tys)  = hsep (pprPrefixOcc con
                                    : map (pprParendHsType . unLoc) tys)
     ppr_details (RecCon fields)  = pprPrefixOcc con
                                  <+> pprConDeclFields (unLoc fields)
+    tvs = case mtvs of
+      Nothing -> []
+      Just (HsQTvs { hsq_tvs = tvs}) -> tvs
+    cxt = fromMaybe (noLoc []) mcxt
 
 pprConDecl (ConDeclGADT { con_names = cons, con_type = res_ty, con_doc = doc })
   = sep [ppr_mbDoc doc <+> ppr_con_names cons <+> dcolon
diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs
index c56857f..31f30f9 100644
--- a/compiler/rename/RnTypes.hs
+++ b/compiler/rename/RnTypes.hs
@@ -385,11 +385,10 @@ rnHsTyKi _ doc (HsBangTy b ty)
   = do { (ty', fvs) <- rnLHsType doc ty
        ; return (HsBangTy b ty', fvs) }
 
-rnHsTyKi _ doc@(ConDeclCtx names) ty@(HsRecTy flds)
-  = do { addErr (hang (ptext (sLit "Record syntax is illegal here:"))
-                    2 (ppr ty))
+rnHsTyKi _ doc@(ConDeclCtx names) (HsRecTy flds)
+  = do {
        -- AZ:reviewers: is there a monadic version of concatMap?
-       ; flss <- mapM (lookupConstructorFields . unLoc) names
+         flss <- mapM (lookupConstructorFields . unLoc) names
        ; let fls = concat flss
        ; (flds', fvs) <- rnConDeclFields fls doc flds
        ; return (HsRecTy flds', fvs) }
diff --git a/compiler/typecheck/TcHsType.hs b/compiler/typecheck/TcHsType.hs
index 303cd57..73cc674 100644
--- a/compiler/typecheck/TcHsType.hs
+++ b/compiler/typecheck/TcHsType.hs
@@ -387,11 +387,10 @@ tc_hs_type ty@(HsBangTy {})    _
     -- other kinds of bangs are not (eg ((!Maybe) Int)). These kinds of
     -- bangs are invalid, so fail. (#7210)
     = failWithTc (ptext (sLit "Unexpected strictness annotation:") <+> ppr ty)
-tc_hs_type ty@(HsRecTy _)      _ -- = panic "tc_hs_type: record" -- Unwrapped by con decls
+tc_hs_type ty@(HsRecTy _)      _
       -- Record types (which only show up temporarily in constructor
       -- signatures) should have been removed by now
-    -- = failWithTc (ptext (sLit "Record syntax is illegal here:") <+> ppr ty)
-    = failWithTc (ptext (sLit "Record syntax is illegal here(tc):") <+> ppr ty)
+    = failWithTc (ptext (sLit "Record syntax is illegal here:") <+> ppr ty)
 
 ---------- Functions and applications
 tc_hs_type hs_ty@(HsTyVar (L _ name)) exp_kind
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 274ab4c..ff315bd 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -1331,7 +1331,7 @@ tcConDecl _new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
              --    ResTyGADT: *all* the quantified type variables
              -- c.f. the comment on con_qvars in HsDecls
        -}
-       ; (ctxt, stricts, field_lbls, arg_tys, res_ty)
+       ; (ctxt, stricts, field_lbls, arg_tys, res_ty,hs_details)
            <- tcGadtSigType (ppr names) (unLoc $ head names) ty
        ; tkvs <- quantifyTyVars emptyVarSet (tyVarsOfTypes (res_ty:ctxt++arg_tys))
 
@@ -1352,8 +1352,7 @@ tcConDecl _new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
        ; traceTc "tcConDecl 2" (ppr names $$ ppr field_lbls)
        ; let
            buildOneDataCon (L _ name) = do
-             { let (hs_details,_,_,_tvs) = gadtDeclDetails ty
-             ; is_infix <- tcConIsInfixGADT name hs_details
+             { is_infix <- tcConIsInfixGADT name hs_details
              ; rep_nm   <- newTyConRepName name
 
              ; buildDataCon fam_envs name is_infix
@@ -1372,7 +1371,8 @@ tcConDecl _new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
 
 
 tcGadtSigType :: SDoc -> Name -> LHsSigType Name
-              -> TcM ([PredType],[HsSrcBang], [FieldLabel], [Type], Type)
+              -> TcM ([PredType],[HsSrcBang], [FieldLabel], [Type], Type
+                     ,HsConDetails (LHsType Name) (Located [LConDeclField Name]))
 tcGadtSigType doc name ty@(HsIB { hsib_kvs = kvs, hsib_tvs = tvs, hsib_body = _bty})
   = do { let (hs_details',res_ty',cxt,gtvs) = gadtDeclDetails ty
        ; (hs_details,res_ty) <- tcUpdateConResult doc hs_details' res_ty'
@@ -1386,7 +1386,7 @@ tcGadtSigType doc name ty@(HsIB { hsib_kvs = kvs, hsib_tvs = tvs, hsib_body = _b
                  ; let (arg_tys, stricts) = unzip btys
                  ; return (ctxt, arg_tys, ty', field_lbls, stricts)
                  }
-       ; return (ctxt,stricts,field_lbls,arg_tys,res_ty)
+       ; return (ctxt,stricts,field_lbls,arg_tys,res_ty,hs_details)
        }
 
 tcUpdateConResult :: SDoc
@@ -1433,7 +1433,7 @@ tcConIsInfixGADT con details
   = case details of
            InfixCon {}  -> return True
            RecCon {}    -> return False
-           PrefixCon arg_tys           -- See Note [Infix GADT cons]
+           PrefixCon arg_tys           -- See Note [Infix GADT constructors]
                | isSymOcc (getOccName con)
                , [_ty1,_ty2] <- arg_tys
                   -> do { fix_env <- getFixityEnv
diff --git a/testsuite/tests/rename/should_fail/T7943.stderr b/testsuite/tests/rename/should_fail/T7943.stderr
index 8594a25..c6bf7ae 100644
--- a/testsuite/tests/rename/should_fail/T7943.stderr
+++ b/testsuite/tests/rename/should_fail/T7943.stderr
@@ -1,2 +1,6 @@
 
-T7943.hs:4:22: Record syntax is illegal here: {bar :: String}
+T7943.hs:4:22:
+     Record syntax is illegal here: {bar :: String}
+     In the type ?{bar :: String}?
+      In the definition of data constructor ?B?
+      In the data declaration for ?Foo?
\ No newline at end of file


From git at git.haskell.org  Sun Nov 29 21:37:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 21:37:56 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Down to only T5331 failing,
 which requires a decision (d7de588)
Message-ID: <20151129213756.A70513A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/d7de5883de863805d7d2d3f1fd9bdc71c6831471/ghc

>---------------------------------------------------------------

commit d7de5883de863805d7d2d3f1fd9bdc71c6831471
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Nov 29 23:36:17 2015 +0200

    Down to only T5331 failing, which requires a decision
    
    See https://ghc.haskell.org/trac/ghc/ticket/11028#comment:33


>---------------------------------------------------------------

d7de5883de863805d7d2d3f1fd9bdc71c6831471
 compiler/deSugar/DsMeta.hs         |  4 --
 compiler/hsSyn/HsDecls.hs          | 83 ++++----------------------------------
 compiler/rename/RnSource.hs        | 82 -------------------------------------
 compiler/typecheck/TcTyClsDecls.hs | 12 ++----
 4 files changed, 11 insertions(+), 170 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d7de5883de863805d7d2d3f1fd9bdc71c6831471

From git at git.haskell.org  Sun Nov 29 22:26:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 22:26:09 +0000 (UTC)
Subject: [commit: ghc] master: ghci: Refactor handling of :show (f101a82)
Message-ID: <20151129222609.672AC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f101a822966c52e96438db52c5fff2c7384f0c4c/ghc

>---------------------------------------------------------------

commit f101a822966c52e96438db52c5fff2c7384f0c4c
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Nov 29 22:49:04 2015 +0100

    ghci: Refactor handling of :show
    
    In so doing ensure that the help text can't fall out of sync with the
    implementation.
    
    Test Plan: Validate and play in ghci
    
    Reviewers: austin, thomie
    
    Reviewed By: austin, thomie
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1538
    
    GHC Trac Issues: #11111


>---------------------------------------------------------------

f101a822966c52e96438db52c5fff2c7384f0c4c
 ghc/InteractiveUI.hs | 60 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index 026d6ea..393de5c 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -2333,27 +2333,45 @@ showCmd :: String -> GHCi ()
 showCmd ""   = showOptions False
 showCmd "-a" = showOptions True
 showCmd str = do
-  st <- getGHCiState
-  case words str of
-        ["args"]     -> liftIO $ putStrLn (show (GhciMonad.args st))
-        ["prog"]     -> liftIO $ putStrLn (show (progname st))
-        ["editor"]   -> liftIO $ putStrLn (show (editor st))
-        ["stop"]     -> liftIO $ putStrLn (show (stop st))
-        ["imports"]  -> showImports
-        ["modules" ] -> showModules
-        ["bindings"] -> showBindings
-        ["linker"]   ->
-            do dflags <- getDynFlags
-               liftIO $ showLinkerState dflags
-        ["breaks"]   -> showBkptTable
-        ["context"]  -> showContext
-        ["packages"]  -> showPackages
-        ["paths"]     -> showPaths
-        ["languages"] -> showLanguages -- backwards compat
-        ["language"]  -> showLanguages
-        ["lang"]      -> showLanguages -- useful abbreviation
-        _ -> throwGhcException (CmdLineError ("syntax:  :show [ args | prog | editor | stop | modules\n" ++
-                                              "               | bindings | breaks | context | packages | language ]"))
+    st <- getGHCiState
+    dflags <- getDynFlags
+
+    let lookupCmd :: String -> Maybe (GHCi ())
+        lookupCmd name = lookup name $ map (\(_,b,c) -> (b,c)) cmds
+
+        -- (show in help?, command name, action)
+        action :: String -> GHCi () -> (Bool, String, GHCi ())
+        action name m = (True, name, m)
+
+        hidden :: String -> GHCi () -> (Bool, String, GHCi ())
+        hidden name m = (False, name, m)
+
+        cmds =
+            [ action "args"       $ liftIO $ putStrLn (show (GhciMonad.args st))
+            , action "prog"       $ liftIO $ putStrLn (show (progname st))
+            , action "editor"     $ liftIO $ putStrLn (show (editor st))
+            , action "stop"       $ liftIO $ putStrLn (show (stop st))
+            , action "imports"    $ showImports
+            , action "modules"    $ showModules
+            , action "bindings"   $ showBindings
+            , action "linker"     $ getDynFlags >>= liftIO . showLinkerState
+            , action "breaks"     $ showBkptTable
+            , action "context"    $ showContext
+            , action "packages"   $ showPackages
+            , action "paths"      $ showPaths
+            , action "language"   $ showLanguages
+            , hidden "languages"  $ showLanguages -- backwards compat
+            , hidden "lang"       $ showLanguages -- useful abbreviation
+            ]
+
+    case words str of
+      [w] | Just action <- lookupCmd w -> action
+
+      _ -> let helpCmds = [ text name | (True, name, _) <- cmds ]
+           in throwGhcException $ CmdLineError $ showSDoc dflags
+              $ hang (text "syntax:") 4
+              $ hang (text ":show") 6
+              $ brackets (fsep $ punctuate (text " |") helpCmds)
 
 showiCmd :: String -> GHCi ()
 showiCmd str = do


From git at git.haskell.org  Sun Nov 29 22:26:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 22:26:12 +0000 (UTC)
Subject: [commit: ghc] master: Some improvements on CoreToDos passed to
 plugins (bcd55a9)
Message-ID: <20151129222612.0BFE03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bcd55a94f234f5efa4bb4fd24429dafc79d93106/ghc

>---------------------------------------------------------------

commit bcd55a94f234f5efa4bb4fd24429dafc79d93106
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Sun Nov 29 22:49:46 2015 +0100

    Some improvements on CoreToDos passed to plugins
    
    This patch does two improvements:
    
    - We now show ToDos in `CoreDoPasses`. This is pretty important,
      otherwise `CoreDoPasses` makes debugging impossible in some cases.
    
    - Before running ToDos we run a cleanup pass on ToDos to remove
      `CoreDoNothing`s and flatten `CoreDoPasses`. This removes a lot of
      noise from `[CoreToDo]` argument passed to plugins.
    
    Reviewers: simonpj, bgamari, austin
    
    Reviewed By: bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1548


>---------------------------------------------------------------

bcd55a94f234f5efa4bb4fd24429dafc79d93106
 compiler/simplCore/CoreMonad.hs | 2 +-
 compiler/simplCore/SimplCore.hs | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/compiler/simplCore/CoreMonad.hs b/compiler/simplCore/CoreMonad.hs
index ce5286d..fa72834 100644
--- a/compiler/simplCore/CoreMonad.hs
+++ b/compiler/simplCore/CoreMonad.hs
@@ -169,7 +169,7 @@ instance Outputable CoreToDo where
   ppr CoreDoPrintCore          = ptext (sLit "Print core")
   ppr (CoreDoRuleCheck {})     = ptext (sLit "Rule check")
   ppr CoreDoNothing            = ptext (sLit "CoreDoNothing")
-  ppr (CoreDoPasses {})        = ptext (sLit "CoreDoPasses")
+  ppr (CoreDoPasses passes)    = ptext (sLit "CoreDoPasses") <+> ppr passes
 
 pprPassDetails :: CoreToDo -> SDoc
 pprPassDetails (CoreDoSimplify n md) = vcat [ ptext (sLit "Max iterations =") <+> int n
diff --git a/compiler/simplCore/SimplCore.hs b/compiler/simplCore/SimplCore.hs
index 9207cf4..8670e30 100644
--- a/compiler/simplCore/SimplCore.hs
+++ b/compiler/simplCore/SimplCore.hs
@@ -109,7 +109,7 @@ core2core hsc_env guts@(ModGuts { mg_module  = mod
 
 getCoreToDo :: DynFlags -> [CoreToDo]
 getCoreToDo dflags
-  = core_todo
+  = flatten_todos core_todo
   where
     opt_level     = optLevel           dflags
     phases        = simplPhases        dflags
@@ -322,6 +322,13 @@ getCoreToDo dflags
         maybe_rule_check (Phase 0)
      ]
 
+    -- Remove 'CoreDoNothing' and flatten 'CoreDoPasses' for clarity.
+    flatten_todos [] = []
+    flatten_todos (CoreDoNothing : rest) = flatten_todos rest
+    flatten_todos (CoreDoPasses passes : rest) =
+      flatten_todos passes ++ flatten_todos rest
+    flatten_todos (todo : rest) = todo : flatten_todos rest
+
 -- Loading plugins
 
 addPluginPasses :: [CoreToDo] -> CoreM [CoreToDo]


From git at git.haskell.org  Sun Nov 29 22:26:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 29 Nov 2015 22:26:15 +0000 (UTC)
Subject: [commit: ghc] master: Implement warnings for Semigroups as parent of
 Monoid (290def7)
Message-ID: <20151129222615.A8CC03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/290def72f54db7969258b4541aaefc87b54ce448/ghc

>---------------------------------------------------------------

commit 290def72f54db7969258b4541aaefc87b54ce448
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Sun Nov 29 22:59:57 2015 +0100

    Implement warnings for Semigroups as parent of Monoid
    
    This patch is similar to the AMP patch (#8004), which offered two
    functions:
    
      1. Warn when an instance of a class has been given, but the type does
         not have a certain superclass instance
      2. Warn when top-level definitions conflict with future Prelude names
    
    These warnings are issued as part of the new `-Wcompat` warning group.
    
    Reviewers: hvr, ekmett, austin, bgamari
    
    Reviewed By: hvr, ekmett, bgamari
    
    Subscribers: ekmett, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1539
    
    GHC Trac Issues: #11139


>---------------------------------------------------------------

290def72f54db7969258b4541aaefc87b54ce448
 compiler/hsSyn/HsTypes.hs                          |  10 ++
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs            |  10 ++
 compiler/main/DynFlags.hs                          |   5 +-
 compiler/main/Packages.hs                          |  16 ++
 compiler/prelude/PrelNames.hs                      |  29 +++-
 compiler/typecheck/TcErrors.hs                     |   9 +
 compiler/typecheck/TcRnDriver.hs                   | 193 ++++++++++++++++++++-
 compiler/utils/OrdList.hs                          |   9 +
 compiler/utils/UniqFM.hs                           |   9 +
 docs/users_guide/7.12.1-notes.rst                  |   6 +
 docs/users_guide/using-warnings.rst                |  18 +-
 testsuite/tests/{ado => semigroup}/Makefile        |   0
 testsuite/tests/semigroup/SemigroupWarnings.hs     |  34 ++++
 testsuite/tests/semigroup/SemigroupWarnings.stderr |   8 +
 testsuite/tests/semigroup/all.T                    |   1 +
 .../should_fail/CustomTypeErrors02.stderr          |  12 +-
 .../tests/wcompat-warnings/WCompatWarningsNotOn.hs |   2 +
 .../tests/wcompat-warnings/WCompatWarningsOff.hs   |   2 +
 .../tests/wcompat-warnings/WCompatWarningsOn.hs    |   2 +
 .../wcompat-warnings/WCompatWarningsOn.stderr      |  42 +++--
 .../tests/wcompat-warnings/WCompatWarningsOnOff.hs |   2 +
 utils/mkUserGuidePart/Options/Warnings.hs          |  11 +-
 22 files changed, 399 insertions(+), 31 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 290def72f54db7969258b4541aaefc87b54ce448

From git at git.haskell.org  Mon Nov 30 13:04:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 30 Nov 2015 13:04:24 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Down to only T5331 failing,
 which requires a decision (c78086e)
Message-ID: <20151130130424.043DC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/c78086ed74a91990c83d5ab95ff24030cbbb7948/ghc

>---------------------------------------------------------------

commit c78086ed74a91990c83d5ab95ff24030cbbb7948
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Nov 29 23:36:17 2015 +0200

    Down to only T5331 failing, which requires a decision
    
    See https://ghc.haskell.org/trac/ghc/ticket/11028#comment:33


>---------------------------------------------------------------

c78086ed74a91990c83d5ab95ff24030cbbb7948
 compiler/deSugar/DsMeta.hs         |  12 ++--
 compiler/hsSyn/HsDecls.hs          | 109 ++-----------------------------------
 compiler/rename/RnSource.hs        |  82 ----------------------------
 compiler/typecheck/TcTyClsDecls.hs |  12 +---
 4 files changed, 14 insertions(+), 201 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c78086ed74a91990c83d5ab95ff24030cbbb7948

From git at git.haskell.org  Mon Nov 30 13:59:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 30 Nov 2015 13:59:48 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Apply option 3 for T5331,
 accept the new behaviour (cdac0b5)
Message-ID: <20151130135948.B27AA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/cdac0b57536fabc2a3734ef6516b0124658797f9/ghc

>---------------------------------------------------------------

commit cdac0b57536fabc2a3734ef6516b0124658797f9
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 30 15:47:55 2015 +0200

    Apply option 3 for T5331, accept the new behaviour
    
    This means that for
    
    data W where
      W1 :: forall a. W
    
    we get
    
    T5331.hs:11:16: Warning:
        Unused quantified type variable ?a?
        In the type `forall a. W?
    
    instead of
    
    T5331.hs:11:16: Warning:
        Unused quantified type variable ?a?
        In the definition of data constructor ?W1?


>---------------------------------------------------------------

cdac0b57536fabc2a3734ef6516b0124658797f9
 testsuite/tests/rename/should_compile/T5331.stderr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/rename/should_compile/T5331.stderr b/testsuite/tests/rename/should_compile/T5331.stderr
index 13249b0..965e15a 100644
--- a/testsuite/tests/rename/should_compile/T5331.stderr
+++ b/testsuite/tests/rename/should_compile/T5331.stderr
@@ -5,7 +5,7 @@ T5331.hs:8:17: warning:
 
 T5331.hs:11:16: warning:
     Unused quantified type variable ?a?
-    In the definition of data constructor ?W1?
+    In the type ?forall a. W?
 
 T5331.hs:13:13: warning:
     Unused quantified type variable ?a?


From git at git.haskell.org  Mon Nov 30 21:40:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 30 Nov 2015 21:40:31 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: Bump Cabal submodule to 1.22.5.0 (aaca9bc)
Message-ID: <20151130214031.ABCD43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/aaca9bc45bd38c73610e61fc8f00de114d7e07ce/ghc

>---------------------------------------------------------------

commit aaca9bc45bd38c73610e61fc8f00de114d7e07ce
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 30 22:39:39 2015 +0100

    Bump Cabal submodule to 1.22.5.0


>---------------------------------------------------------------

aaca9bc45bd38c73610e61fc8f00de114d7e07ce
 libraries/Cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 4f6e9a5..fb7ce39 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 4f6e9a5b63640f4203560f3c7a89131fc66fdd7e
+Subproject commit fb7ce39dc5332fb4dee84d60b22a138821ccd3f6