c++: Revert deferring emission of inline variables [PR114013]