use the gcc bug workaround in all case to make it more consistent and fix a bad code generation case.