Commit 54069e59 by Jason Merrill Committed by Jason Merrill

PR c++/66297, DR 1684 - literal class and constexpr member fns

	* constexpr.c (is_valid_constexpr_fn): Only complain about
	non-literal enclosing class in C++11.
	* class.c (finalize_literal_type_property): Likewise.

From-SVN: r247813
parent 8ef2b9a7
2017-05-09 Jason Merrill <jason@redhat.com>
PR c++/66297, DR 1684 - literal class and constexpr member fns
* constexpr.c (is_valid_constexpr_fn): Only complain about
non-literal enclosing class in C++11.
* class.c (finalize_literal_type_property): Likewise.
2017-05-09 Paolo Carlini <paolo.carlini@oracle.com> 2017-05-09 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/80186 PR c++/80186
......
...@@ -5757,7 +5757,9 @@ finalize_literal_type_property (tree t) ...@@ -5757,7 +5757,9 @@ finalize_literal_type_property (tree t)
&& !TYPE_HAS_CONSTEXPR_CTOR (t)) && !TYPE_HAS_CONSTEXPR_CTOR (t))
CLASSTYPE_LITERAL_P (t) = false; CLASSTYPE_LITERAL_P (t) = false;
if (!CLASSTYPE_LITERAL_P (t)) /* C++14 DR 1684 removed this restriction. */
if (cxx_dialect < cxx14
&& !CLASSTYPE_LITERAL_P (t) && !LAMBDA_TYPE_P (t))
for (fn = TYPE_METHODS (t); fn; fn = DECL_CHAIN (fn)) for (fn = TYPE_METHODS (t); fn; fn = DECL_CHAIN (fn))
if (DECL_DECLARED_CONSTEXPR_P (fn) if (DECL_DECLARED_CONSTEXPR_P (fn)
&& TREE_CODE (fn) != TEMPLATE_DECL && TREE_CODE (fn) != TEMPLATE_DECL
...@@ -5765,12 +5767,11 @@ finalize_literal_type_property (tree t) ...@@ -5765,12 +5767,11 @@ finalize_literal_type_property (tree t)
&& !DECL_CONSTRUCTOR_P (fn)) && !DECL_CONSTRUCTOR_P (fn))
{ {
DECL_DECLARED_CONSTEXPR_P (fn) = false; DECL_DECLARED_CONSTEXPR_P (fn) = false;
if (!DECL_GENERATED_P (fn) && !LAMBDA_TYPE_P (t)) if (!DECL_GENERATED_P (fn)
{ && pedwarn (DECL_SOURCE_LOCATION (fn), OPT_Wpedantic,
error ("enclosing class of constexpr non-static member " "enclosing class of constexpr non-static member "
"function %q+#D is not a literal type", fn); "function %q+#D is not a literal type", fn))
explain_non_literal_class (t); explain_non_literal_class (t);
}
} }
} }
......
...@@ -210,16 +210,17 @@ is_valid_constexpr_fn (tree fun, bool complain) ...@@ -210,16 +210,17 @@ is_valid_constexpr_fn (tree fun, bool complain)
} }
} }
if (DECL_NONSTATIC_MEMBER_FUNCTION_P (fun) /* C++14 DR 1684 removed this restriction. */
if (cxx_dialect < cxx14
&& DECL_NONSTATIC_MEMBER_FUNCTION_P (fun)
&& !CLASSTYPE_LITERAL_P (DECL_CONTEXT (fun))) && !CLASSTYPE_LITERAL_P (DECL_CONTEXT (fun)))
{ {
ret = false; ret = false;
if (complain) if (complain
{ && pedwarn (DECL_SOURCE_LOCATION (fun), OPT_Wpedantic,
error ("enclosing class of constexpr non-static member " "enclosing class of constexpr non-static member "
"function %q+#D is not a literal type", fun); "function %q+#D is not a literal type", fun))
explain_non_literal_class (DECL_CONTEXT (fun)); explain_non_literal_class (DECL_CONTEXT (fun));
}
} }
} }
else if (CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun))) else if (CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun)))
......
...@@ -36,7 +36,7 @@ class debug_flag ...@@ -36,7 +36,7 @@ class debug_flag
{ {
public: public:
explicit debug_flag(bool); explicit debug_flag(bool);
constexpr bool is_on(); // { dg-error "enclosing class .* not a literal type" } constexpr bool is_on(); // { dg-error "enclosing class .* not a literal type" "" { target c++11_only } }
private: private:
bool flag; bool flag;
}; };
...@@ -5,7 +5,7 @@ template <class T> ...@@ -5,7 +5,7 @@ template <class T>
struct A struct A
{ {
T t; T t;
constexpr int f() const { return 42; } // { dg-error "enclosing class" } constexpr int f() const { return 42; } // { dg-error "enclosing class" "" { target c++11_only } }
}; };
struct B { B(); operator int(); }; struct B { B(); operator int(); };
...@@ -13,7 +13,7 @@ struct B { B(); operator int(); }; ...@@ -13,7 +13,7 @@ struct B { B(); operator int(); };
constexpr A<int> ai = { 42 }; constexpr A<int> ai = { 42 };
constexpr int i = ai.f(); constexpr int i = ai.f();
constexpr int b = A<B>().f(); // { dg-error "non-constexpr function" } constexpr int b = A<B>().f(); // { dg-error "" }
template <class T> template <class T>
constexpr int f (T t) { return 42; } // { dg-error "parameter" } constexpr int f (T t) { return 42; } // { dg-error "parameter" }
......
...@@ -16,7 +16,7 @@ int main() ...@@ -16,7 +16,7 @@ int main()
struct complex // { dg-message "no constexpr constructor" } struct complex // { dg-message "no constexpr constructor" }
{ {
complex(double r, double i) : re(r), im(i) { } complex(double r, double i) : re(r), im(i) { }
constexpr double real() const { return re; } // { dg-error "not a literal type" } constexpr double real() const { return re; } // { dg-error "not a literal type" "" { target c++11_only } }
double imag() const { return im; } double imag() const { return im; }
private: private:
...@@ -25,7 +25,7 @@ private: ...@@ -25,7 +25,7 @@ private:
}; };
constexpr complex co1(0, 1); // { dg-error "not literal" } constexpr complex co1(0, 1); // { dg-error "not literal" }
constexpr double dd2 = co1.real(); // { dg-error "non-constexpr function" } constexpr double dd2 = co1.real(); // { dg-error "" }
// -------------------- // --------------------
......
...@@ -13,6 +13,6 @@ constexpr X X::g(X x) { return x; } ...@@ -13,6 +13,6 @@ constexpr X X::g(X x) { return x; }
struct Y struct Y
{ {
Y() { } Y() { }
constexpr Y f(Y y); // { dg-error "not a literal type" } constexpr Y f(Y y) {} // { dg-error "constexpr" }
static constexpr Y g(Y y) {} // { dg-error "constexpr" } static constexpr Y g(Y y) {} // { dg-error "constexpr" }
}; };
...@@ -45,7 +45,7 @@ constexpr int g(int x, int n) { ...@@ -45,7 +45,7 @@ constexpr int g(int x, int n) {
class debug_flag { class debug_flag {
public: public:
explicit debug_flag(bool); explicit debug_flag(bool);
constexpr bool is_on(); // { dg-error "not a literal type" } debug_flag not literal type constexpr bool is_on(); // { dg-error "not a literal type" "" { target c++11_only } } debug_flag not literal type
private: private:
bool flag; bool flag;
}; };
......
// DR 1684
// { dg-do compile { target c++11 } }
struct A {
A(int);
constexpr int foo() { return 0; } // { dg-error "literal" "" { target c++11_only } }
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment