mgorny added a comment. @bebuch, I agree with @mclow.lists here that the new errors are completely unrelated to the problem solved by this patch, and the fix to it belongs in a separate changeset. Can we get the original problem fixed first then? https://reviews.llvm.org/D42242