This is necessary for lint-correctness since we no longer allow such
shifts in Cmm.

(cherry picked from commit 9c65197e)