[commit: ghc] master: Better error message in vectoriser (b5ca10c)

[git at git.haskell.org]

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

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

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

commit b5ca10c08b2ae4d8914fb7565dc0a93165420260
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 8 10:39:21 2014 +0100

    Better error message in vectoriser


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

b5ca10c08b2ae4d8914fb7565dc0a93165420260
 compiler/vectorise/Vectorise.hs                             | 2 +-
 testsuite/tests/dph/modules/dph-ExportList-vseg-fast.stderr | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs
index 012ae37..38bd554 100644
--- a/compiler/vectorise/Vectorise.hs
+++ b/compiler/vectorise/Vectorise.hs
@@ -351,6 +351,6 @@ tryConvert var vect_var rhs
   = fromVect (idType var) (Var vect_var) 
     `orElseErrV` 
     do 
-    { emitVt "  Could NOT call vectorised from original version" $ ppr var
+    { emitVt "  Could NOT call vectorised from original version" $ ppr var <+> dcolon <+> ppr (idType var)
     ; return rhs
     }
diff --git a/testsuite/tests/dph/modules/dph-ExportList-vseg-fast.stderr b/testsuite/tests/dph/modules/dph-ExportList-vseg-fast.stderr
index 749c3cd..bf6f453 100644
--- a/testsuite/tests/dph/modules/dph-ExportList-vseg-fast.stderr
+++ b/testsuite/tests/dph/modules/dph-ExportList-vseg-fast.stderr
@@ -1,6 +1,9 @@
 [1 of 1] Compiling ExportList       ( ExportList.hs, ExportList.o )
 Warning: vectorisation failure: identityConvTyCon: type constructor contains parallel arrays [::]
-  Could NOT call vectorised from original version ExportList.solveV
+  Could NOT call vectorised from original version
+  ExportList.solveV :: GHC.Types.Double -> [:GHC.Types.Double:]
 Warning: vectorisation failure: identityConvTyCon: type constructor contains parallel arrays NodeV
   Could NOT call vectorised from original version
-  ExportList.solvePA
+  ExportList.solvePA :: ExportList.NodeV
+                        -> GHC.Types.Double
+                        -> Data.Array.Parallel.PArray.PData.Base.PArray GHC.Types.Double