Reinstate dump_generic_expr_loc

gcc/ChangeLog:
	* dumpfile.c (dump_generic_expr_loc): Undo removal of this
	function in r262149, changing "loc" param from source_location to
	const dump_location_t &.
	* dumpfile.h (dump_generic_expr_loc): Undo removal of this
	declaration, as above.

From-SVN: r262295

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 26dfb8589397939180327c15ee6f27c74f5018ed..64ed2f7e954d0324ea8e4fbe3b25c7a29ccb5e1b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2018-07-02  David Malcolm  <dmalcolm@redhat.com>
+
+       * dumpfile.c (dump_generic_expr_loc): Undo removal of this
+       function in r262149, changing "loc" param from source_location to
+       const dump_location_t &.
+       * dumpfile.h (dump_generic_expr_loc): Undo removal of this
+       declaration, as above.
+
 2018-07-01  Paul Koning  <ni1d@arrl.net>
 
        * common/config/pdp11/pdp11-common.c (pdp11_handle_option): Handle

diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 93bc65148dd94779f6f6059d15347f543527c4ef..5f69f9bd64612fc29fe6c19550f2430c048d5519 100644 (file)
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -506,6 +506,28 @@ dump_generic_expr (dump_flags_t dump_kind, dump_flags_t extra_dump_flags,
       print_generic_expr (alt_dump_file, t, dump_flags | extra_dump_flags);
 }
 
+
+/* Similar to dump_generic_expr, except additionally print the source
+   location.  */
+
+void
+dump_generic_expr_loc (dump_flags_t dump_kind, const dump_location_t &loc,
+                      dump_flags_t extra_dump_flags, tree t)
+{
+  location_t srcloc = loc.get_location_t ();
+  if (dump_file && (dump_kind & pflags))
+    {
+      dump_loc (dump_kind, dump_file, srcloc);
+      print_generic_expr (dump_file, t, dump_flags | extra_dump_flags);
+    }
+
+  if (alt_dump_file && (dump_kind & alt_flags))
+    {
+      dump_loc (dump_kind, alt_dump_file, srcloc);
+      print_generic_expr (alt_dump_file, t, dump_flags | extra_dump_flags);
+    }
+}
+
 /* Output a formatted message using FORMAT on appropriate dump streams.  */
 
 void

diff --git a/gcc/dumpfile.h b/gcc/dumpfile.h
index 9828a3f550cf317923363d690596743b472c1f6b..0e588a6dac6a85cb8bb51a5f42fefa526cdac402 100644 (file)
--- a/gcc/dumpfile.h
+++ b/gcc/dumpfile.h
@@ -425,6 +425,8 @@ extern void dump_printf_loc (dump_flags_t, const dump_location_t &,
                             const char *, ...) ATTRIBUTE_PRINTF_3;
 extern void dump_function (int phase, tree fn);
 extern void dump_basic_block (dump_flags_t, basic_block, int);
+extern void dump_generic_expr_loc (dump_flags_t, const dump_location_t &,
+                                  dump_flags_t, tree);
 extern void dump_generic_expr (dump_flags_t, dump_flags_t, tree);
 extern void dump_gimple_stmt_loc (dump_flags_t, const dump_location_t &,
                                  dump_flags_t, gimple *, int);