Merge r313776 into the 5.0 branch

[llvmbot]

Bugzilla Link	35186
Resolution	FIXED
Resolved on	Nov 14, 2017 16:21
Version	5.0
OS	Windows NT
Blocks	#33840
Reporter	LLVM Bugzilla Contributor
CC	@tstellar
Fixed by commit(s)	r313776 r318236

[llvmbot]

assigned to @mclow

[tstellar]

Hi Marshall,

Is this OK to merge to the release_50 branch:

https://reviews.llvm.org/rL313776

[mclow]

Yes, please.

[tstellar]

Merged: r318236