[PATCH 6/9] ENABLE_CHECKING refactoring: generators

        * genautomata.c: Use CHECKING_P instead of ENABLE_CHECKING.
        * genconditions.c: Define CHECKING_P in the generated code.
        * genextract.c: Use flag_checking in insn_extract.
        * gengtype.c (main): Remove conditional compilation.
        * gengtype.h: Likewise.

From-SVN: r229539

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4fbfea052871194ffa8481bd64e0991eac01361b..4dc5b71504208e067c86372a061095a2e12fde10 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-29  Mikhail Maltsev  <maltsevm@gmail.com>
+
+        * genautomata.c: Use CHECKING_P instead of ENABLE_CHECKING.
+        * genconditions.c: Define CHECKING_P in the generated code.
+        * genextract.c: Use flag_checking in insn_extract.
+        * gengtype.c (main): Remove conditional compilation.
+        * gengtype.h: Likewise.
+
 2015-10-29  Jeff Law  <law@redhat.com>
 
        PR tree-optimization/67892

diff --git a/gcc/genautomata.c b/gcc/genautomata.c
index 5196d6800d1b3b1ca581541bb86ce53eff0425d4..504107840a332d544b18bf87428acd67cfd1975a 100644 (file)
--- a/gcc/genautomata.c
+++ b/gcc/genautomata.c
@@ -879,7 +879,7 @@ struct state_ainsn_table
 /* Macros to access members of unions.  Use only them for access to
    union members of declarations and regexps.  */
 
