mirror of
https://github.com/intel/llvm.git
synced 2026-01-17 06:40:01 +08:00
constexpr: Implement DR1358: An instantiation of a constexpr function which
can't produce a constant expression is not ill-formed (so long as some instantiation of that function can produce a constant expression). llvm-svn: 149802
This commit is contained in:
@@ -1016,7 +1016,8 @@ public:
|
||||
};
|
||||
bool CheckConstexprFunctionDecl(const FunctionDecl *FD,
|
||||
CheckConstexprKind CCK);
|
||||
bool CheckConstexprFunctionBody(const FunctionDecl *FD, Stmt *Body);
|
||||
bool CheckConstexprFunctionBody(const FunctionDecl *FD, Stmt *Body,
|
||||
bool IsInstantiation);
|
||||
|
||||
void DiagnoseHiddenVirtualMethods(CXXRecordDecl *DC, CXXMethodDecl *MD);
|
||||
// Returns true if the function declaration is a redeclaration
|
||||
|
||||
@@ -7302,7 +7302,7 @@ Decl *Sema::ActOnFinishFunctionBody(Decl *dcl, Stmt *Body,
|
||||
}
|
||||
|
||||
if (FD && FD->isConstexpr() && !FD->isInvalidDecl() &&
|
||||
!CheckConstexprFunctionBody(FD, Body))
|
||||
!CheckConstexprFunctionBody(FD, Body, IsInstantiation))
|
||||
FD->setInvalidDecl();
|
||||
|
||||
assert(ExprCleanupObjects.empty() && "Leftover temporaries in function");
|
||||
|
||||
@@ -837,7 +837,8 @@ static void CheckConstexprCtorInitializer(Sema &SemaRef,
|
||||
/// the permitted types of statement. C++11 [dcl.constexpr]p3,p4.
|
||||
///
|
||||
/// \return true if the body is OK, false if we have diagnosed a problem.
|
||||
bool Sema::CheckConstexprFunctionBody(const FunctionDecl *Dcl, Stmt *Body) {
|
||||
bool Sema::CheckConstexprFunctionBody(const FunctionDecl *Dcl, Stmt *Body,
|
||||
bool IsInstantiation) {
|
||||
if (isa<CXXTryStmt>(Body)) {
|
||||
// C++11 [dcl.constexpr]p3:
|
||||
// The definition of a constexpr function shall satisfy the following
|
||||
@@ -989,7 +990,7 @@ bool Sema::CheckConstexprFunctionBody(const FunctionDecl *Dcl, Stmt *Body) {
|
||||
// can't produce constant expressions.
|
||||
llvm::SmallVector<PartialDiagnosticAt, 8> Diags;
|
||||
if (!Context.getSourceManager().isInSystemHeader(Dcl->getLocation()) &&
|
||||
!Expr::isPotentialConstantExpr(Dcl, Diags)) {
|
||||
!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)
|
||||
|
||||
@@ -78,4 +78,29 @@ constexpr bool BcpCall(int n) {
|
||||
}
|
||||
static_assert(BcpCall(0), "");
|
||||
|
||||
// DR1311: A function template which can produce a constant expression, but
|
||||
// for which a particular specialization cannot, is ok.
|
||||
template<typename T> constexpr T cmin(T a, T b) {
|
||||
return a < b ? a : b;
|
||||
}
|
||||
int n = cmin(3, 5); // ok
|
||||
|
||||
struct X {
|
||||
constexpr X() {}
|
||||
bool operator<(X); // not constexpr
|
||||
};
|
||||
|
||||
X x = cmin(X(), X()); // ok, not constexpr
|
||||
|
||||
// Same with other temploids.
|
||||
template<typename T>
|
||||
struct Y {
|
||||
constexpr Y() {}
|
||||
constexpr int get() { return T(); }
|
||||
};
|
||||
struct Z { operator int(); };
|
||||
|
||||
int y1 = Y<int>().get(); // ok
|
||||
int y2 = Y<Z>().get(); // ok
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user