Please merge r340171 into 7.0: https://llvm.org/viewvc/llvm-project?view=revision&revision=340171 To avoid compilation failures with some buildbot slaves, you will need to backport r340172 as well (or squash them). Thanks!
Both patches have been reverted with r340202. I will create a new issue when the correct fix will be upstream and ready to be backported.