[x86] Fix two independent miscompiles in the process of getting the same