Skip to content

Commit 68ca464

Browse files
frasercrmckfrasercrmck
committed
update tests
1 parent 5796cb3 commit 68ca464

23 files changed

+274
-265
lines changed

‎clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12519,17 +12519,13 @@ def err_builtin_is_within_lifetime_invalid_arg : Error<
1251912519
"%select{non-|function }0pointer argument to '__builtin_is_within_lifetime' "
1252012520
"is not allowed">;
1252112521

12522-
def err_builtin_invalid_arg_type: Error <
12523-
"%ordinal0 argument must be "
12524-
"%select{a vector, integer or floating point type|a matrix|"
12525-
"a pointer to a valid matrix element type|"
12526-
"a signed integer or floating point type|a vector type|"
12527-
"a floating point type|"
12528-
"a vector of integers|"
12529-
"an unsigned integer|"
12530-
"an 'int'|"
12531-
"a vector of floating points|"
12532-
"an integer or vector of integers}1 (was %2)">;
12522+
def err_builtin_invalid_arg_type: Error<
12523+
"%ordinal0 argument must be a"
12524+
"%select{| scalar| vector| vector,| vector of| scalar or vector of}1"
12525+
"%select{| integer| signed integer| unsigned integer| 'int'|"
12526+
" matrix| pointer to a valid matrix element}2"
12527+
"%plural{0:|:%plural{0:|: or}2}3"
12528+
"%select{| floating-point}3 %plural{[0,3]:type|:types}1 (was %4)">;
1253312529

1253412530
def err_builtin_matrix_disabled: Error<
1253512531
"matrix types extension is disabled. Pass -fenable-matrix to enable it">;

