PATCH: backport fix for PR 39175 to 4.3 branch

[Jason Merrill]

Richard Guenther wrote:
> Thus, this would be ok for me.  But as this isn't a regression you
> should get an ok from a C++ frontend maintainer.

OK.

Jason