Merge r344368 into the 7.0 branch

[llvmbot]

Bugzilla Link	39267
Resolution	FIXED
Resolved on	Oct 22, 2018 10:45
Version	unspecified
OS	Linux
Blocks	#38454
Reporter	LLVM Bugzilla Contributor
CC	@tstellar
Fixed by commit(s)	r344368 r344926

[llvmbot]

assigned to @rui314

[llvmbot]

Can we merge the following revision into the 7.0 branch?

https://reviews.llvm.org/rL344368

[tstellar]

Hi Rui,

Is this Ok to merge?

[rui314]

Yes.

[tstellar]

Merged: r344926