Cleaned-up version of gc attribute type merging. I still don't like it

very much, but I have a feeling we're never going to have an 
implementation that makes sense because of compatibility issues.

llvm-svn: 72715