jlebar accepted this revision. jlebar added a comment. This revision is now accepted and ready to land. Since this is tricky and we've seen it affecting user code, do you think it's a bad idea to add tests to the test-suite? https://reviews.llvm.org/D41521