The change to "lib/Transforms/Utils/Local.cpp" isn't necessary for this patch. It should be applied separately. The change in "lib/Analysis/InstructionSimplify.cpp" at 2037 doesn't look like part of this patch. Is it? Could you explain why that's there? Otherwise, LGTM. http://llvm-reviews.chandlerc.com/D1250