Parser: Shapes in OSSShapingExpr must be parsed with ParseExpression (i.e. we allow top level comma)

Author: mikaoP

clang/lib/Parse/ParseExpr.cpp

@@ -3273,7 +3273,7 @@ ExprResult Parser::TryParseOSSArrayShaping() {
 
     // Parse whatever between []
     Diags.setSuppressAllDiagnostics();
-    Actions.CorrectDelayedTyposInExpr(ParseAssignmentExpression());
+    Actions.CorrectDelayedTyposInExpr(ParseExpression());
     Diags.setSuppressAllDiagnostics(false);
 
     // After that we're supposed to be at ]
@@ -3323,7 +3323,7 @@ ExprResult Parser::ParseOSSArrayShaping() {
       Loc = T.getOpenLocation();
     First = false;
 
-    ExprResult ShapeExpr = Actions.CorrectDelayedTyposInExpr(ParseAssignmentExpression());
+    ExprResult ShapeExpr = Actions.CorrectDelayedTyposInExpr(ParseExpression());
 
     ShapeList.push_back(ShapeExpr.get());
 

clang/test/OmpSs/Parser/shaping_expr_vs_lambda.cpp

@@ -21,8 +21,7 @@ void foo2(int x) {
   {}
   #pragma oss task depend(in : [x + x]() {} ) // expected-error {{expected ',' or ']' in lambda capture list}}
   {}
-  // Incomplete lambdas ignore whatever is after it until ';'
-  #pragma oss task depend(in : [x,](array),  [x,](array){} ) // expected-error {{expected variable name or 'this' in lambda capture list}}
+  #pragma oss task depend(in : [x,](array),  [x,](array){}, [3](array, array)) // expected-error 2 {{expected expression}} expected-warning {{expression result unused}}
   {}
   #pragma oss task depend(in : [x](int a) {} ) // expected-error {{expected addressable lvalue expression, array element or array section}}
   {}