projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppc: switch handling of 'foreign import wrapper' (FIW) to libffi
[ghc-hetmet.git]
/
rts
/
sm
/
Evac.c
diff --git
a/rts/sm/Evac.c
b/rts/sm/Evac.c
index
37cbee5
..
61cf10b
100644
(file)
--- a/
rts/sm/Evac.c
+++ b/
rts/sm/Evac.c
@@
-415,8
+415,7
@@
loop:
* on the CAF list, so don't do anything with it here (we'll
* scavenge it later).
*/
* on the CAF list, so don't do anything with it here (we'll
* scavenge it later).
*/
- if (((StgIndStatic *)q)->saved_info == NULL) {
- if (*IND_STATIC_LINK((StgClosure *)q) == NULL) {
+ if (*IND_STATIC_LINK((StgClosure *)q) == NULL) {
#ifndef THREADED_RTS
*IND_STATIC_LINK((StgClosure *)q) = gct->static_objects;
gct->static_objects = (StgClosure *)q;
#ifndef THREADED_RTS
*IND_STATIC_LINK((StgClosure *)q) = gct->static_objects;
gct->static_objects = (StgClosure *)q;
@@
-429,7
+428,6
@@
loop:
gct->static_objects = (StgClosure *)q;
}
#endif
gct->static_objects = (StgClosure *)q;
}
#endif
- }
}
return;
}
return;
@@
-622,7
+620,6
@@
loop:
case FUN:
case IND_PERM:
case FUN:
case IND_PERM:
- case IND_OLDGEN_PERM:
case CONSTR:
copy_tag_nolock(p,info,q,sizeW_fromITBL(INFO_PTR_TO_STRUCT(info)),gen,tag);
return;
case CONSTR:
copy_tag_nolock(p,info,q,sizeW_fromITBL(INFO_PTR_TO_STRUCT(info)),gen,tag);
return;
@@
-668,7
+665,6
@@
loop:
return;
case IND:
return;
case IND:
- case IND_OLDGEN:
// follow chains of indirections, don't evacuate them
q = ((StgInd*)q)->indirectee;
*p = q;
// follow chains of indirections, don't evacuate them
q = ((StgInd*)q)->indirectee;
*p = q;
@@
-973,8
+969,6
@@
selector_loop:
switch (info->type) {
case IND:
case IND_PERM:
switch (info->type) {
case IND:
case IND_PERM:
- case IND_OLDGEN:
- case IND_OLDGEN_PERM:
case IND_STATIC:
val = ((StgInd *)val)->indirectee;
goto val_loop;
case IND_STATIC:
val = ((StgInd *)val)->indirectee;
goto val_loop;
@@
-1008,8
+1002,6
@@
selector_loop:
case IND:
case IND_PERM:
case IND:
case IND_PERM:
- case IND_OLDGEN:
- case IND_OLDGEN_PERM:
case IND_STATIC:
// Again, we might need to untag a constructor.
selectee = UNTAG_CLOSURE( ((StgInd *)selectee)->indirectee );
case IND_STATIC:
// Again, we might need to untag a constructor.
selectee = UNTAG_CLOSURE( ((StgInd *)selectee)->indirectee );