From d2884ecafd62050470003bd06893101a9c24e7ec Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 13 Jul 2017 12:38:32 +0000 Subject: [PATCH] revert previous premature commit From-SVN: r250181 --- libcc1/libcp1plugin.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index d7bf5a2..8dd5e67 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -1556,7 +1556,7 @@ plugin_build_decl (cc1_plugin::connection *self, if ((ctor || dtor) /* Don't crash after a duplicate declaration of a cdtor. */ - && TYPE_FIELDS (current_class_type) == decl) + && TYPE_METHODS (current_class_type) == decl) { /* ctors and dtors clones are chained after DECL. However, we create the clones before TYPE_METHODS is @@ -1568,9 +1568,9 @@ plugin_build_decl (cc1_plugin::connection *self, tree save = DECL_CHAIN (decl); DECL_CHAIN (decl) = NULL_TREE; clone_function_decl (decl, /*update_methods=*/true); - gcc_assert (TYPE_FIELDS (current_class_type) == decl); - TYPE_FIELDS (current_class_type) - = nreverse (TYPE_FIELDS (current_class_type)); + gcc_assert (TYPE_METHODS (current_class_type) == decl); + TYPE_METHODS (current_class_type) + = nreverse (TYPE_METHODS (current_class_type)); DECL_CHAIN (decl) = save; } -- 2.7.4