Please merge 2504f14a06872f2e1755a88b3aab7e6bc280bec7 to 10.0.1

[zmodem]

Bugzilla Link	45825
Resolution	FIXED
Resolved on	May 19, 2020 08:43
Version	10.0
OS	Linux
Blocks	#44654
CC	@ggreif,@tstellar
Fixed by commit(s)	2504f14 17d0ddd

Extended Description

As requested here: http://lists.llvm.org/pipermail/release-testers/2020-May/001223.html

[zmodem]

assigned to @sunfishcode

[tstellar]

Dan, is this OK to backport:

https://reviews.llvm.org/rG2504f14a06872f2e1755a88b3aab7e6bc280bec7

[sunfishcode]

Yes, it's ok.

[tstellar]

Merged: 17d0ddd