gensupport.h (get_c_test): Declare.

gcc/
	* gensupport.h (get_c_test): Declare.
	* gensupport.c (get_c_test): New function.
	* genconditions.c (main): Use it.
	* genrecog.c (validate_pattern): Likewise.
	(match_pattern_1): Likewise.  Remove c_test argument.
	(match_pattern): Update accordingly and remove c_test argument.
	(main): Update accordingly.

From-SVN: r226634

1 files changed, 1 insertions, 9 deletions

diff --git a/gcc/genconditions.c b/gcc/genconditions.c
index 23109eeb595..001e58eff8a 100644
--- a/gcc/genconditions.c
+++ b/gcc/genconditions.c
@@ -222,25 +222,17 @@ main (int argc, char **argv)
   while (read_md_rtx (&info))
     {
       rtx def = info.def;
-      /* N.B. define_insn_and_split, define_cond_exec are handled
-	 entirely within read_md_rtx; we never see them.  */
+      add_c_test (get_c_test (def), -1);
       switch (GET_CODE (def))
 	{
 	case DEFINE_INSN:
 	case DEFINE_EXPAND:
-	  add_c_test (XSTR (def, 2), -1);
 	  /* except.h needs to know whether there is an eh_return
 	     pattern in the machine description.  */
 	  if (!strcmp (XSTR (def, 0), "eh_return"))
 	    saw_eh_return = 1;
 	  break;
 
-	case DEFINE_SPLIT:
-	case DEFINE_PEEPHOLE:
-	case DEFINE_PEEPHOLE2:
-	  add_c_test (XSTR (def, 1), -1);
-	  break;
-
 	default:
 	  break;
 	}