fix a nasty bug that Neil identifier in pp-expr parsing (this is PR2279 part D).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@50617 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index 398567b..6317015 100644
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -433,20 +433,28 @@
default: assert(0 && "Unknown operator token!");
case tok::percent:
if (RHS == 0) {
- if (ValueLive) PP.Diag(OpToken, diag::err_pp_remainder_by_zero);
- return true;
+ if (ValueLive) {
+ PP.Diag(OpToken, diag::err_pp_remainder_by_zero);
+ return true;
+ }
+ } else {
+ Res = LHS % RHS;
}
- Res = LHS % RHS;
break;
case tok::slash:
if (RHS == 0) {
- if (ValueLive) PP.Diag(OpToken, diag::err_pp_division_by_zero);
- return true;
+ if (ValueLive) {
+ PP.Diag(OpToken, diag::err_pp_division_by_zero);
+ return true;
+ }
+ break;
}
+
Res = LHS / RHS;
if (LHS.isSigned())
Overflow = LHS.isMinSignedValue() && RHS.isAllOnesValue(); // MININT/-1
break;
+
case tok::star:
Res = LHS * RHS;
if (LHS != 0 && RHS != 0)