diff options
author | Anders Carlsson <andersca@mac.com> | 2008-12-01 02:13:02 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@mac.com> | 2008-12-01 02:13:02 +0000 |
commit | f7fba46331aba075de1a718c8e2f12e7c247b830 (patch) | |
tree | 3f74a0caea27f78400aa9b04df539ab3b36df21e /clang/lib/Sema/SemaStmt.cpp | |
parent | 564730a85769cb539f21ec2b9d0054eb9abf60a3 (diff) | |
download | bcm5719-llvm-f7fba46331aba075de1a718c8e2f12e7c247b830.tar.gz bcm5719-llvm-f7fba46331aba075de1a718c8e2f12e7c247b830.zip |
Use VerifyIntegerConstantExpression for case values.
llvm-svn: 60317
Diffstat (limited to 'clang/lib/Sema/SemaStmt.cpp')
-rw-r--r-- | clang/lib/Sema/SemaStmt.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index 99fdbdb0228..a469713121d 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -126,31 +126,16 @@ Sema::ActOnCaseStmt(SourceLocation CaseLoc, ExprTy *lhsval, Expr *LHSVal = ((Expr *)lhsval), *RHSVal = ((Expr *)rhsval); assert((LHSVal != 0) && "missing expression in case statement"); - SourceLocation ExpLoc; // C99 6.8.4.2p3: The expression shall be an integer constant. // However, GCC allows any evaluatable integer expression. - // FIXME: Should we warn if this is evaluatable but not an I-C-E? - APValue Result; - bool isEvaluated; - - if (!LHSVal->Evaluate(Result, Context, &isEvaluated) || !Result.isInt() || - !isEvaluated) { - // FIXME: Evaluate doesn't return the SourceLocation that it failed to - // evaluate. - ExpLoc = LHSVal->getExprLoc(); - Diag(ExpLoc, diag::err_case_label_not_integer_constant_expr) - << LHSVal->getSourceRange(); + + if (VerifyIntegerConstantExpression(LHSVal)) return SubStmt; - } // GCC extension: The expression shall be an integer constant. - if (RHSVal && !RHSVal->Evaluate(Result, Context, &isEvaluated) || - !Result.isInt() || !isEvaluated) { - ExpLoc = RHSVal->getExprLoc(); - Diag(ExpLoc, diag::err_case_label_not_integer_constant_expr) - << RHSVal->getSourceRange(); + + if (RHSVal && VerifyIntegerConstantExpression(RHSVal)) RHSVal = 0; // Recover by just forgetting about it. - } if (SwitchStack.empty()) { Diag(CaseLoc, diag::err_case_not_in_switch); |