[commit: ghc] wip/forall-keyword, wip/no-kind-vars: Fix checkStackChunk() call in Interepter.c, enable an assertion (6b890d7)
git at git.haskell.org
git at git.haskell.org
Thu Feb 14 09:12:48 UTC 2019
Repository : ssh://git@git.haskell.org/ghc
On branches: wip/forall-keyword,wip/no-kind-vars
Link : http://ghc.haskell.org/trac/ghc/changeset/6b890d76a252259843a6e87043f8f12e6a8a0aae/ghc
>---------------------------------------------------------------
commit 6b890d76a252259843a6e87043f8f12e6a8a0aae
Author: Ömer Sinan Ağacan <omeragacan at gmail.com>
Date: Mon Feb 11 18:17:43 2019 +0300
Fix checkStackChunk() call in Interepter.c, enable an assertion
Fixes #16303
>---------------------------------------------------------------
6b890d76a252259843a6e87043f8f12e6a8a0aae
rts/Interpreter.c | 2 +-
rts/sm/Sanity.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rts/Interpreter.c b/rts/Interpreter.c
index a3b179a..3450780 100644
--- a/rts/Interpreter.c
+++ b/rts/Interpreter.c
@@ -938,7 +938,7 @@ run_BCO_fun:
Sp_subW(2);
SpW(1) = (W_)obj;
SpW(0) = (W_)&stg_apply_interp_info;
- checkStackChunk(Sp,SpLim);
+ checkStackChunk(Sp, cap->r.rCurrentTSO->stackobj->stack+cap->r.rCurrentTSO->stackobj->stack_size);
Sp_addW(2);
);
diff --git a/rts/sm/Sanity.c b/rts/sm/Sanity.c
index 28c9b43..8082b7e 100644
--- a/rts/sm/Sanity.c
+++ b/rts/sm/Sanity.c
@@ -172,7 +172,7 @@ checkStackChunk( StgPtr sp, StgPtr stack_end )
while (p < stack_end) {
p += checkStackFrame( p );
}
- // ASSERT( p == stack_end ); -- HWL
+ ASSERT( p == stack_end );
}
static void
More information about the ghc-commits
mailing list