Improve multideps base expr. caching.

Closes llvm#98

Author: mikaoP

clang/lib/Parse/ParseExpr.cpp

@@ -3301,12 +3301,9 @@ ExprResult Parser::ParseOSSMultiDepExpression() {
 
   CachedTokens LateParsedTokens;
   // Save stmt to parse it after declaring iterators
-  while (Tok.isNot(tok::comma) &&
-         Tok.isNot(tok::r_brace) &&
-         Tok.isNot(tok::annot_pragma_ompss_end)) {
-    LateParsedTokens.push_back(Tok);
-    ConsumeAnyToken();
-  }
+  ConsumeAndStoreUntil(
+    tok::comma, tok::r_brace, LateParsedTokens,
+    /* StopAtSemi=*/ false, /* ConsumeFinalToken= */false);
 
   ParseScope OSSMultiDepScope(this, Scope::DeclScope | Scope::CompoundStmtScope);
 

clang/test/OmpSs/Sema/multideps.c

@@ -50,5 +50,6 @@ int main() {
     #pragma oss task in( { v1[i], i = 0:10:1 }[2], v ) // expected-error {{expected ',' or ')' in 'in' clause}} expected-error {{expected expression}}
     #pragma oss task in( { v[i], i = { ,}, j = i: } ) // expected-error 2 {{expected expression}}
     #pragma oss task in( { v[i], i = 0:v:v1 } ) // expected-error {{expression must have integral or unscoped enumeration type, not 'int [10][20]'}} expected-error {{expression must have integral or unscoped enumeration type, not 'int [10]'}}
+    #pragma oss task in( { v[1, 2], i=0;10 } ) // expected-warning {{expression result unused}}
     {}
 }

clang/test/OmpSs/Sema/multideps.cpp

@@ -50,6 +50,7 @@ void foo() {
     #pragma oss task in( { v1[i], i = 0:10:1 }[2], v ) // expected-error {{expected ',' or ')' in 'in' clause}} expected-error {{expected expression}}
     #pragma oss task in( { v[i], i = { ,}, j = i: } ) // expected-error 2 {{expected expression}}
     #pragma oss task in( { v[i], i = 0:v:v1 } ) // expected-error {{expression must have integral or unscoped enumeration type, not 'int [10][10]'}} expected-error {{expression must have integral or unscoped enumeration type, not 'int [10]'}}
+    #pragma oss task in( { v[1, 2], i=0;10 } ) // expected-warning {{expression result unused}}
     {}
 }