When comparing two calling conventions after redeclaring a function, compare

the canonical calling conventions instead of comparing the raw calling
conventions directly. Fixes PR6361.

llvm-svn: 96895