8212821: CHECK_ must be used in the rhs of an assignment statement within a block (round 2) Correction of failed backport of JDK-8211394 via JDK-8212696. Reviewed-by: dholmes, coffeys