--- a/gcc/genextract.c	Thu Oct 25 07:37:49 2018 +0900
+++ b/gcc/genextract.c	Thu Feb 13 11:34:05 2020 +0900
@@ -1,5 +1,5 @@
 /* Generate code from machine description to extract operands from insn as rtl.
-   Copyright (C) 1987-2018 Free Software Foundation, Inc.
+   Copyright (C) 1987-2020 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -68,8 +68,9 @@
    data that will be used to produce an extractions structure.  */
 
 
-struct accum_extract
+class accum_extract
 {
+public:
   accum_extract () : oplocs (10), duplocs (10), dupnums (10), pathstr (20) {}
 
   auto_vec<locstr> oplocs;
@@ -79,7 +80,7 @@
 };
 
 /* Forward declarations.  */
-static void walk_rtx (md_rtx_info *, rtx, struct accum_extract *);
+static void walk_rtx (md_rtx_info *, rtx, class accum_extract *);
 
 #define UPPER_OFFSET ('A' - ('z' - 'a' + 1))
 
@@ -88,7 +89,7 @@
    in ACC.  */
 static void
 push_pathstr_operand (int operand, bool is_vector,
-		     struct accum_extract *acc)
+		     class accum_extract *acc)
 {
   if (is_vector && 'a' + operand > 'z')
     acc->pathstr.safe_push (operand + UPPER_OFFSET);
@@ -105,7 +106,7 @@
   unsigned int op_count, dup_count, j;
   struct extraction *p;
   struct code_ptr *link;
-  struct accum_extract acc;
+  class accum_extract acc;
 
   /* Walk the insn's pattern, remembering at all times the path
      down to the walking point.  */
@@ -223,7 +224,7 @@
 }
 
 static void
-walk_rtx (md_rtx_info *info, rtx x, struct accum_extract *acc)
+walk_rtx (md_rtx_info *info, rtx x, class accum_extract *acc)
 {
   RTX_CODE code;
   int i, len;