Merge "Fix safepoint bug when computing live registers."