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

PR c++/12333 - X::~X() with implicit this->. 

this->X::~X() is handled by finish_class_member_access_expr and its
lookup_destructor subroutine; let's use it in cp_parser_lookup_name for the
case where this-> is implicit.

I tried replacing the other destructor code here with just the call to
lookup_destructor, but that regressed handling of naming the destructor
outside a non-static member function.

	* parser.c (cp_parser_lookup_name): Use lookup_destructor.
	* typeck.c (lookup_destructor): No longer static.

From-SVN: r279522
This commit is contained in:
Jason Merrill 2019-12-18 07:44:34 -05:00 committed by Jason Merrill
parent 542803c9ad
commit 1ad431f95c
6 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2019-12-17 Jason Merrill <jason@redhat.com>
PR c++/12333 - X::~X() with implicit this->.
* parser.c (cp_parser_lookup_name): Use lookup_destructor.
* typeck.c (lookup_destructor): No longer static.
2019-12-17 Martin Sebor <msebor@redhat.com>
PR c++/61339

1
gcc/cp/cp-tree.h
View File

@ -7500,6 +7500,7 @@ extern tree build_class_member_access_expr (cp_expr, tree, tree, bool,
tsubst_flags_t);
extern tree finish_class_member_access_expr (cp_expr, tree, bool,
tsubst_flags_t);
extern tree lookup_destructor (tree, tree, tree, tsubst_flags_t);
extern tree build_x_indirect_ref (location_t, tree,
ref_operator,
tsubst_flags_t);

5
gcc/cp/parser.c
View File

@ -27939,6 +27939,11 @@ cp_parser_lookup_name (cp_parser *parser, tree name,
if (!type || !CLASS_TYPE_P (type))
return error_mark_node;
/* In a non-static member function, check implicit this->. */
if (current_class_ref)
return lookup_destructor (current_class_ref, parser->scope, name,
tf_warning_or_error);
if (CLASSTYPE_LAZY_DESTRUCTOR (type))
lazily_declare_fn (sfk_destructor, type);

3
gcc/cp/typeck.c
View File

@ -59,7 +59,6 @@ static tree get_delta_difference (tree, tree, bool, bool, tsubst_flags_t);
static void casts_away_constness_r (tree *, tree *, tsubst_flags_t);
static bool casts_away_constness (tree, tree, tsubst_flags_t);
static bool maybe_warn_about_returning_address_of_local (tree);
static tree lookup_destructor (tree, tree, tree, tsubst_flags_t);
static void error_args_num (location_t, tree, bool);
static int convert_arguments (tree, vec<tree, va_gc> **, tree, int,
tsubst_flags_t);
@ -2696,7 +2695,7 @@ build_class_member_access_expr (cp_expr object, tree member,
/* Return the destructor denoted by OBJECT.SCOPE::DTOR_NAME, or, if
SCOPE is NULL, by OBJECT.DTOR_NAME, where DTOR_NAME is ~type. */
static tree
tree
lookup_destructor (tree object, tree scope, tree dtor_name,
tsubst_flags_t complain)
{

13
gcc/testsuite/g++.dg/lookup/dtor1.C Normal file
View File

@ -0,0 +1,13 @@
// PR c++/12333
struct A { };
struct X {
void f () {
X::~X ();
this->~X();
~X(); // { dg-error "" "unary ~" }
A::~A (); // { dg-error "" }
X::~A (); // { dg-error "" }
}
};

8
gcc/testsuite/g++.dg/parse/dtor3.C
View File

@ -4,13 +4,13 @@
// destructor call.
struct Y {
~Y() {} // { dg-bogus "note" "implemented DR272" { xfail *-*-* } }
~Y() {} // { dg-bogus "note" "implemented DR272" }
};
struct X : Y {
~X() {} // { dg-bogus "note" "implemented DR272" { xfail *-*-* } }
~X() {} // { dg-bogus "note" "implemented DR272" }
void f() {
X::~X(); // { dg-bogus "" "implemented DR272" { xfail *-*-* } }
Y::~Y(); // { dg-bogus "" "implemented DR272" { xfail *-*-* } }
X::~X(); // { dg-bogus "" "implemented DR272" }
Y::~Y(); // { dg-bogus "" "implemented DR272" }
}
};