Another stab at fixing http://llvm.org/bugs/show_bug.cgi?id=12007. I earlier...

Another stab at fixing http://llvm.org/bugs/show_bug.cgi?id=12007.  I earlier missed that there are two common_type definitions and corrected only one of them.

llvm-svn: 150599