forked from OSchip/llvm-project
[Sema] Extend GetSignedVectorType to deal with non ExtVector types
This improves some error messages which would otherwise refer to ext_vector_type types in contexts where there are no such types. Factored out from D25866 at reviewer's request. Reviewers: bruno Differential Revision: https://reviews.llvm.org/D31667 llvm-svn: 299641
This commit is contained in:
Simon Dardis
parent
77d3c770d3
commit
f81c995dab
|
|
@ -9711,24 +9711,45 @@ QualType Sema::CheckCompareOperands(ExprResult &LHS, ExprResult &RHS,
|
|||
return InvalidOperands(Loc, LHS, RHS);
|
||||
}
|
||||
|
||||
|
||||
// Return a signed type that is of identical size and number of elements.
|
||||
// For floating point vectors, return an integer type of identical size
|
||||
// and number of elements.
|
||||
// Return a signed ext_vector_type that is of identical size and number of
|
||||
// elements. For floating point vectors, return an integer type of identical
|
||||
// size and number of elements. In the non ext_vector_type case, search from
|
||||
// the largest type to the smallest type to avoid cases where long long == long,
|
||||
// where long gets picked over long long.
|
||||
QualType Sema::GetSignedVectorType(QualType V) {
|
||||
const VectorType *VTy = V->getAs<VectorType>();
|
||||
unsigned TypeSize = Context.getTypeSize(VTy->getElementType());
|
||||
if (TypeSize == Context.getTypeSize(Context.CharTy))
|
||||
return Context.getExtVectorType(Context.CharTy, VTy->getNumElements());
|
||||
else if (TypeSize == Context.getTypeSize(Context.ShortTy))
|
||||
return Context.getExtVectorType(Context.ShortTy, VTy->getNumElements());
|
||||
else if (TypeSize == Context.getTypeSize(Context.IntTy))
|
||||
return Context.getExtVectorType(Context.IntTy, VTy->getNumElements());
|
||||
|
||||
if (isa<ExtVectorType>(VTy)) {
|
||||
if (TypeSize == Context.getTypeSize(Context.CharTy))
|
||||
return Context.getExtVectorType(Context.CharTy, VTy->getNumElements());
|
||||
else if (TypeSize == Context.getTypeSize(Context.ShortTy))
|
||||
return Context.getExtVectorType(Context.ShortTy, VTy->getNumElements());
|
||||
else if (TypeSize == Context.getTypeSize(Context.IntTy))
|
||||
return Context.getExtVectorType(Context.IntTy, VTy->getNumElements());
|
||||
else if (TypeSize == Context.getTypeSize(Context.LongTy))
|
||||
return Context.getExtVectorType(Context.LongTy, VTy->getNumElements());
|
||||
assert(TypeSize == Context.getTypeSize(Context.LongLongTy) &&
|
||||
"Unhandled vector element size in vector compare");
|
||||
return Context.getExtVectorType(Context.LongLongTy, VTy->getNumElements());
|
||||
}
|
||||
|
||||
if (TypeSize == Context.getTypeSize(Context.LongLongTy))
|
||||
return Context.getVectorType(Context.LongLongTy, VTy->getNumElements(),
|
||||
VectorType::GenericVector);
|
||||
else if (TypeSize == Context.getTypeSize(Context.LongTy))
|
||||
return Context.getExtVectorType(Context.LongTy, VTy->getNumElements());
|
||||
assert(TypeSize == Context.getTypeSize(Context.LongLongTy) &&
|
||||
return Context.getVectorType(Context.LongTy, VTy->getNumElements(),
|
||||
VectorType::GenericVector);
|
||||
else if (TypeSize == Context.getTypeSize(Context.IntTy))
|
||||
return Context.getVectorType(Context.IntTy, VTy->getNumElements(),
|
||||
VectorType::GenericVector);
|
||||
else if (TypeSize == Context.getTypeSize(Context.ShortTy))
|
||||
return Context.getVectorType(Context.ShortTy, VTy->getNumElements(),
|
||||
VectorType::GenericVector);
|
||||
assert(TypeSize == Context.getTypeSize(Context.CharTy) &&
|
||||
"Unhandled vector element size in vector compare");
|
||||
return Context.getExtVectorType(Context.LongLongTy, VTy->getNumElements());
|
||||
return Context.getVectorType(Context.CharTy, VTy->getNumElements(),
|
||||
VectorType::GenericVector);
|
||||
}
|
||||
|
||||
/// CheckVectorCompareOperands - vector comparisons are a clang extension that
|
||||
|
|
@ -9775,7 +9796,7 @@ QualType Sema::CheckVectorCompareOperands(ExprResult &LHS, ExprResult &RHS,
|
|||
assert (RHS.get()->getType()->hasFloatingRepresentation());
|
||||
CheckFloatComparison(Loc, LHS.get(), RHS.get());
|
||||
}
|
||||
|
||||
|
||||
// Return a signed type for the vector.
|
||||
return GetSignedVectorType(vType);
|
||||
}
|
||||
|
|
@ -9792,7 +9813,7 @@ QualType Sema::CheckVectorLogicalOperands(ExprResult &LHS, ExprResult &RHS,
|
|||
if (getLangOpts().OpenCL && getLangOpts().OpenCLVersion < 120 &&
|
||||
vType->hasFloatingRepresentation())
|
||||
return InvalidOperands(Loc, LHS, RHS);
|
||||
|
||||
|
||||
return GetSignedVectorType(LHS.get()->getType());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ void test1(v2u v2ua, v2s v2sa, v2f v2fa) {
|
|||
(void)(~v2fa); // expected-error{{invalid argument type 'v2f' (vector of 2 'float' values) to unary}}
|
||||
|
||||
// Comparison operators
|
||||
v2ua = (v2ua==v2sa); // expected-warning{{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from 'int __attribute__((ext_vector_type(2)))' (vector of 2 'int' values)}}
|
||||
v2ua = (v2ua==v2sa); // expected-warning{{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2sa = (v2ua==v2sa);
|
||||
|
||||
|
||||
// Arrays
|
||||
int array1[v2ua]; // expected-error{{size of array has non-integer type 'v2u' (vector of 2 'unsigned int' values)}}
|
||||
int array2[17];
|
||||
|
|
@ -26,4 +26,110 @@ void test1(v2u v2ua, v2s v2sa, v2f v2fa) {
|
|||
v2s *v2s_ptr;
|
||||
v2s_ptr = v2u_ptr; // expected-warning{{converts between pointers to integer types with different sign}}
|
||||
}
|
||||
|
||||
|
||||
void testLogicalVecVec(v2u v2ua, v2s v2sa, v2f v2fa) {
|
||||
|
||||
// Logical operators
|
||||
v2ua = v2ua && v2ua; // expected-warning {{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2ua = v2ua || v2ua; // expected-warning {{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2ua = v2sa && v2ua; // expected-warning {{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2ua = v2sa || v2ua; // expected-warning {{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2ua = v2ua && v2fa; // expected-warning {{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2ua = v2ua || v2fa; // expected-warning {{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2ua = v2sa && v2fa; // expected-warning {{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2ua = v2sa || v2fa; // expected-warning {{incompatible vector types assigning to 'v2u' (vector of 2 'unsigned int' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2sa = v2sa && v2sa;
|
||||
v2sa = v2sa || v2sa;
|
||||
|
||||
v2sa = v2ua && v2ua;
|
||||
v2sa = v2ua || v2ua;
|
||||
|
||||
v2sa = v2sa && v2ua;
|
||||
v2sa = v2sa || v2ua;
|
||||
|
||||
v2sa = v2sa && v2fa;
|
||||
v2sa = v2sa || v2fa;
|
||||
|
||||
v2sa = v2ua && v2fa;
|
||||
v2sa = v2ua || v2fa;
|
||||
|
||||
v2fa = v2fa && v2fa; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2fa = v2fa || v2fa; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2fa = v2sa && v2fa; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2fa = v2sa || v2fa; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2fa = v2ua && v2fa; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2fa = v2ua || v2fa; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2fa = v2ua && v2ua; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2fa = v2ua || v2ua; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2fa = v2sa && v2sa; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2fa = v2sa || v2sa; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
|
||||
v2fa = v2sa && v2ua; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
v2fa = v2sa || v2ua; // expected-warning {{incompatible vector types assigning to 'v2f' (vector of 2 'float' values) from '__attribute__((__vector_size__(2 * sizeof(int)))) int' (vector of 2 'int' values)}}
|
||||
}
|
||||
|
||||
void testLogicalVecScalar(v2u v2ua, v2s v2sa, v2f v2fa) {
|
||||
|
||||
unsigned u1;
|
||||
v2ua = v2ua && u1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'unsigned int')}}
|
||||
v2ua = v2ua || u1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'unsigned int')}}
|
||||
|
||||
v2sa = v2sa && u1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'unsigned int')}}
|
||||
v2sa = v2sa || u1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'unsigned int')}}
|
||||
|
||||
v2ua = v2sa && u1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'unsigned int')}}
|
||||
v2ua = v2sa || u1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'unsigned int')}}
|
||||
v2sa = v2ua && u1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'unsigned int')}}
|
||||
v2sa = v2ua || u1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'unsigned int')}}
|
||||
|
||||
v2ua = v2fa && u1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'unsigned int')}}
|
||||
v2ua = v2fa || u1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'unsigned int')}}
|
||||
|
||||
v2sa = v2fa && u1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'unsigned int')}}
|
||||
v2sa = v2fa || u1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'unsigned int')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'unsigned int')}}
|
||||
|
||||
int s1;
|
||||
v2ua = v2ua && s1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'int')}}
|
||||
v2ua = v2ua || s1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'int')}}
|
||||
|
||||
v2sa = v2sa && s1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'int')}}
|
||||
v2sa = v2sa || s1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'int')}}
|
||||
|
||||
v2ua = v2sa && s1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'int')}}
|
||||
v2ua = v2sa || s1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'int')}}
|
||||
v2sa = v2ua && s1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'int')}}
|
||||
v2sa = v2ua || s1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'int')}}
|
||||
|
||||
v2ua = v2fa && s1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'int')}}
|
||||
v2ua = v2fa || s1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'int')}}
|
||||
|
||||
v2sa = v2fa && s1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'int')}}
|
||||
v2sa = v2fa || s1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'int')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'int')}}
|
||||
|
||||
float f1;
|
||||
v2ua = v2ua && f1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'float')}}
|
||||
v2ua = v2ua || f1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'float')}}
|
||||
|
||||
v2sa = v2sa && f1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'float')}}
|
||||
v2sa = v2sa || f1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'float')}}
|
||||
|
||||
v2ua = v2sa && f1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'float')}}
|
||||
v2ua = v2sa || f1; // expected-error {{cannot convert between vector values of different size ('v2s' (vector of 2 'int' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2s' (vector of 2 'int' values) and 'float')}}
|
||||
v2sa = v2ua && f1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'float')}}
|
||||
v2sa = v2ua || f1; // expected-error {{cannot convert between vector values of different size ('v2u' (vector of 2 'unsigned int' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2u' (vector of 2 'unsigned int' values) and 'float')}}
|
||||
|
||||
v2ua = v2fa && f1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'float')}}
|
||||
v2ua = v2fa || f1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'float')}}
|
||||
|
||||
v2sa = v2fa && f1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'float')}}
|
||||
v2sa = v2fa || f1; // expected-error {{cannot convert between vector values of different size ('v2f' (vector of 2 'float' values) and 'float')}} expected-error {{invalid operands to binary expression ('v2f' (vector of 2 'float' values) and 'float')}}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue