dberlin added a comment. I"m going to commit this and let david post-commit review it for style, since we've verified it's correct, and it's clearly broken right now :) https://reviews.llvm.org/D28312