diff options
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 13 | ||||
| -rw-r--r-- | test/SemaCXX/vector.cpp | 30 |
2 files changed, 39 insertions, 4 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 001e951d96..a22556a7e5 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -1015,14 +1015,18 @@ Sema::IsStandardConversion(Expr* From, QualType ToType, // 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 @@ Sema::IsStandardConversion(Expr* From, QualType ToType, 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; diff --git a/test/SemaCXX/vector.cpp b/test/SemaCXX/vector.cpp index b548865553..66b2d680d2 100644 --- a/test/SemaCXX/vector.cpp +++ b/test/SemaCXX/vector.cpp @@ -186,3 +186,33 @@ void test_implicit_conversions(bool Cond, char16 c16, longlong16 ll16, (void)(Cond? to_c16 : to_ll16); // expected-error{{can't convert between vector values of different size}} (void)(Cond? to_c16e : to_ll16e); // expected-error{{can't convert between vector values of different size}} } + +typedef float fltx2 __attribute__((__vector_size__(8))); +typedef float fltx4 __attribute__((__vector_size__(16))); +typedef double dblx2 __attribute__((__vector_size__(16))); +typedef double dblx4 __attribute__((__vector_size__(32))); + +void accept_fltx2(fltx2); // expected-note{{candidate function not viable: no known conversion from 'double' to 'fltx2' for 1st argument}} +void accept_fltx4(fltx4); +void accept_dblx2(dblx2); +void accept_dblx4(dblx4); +void accept_bool(bool); // expected-note{{candidate function not viable: no known conversion from 'fltx2' to 'bool' for 1st argument}} + +void test(fltx2 fltx2_val, fltx4 fltx4_val, dblx2 dblx2_val, dblx4 dblx4_val) { + // Exact matches + accept_fltx2(fltx2_val); + accept_fltx4(fltx4_val); + accept_dblx2(dblx2_val); + accept_dblx4(dblx4_val); + + // Same-size conversions + // FIXME: G++ rejects these conversions, we accept them. Revisit this! + accept_fltx4(dblx2_val); + accept_dblx2(fltx4_val); + + // Conversion to bool. + accept_bool(fltx2_val); // expected-error{{no matching function for call to 'accept_bool'}} + + // Scalar-to-vector conversions. + accept_fltx2(1.0); // expected-error{{no matching function for call to 'accept_fltx2'}} +} |