add test, fix up array diag to use the array type as it statses

Author: erichkeane

clang/lib/Sema/SemaOpenACCClause.cpp

@@ -1939,10 +1939,10 @@ bool SemaOpenACC::CheckReductionVarType(Expr *VarExpr) {
   if (auto *AT = getASTContext().getAsArrayType(CurType)) {
     // If we're already the array type, peel off the array and leave the element
     // type.
-    CurType = AT->getElementType();
     PartialDiagnostic PD = PDiag(diag::note_acc_reduction_array)
                            << diag::OACCReductionArray::ArrayTy << CurType;
     Notes.push_back({VarLoc, PD});
+    CurType = AT->getElementType();
   }
 
   auto IsValidMemberOfComposite = [](QualType Ty) {

clang/test/SemaOpenACC/combined-construct-reduction-clause.cpp

@@ -166,7 +166,7 @@ void uses(unsigned Parm) {
 
   CompositeHasComposite CoCArr[5];
   // expected-error@+4{{invalid type 'struct CompositeOfScalars' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
-  // expected-note@+3{{used as element type of array type 'CompositeHasComposite'}}
+  // expected-note@+3{{used as element type of array type 'CompositeHasComposite[5]'}}
   // expected-note@#COS_FIELD{{used as field 'COS' of composite 'CompositeHasComposite'}}
   // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
 #pragma acc parallel loop reduction(+:CoCArr)

clang/test/SemaOpenACC/compute-construct-reduction-clause.cpp

@@ -91,7 +91,7 @@ void uses(unsigned Parm) {
 
   CompositeHasComposite CoCArr[5];
   // expected-error@+4{{invalid type 'struct CompositeOfScalars' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
-  // expected-note@+3{{used as element type of array type 'CompositeHasComposite'}}
+  // expected-note@+3{{used as element type of array type 'CompositeHasComposite[5]'}}
   // expected-note@#COS_FIELD{{used as field 'COS' of composite 'CompositeHasComposite'}}
   // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
 #pragma acc parallel reduction(+:CoCArr)
@@ -134,7 +134,7 @@ void uses(unsigned Parm) {
 
   HasPtr HPArr[5];
   // expected-error@+4{{invalid type 'int *' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
-  // expected-note@+3{{used as element type of array type 'HasPtr'}}
+  // expected-note@+3{{used as element type of array type 'HasPtr[5]'}}
   // expected-note@#HASPTR{{used as field 'I' of composite 'HasPtr'}}
   // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
 #pragma acc parallel reduction(+:HPArr)
@@ -150,7 +150,7 @@ void uses(unsigned Parm) {
 #pragma acc parallel reduction(+:CplxI)
   while (1);
   // expected-error@+3{{invalid type '_Complex int' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
-  // expected-note@+2{{used as element type of array type '_Complex int'}}
+  // expected-note@+2{{used as element type of array type '_Complex int[5]'}}
   // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
 #pragma acc parallel reduction(+:CplxIArr)
   while (1);
@@ -159,7 +159,7 @@ void uses(unsigned Parm) {
 #pragma acc parallel reduction(+:CplxF)
   while (1);
   // expected-error@+3{{invalid type '_Complex float' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
-  // expected-note@+2{{used as element type of array type '_Complex float'}}
+  // expected-note@+2{{used as element type of array type '_Complex float[5]'}}
   // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
 #pragma acc parallel reduction(+:CplxFArr)
   while (1);
@@ -240,6 +240,50 @@ void TemplUses(T Parm, U CoS, V ChC) {
   // expected-error@+1{{OpenACC variable is not a valid variable name, sub-array, array element, or composite variable member}}
 #pragma acc parallel reduction(&: ChCPtr->COS)
   while (1);
+
+  T ThreeDArray[3][4][5];
+
+  // expected-error@+3{{invalid type 'int[4][5]' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
+  // expected-note@+2{{used as element type of array type 'int[3][4][5]'}}
+  // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
+#pragma acc parallel reduction(+:ThreeDArray)
+  while (1);
+  // expected-error@+3{{invalid type 'int[5]' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
+  // expected-note@+2{{used as element type of array type 'int[4][5]'}}
+  // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
+#pragma acc parallel reduction(+:ThreeDArray[1:1])
+  while (1);
+  // expected-error@+3{{invalid type 'int[5]' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
+  // expected-note@+2{{used as element type of array type 'int[4][5]'}}
+  // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
+#pragma acc parallel reduction(+:ThreeDArray[1])
+  while (1);
+
+#pragma acc parallel reduction(+:ThreeDArray[1:1][1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1:1][1:1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1][1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1][1:1])
+  while (1);
+
+#pragma acc parallel reduction(+:ThreeDArray[1:1][1][1:1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1:1][1][1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1:1][1:1][1:1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1:1][1:1][1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1][1][1:1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1][1][1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1][1:1][1:1])
+  while (1);
+#pragma acc parallel reduction(+:ThreeDArray[1][1:1][1])
+  while (1);
 }
 
 void inst() {

clang/test/SemaOpenACC/loop-construct-reduction-clause.cpp

@@ -153,7 +153,7 @@ void uses() {
 
   CompositeHasComposite CoCArr[5];
   // expected-error@+4{{invalid type 'struct CompositeOfScalars' used in OpenACC 'reduction' variable reference; type is not a scalar value}}
-  // expected-note@+3{{used as element type of array type 'CompositeHasComposite'}}
+  // expected-note@+3{{used as element type of array type 'CompositeHasComposite[5]'}}
   // expected-note@#COS_FIELD{{used as field 'COS' of composite 'CompositeHasComposite'}}
   // expected-note@+1{{OpenACC 'reduction' variable reference must be a scalar variable or a composite of scalars, or an array, sub-array, or element of scalar types}}
 #pragma acc loop reduction(+:CoCArr)