I got it working, I see it correctly in the diff, but when I apply it the two "case lltok::kw_addrspacecast:" end up in the same place but I can manually fix it http://llvm-reviews.chandlerc.com/D1401