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 dc6ba9196440da4a124fe752f170230d9c19bdec..430b614d0d7a27c7f1ba38ecaf2c9bfc22f4f313 100644 (file)
--- 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 5dd2e31340a34562741a3ef0a9f32862f5e9dd5a..233be9e5dc7b0b30540080c4b482ffaa875d4b31 100644 (file)
--- 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 a4ee18f58d0b4a4cdf4a2dec491612937674d8ca..1cfd3b733eb882001c545d9d271c50da9466cd55 100644 (file)
--- 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 f46ac577e104afaefe41c61ed2d8886b7e92718a..184ecfc3477da901d16f2efb7e7cbb31e7ab2a24 100644 (file)
--- 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" } } */