| Index: src/pkg/runtime/mfinal.c |
| =================================================================== |
| --- a/src/pkg/runtime/mfinal.c |
| +++ b/src/pkg/runtime/mfinal.c |
| @@ -5,6 +5,7 @@ |
| #include "runtime.h" |
| #include "arch_GOARCH.h" |
| #include "malloc.h" |
| +#include "type.h" |
| enum { debug = 0 }; |
| @@ -13,7 +14,8 @@ |
| { |
| FuncVal *fn; |
| uintptr nret; |
| - void *ot; |
| + Type *fint; |
| + PtrType *ot; |
| }; |
| // Finalizer hash table. Direct hash, linear scan, at most 3/4 full. |
| @@ -43,7 +45,7 @@ |
| } fintab[TABSZ]; |
| static void |
| -addfintab(Fintab *t, void *k, FuncVal *fn, uintptr nret, void *ot) |
| +addfintab(Fintab *t, void *k, FuncVal *fn, uintptr nret, Type *fint, PtrType *ot) |
| { |
| int32 i, j; |
| @@ -68,6 +70,7 @@ |
| t->key[i] = k; |
| t->val[i].fn = fn; |
| t->val[i].nret = nret; |
| + t->val[i].fint = fint; |
| t->val[i].ot = ot; |
| } |
| @@ -126,7 +129,7 @@ |
| for(i=0; i<tab->max; i++) { |
| k = tab->key[i]; |
| if(k != nil && k != (void*)-1) |
| - addfintab(&newtab, k, tab->val[i].fn, tab->val[i].nret, tab->val[i].ot); |
| + addfintab(&newtab, k, tab->val[i].fn, tab->val[i].nret, tab->val[i].fint, tab->val[i].ot); |
| } |
| runtime·free(tab->key); |
| @@ -140,7 +143,7 @@ |
| } |
| bool |
| -runtime·addfinalizer(void *p, FuncVal *f, uintptr nret, void *ot) |
| +runtime·addfinalizer(void *p, FuncVal *f, uintptr nret, Type *fint, PtrType *ot) |
| { |
| Fintab *tab; |
| byte *base; |
| @@ -169,7 +172,7 @@ |
| resizefintab(tab); |
| } |
| - addfintab(tab, p, f, nret, ot); |
| + addfintab(tab, p, f, nret, fint, ot); |
| runtime·setblockspecial(p, true); |
| runtime·unlock(tab); |
| return true; |
| @@ -178,7 +181,7 @@ |
| // get finalizer; if del, delete finalizer. |
| // caller is responsible for updating RefHasFinalizer (special) bit. |
| bool |
| -runtime·getfinalizer(void *p, bool del, FuncVal **fn, uintptr *nret, void **ot) |
| +runtime·getfinalizer(void *p, bool del, FuncVal **fn, uintptr *nret, Type **fint, PtrType **ot) |
| { |
| Fintab *tab; |
| bool res; |
| @@ -192,6 +195,7 @@ |
| return false; |
| *fn = f.fn; |
| *nret = f.nret; |
| + *fint = f.fint; |
| *ot = f.ot; |
| return true; |
| } |
