diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 7 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index e33d22a4aa..410406788d 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -4704,12 +4704,11 @@ bool IntExprEvaluator::VisitBinaryOperator(const BinaryOperator *E) { << RHS << E->getType() << LHS.getBitWidth(); } else if (LHS.isSigned()) { // C++11 [expr.shift]p2: A signed left shift must have a non-negative - // operand, and must not overflow. + // operand, and must not overflow the corresponding unsigned type. if (LHS.isNegative()) CCEDiag(E, diag::note_constexpr_lshift_of_negative) << LHS; - else if (LHS.countLeadingZeros() <= SA) - HandleOverflow(Info, E, LHS.extend(LHS.getBitWidth() + SA) << SA, - E->getType()); + else if (LHS.countLeadingZeros() < SA) + CCEDiag(E, diag::note_constexpr_lshift_discards); } return Success(LHS << SA, E); diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 2c1642361b..ca64af644f 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -984,13 +984,8 @@ bool Sema::CheckConstexprFunctionBody(const FunctionDecl *Dcl, Stmt *Body, // C++11 [dcl.constexpr]p4: // - every constructor involved in initializing non-static data members and // base class sub-objects shall be a constexpr constructor. - // - // FIXME: We currently disable this check inside system headers, to work - // around early STL implementations which contain constexpr functions which - // can't produce constant expressions. llvm::SmallVector<PartialDiagnosticAt, 8> Diags; - if (!Context.getSourceManager().isInSystemHeader(Dcl->getLocation()) && - !IsInstantiation && !Expr::isPotentialConstantExpr(Dcl, Diags)) { + if (!IsInstantiation && !Expr::isPotentialConstantExpr(Dcl, Diags)) { Diag(Dcl->getLocation(), diag::err_constexpr_function_never_constant_expr) << isa<CXXConstructorDecl>(Dcl); for (size_t I = 0, N = Diags.size(); I != N; ++I) |