libcp1plugin.cc (plugin_build_decl): Use DECL_CXX_{CON,DE}STRUCTOR directly.
authorNathan Sidwell <nathan@gcc.gnu.org>
Thu, 13 Jul 2017 12:35:52 +0000 (12:35 +0000)
committerNathan Sidwell <nathan@gcc.gnu.org>
Thu, 13 Jul 2017 12:35:52 +0000 (12:35 +0000)
* libcp1plugin.cc (plugin_build_decl): Use
DECL_CXX_{CON,DE}STRUCTOR directly.

From-SVN: r250180

libcc1/libcp1plugin.cc

index 8dd5e673838728537b1fa408150ac5d63e531df0..d7bf5a29d6d0019a3a87aeb6979814aebf6721d3 100644 (file)
@@ -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_METHODS (current_class_type) == decl)
+      && TYPE_FIELDS (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_METHODS (current_class_type) == decl);
-      TYPE_METHODS (current_class_type)
-       = nreverse (TYPE_METHODS (current_class_type));
+      gcc_assert (TYPE_FIELDS (current_class_type) == decl);
+      TYPE_FIELDS (current_class_type)
+       = nreverse (TYPE_FIELDS (current_class_type));
       DECL_CHAIN (decl) = save;
     }