[commit: ghc] ghc-7.2: Fix Trac #5286: getPredTyDescription (c4e54f9)
Ian Lynagh
igloo at earth.li
Tue Jul 5 17:27:42 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/c4e54f9a7819b6078a61a5ac5427f79d53d22e52
>---------------------------------------------------------------
commit c4e54f9a7819b6078a61a5ac5427f79d53d22e52
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Thu Jun 30 17:45:00 2011 +0100
Fix Trac #5286: getPredTyDescription
>---------------------------------------------------------------
compiler/codeGen/ClosureInfo.lhs | 2 +-
compiler/codeGen/StgCmmClosure.hs | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/compiler/codeGen/ClosureInfo.lhs b/compiler/codeGen/ClosureInfo.lhs
index d2c63b3..4f59d95 100644
--- a/compiler/codeGen/ClosureInfo.lhs
+++ b/compiler/codeGen/ClosureInfo.lhs
@@ -1052,5 +1052,5 @@ getTyDescription ty
getPredTyDescription :: PredType -> String
getPredTyDescription (ClassP cl _) = getOccString cl
getPredTyDescription (IParam ip _) = getOccString (ipNameName ip)
-getPredTyDescription (EqPred _ _) = panic "getPredTyDescription EqPred"
+getPredTyDescription (EqPred _ _) = "Type equality"
\end{code}
diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs
index d617743..a8d91f5 100644
--- a/compiler/codeGen/StgCmmClosure.hs
+++ b/compiler/codeGen/StgCmmClosure.hs
@@ -1086,10 +1086,9 @@ getTyDescription ty
fun_result other = getTyDescription other
getPredTyDescription :: PredType -> String
-getPredTyDescription (ClassP cl _) = getOccString cl
-getPredTyDescription (IParam ip _) = getOccString (ipNameName ip)
-getPredTyDescription (EqPred ty1 _ty2) = getTyDescription ty1 -- Urk?
-
+getPredTyDescription (ClassP cl _) = getOccString cl
+getPredTyDescription (IParam ip _) = getOccString (ipNameName ip)
+getPredTyDescription (EqPred {}) = "Type equality"
--------------------------------------
-- SRTs/CAFs
More information about the Cvs-ghc
mailing list