From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 8 Oct 2018 22:50:51 +0000 (+0000)
Subject: print-rtl.c (rtx_writer::print_rtx_operand_code_i): Print column information.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87bd153645f393a1fe18e4fcd7f4323f83a8ac87;p=gcc.git

print-rtl.c (rtx_writer::print_rtx_operand_code_i): Print column information.

	* print-rtl.c (rtx_writer::print_rtx_operand_code_i): Print column
	information.

From-SVN: r264944
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc6ba919644..430b614d0d7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* print-rtl.c (rtx_writer::print_rtx_operand_code_i): Print column
+	information.
+
 2018-10-08  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* cgraphunit.c (cgraph_node::expand_thunk): Do not force DECL_IGNORED_P
diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index 5dd2e31340a..233be9e5dc7 100644
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -398,7 +398,8 @@ rtx_writer::print_rtx_operand_code_i (const_rtx in_rtx, int idx)
       if (INSN_HAS_LOCATION (in_insn))
 	{
 	  expanded_location xloc = insn_location (in_insn);
-	  fprintf (m_outfile, " \"%s\":%i", xloc.file, xloc.line);
+	  fprintf (m_outfile, " \"%s\":%i:%i", xloc.file, xloc.line,
+		   xloc.column);
 	}
 #endif
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a4ee18f58d0..1cfd3b733eb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.target/i386/vararg-loc.c: Accept a column number.
+
 2018-10-08  Martin Liska  <mliska@suse.cz>
 
 	* gcc.target/i386/i386.exp: Move procedures to
diff --git a/gcc/testsuite/gcc.target/i386/vararg-loc.c b/gcc/testsuite/gcc.target/i386/vararg-loc.c
index f46ac577e10..184ecfc3477 100644
--- a/gcc/testsuite/gcc.target/i386/vararg-loc.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-loc.c
@@ -23,5 +23,5 @@ f (int a, ...)			/* 8.  */
 }
 
 /* { dg-final { scan-rtl-dump-not "vararg-loc\\.c.:\[6789\] " "final" } } */
-/* { dg-final { scan-rtl-dump "vararg-loc\\.c.:18 " "final" } } */
-/* { dg-final { scan-rtl-dump "vararg-loc\\.c.:20 " "final" } } */
+/* { dg-final { scan-rtl-dump "vararg-loc\\.c.:18:\[0-9\]+ " "final" } } */
+/* { dg-final { scan-rtl-dump "vararg-loc\\.c.:20:\[0-9\]+ " "final" } } */