joker.eph added a comment. Let me clarify: I'm not opposed about doing the renaming during bitcode loading, I just think it is wrong to use the autoupdate path. I'd expect that it could be done at the time you parse the intrinsic from the bitcode? http://reviews.llvm.org/D19373