[commit: ghc] master: Improve accuracy of memory conflict tracking (40b6598)

low Date: Thu Aug 2 09:37:39 2012 +0100 Improve accuracy of memory conflict tracking We now track stack regions, so that we can float a stack load past a stack store if they don't conflict. Also, we now use the CmmType to more accurately identify heap a

[commit: testsuite] master: Fix T5975a/b conflict when run in parallel (4f21b8b)

mon Marlow Date: Fri Jul 6 10:40:49 2012 +0100 Fix T5975a/b conflict when run in parallel Also make T5975b actually load the file, it looks like this was an oversight when the test was created (it wasn't doing anything useful

[commit: ghc] ghc-7.4: Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register (647f8a2)

low Date: Wed Jan 4 15:13:23 2012 + Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register Needed by #5357 >--- compiler/codeGen/CgForeignCall.hs |2 +- compiler/codeGen/StgCmmFore

[commit: ghc] master: Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register (3478213)

low Date: Wed Jan 4 15:13:23 2012 + Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register Needed by #5357 >--- compiler/codeGen/CgForeignCall.hs |2 +- compiler/codeGen/StgCmmFore

patch applied (ghc-7.0/testsuite): Resolve conflict in 7.0 branch

Sun Feb 13 06:28:28 PST 2011 Ian Lynagh * Resolve conflict in 7.0 branch M ./tests/ghc-regress/th/all.T -1 +2 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=ghc-7.0/testsuite;a=darcs_commitdiff;h=20110213142828-3fd76-c1e61add628166eecf8e54822345fdf778456910.gz

patch applied (ghc-7.0/testsuite): Resolve conflict in perf test expected values

Fri Jan 21 11:29:56 PST 2011 Ian Lynagh * Resolve conflict in perf test expected values M ./tests/ghc-regress/perf/compiler/all.T -3 +3 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=ghc-7.0/testsuite;a=darcs_commitdiff;h=20110121192956-3fd76

patch applied (ghc-7.0/ghc): Resolve conflict

Fri Jan 21 06:44:37 PST 2011 Ian Lynagh * Resolve conflict M ./compiler/vectorise/Vectorise/Type/PADict.hs -1 +1 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=ghc-7.0/ghc;a=darcs_commitdiff;h=20110121144437-3fd76-eda2d78afbd081ebb1a19c91193207f43b4644e4.gz

Conflict

I accidentally committed a pair of patches last night that was a conflict. (I didn't know that I had an old (Nov 1) un-pushed patch in my tree, so I thought the conflict bleat referred only to my working tree. So I ended up with two patches, below, instead of one.) This is annoying but

patch applied (ghc-6.10/ghc): Better error message for fundep conflict

Mon Dec 1 08:28:45 PST 2008 [EMAIL PROTECTED] * Better error message for fundep conflict M ./compiler/types/Class.lhs -5 +5 M ./compiler/types/FunDeps.lhs -2 +3 View patch online: http://darcs.haskell.org/ghc-6.10/ghc/_darcs/patches/20081201162845-1287e

patch applied (ghc): Better error message for fundep conflict

Mon Dec 1 08:28:45 PST 2008 [EMAIL PROTECTED] * Better error message for fundep conflict M ./compiler/types/Class.lhs -5 +5 M ./compiler/types/FunDeps.lhs -2 +3 View patch online: http://darcs.haskell.org/ghc/_darcs/patches/20081201162845-1287e

patch applied (ghc): Add vreg-conflicts and vreg-conflict-lifetimes to drop-asm-stats

Mon Aug 20 02:39:19 PDT 2007 [EMAIL PROTECTED] * Add vreg-conflicts and vreg-conflict-lifetimes to drop-asm-stats M ./compiler/nativeGen/AsmCodeGen.lhs -34 +9 M ./compiler/nativeGen/GraphOps.hs -1 +20 M ./compiler/nativeGen/RegAllocStats.hs -2 +84