Something seems to be wrong with the current diff. I have to fix a duplicate case value handling kw_addrspacecast, and then the tests fail with:
error: expected instruction opcode
%8 = addrspacecast i8* %ptrtoarg4 to i32 addrspace(1)*
http://llvm-reviews.chandlerc.com/D1401