[upstream] Intermediate commit to test a change to gcc.