Merge r330788 into the 6.0 branch : Bring r329960 back.

[tstellar]

Bugzilla Link	37490
Resolution	WONTFIX
Resolved on	May 30, 2018 12:05
Version	6.0
OS	All
Blocks	#35997
Fixed by commit(s)	r330788

Extended Description

Is it OK to merge the following revision(s) to the 6.0 branch?

[tstellar]

assigned to @andrewrk

[tstellar]

https://reviews.llvm.org/rL330788

[tstellar]

r329960 was committed to master after the release_60 branch was made, do we really need this fix?

[andrewrk]

I'm fine with waiting until llvm 7 for this fix if it seems risky to backport.

[tstellar]

Ok, let's wait then.