Merge r354633 to the release_80 branch

[zmodem]

Bugzilla Link	41234
Resolution	FIXED
Resolved on	Jun 26, 2019 16:03
Version	8.0
OS	Linux
Blocks	#40566
CC	@nico,@zygoloid,@tstellar
Fixed by commit(s)	r354633 r364487

Extended Description

This was a candidate for 8.0.0 but was noticed too late.

[zmodem]

assigned to @tstellar

[tstellar]

Hi Richard,

Is ths OK to merge:

https://reviews.llvm.org/rL354633

[tstellar]

Hi Richard,

Is ths OK to merge:

https://reviews.llvm.org/rL354633

[nico]

If you merge r354633 you likely also want to merge r361839.

[zygoloid]

Looks good for branch.

[tstellar]

If you merge r354633 you likely also want to merge r361839.

We can't merge this one, because it will change the ABI. What's the consequence of only merging r354633?

[tstellar]

After reviewing the 2 commits, it doesn't look like r354633 depends on r361839, so I'm just going to merge r354633.

[tstellar]

Merged: r364487