summaryrefslogtreecommitdiff
path: root/compiler/codeGen/StgCmm.hs
diff options
context:
space:
mode:
authorPaolo Capriotti <p.capriotti@gmail.com>2012-06-05 16:47:02 +0100
committerPaolo Capriotti <p.capriotti@gmail.com>2012-06-05 16:47:02 +0100
commit0076786de1c4450743803be8b23a0f3e5c47e4ee (patch)
tree9b867ef1d1c4aacc5652a7e9f05a940970a1c064 /compiler/codeGen/StgCmm.hs
parenteb02ad91b1479f389d26394f3e148ee8e45e4ec4 (diff)
parent09987de4ece1fc634af6b2b37173b12ed46fdf3e (diff)
downloadhaskell-0076786de1c4450743803be8b23a0f3e5c47e4ee.tar.gz
Merge remote-tracking branch 'origin/unboxed-tuple-arguments2'
Diffstat (limited to 'compiler/codeGen/StgCmm.hs')
-rw-r--r--compiler/codeGen/StgCmm.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/codeGen/StgCmm.hs b/compiler/codeGen/StgCmm.hs
index 6e99543064..17a7062559 100644
--- a/compiler/codeGen/StgCmm.hs
+++ b/compiler/codeGen/StgCmm.hs
@@ -274,8 +274,8 @@ cgDataCon data_con
(tagForCon data_con)] }
-- The case continuation code expects a tagged pointer
- arg_reps :: [(PrimRep, Type)]
- arg_reps = [(typePrimRep ty, ty) | ty <- dataConRepArgTys data_con]
+ arg_reps :: [(PrimRep, UnaryType)]
+ arg_reps = [(typePrimRep rep_ty, rep_ty) | ty <- dataConRepArgTys data_con, rep_ty <- flattenRepType (repType ty)]
-- Dynamic closure code for non-nullary constructors only
; whenC (not (isNullaryRepDataCon data_con))