With this patch I don’t see any test failures. Did you see the crash on our tests, or some other code? With this patch, does the assertion fire on your original example that triggered the crash? http://llvm-reviews.chandlerc.com/D2427