-#if defined ENABLE_CHECKING && (GCC_VERSION >= 2007)
+#if CHECKING_P && (GCC_VERSION >= 2007)
 
 #define DECL_UNIT(d) __extension__                                     \
 (({ __typeof (d) const _decl = (d);                                    \
@@ -1070,7 +1070,7 @@ regexp_mode_check_failed (enum regexp_mode mode,
   exit (1);
 }
 
-#else /* #if defined ENABLE_RTL_CHECKING && (GCC_VERSION >= 2007) */
+#else /* #if CHECKING_P && (GCC_VERSION >= 2007) */
 
 #define DECL_UNIT(d) (&(d)->decl.unit)
 #define DECL_BYPASS(d) (&(d)->decl.bypass)
@@ -1088,7 +1088,7 @@ regexp_mode_check_failed (enum regexp_mode mode,
 #define REGEXP_ALLOF(r) (&(r)->regexp.allof)
 #define REGEXP_ONEOF(r) (&(r)->regexp.oneof)
 
-#endif /* #if defined ENABLE_RTL_CHECKING && (GCC_VERSION >= 2007) */
+#endif /* #if CHECKING_P && (GCC_VERSION >= 2007) */
 
 #define XCREATENODE(T) ((T *) create_node (sizeof (T)))
 #define XCREATENODEVEC(T, N) ((T *) create_node (sizeof (T) * (N)))

diff --git a/gcc/genconditions.c b/gcc/genconditions.c
index 001e58eff8afdc78528cb1df7814bee42e7fece5..7481ab41d5e5bad78dd0b46ea71e660809829724 100644 (file)
--- a/gcc/genconditions.c
+++ b/gcc/genconditions.c
@@ -60,6 +60,8 @@ write_header (void)
 \n\
 /* Do not allow checking to confuse the issue.  */\n\
 #undef ENABLE_CHECKING\n\
+#undef CHECKING_P\n\
+#define CHECKING_P 0\n\
 #undef ENABLE_TREE_CHECKING\n\
 #undef ENABLE_RTL_CHECKING\n\
 #undef ENABLE_RTL_FLAG_CHECKING\n\

diff --git a/gcc/genextract.c b/gcc/genextract.c
index fe97701472909c47af77ef963d8f2d0385a8d4fd..a03ac972182a799767cee9155eb6f824417ac1b2 100644 (file)
--- a/gcc/genextract.c
+++ b/gcc/genextract.c
@@ -373,10 +373,11 @@ insn_extract (rtx_insn *insn)\n{\n\
   rtx pat = PATTERN (insn);\n\
   int i ATTRIBUTE_UNUSED; /* only for peepholes */\n\
 \n\
-#ifdef ENABLE_CHECKING\n\
-  memset (ro, 0xab, sizeof (*ro) * MAX_RECOG_OPERANDS);\n\
-  memset (ro_loc, 0xab, sizeof (*ro_loc) * MAX_RECOG_OPERANDS);\n\
-#endif\n");
+  if (flag_checking)\n\
+    {\n\
+      memset (ro, 0xab, sizeof (*ro) * MAX_RECOG_OPERANDS);\n\
+      memset (ro_loc, 0xab, sizeof (*ro_loc) * MAX_RECOG_OPERANDS);\n\
+    }\n");
 
   puts ("\
   switch (INSN_CODE (insn))\n\

diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 8c5c36d384e471f3fd9bec37b19c7b81f9c2fbbe..98ee32a8931531f06e4370012e404edb8ac46ca9 100644 (file)
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -158,9 +158,6 @@ size_t num_lang_dirs;
    BASE_FILES entry for each language.  */
 static outf_p *base_files;
 
-
-
-#if ENABLE_CHECKING
 /* Utility debugging function, printing the various type counts within
    a list of types.  Called through the DBGPRINT_COUNT_TYPE macro.  */
 void
@@ -222,7 +219,6 @@ dbgprint_count_type_at (const char *fil, int lin, const char *msg, type_p t)
     fprintf (stderr, "@@%%@@ %d undefined types\n", nb_undefined);
   fprintf (stderr, "\n");
 }
-#endif /* ENABLE_CHECKING */
 
 /* Scan the input file, LIST, and determine how much space we need to
    store strings in.  Also, count the number of language directories
@@ -5188,7 +5184,6 @@ main (int argc, char **argv)
 
   parse_program_options (argc, argv);
 
-#if ENABLE_CHECKING
   if (do_debug)
     {
       time_t now = (time_t) 0;
@@ -5196,7 +5191,6 @@ main (int argc, char **argv)
       DBGPRINTF ("gengtype started pid %d at %s",
                 (int) getpid (), ctime (&now));
     }
-#endif /* ENABLE_CHECKING */
 
   /* Parse the input list and the input files.  */
   DBGPRINTF ("inputlist %s", inputlist);

diff --git a/gcc/gengtype.h b/gcc/gengtype.h
index 83f36321033f1e82787670a6968a0b1b08682561..b8ce7ceba3fe18e912b6107791e2b2de16017967 100644 (file)
--- a/gcc/gengtype.h
+++ b/gcc/gengtype.h
@@ -492,17 +492,12 @@ extern int do_dump;               /* (-d) program argument. */
    gengtype source code).  Only useful to debug gengtype itself.  */
 extern int do_debug;           /* (-D) program argument. */
 
-#if ENABLE_CHECKING
 #define DBGPRINTF(Fmt,...) do {if (do_debug)                           \
       fprintf (stderr, "%s:%d: " Fmt "\n",                             \
               lbasename (__FILE__),__LINE__, ##__VA_ARGS__);} while (0)
 void dbgprint_count_type_at (const char *, int, const char *, type_p);
 #define DBGPRINT_COUNT_TYPE(Msg,Ty) do {if (do_debug)                  \
       dbgprint_count_type_at (__FILE__, __LINE__, Msg, Ty);}while (0)
-#else
-#define DBGPRINTF(Fmt,...) do {/*nodbgrintf*/} while (0)
-#define DBGPRINT_COUNT_TYPE(Msg,Ty) do{/*nodbgprint_count_type*/}while (0)
-#endif /*ENABLE_CHECKING */
 
 #define FOR_ALL_INHERITED_FIELDS(TYPE, FIELD_VAR) \
   for (type_p sub = (TYPE); sub; sub = sub->u.s.base_class) \