wmi added a comment. I think the bug has been fixed in r259815. Please update to the head and verify whether it fixes your problem. Looks like your fix here is the same with r259815. But still many thanks for trying to help. http://reviews.llvm.org/D17544