Merging r309147:
------------------------------------------------------------------------
r309147 | jroelofs | 2017-07-26 11:13:57 -0700 (Wed, 26 Jul 2017) | 4 lines

Partial fix for PR33858

https://reviews.llvm.org/D35848

------------------------------------------------------------------------

llvm-svn: 309150
2 files changed