commit db48cf3c319dbbb58efcb6dfee5644103fe42140
author Douglas Gregor <dgregor@apple.com> Tue Jun 22 16:52:27 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Tue Jun 22 16:52:27 2010 +0000
tree ed9b84648c170a5143d6b01e758de1f9be3b309d
parent 7966aff294017cd05ab1c3c1ba8967bf5b8b2150

Don't allow vector conversions to sneak in under the guise of
floating-point conversions or floating-integral conversions. We
really, really, really need to make isFloatingType() and friends not
apply to vector types.

llvm-svn: 106551

clang/lib/Sema/SemaOverload.cpp

diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 001e951..a22556a 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -1015,14 +1015,18 @@
     // Complex-real conversions (C99 6.3.1.7)
     SCS.Second = ICK_Complex_Real;
     FromType = ToType.getUnqualifiedType();
-  } else if (FromType->isFloatingType() && ToType->isFloatingType()) {
+  } else if (FromType->isFloatingType() && ToType->isFloatingType() &&
+             /*FIXME*/!FromType->isVectorType() && 
+             /*FIXME*/!ToType->isVectorType()) {
     // Floating point conversions (C++ 4.8).
     SCS.Second = ICK_Floating_Conversion;
     FromType = ToType.getUnqualifiedType();
-  } else if ((FromType->isFloatingType() &&
+  } else if ((FromType->isFloatingType() && 
+              /*FIXME*/!FromType->isVectorType() &&
               ToType->isIntegralType(Context) && !ToType->isBooleanType()) ||
              (FromType->isIntegralOrEnumerationType() &&
-              ToType->isFloatingType())) {
+              ToType->isFloatingType() &&
+              /*FIXME*/!FromType->isVectorType())) {
     // Floating-integral conversions (C++ 4.9).
     SCS.Second = ICK_Floating_Integral;
     FromType = ToType.getUnqualifiedType();
@@ -1041,7 +1045,8 @@
               FromType->isAnyPointerType() ||
               FromType->isBlockPointerType() ||
               FromType->isMemberPointerType() ||
-              FromType->isNullPtrType())) {
+              FromType->isNullPtrType()) &&
+             /*FIXME*/!FromType->isVectorType()) {
     // Boolean conversions (C++ 4.12).
     SCS.Second = ICK_Boolean_Conversion;
     FromType = Context.BoolTy;