diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-18 23:22:20 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-09-18 23:22:20 +0100 |
| commit | a9b986e2fe285f844e42e573e4887a4e36ba92d4 (patch) | |
| tree | 30509b6c6aa091125089208631c146ca72793758 /compiler/codeGen/ClosureInfo.lhs | |
| parent | 3a4c64c1a2953bbc759a6f5c99dad31ab50dc96b (diff) | |
| download | haskell-a9b986e2fe285f844e42e573e4887a4e36ba92d4.tar.gz | |
Make StgWord a portable type too
StgWord is a newtyped Word64, as it needed to be something that
has a UArray instance.
Diffstat (limited to 'compiler/codeGen/ClosureInfo.lhs')
| -rw-r--r-- | compiler/codeGen/ClosureInfo.lhs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/codeGen/ClosureInfo.lhs b/compiler/codeGen/ClosureInfo.lhs index f06ee7840c..740bfab845 100644 --- a/compiler/codeGen/ClosureInfo.lhs +++ b/compiler/codeGen/ClosureInfo.lhs @@ -530,12 +530,12 @@ lfClosureType :: DynFlags -> LambdaFormInfo -> ClosureTypeInfo lfClosureType dflags (LFReEntrant _ arity _ argd) = Fun (toStgHalfWord dflags (toInteger arity)) argd lfClosureType dflags (LFCon con) = Constr (toStgHalfWord dflags (toInteger (dataConTagZ con))) (dataConIdentity con) -lfClosureType _ (LFThunk _ _ _ is_sel _) = thunkClosureType is_sel +lfClosureType dflags (LFThunk _ _ _ is_sel _) = thunkClosureType dflags is_sel lfClosureType _ _ = panic "lfClosureType" -thunkClosureType :: StandardFormInfo -> ClosureTypeInfo -thunkClosureType (SelectorThunk off) = ThunkSelector (fromIntegral off) -thunkClosureType _ = Thunk +thunkClosureType :: DynFlags -> StandardFormInfo -> ClosureTypeInfo +thunkClosureType dflags (SelectorThunk off) = ThunkSelector (toStgWord dflags (toInteger off)) +thunkClosureType _ _ = Thunk -- We *do* get non-updatable top-level thunks sometimes. eg. f = g -- gets compiled to a jump to g (if g has non-zero arity), instead of |