diff options
Diffstat (limited to 'clang')
16 files changed, 41 insertions, 65 deletions
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 9b5ed12cd17..8025668e664 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -10273,7 +10273,6 @@ private: 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 diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index e836135cf2f..768947d00ac 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -6226,6 +6226,10 @@ bool RecordExprEvaluator::VisitInitListExpr(const InitListExpr *E) { // 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, @@ -9936,7 +9940,8 @@ static bool EvaluateAsRValue(EvalInfo &Info, const Expr *E, APValue &Result) { } 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)) { @@ -9957,7 +9962,7 @@ static bool FastEvaluateAsRValue(const Expr *Exp, Expr::EvalResult &Result, // 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; } @@ -9972,7 +9977,7 @@ static bool FastEvaluateAsRValue(const Expr *Exp, Expr::EvalResult &Result, /// 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); @@ -10097,7 +10102,7 @@ APSInt Expr::EvaluateKnownConstInt(const ASTContext &Ctx, 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); } diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 44184c73664..b794628db73 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -9935,28 +9935,6 @@ void Sema::CheckBoolLikeConversion(Expr *E, SourceLocation CC) { ::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()); - - if (isa<ObjCBoxedExpr>(E)) - E->IgnoreParenCasts()->EvaluateForOverflow(Context); - } while (!Exprs.empty()); -} - namespace { /// \brief Visitor for expressions which looks for unsequenced operations on the /// same object. @@ -10458,7 +10436,7 @@ void Sema::CheckCompletedExpr(Expr *E, SourceLocation CheckLoc, if (!E->isInstantiationDependent()) CheckUnsequencedOperations(E); if (!IsConstexpr && !E->isValueDependent()) - CheckForIntOverflow(E); + E->EvaluateForOverflow(Context); DiagnoseMisalignedMembers(); } diff --git a/clang/test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp b/clang/test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp index f865e0be424..2d99d7d8f4b 100644 --- a/clang/test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp @@ -134,9 +134,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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 diff --git a/clang/test/OpenMP/distribute_simd_aligned_messages.cpp b/clang/test/OpenMP/distribute_simd_aligned_messages.cpp index 10beb7198a6..21b1bc9da1f 100644 --- a/clang/test/OpenMP/distribute_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/distribute_simd_aligned_messages.cpp @@ -134,9 +134,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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 diff --git a/clang/test/OpenMP/for_simd_aligned_messages.cpp b/clang/test/OpenMP/for_simd_aligned_messages.cpp index 1d0918e449f..3ff25870e5a 100644 --- a/clang/test/OpenMP/for_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/for_simd_aligned_messages.cpp @@ -107,9 +107,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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; diff --git a/clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp b/clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp index fc0f88cc38f..eed80170039 100644 --- a/clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/parallel_for_simd_aligned_messages.cpp @@ -107,9 +107,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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; diff --git a/clang/test/OpenMP/simd_aligned_messages.cpp b/clang/test/OpenMP/simd_aligned_messages.cpp index 81aec960f26..d936fed0143 100644 --- a/clang/test/OpenMP/simd_aligned_messages.cpp +++ b/clang/test/OpenMP/simd_aligned_messages.cpp @@ -107,9 +107,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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; diff --git a/clang/test/OpenMP/target_parallel_for_simd_aligned_messages.cpp b/clang/test/OpenMP/target_parallel_for_simd_aligned_messages.cpp index 538d65b82b5..655f90642f5 100644 --- a/clang/test/OpenMP/target_parallel_for_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/target_parallel_for_simd_aligned_messages.cpp @@ -107,9 +107,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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; diff --git a/clang/test/OpenMP/target_simd_aligned_messages.cpp b/clang/test/OpenMP/target_simd_aligned_messages.cpp index ae2859d5b61..76a37f64984 100644 --- a/clang/test/OpenMP/target_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/target_simd_aligned_messages.cpp @@ -107,9 +107,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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; diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_aligned_messages.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_aligned_messages.cpp index df5468c8266..f121512733a 100644 --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_aligned_messages.cpp @@ -110,9 +110,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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'}} diff --git a/clang/test/OpenMP/target_teams_distribute_simd_aligned_messages.cpp b/clang/test/OpenMP/target_teams_distribute_simd_aligned_messages.cpp index e9df563ded2..d91cfa9b54a 100644 --- a/clang/test/OpenMP/target_teams_distribute_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_simd_aligned_messages.cpp @@ -110,9 +110,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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'}} diff --git a/clang/test/OpenMP/taskloop_simd_aligned_messages.cpp b/clang/test/OpenMP/taskloop_simd_aligned_messages.cpp index 6085660b705..c4c41ebbafe 100644 --- a/clang/test/OpenMP/taskloop_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/taskloop_simd_aligned_messages.cpp @@ -107,9 +107,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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; diff --git a/clang/test/OpenMP/teams_distribute_parallel_for_simd_aligned_messages.cpp b/clang/test/OpenMP/teams_distribute_parallel_for_simd_aligned_messages.cpp index 674057712ec..97b200bb164 100644 --- a/clang/test/OpenMP/teams_distribute_parallel_for_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_parallel_for_simd_aligned_messages.cpp @@ -123,9 +123,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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 diff --git a/clang/test/OpenMP/teams_distribute_simd_aligned_messages.cpp b/clang/test/OpenMP/teams_distribute_simd_aligned_messages.cpp index 95a85b2d0db..885432bb9a1 100644 --- a/clang/test/OpenMP/teams_distribute_simd_aligned_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_simd_aligned_messages.cpp @@ -123,9 +123,8 @@ S3 h; // expected-note 2 {{'h' defined here}} 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 diff --git a/clang/test/Sema/integer-overflow.c b/clang/test/Sema/integer-overflow.c index 44c2629ebf7..62ee33e3d18 100644 --- a/clang/test/Sema/integer-overflow.c +++ b/clang/test/Sema/integer-overflow.c @@ -152,7 +152,13 @@ uint64_t check_integer_overflows(int i) { uint64_t b2 = b[4608 * 1024 * 1024] + 1; // expected-warning@+1 2{{overflow in expression; result is 536870912 with type 'int'}} - (void)((i ? (4608 * 1024 * 1024) : (4608 * 1024 * 1024)) + 1); + int j1 = i ? (4608 * 1024 * 1024) : (4608 * 1024 * 1024); + +// expected-warning@+1 {{overflow in expression; result is 536870912 with type 'int'}} + int j2 = -(4608 * 1024 * 1024); + +// expected-warning@+1 {{overflow in expression; result is 536870912 with type 'int'}} + uint64_t j3 = b[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))); |
