Fix auto-upgrade of intrinsics to work properly with both assembly and

bytecode reading. This code is crufty, the result of much hacking to get things
working correctly. Cleanup patches will follow.

llvm-svn: 25682