[commit: ghc] cardinality: Avoid asking for non-updatable selector thunks (8082b28)
Simon Peyton Jones
simonpj at microsoft.com
Thu Mar 14 14:39:03 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : cardinality
http://hackage.haskell.org/trac/ghc/changeset/8082b28cf50e31685126f7a46b750ceee40cd7db
>---------------------------------------------------------------
commit 8082b28cf50e31685126f7a46b750ceee40cd7db
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Thu Mar 14 13:38:39 2013 +0000
Avoid asking for non-updatable selector thunks
(Pending the fix to Trac #7771).
>---------------------------------------------------------------
compiler/cmm/CLabel.hs | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index ebc9e53..e901168 100644
--- a/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
@@ -1005,11 +1005,14 @@ pprCLbl (CmmLabel _ str CmmPrimCall) = ftext str
pprCLbl (RtsLabel (RtsApFast str)) = ftext str <> ptext (sLit "_fast")
-pprCLbl (RtsLabel (RtsSelectorInfoTable upd_reqd offset))
+pprCLbl (RtsLabel (RtsSelectorInfoTable _upd_reqd offset))
= hcat [ptext (sLit "stg_sel_"), text (show offset),
- ptext (if upd_reqd
- then (sLit "_upd_info")
- else (sLit "_noupd_info"))
+ ptext (sLit "_upd_info")
+-- RTS only has updatable selector thunks at the moment
+-- so we use just them; see Trac #7771.
+-- ptext (if upd_reqd
+-- then (sLit "_upd_info")
+-- else (sLit "_noupd_info"))
]
pprCLbl (RtsLabel (RtsSelectorEntry upd_reqd offset))
More information about the ghc-commits
mailing list