diff options
| -rw-r--r-- | rts/HeapStackCheck.cmm | 5 | ||||
| -rw-r--r-- | utils/deriveConstants/DeriveConstants.hs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index a1e18ca0f0..9430a09e36 100644 --- a/rts/HeapStackCheck.cmm +++ b/rts/HeapStackCheck.cmm @@ -405,8 +405,9 @@ __stg_gc_fun /* explicit stack */ if (type == ARG_GEN_BIG) { #ifdef TABLES_NEXT_TO_CODE // bitmap field holds an offset - size = StgLargeBitmap_size( StgFunInfoExtra_bitmap(info) - + %GET_ENTRY(UNTAG(R1)) /* ### */ ); + size = StgLargeBitmap_size( + TO_W_(StgFunInfoExtraRev_bitmap_offset(info)) + + %GET_ENTRY(UNTAG(R1)) /* ### */ ); #else size = StgLargeBitmap_size( StgFunInfoExtra_bitmap(info) ); #endif diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/DeriveConstants.hs index ccf9028904..65635506e2 100644 --- a/utils/deriveConstants/DeriveConstants.hs +++ b/utils/deriveConstants/DeriveConstants.hs @@ -568,6 +568,7 @@ wanteds = concat ,structField C "StgFunInfoExtraRev" "fun_type" ,structFieldH Both "StgFunInfoExtraRev" "arity" ,structField_ C "StgFunInfoExtraRev_bitmap" "StgFunInfoExtraRev" "b.bitmap" + ,structField_ C "StgFunInfoExtraRev_bitmap_offset" "StgFunInfoExtraRev" "b.bitmap_offset" ,structField C "StgLargeBitmap" "size" ,fieldOffset C "StgLargeBitmap" "bitmap" |