Skip to content
Commits on Source (2)
  • Ryan Scott's avatar
    Bump hpc submodule · 6e254ee3
    Ryan Scott authored 
    Currently, the `hpc` submodule is pinned against the `wip/final-mfp`
branch, not against `master`. This pins it back against `master`.
    6e254ee3
  • Ömer Sinan Ağacan's avatar
    Fix two bugs in stg_ap_0_fast in profiling runtime · 2ea424ea
    Ömer Sinan Ağacan authored and Ben Gamari's avatar Ben Gamari committed 
    This includes two bug fixes in profiling version of stg_ap_0_fast:

- PAPs allocated by stg_ap_0_fast are now correctly tagged. This
  invariant is checked in Sanity.c:checkPAP.

  (This was originally implemented in 2693eb11, later reverted with
  ab55b4dd because it revealed the bug below, but it wasn't clear at
  the time whether the bug was the one below or something in the commit)

- The local variable `untaggedfun` is now marked as a pointer so it
  survives GC.

With this we finally fix all known bugs caught in #15508. `concprog001`
now works reliably with prof+threaded and prof runtimes (with and
without -debug).


(cherry picked from commit 908b4b86)
    2ea424ea
Hide whitespace changes
Inline Side-by-side
hpc @ 42bb0059
Compare 76734205...42bb0059
Subproject commit 7673420558e2a54affe530911d555cc78577ad87
Subproject commit 42bb0059dc535948ce87b846611968c1c01ae049
rts/Apply.cmm
View file @ 2ea424ea
......@@ -60,7 +60,7 @@ stg_ap_0_fast ( P_ fun )
again:
W_ info;
W_ untaggedfun;
P_ untaggedfun;
W_ arity;
untaggedfun = UNTAG(fun);
info = %INFO_PTR(untaggedfun);
......@@ -106,6 +106,11 @@ again:
pap = Hp - SIZEOF_StgPAP + WDS(1);
SET_HDR(pap, stg_PAP_info, CCCS);
StgPAP_arity(pap) = arity;
if (arity <= TAG_MASK) {
// TODO: Shouldn't this already be tagged? If not why did we
// untag it at the beginning of this function?
fun = untaggedfun + arity;
}
StgPAP_fun(pap) = fun;
StgPAP_n_args(pap) = 0;
return (pap);
......@@ -117,9 +122,8 @@ again:
return (fun);
} else {
// We're going to copy this PAP, and put the new CCS in it
fun = untaggedfun;
W_ size;
size = SIZEOF_StgPAP + WDS(TO_W_(StgPAP_n_args(fun)));
size = SIZEOF_StgPAP + WDS(TO_W_(StgPAP_n_args(untaggedfun)));
HP_CHK_GEN(size);
TICK_ALLOC_PAP(size, 0);
// attribute this allocation to the "overhead of profiling"
......@@ -127,13 +131,13 @@ again:
P_ pap;
pap = Hp - size + WDS(1);
// We'll lose the original PAP, so we should enter its CCS
ccall enterFunCCS(BaseReg "ptr", StgHeader_ccs(fun) "ptr");
ccall enterFunCCS(BaseReg "ptr", StgHeader_ccs(untaggedfun) "ptr");
SET_HDR(pap, stg_PAP_info, CCCS);
StgPAP_arity(pap) = StgPAP_arity(fun);
StgPAP_n_args(pap) = StgPAP_n_args(fun);
StgPAP_arity(pap) = StgPAP_arity(untaggedfun);
StgPAP_n_args(pap) = StgPAP_n_args(untaggedfun);
StgPAP_fun(pap) = StgPAP_fun(fun);
W_ i;
i = TO_W_(StgPAP_n_args(fun));
i = TO_W_(StgPAP_n_args(untaggedfun));
loop:
if (i == 0) {
return (pap);
......