‎clang/lib/Sema/SemaChecking.cpp

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,25 +1983,29 @@ checkMathBuiltinElementType(Sema &S, SourceLocation Loc, QualType ArgTy,
19831983
if (!ArgTy->getAs<VectorType>() &&
19841984
!ConstantMatrixType::isValidElementType(ArgTy)) {
19851985
return S.Diag(Loc, diag::err_builtin_invalid_arg_type)
1986-
<< ArgOrdinal << /* vector, integer or float ty*/ 0 << ArgTy;
1986+
<< ArgOrdinal << /* vector, */ 3 << /* integer */ 1 << /* fp */ 1
1987+
<< ArgTy;
19871988
}
19881989
break;
19891990
case Sema::EltwiseBuiltinArgTyRestriction::FloatTy:
19901991
if (!EltTy->isRealFloatingType()) {
19911992
return S.Diag(Loc, diag::err_builtin_invalid_arg_type)
1992-
<< ArgOrdinal << /* vector or float ty*/ 5 << ArgTy;
1993+
<< ArgOrdinal << /* scalar or vector */ 5 << /* no int */ 0
1994+
<< /* floating-point */ 1 << ArgTy;
19931995
}
19941996
break;
19951997
case Sema::EltwiseBuiltinArgTyRestriction::IntegerTy:
19961998
if (!EltTy->isIntegerType()) {
19971999
return S.Diag(Loc, diag::err_builtin_invalid_arg_type)
1998-
<< ArgOrdinal << /* vector or int ty*/ 10 << ArgTy;
2000+
<< ArgOrdinal << /* scalar or vector */ 5 << /* integer */ 1
2001+
<< /* no fp */ 0 << ArgTy;
19992002
}
20002003
break;
20012004
case Sema::EltwiseBuiltinArgTyRestriction::SignedIntOrFloatTy:
20022005
if (EltTy->isUnsignedIntegerType()) {
20032006
return S.Diag(Loc, diag::err_builtin_invalid_arg_type)
2004-
<< 1 << /* signed integer or float ty*/ 3 << ArgTy;
2007+
<< 1 << /* scalar or vector */ 5 << /* signed int */ 2
2008+
<< /* or fp */ 1 << ArgTy;
20052009
}
20062010
break;
20072011
}
@@ -2071,7 +2075,8 @@ static bool BuiltinPopcountg(Sema &S, CallExpr *TheCall) {
20712075

20722076
if (!ArgTy->isUnsignedIntegerType()) {
20732077
S.Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
2074-
<< 1 << /*unsigned integer ty*/ 7 << ArgTy;
2078+
<< 1 << /* scalar */ 1 << /* unsigned integer ty */ 3 << /* no fp */ 0
2079+
<< ArgTy;
20752080
return true;
20762081
}
20772082
return false;
@@ -2095,7 +2100,8 @@ static bool BuiltinCountZeroBitsGeneric(Sema &S, CallExpr *TheCall) {
20952100

20962101
if (!Arg0Ty->isUnsignedIntegerType()) {
20972102
S.Diag(Arg0->getBeginLoc(), diag::err_builtin_invalid_arg_type)
2098-
<< 1 << /*unsigned integer ty*/ 7 << Arg0Ty;
2103+
<< 1 << /* scalar */ 1 << /* unsigned integer ty */ 3 << /* no fp */ 0
2104+
<< Arg0Ty;
20992105
return true;
21002106
}
21012107

@@ -2111,7 +2117,7 @@ static bool BuiltinCountZeroBitsGeneric(Sema &S, CallExpr *TheCall) {
21112117

21122118
if (!Arg1Ty->isSpecificBuiltinType(BuiltinType::Int)) {
21132119
S.Diag(Arg1->getBeginLoc(), diag::err_builtin_invalid_arg_type)
2114-
<< 2 << /*'int' ty*/ 8 << Arg1Ty;
2120+
<< 2 << /* scalar */ 1 << /* 'int' ty */ 4 << /* no fp */ 0 << Arg1Ty;
21152121
return true;
21162122
}
21172123
}
@@ -2828,7 +2834,8 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
28282834

28292835
if (ElTy.isNull()) {
28302836
Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
2831-
<< 1 << /* vector ty*/ 4 << Arg->getType();
2837+
<< 1 << /* vector ty */ 2 << /* no int */ 0 << /* no fp */ 0
2838+
<< Arg->getType();
28322839
return ExprError();
28332840
}
28342841

@@ -2851,7 +2858,8 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
28512858

28522859
if (ElTy.isNull() || !ElTy->isFloatingType()) {
28532860
Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
2854-
<< 1 << /* vector of floating points */ 9 << Arg->getType();
2861+
<< 1 << /* vector of */ 4 << /* no int */ 0 << /* fp */ 1
2862+
<< Arg->getType();
28552863
return ExprError();
28562864
}
28572865

@@ -2880,7 +2888,8 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
28802888

28812889
if (ElTy.isNull() || !ElTy->isIntegerType()) {
28822890
Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
2883-
<< 1 << /* vector of integers */ 6 << Arg->getType();
2891+
<< 1 << /* vector of */ 4 << /* int */ 1 << /* no fp */ 0
2892+
<< Arg->getType();
28842893
return ExprError();
28852894
}
28862895

@@ -15401,8 +15410,9 @@ bool Sema::BuiltinNonDeterministicValue(CallExpr *TheCall) {
1540115410
QualType TyArg = Arg.get()->getType();
1540215411

1540315412
if (!TyArg->isBuiltinType() && !TyArg->isVectorType())
15404-
return Diag(TheCall->getArg(0)->getBeginLoc(), diag::err_builtin_invalid_arg_type)
15405-
<< 1 << /*vector, integer or floating point ty*/ 0 << TyArg;
15413+
return Diag(TheCall->getArg(0)->getBeginLoc(),
15414+
diag::err_builtin_invalid_arg_type)
15415+
<< 1 << /* vector, */ 3 << /* integer */ 1 << /* fp */ 1 << TyArg;
1540615416

1540715417
TheCall->setType(TyArg);
1540815418
return false;
@@ -15421,7 +15431,7 @@ ExprResult Sema::BuiltinMatrixTranspose(CallExpr *TheCall,
1542115431
auto *MType = Matrix->getType()->getAs<ConstantMatrixType>();
1542215432
if (!MType) {
1542315433
Diag(Matrix->getBeginLoc(), diag::err_builtin_invalid_arg_type)
15424-
<< 1 << /* matrix ty*/ 1 << Matrix->getType();
15434+
<< 1 << 0 << /* matrix ty */ 5 << /* no fp */ 0 << Matrix->getType();
1542515435
return ExprError();
1542615436
}
1542715437

@@ -15493,15 +15503,16 @@ ExprResult Sema::BuiltinMatrixColumnMajorLoad(CallExpr *TheCall,
1549315503
QualType ElementTy;
1549415504
if (!PtrTy) {
1549515505
Diag(PtrExpr->getBeginLoc(), diag::err_builtin_invalid_arg_type)
15496-
<< PtrArgIdx + 1 << /*pointer to element ty*/ 2 << PtrExpr->getType();
15506+
<< PtrArgIdx + 1 << 0 << /* pointer to element ty */ 6 << /* no fp */ 0
15507+
<< PtrExpr->getType();
1549715508
ArgError = true;
1549815509
} else {
1549915510
ElementTy = PtrTy->getPointeeType().getUnqualifiedType();
1550015511

1550115512
if (!ConstantMatrixType::isValidElementType(ElementTy)) {
1550215513
Diag(PtrExpr->getBeginLoc(), diag::err_builtin_invalid_arg_type)
15503-
<< PtrArgIdx + 1 << /* pointer to element ty*/ 2
15504-
<< PtrExpr->getType();
15514+
<< PtrArgIdx + 1 << 0 << /* pointer to element ty */ 6
15515+
<< /* no fp */ 0 << PtrExpr->getType();
1550515516
ArgError = true;
1550615517
}
1550715518
}
@@ -15601,7 +15612,7 @@ ExprResult Sema::BuiltinMatrixColumnMajorStore(CallExpr *TheCall,
1560115612
auto *MatrixTy = MatrixExpr->getType()->getAs<ConstantMatrixType>();
1560215613
if (!MatrixTy) {
1560315614
Diag(MatrixExpr->getBeginLoc(), diag::err_builtin_invalid_arg_type)
15604-
<< 1 << /*matrix ty */ 1 << MatrixExpr->getType();
15615+
<< 1 << 0 << /* matrix ty */ 5 << 0 << MatrixExpr->getType();
1560515616
ArgError = true;
1560615617
}
1560715618

@@ -15621,7 +15632,8 @@ ExprResult Sema::BuiltinMatrixColumnMajorStore(CallExpr *TheCall,
1562115632
auto *PtrTy = PtrExpr->getType()->getAs<PointerType>();
1562215633
if (!PtrTy) {
1562315634
Diag(PtrExpr->getBeginLoc(), diag::err_builtin_invalid_arg_type)
15624-
<< PtrArgIdx + 1 << /*pointer to element ty*/ 2 << PtrExpr->getType();
15635+
<< PtrArgIdx + 1 << 0 << /* pointer to element ty */ 6 << 0
15636+
<< PtrExpr->getType();
1562515637
ArgError = true;
1562615638
} else {
1562715639
QualType ElementTy = PtrTy->getPointeeType();

‎clang/lib/Sema/SemaHLSL.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2493,7 +2493,8 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
24932493

24942494
if (!EltTy->isIntegerType()) {
24952495
Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
2496-
<< 1 << /* integer ty */ 6 << ArgTy;
2496+
<< 1 << /* scalar or vector of */ 5 << /* integer ty */ 1
2497+
<< /* no fp */ 0 << ArgTy;
24972498
return true;
24982499
}
24992500

‎clang/test/Sema/aarch64-sve-vector-exp-ops.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
svfloat32_t test_exp_vv_i8mf8(svfloat32_t v) {
88

99
return __builtin_elementwise_exp(v);
10-
// expected-error@-1 {{1st argument must be a floating point type}}
10+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
1111
}
1212

1313
svfloat32_t test_exp2_vv_i8mf8(svfloat32_t v) {
1414

1515
return __builtin_elementwise_exp2(v);
16-
// expected-error@-1 {{1st argument must be a floating point type}}
16+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
1717
}

‎clang/test/Sema/aarch64-sve-vector-log-ops.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
svfloat32_t test_log_vv_i8mf8(svfloat32_t v) {
88

99
return __builtin_elementwise_log(v);
10-
// expected-error@-1 {{1st argument must be a floating point type}}
10+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
1111
}
1212

1313
svfloat32_t test_log10_vv_i8mf8(svfloat32_t v) {
1414

1515
return __builtin_elementwise_log10(v);
16-
// expected-error@-1 {{1st argument must be a floating point type}}
16+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
1717
}
1818

1919
svfloat32_t test_log2_vv_i8mf8(svfloat32_t v) {
2020

2121
return __builtin_elementwise_log2(v);
22-
// expected-error@-1 {{1st argument must be a floating point type}}
22+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
2323
}

‎clang/test/Sema/aarch64-sve-vector-pow-ops.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
svfloat32_t test_pow_vv_i8mf8(svfloat32_t v) {
88

99
return __builtin_elementwise_pow(v, v);
10-
// expected-error@-1 {{1st argument must be a floating point type}}
10+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
1111
}

‎clang/test/Sema/aarch64-sve-vector-trig-ops.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,59 @@
77
svfloat32_t test_asin_vv_i8mf8(svfloat32_t v) {
88

99
return __builtin_elementwise_asin(v);
10-
// expected-error@-1 {{1st argument must be a floating point type}}
10+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
1111
}
1212

1313
svfloat32_t test_acos_vv_i8mf8(svfloat32_t v) {
1414

1515
return __builtin_elementwise_acos(v);
16-
// expected-error@-1 {{1st argument must be a floating point type}}
16+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
1717
}
1818

1919
svfloat32_t test_atan_vv_i8mf8(svfloat32_t v) {
2020

2121
return __builtin_elementwise_atan(v);
22-
// expected-error@-1 {{1st argument must be a floating point type}}
22+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
2323
}
2424

2525
svfloat32_t test_atan2_vv_i8mf8(svfloat32_t v) {
2626

2727
return __builtin_elementwise_atan2(v, v);
28-
// expected-error@-1 {{1st argument must be a floating point type}}
28+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
2929
}
3030

3131
svfloat32_t test_sin_vv_i8mf8(svfloat32_t v) {
3232

3333
return __builtin_elementwise_sin(v);
34-
// expected-error@-1 {{1st argument must be a floating point type}}
34+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
3535
}
3636

3737
svfloat32_t test_cos_vv_i8mf8(svfloat32_t v) {
3838

3939
return __builtin_elementwise_cos(v);
40-
// expected-error@-1 {{1st argument must be a floating point type}}
40+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
4141
}
4242

4343
svfloat32_t test_tan_vv_i8mf8(svfloat32_t v) {
4444

4545
return __builtin_elementwise_tan(v);
46-
// expected-error@-1 {{1st argument must be a floating point type}}
46+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
4747
}
4848

4949
svfloat32_t test_sinh_vv_i8mf8(svfloat32_t v) {
5050

5151
return __builtin_elementwise_sinh(v);
52-
// expected-error@-1 {{1st argument must be a floating point type}}
52+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
5353
}
5454

5555
svfloat32_t test_cosh_vv_i8mf8(svfloat32_t v) {
5656

5757
return __builtin_elementwise_cosh(v);
58-
// expected-error@-1 {{1st argument must be a floating point type}}
58+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
5959
}
6060

6161
svfloat32_t test_tanh_vv_i8mf8(svfloat32_t v) {
6262

6363
return __builtin_elementwise_tanh(v);
64-
// expected-error@-1 {{1st argument must be a floating point type}}
64+
// expected-error@-1 {{1st argument must be a scalar or vector of floating-point types}}
6565
}

0 commit comments

Comments
 (0)