This does not look right. I'd expect outstanding references typeinfo references to still work, the way this patch does it, you won't be able to even release them. Another thing to check is if it's possible to have references from typeinfo to another typeinfo, maybe that can't happen.