Merge "Handle catch phis in code sinking."