8149451: Fix bytecode generation issue after 8149186

Reviewed-by: mhaupt, sundar
5 files changed