Merge fix of #62836 to ?.re, and regenerate ?.c