projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Buggy optimizations caused function-call return to share the function's entry point
[ghc-hetmet.git]
/
rts
/
sm
/
GCAux.c
diff --git
a/rts/sm/GCAux.c
b/rts/sm/GCAux.c
index
52e0aef
..
c1ff541
100644
(file)
--- a/
rts/sm/GCAux.c
+++ b/
rts/sm/GCAux.c
@@
-41,7
+41,6
@@
isAlive(StgClosure *p)
q = UNTAG_CLOSURE(p);
ASSERT(LOOKS_LIKE_CLOSURE_PTR(q));
q = UNTAG_CLOSURE(p);
ASSERT(LOOKS_LIKE_CLOSURE_PTR(q));
- info = get_itbl(q);
// ignore static closures
//
// ignore static closures
//
@@
-49,15
+48,12
@@
isAlive(StgClosure *p)
// Problem here is that we sometimes don't set the link field, eg.
// for static closures with an empty SRT or CONSTR_STATIC_NOCAFs.
//
// Problem here is that we sometimes don't set the link field, eg.
// for static closures with an empty SRT or CONSTR_STATIC_NOCAFs.
//
- if (!HEAP_ALLOCED(q)) {
+ if (!HEAP_ALLOCED_GC(q)) {
return p;
}
// ignore closures in generations that we're not collecting.
bd = Bdescr((P_)q);
return p;
}
// ignore closures in generations that we're not collecting.
bd = Bdescr((P_)q);
- if (bd->gen_no > N) {
- return p;
- }
// if it's a pointer into to-space, then we're done
if (bd->flags & BF_EVACUATED) {
// if it's a pointer into to-space, then we're done
if (bd->flags & BF_EVACUATED) {
@@
-66,14
+62,28
@@
isAlive(StgClosure *p)
// large objects use the evacuated flag
if (bd->flags & BF_LARGE) {
// large objects use the evacuated flag
if (bd->flags & BF_LARGE) {
+ if (get_itbl(q)->type == TSO &&
+ ((StgTSO *)p)->what_next == ThreadRelocated) {
+ p = (StgClosure *)((StgTSO *)p)->_link;
+ continue;
+ }
return NULL;
}
// check the mark bit for compacted steps
return NULL;
}
// check the mark bit for compacted steps
- if ((bd->flags & BF_COMPACTED) && is_marked((P_)q,bd)) {
+ if ((bd->flags & BF_MARKED) && is_marked((P_)q,bd)) {
return p;
}
return p;
}
+ info = q->header.info;
+
+ if (IS_FORWARDING_PTR(info)) {
+ // alive!
+ return (StgClosure*)UN_FORWARDING_PTR(info);
+ }
+
+ info = INFO_PTR_TO_STRUCT(info);
+
switch (info->type) {
case IND:
switch (info->type) {
case IND:
@@
-85,13
+95,9
@@
isAlive(StgClosure *p)
p = ((StgInd *)q)->indirectee;
continue;
p = ((StgInd *)q)->indirectee;
continue;
- case EVACUATED:
- // alive!
- return ((StgEvacuated *)q)->evacuee;
-
case TSO:
if (((StgTSO *)q)->what_next == ThreadRelocated) {
case TSO:
if (((StgTSO *)q)->what_next == ThreadRelocated) {
- p = (StgClosure *)((StgTSO *)q)->link;
+ p = (StgClosure *)((StgTSO *)q)->_link;
continue;
}
return NULL;
continue;
}
return NULL;