nlewycky created this revision.
When checkingForOverflow(), look through call arguments (and the callee itself
if calculated).
Make the statement visitor go through ObjCBoxedExpr by default because it has a
single subexpr node. Don't do that when looking for a pointer object, stop
because the boxed expr is the pointer.
https://reviews.llvm.org/D31839
Files:
include/clang/Sema/Sema.h
lib/AST/ExprConstant.cpp
lib/Sema/SemaChecking.cpp
lib/Sema/SemaExprObjC.cpp
test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp
test/OpenMP/distribute_simd_aligned_messages.cpp
test/OpenMP/for_simd_aligned_messages.cpp
test/OpenMP/parallel_for_simd_aligned_messages.cpp
test/OpenMP/simd_aligned_messages.cpp
test/OpenMP/target_parallel_for_simd_aligned_messages.cpp
test/OpenMP/target_simd_aligned_messages.cpp
test/OpenMP/target_teams_distribute_parallel_for_simd_aligned_messages.cpp
test/OpenMP/target_teams_distribute_simd_aligned_messages.cpp
test/OpenMP/taskloop_simd_aligned_messages.cpp
test/OpenMP/teams_distribute_parallel_for_simd_aligned_messages.cpp
test/OpenMP/teams_distribute_simd_aligned_messages.cpp
test/SemaCXX/integer-overflow.cpp
Index: test/SemaCXX/integer-overflow.cpp
===================================================================
--- test/SemaCXX/integer-overflow.cpp
+++ test/SemaCXX/integer-overflow.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -verify -fsyntax-only -std=gnu++98 -triple x86_64-pc-linux-gnu
+// RUN: %clang_cc1 %s -verify -std=gnu++98 -triple x86_64-pc-linux-gnu
typedef unsigned long long uint64_t;
typedef unsigned int uint32_t;
@@ -166,6 +166,9 @@
uint64_t a[10];
a[4608 * 1024 * 1024] = 1i;
+// expected-warning@+1 {{overflow in expression; result is 536870912 with type 'int'}}
+ f0(4608 * 1024 * 1024);
+
// expected-warning@+1 2{{overflow in expression; result is 536870912 with type 'int'}}
return ((4608 * 1024 * 1024) + ((uint64_t)(4608 * 1024 * 1024)));
}
Index: test/OpenMP/teams_distribute_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/teams_distribute_simd_aligned_messages.cpp
+++ test/OpenMP/teams_distribute_simd_aligned_messages.cpp
@@ -123,9 +123,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp target
Index: test/OpenMP/teams_distribute_parallel_for_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/teams_distribute_parallel_for_simd_aligned_messages.cpp
+++ test/OpenMP/teams_distribute_parallel_for_simd_aligned_messages.cpp
@@ -123,9 +123,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp target
Index: test/OpenMP/taskloop_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/taskloop_simd_aligned_messages.cpp
+++ test/OpenMP/taskloop_simd_aligned_messages.cpp
@@ -107,9 +107,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp taskloop simd aligned // expected-error {{expected '(' after 'aligned'}}
for (I k = 0; k < argc; ++k) ++k;
Index: test/OpenMP/target_teams_distribute_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/target_teams_distribute_simd_aligned_messages.cpp
+++ test/OpenMP/target_teams_distribute_simd_aligned_messages.cpp
@@ -110,9 +110,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp target teams distribute simd aligned // expected-error {{expected '(' after 'aligned'}}
Index: test/OpenMP/target_teams_distribute_parallel_for_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/target_teams_distribute_parallel_for_simd_aligned_messages.cpp
+++ test/OpenMP/target_teams_distribute_parallel_for_simd_aligned_messages.cpp
@@ -110,9 +110,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp target teams distribute parallel for simd aligned // expected-error {{expected '(' after 'aligned'}}
Index: test/OpenMP/target_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/target_simd_aligned_messages.cpp
+++ test/OpenMP/target_simd_aligned_messages.cpp
@@ -107,9 +107,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp target simd aligned // expected-error {{expected '(' after 'aligned'}}
for (I k = 0; k < argc; ++k) ++k;
Index: test/OpenMP/target_parallel_for_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/target_parallel_for_simd_aligned_messages.cpp
+++ test/OpenMP/target_parallel_for_simd_aligned_messages.cpp
@@ -107,9 +107,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp target parallel for simd aligned // expected-error {{expected '(' after 'aligned'}}
for (I k = 0; k < argc; ++k) ++k;
Index: test/OpenMP/simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/simd_aligned_messages.cpp
+++ test/OpenMP/simd_aligned_messages.cpp
@@ -107,9 +107,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp simd aligned // expected-error {{expected '(' after 'aligned'}}
for (I k = 0; k < argc; ++k) ++k;
Index: test/OpenMP/parallel_for_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/parallel_for_simd_aligned_messages.cpp
+++ test/OpenMP/parallel_for_simd_aligned_messages.cpp
@@ -107,9 +107,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp parallel for simd aligned // expected-error {{expected '(' after 'aligned'}}
for (I k = 0; k < argc; ++k) ++k;
Index: test/OpenMP/for_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/for_simd_aligned_messages.cpp
+++ test/OpenMP/for_simd_aligned_messages.cpp
@@ -107,9 +107,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp for simd aligned // expected-error {{expected '(' after 'aligned'}}
for (I k = 0; k < argc; ++k) ++k;
Index: test/OpenMP/distribute_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/distribute_simd_aligned_messages.cpp
+++ test/OpenMP/distribute_simd_aligned_messages.cpp
@@ -134,9 +134,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp target
Index: test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp
===================================================================
--- test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp
+++ test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp
@@ -134,9 +134,8 @@
template<class I, class C> int foomain(I argc, C **argv) {
I e(argc);
I g(argc);
- int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
- // expected-note@+2 {{declared here}}
- // expected-note@+1 {{reference to 'i' is not a constant expression}}
+ int i; // expected-note {{'i' defined here}}
+ // expected-note@+1 {{declared here}}
int &j = i;
#pragma omp target
Index: lib/Sema/SemaExprObjC.cpp
===================================================================
--- lib/Sema/SemaExprObjC.cpp
+++ lib/Sema/SemaExprObjC.cpp
@@ -595,7 +595,6 @@
break;
}
}
- CheckForIntOverflow(ValueExpr);
// FIXME: Do I need to do anything special with BoolTy expressions?
// Look for the appropriate method within NSNumber.
Index: lib/Sema/SemaChecking.cpp
===================================================================
--- lib/Sema/SemaChecking.cpp
+++ lib/Sema/SemaChecking.cpp
@@ -9870,25 +9870,6 @@
::CheckBoolLikeConversion(*this, E, CC);
}
-/// Diagnose when expression is an integer constant expression and its evaluation
-/// results in integer overflow
-void Sema::CheckForIntOverflow (Expr *E) {
- // Use a work list to deal with nested struct initializers.
- SmallVector<Expr *, 2> Exprs(1, E);
-
- do {
- Expr *E = Exprs.pop_back_val();
-
- if (isa<BinaryOperator>(E->IgnoreParenCasts())) {
- E->IgnoreParenCasts()->EvaluateForOverflow(Context);
- continue;
- }
-
- if (auto InitList = dyn_cast<InitListExpr>(E))
- Exprs.append(InitList->inits().begin(), InitList->inits().end());
- } while (!Exprs.empty());
-}
-
namespace {
/// \brief Visitor for expressions which looks for unsequenced operations on the
/// same object.
@@ -10390,7 +10371,7 @@
if (!E->isInstantiationDependent())
CheckUnsequencedOperations(E);
if (!IsConstexpr && !E->isValueDependent())
- CheckForIntOverflow(E);
+ E->EvaluateForOverflow(Context);
DiagnoseMisalignedMembers();
}
Index: lib/AST/ExprConstant.cpp
===================================================================
--- lib/AST/ExprConstant.cpp
+++ lib/AST/ExprConstant.cpp
@@ -4466,6 +4466,8 @@
{ return StmtVisitorTy::Visit(E->getSubExpr()); }
bool VisitUnaryPlus(const UnaryOperator *E)
{ return StmtVisitorTy::Visit(E->getSubExpr()); }
+ bool VisitObjCBoxedExpr(const ObjCBoxedExpr *E)
+ { return StmtVisitorTy::Visit(E->getSubExpr()); }
bool VisitChooseExpr(const ChooseExpr *E)
{ return StmtVisitorTy::Visit(E->getChosenSubExpr()); }
bool VisitGenericSelectionExpr(const GenericSelectionExpr *E)
@@ -4567,8 +4569,19 @@
bool VisitCallExpr(const CallExpr *E) {
APValue Result;
- if (!handleCallExpr(E, Result, nullptr))
+ if (!handleCallExpr(E, Result, nullptr)) {
+ if (Info.checkingForOverflow()) {
+ if (!E->getDirectCallee()) {
+ if (!E->getCallee()->isValueDependent())
+ E->getCallee()->EvaluateForOverflow(Info.Ctx);
+ }
+ for (auto arg : E->arguments()) {
+ if (!arg->isValueDependent())
+ arg->EvaluateForOverflow(Info.Ctx);
+ }
+ }
return false;
+ }
return DerivedSuccess(Result, E);
}
@@ -5470,8 +5483,13 @@
bool VisitUnaryAddrOf(const UnaryOperator *E);
bool VisitObjCStringLiteral(const ObjCStringLiteral *E)
{ return Success(E); }
- bool VisitObjCBoxedExpr(const ObjCBoxedExpr *E)
- { return Success(E); }
+ bool VisitObjCBoxedExpr(const ObjCBoxedExpr *E) {
+ if (Info.checkingForOverflow()) {
+ if (!E->getSubExpr()->isValueDependent())
+ E->getSubExpr()->EvaluateForOverflow(Info.Ctx);
+ }
+ return Success(E);
+ }
bool VisitAddrLabelExpr(const AddrLabelExpr *E)
{ return Success(E); }
bool VisitCallExpr(const CallExpr *E);
@@ -6203,6 +6221,10 @@
// the initializer list.
ImplicitValueInitExpr VIE(HaveInit ? Info.Ctx.IntTy : Field->getType());
const Expr *Init = HaveInit ? E->getInit(ElementNo++) : &VIE;
+ if (Init->isValueDependent()) {
+ Success = false;
+ continue;
+ }
// Temporarily override This, in case there's a CXXDefaultInitExpr in here.
ThisOverrideRAII ThisOverride(*Info.CurrentCall, &This,
@@ -9913,7 +9935,8 @@
}
static bool FastEvaluateAsRValue(const Expr *Exp, Expr::EvalResult &Result,
- const ASTContext &Ctx, bool &IsConst) {
+ const ASTContext &Ctx, bool &IsConst,
+ bool IsCheckingForOverflow) {
// Fast-path evaluations of integer literals, since we sometimes see files
// containing vast quantities of these.
if (const IntegerLiteral *L = dyn_cast<IntegerLiteral>(Exp)) {
@@ -9934,7 +9957,7 @@
// performance problems. Only do so in C++11 for now.
if (Exp->isRValue() && (Exp->getType()->isArrayType() ||
Exp->getType()->isRecordType()) &&
- !Ctx.getLangOpts().CPlusPlus11) {
+ !Ctx.getLangOpts().CPlusPlus11 && !IsCheckingForOverflow) {
IsConst = false;
return true;
}
@@ -9949,7 +9972,7 @@
/// will be applied to the result.
bool Expr::EvaluateAsRValue(EvalResult &Result, const ASTContext &Ctx) const {
bool IsConst;
- if (FastEvaluateAsRValue(this, Result, Ctx, IsConst))
+ if (FastEvaluateAsRValue(this, Result, Ctx, IsConst, false))
return IsConst;
EvalInfo Info(Ctx, Result, EvalInfo::EM_IgnoreSideEffects);
@@ -10074,7 +10097,7 @@
void Expr::EvaluateForOverflow(const ASTContext &Ctx) const {
bool IsConst;
EvalResult EvalResult;
- if (!FastEvaluateAsRValue(this, EvalResult, Ctx, IsConst)) {
+ if (!FastEvaluateAsRValue(this, EvalResult, Ctx, IsConst, true)) {
EvalInfo Info(Ctx, EvalResult, EvalInfo::EM_EvaluateForOverflow);
(void)::EvaluateAsRValue(Info, this, EvalResult.Val);
}
Index: include/clang/Sema/Sema.h
===================================================================
--- include/clang/Sema/Sema.h
+++ include/clang/Sema/Sema.h
@@ -10115,7 +10115,6 @@
void CheckFloatComparison(SourceLocation Loc, Expr* LHS, Expr* RHS);
void CheckImplicitConversions(Expr *E, SourceLocation CC = SourceLocation());
void CheckBoolLikeConversion(Expr *E, SourceLocation CC);
- void CheckForIntOverflow(Expr *E);
void CheckUnsequencedOperations(Expr *E);
/// \brief Perform semantic checks on a completed expression. This will either
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
