OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++: constexpr, inheritance, and local class [PR91933] 

Here we complained about referring to nm3 from the local class member
function because referring to the base class subobject involved taking the
variable's address.  Let's shortcut this case to avoid that.

gcc/cp/ChangeLog:

	PR c++/91933
	* class.c (build_base_path): Shortcut simple non-pointer case.

gcc/testsuite/ChangeLog:

	PR c++/91933
	* g++.dg/cpp0x/constexpr-base7.C: New test.
This commit is contained in:
Jason Merrill 2021-04-12 17:43:51 -04:00
parent 945c2afcb3
commit 370440f9f9
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/cp/class.c
View File

@ -331,6 +331,15 @@ build_base_path (enum tree_code code,
return error_mark_node;
}
bool uneval = (cp_unevaluated_operand != 0
|| processing_template_decl
|| in_template_function ());
/* For a non-pointer simple base reference, express it as a COMPONENT_REF
without taking its address (and so causing lambda capture, 91933). */
if (code == PLUS_EXPR && !v_binfo && !want_pointer && !has_empty && !uneval)
return build_simple_base_path (expr, binfo);
if (!want_pointer)
{
rvalue = !lvalue_p (expr);
@ -358,9 +367,7 @@ build_base_path (enum tree_code code,
template (even in instantiate_non_dependent_expr), we don't have vtables
set up properly yet, and the value doesn't matter there either; we're
just interested in the result of overload resolution. */
if (cp_unevaluated_operand != 0
|| processing_template_decl
|| in_template_function ())
if (uneval)
{
expr = build_nop (ptr_target_type, expr);
goto indout;

15
gcc/testsuite/g++.dg/cpp0x/constexpr-base7.C Normal file
View File

@ -0,0 +1,15 @@
// PR c++/91933
// { dg-do compile { target c++11 } }
struct NoMut1 { int a, b; };
struct NoMut3 : NoMut1 {
constexpr NoMut3(int a, int b) : NoMut1{a, b} {}
};
void mutable_subobjects() {
constexpr NoMut3 nm3 = {1, 2};
struct A {
void f() {
static_assert(nm3.a == 1, "");
}
};
}