Update Convert.cpp corresponding to llvm r203559.