diff options
| author | Dimitrios Vytiniotis <dimitris@microsoft.com> | 2012-03-28 10:56:29 +0200 |
|---|---|---|
| committer | Dimitrios Vytiniotis <dimitris@microsoft.com> | 2012-03-28 10:56:29 +0200 |
| commit | b4b7647fedf0feab41d417c4e980bd08445ce559 (patch) | |
| tree | 004f4e966e1a1e3a5457b11c57cb7f9abf43a108 /compiler/codeGen | |
| parent | cc2d2e1d44405630fb34311dc3f5e42eadc5c6b1 (diff) | |
| parent | 9606231dd203163c8ca839b3f58c6e40a3805fa8 (diff) | |
| download | haskell-b4b7647fedf0feab41d417c4e980bd08445ce559.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-new-flavor
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/ClosureInfo.lhs | 8 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmClosure.hs | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/compiler/codeGen/ClosureInfo.lhs b/compiler/codeGen/ClosureInfo.lhs index 34746984c2..d8fd07fead 100644 --- a/compiler/codeGen/ClosureInfo.lhs +++ b/compiler/codeGen/ClosureInfo.lhs @@ -1097,8 +1097,16 @@ getTyDescription ty FunTy _ res -> '-' : '>' : fun_result res TyConApp tycon _ -> getOccString tycon ForAllTy _ ty -> getTyDescription ty + LitTy n -> getTyLitDescription n } where fun_result (FunTy _ res) = '>' : fun_result res fun_result other = getTyDescription other + + +getTyLitDescription :: TyLit -> String +getTyLitDescription l = + case l of + NumTyLit n -> show n + StrTyLit n -> show n \end{code} diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs index 5c0741a65e..d4ba62c6ca 100644 --- a/compiler/codeGen/StgCmmClosure.hs +++ b/compiler/codeGen/StgCmmClosure.hs @@ -864,11 +864,18 @@ getTyDescription ty FunTy _ res -> '-' : '>' : fun_result res TyConApp tycon _ -> getOccString tycon ForAllTy _ ty -> getTyDescription ty + LitTy n -> getTyLitDescription n } where fun_result (FunTy _ res) = '>' : fun_result res fun_result other = getTyDescription other +getTyLitDescription :: TyLit -> String +getTyLitDescription l = + case l of + NumTyLit n -> show n + StrTyLit n -> show n + -------------------------------------- -- CmmInfoTable-related things -------------------------------------- |