tree-pass.h (TDF_EH): Define.

	* tree-pass.h (TDF_EH): Define.
	* gimple-pretty-print.c (dump_gimple_stmt): If FLAGS
	contains TDF_EH, print the EH region number holding GS.
	* tree-dump.c (dump_options): Add "eh".
	* doc/invoke.texi: Document it.

From-SVN: r149958

gcc/ChangeLog

+2009-07-22  Diego Novillo  <dnovillo@google.com>
+
+	* tree-pass.h (TDF_EH): Define.
+	* gimple-pretty-print.c (dump_gimple_stmt): If FLAGS
+	contains TDF_EH, print the EH region number holding GS.
+	* tree-dump.c (dump_options): Add "eh".
+	* doc/invoke.texi: Document it.
+
 2009-07-22  Doug Kwan  <dougkwan@google.com>
 
 	* config/arm/arm.md (subdi3) Copy non-reg values to DImode registers.

gcc/doc/invoke.texi

@@ -5149,6 +5149,8 @@ Enable showing line numbers for statements.
 Enable showing the unique ID (@code{DECL_UID}) for each variable.
 @item verbose
 Enable showing the tree dump for each statement.
+@item eh
+Enable showing the EH region number holding each statement.
 @item all
 Turn on all options, except @option{raw}, @option{slim}, @option{verbose}
 and @option{lineno}.

gcc/gimple-pretty-print.c

@@ -1384,6 +1384,13 @@ dump_gimple_stmt (pretty_printer *buffer, gimple gs, int spc, int flags)
       pp_string (buffer, "] ");
     }
 
+  if (flags & TDF_EH)
+    {
+      int eh_region = lookup_stmt_eh_region_fn (cfun, gs);
+      if (eh_region >= 0)
+	pp_printf (buffer, "[EH #%d] ", eh_region);
+    }
+
   if ((flags & (TDF_VOPS|TDF_MEMSYMS))
       && gimple_has_mem_ops (gs))
     dump_gimple_mem_ops (buffer, gs, spc, flags);

gcc/tree-dump.c

@@ -816,6 +816,7 @@ static const struct dump_option_value_info dump_options[] =
   {"stmtaddr", TDF_STMTADDR},
   {"memsyms", TDF_MEMSYMS},
   {"verbose", TDF_VERBOSE},
+  {"eh", TDF_EH},
   {"all", ~(TDF_RAW | TDF_SLIM | TDF_LINENO | TDF_TREE | TDF_RTL | TDF_IPA 
 	    | TDF_STMTADDR | TDF_GRAPH | TDF_DIAGNOSTIC | TDF_VERBOSE
 	    | TDF_RHS_ONLY)},

gcc/tree-pass.h

@@ -76,6 +76,8 @@ enum tree_dump_index
 #define TDF_RHS_ONLY	(1 << 17)	/* a flag to only print the RHS of
 					   a gimple stmt.  */
 #define TDF_ASMNAME	(1 << 18)	/* display asm names of decls  */
+#define TDF_EH		(1 << 19)	/* display EH region number
+					   holding this gimple statement.  */
 
 
 /* In tree-dump.c */