My earlier patch to reintroduce short_shift failed to adjust for the C++
front end use of const_op1 rather than op1.

	* typeck.c (cp_build_binary_op): Use folded op1 for short_shift.