aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Lex/PPExpressions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index 3c0bf5c59c..aea203f9df 100644
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -413,7 +413,7 @@ static bool EvaluateDirectiveSubExpr(llvm::APSInt &LHS, unsigned MinPrec,
// for shifts.
llvm::APSInt Res(LHS.getBitWidth());
if (Operator != tok::question && Operator != tok::lessless &&
- Operator != tok::greatergreater) {
+ Operator != tok::greatergreater && Operator != tok::comma) {
Res.setIsUnsigned(LHS.isUnsigned()|RHS.isUnsigned());
// If this just promoted something from signed to unsigned, and if the
// value was negative, warn about it.