Pass more sane arguments to ActOnStaticAssertDeclaration
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66983 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index b21ac77..f534f42 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -239,14 +239,9 @@
return 0;
}
- if (Tok.isNot(tok::comma)) {
- Diag(Tok, diag::err_expected_comma);
- SkipUntil(tok::semi);
+ if (ExpectAndConsume(tok::comma, diag::err_expected_comma, "", tok::semi))
return 0;
- }
-
- SourceLocation CommaLoc = ConsumeToken();
-
+
if (Tok.isNot(tok::string_literal)) {
Diag(Tok, diag::err_expected_string_literal);
SkipUntil(tok::semi);
@@ -261,8 +256,8 @@
ExpectAndConsume(tok::semi, diag::err_expected_semi_after_static_assert);
- return Actions.ActOnStaticAssertDeclaration(LParenLoc, move(AssertExpr),
- CommaLoc, move(AssertMessage),
+ return Actions.ActOnStaticAssertDeclaration(StaticAssertLoc, move(AssertExpr),
+ move(AssertMessage),
RParenLoc);
}