Discussed with Zachary Turner and Pavel Labath on lldb-dev. Let's hope this doesn't break anything :) llvm-svn: 316800