I happened to also have a similar modification in a local branch. I just added a test and sent it via Phabricator: https://reviews.llvm.org/D35187 As this is one of my first contributions any input would be appreciated.