c++: another build_new_1 folding fix [PR111929]