This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: patch: enable -fshow-column by default
- From: Aldy Hernandez <aldyh at redhat dot com>
- To: Ian Lance Taylor <iant at google dot com>
- Cc: gcc-patches at gcc dot gnu dot org, tromey at redhat dot com
- Date: Tue, 26 May 2009 14:44:17 -0400
- Subject: Re: patch: enable -fshow-column by default
- References: <20090520142305.GA14937@redhat.com> <m3pre33kbf.fsf@google.com> <20090521001057.GA26149@redhat.com>
Ok, here's the official submission since everyone's awfully quiet.
This patch enables -fshow-column by default.
There are no regressions. Tom, I've fixed the CPP testsuite to not pass
-fno-show-column, and have modified the CPP tests accordingly.
OK for mainline?
Aldy
gcc/
* diagnostic.c (diagnostic_build_prefix): Always print columns.
(diagnostic_report_current_module): Print columns.
* common.opt (flag_show_column): Enable by default.
gcc/testsuite/
* lib/gcc-dg.exp (dg-bogus): Override dg-bogus.
(process-message): Expect column numbers.
* gcc.dg/va-arg-2.c: Use line 0 to indicate no column.
* gcc.dg/pch/counter-2.c: Same.
* gcc.dg/pch/valid-2.c: Same.
* gcc.dg/pch/warn-1.c: Same.
* gcc.dg/pch/valid-1.c: Same.
gcc/cp/
* error.c (print_instantiation_partial_context): Print column
numbers.
* cpp/include2a.c: Handle lack of columns.
* cpp/syshdr.c: Same.
* cpp/19940712-1.c: Same.
* cpp/missing-header-1.c: Same.
* cpp/unc4.c: Remove -fno-show-column.
* cpp/tr-warn3.c: Same.
* cpp/pr29612-2.c: Same.
* cpp/tr-warn4.c: Same.
* cpp/Wtrigraphs.c: Same.
* cpp/poison.c: Same.
* cpp/arith-3.c: Same.
* cpp/sysmac2.c: Same.
* cpp/cpp.exp: Same.
* cpp/tr-warn5.c: Same.
* cpp/include2.c: Same.
* cpp/Wmissingdirs.c: Same.
* cpp/Wmissingdirs.c: Same.
* cpp/tr-warn6.c: Same.
* cpp/Wtrigraphs-2.c: Same.
* cpp/macspace1.c: Same.
* cpp/escape-2.c: Same.
* cpp/assert2.c: Same.
* cpp/undef2.c: Same.
* cpp/macspace2.c: Same.
* cpp/tr-warn1.c: Same.
* cpp/extratokens2.c: Same.
* cpp/strify2.c: Same.
* cpp/Wsignprom.c: Same.
* cpp/redef2.c: Same.
* cpp/trad/trad.exp: Same.
* cpp/arith-1.c: Same.
* cpp/extratokens.c: Same.
* cpp/if-mpar.c: Same.
libcpp/
* include/line-map.h (LAST_SOURCE_COLUMN): New.
Index: gcc/diagnostic.c
===================================================================
--- gcc/diagnostic.c (revision 147662)
+++ gcc/diagnostic.c (working copy)
@@ -162,7 +162,7 @@ diagnostic_build_prefix (diagnostic_info
return
(s.file == NULL
? build_message_string ("%s: %s", progname, text)
- : flag_show_column && s.column != 0
+ : flag_show_column
? build_message_string ("%s:%d:%d: %s", s.file, s.line, s.column, text)
: build_message_string ("%s:%d: %s", s.file, s.line, text));
}
@@ -244,9 +244,15 @@ diagnostic_report_current_module (diagno
if (! MAIN_FILE_P (map))
{
map = INCLUDED_FROM (line_table, map);
- pp_verbatim (context->printer,
- "In file included from %s:%d",
- map->to_file, LAST_SOURCE_LINE (map));
+ if (flag_show_column)
+ pp_verbatim (context->printer,
+ "In file included from %s:%d:%d",
+ map->to_file,
+ LAST_SOURCE_LINE (map), LAST_SOURCE_COLUMN (map));
+ else
+ pp_verbatim (context->printer,
+ "In file included from %s:%d",
+ map->to_file, LAST_SOURCE_LINE (map));
while (! MAIN_FILE_P (map))
{
map = INCLUDED_FROM (line_table, map);
Index: gcc/testsuite/gcc.dg/va-arg-2.c
===================================================================
--- gcc/testsuite/gcc.dg/va-arg-2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/va-arg-2.c (working copy)
@@ -5,7 +5,7 @@
#include <varargs.h> /* { dg-bogus "varargs.h" "missing file" } */
-/* { dg-message "" "In file included from" { target *-*-* } 6 } */
+/* { dg-message "file included from" "file included from" { target *-*-* } 0 } */
/* { dg-error "no longer implements" "#error 1" { target *-*-* } 4 } */
/* { dg-error "Revise your code" "#error 2" { target *-*-* } 5 } */
Index: gcc/testsuite/gcc.dg/cpp/include2a.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/include2a.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/include2a.c (working copy)
@@ -11,6 +11,6 @@
/* These error is No such file or directory, just once. However, this
message is locale-dependent, so don't test for it. */
-/* { dg-error "silly" "" { target *-*-* } 10 } */
-/* { dg-error "missing" "" { target *-*-* } 10 } */
+/* { dg-error "silly" "" { target *-*-* } 0 } */
+/* { dg-error "missing" "" { target *-*-* } 0 } */
/* { dg-message "terminated" "" { target *-*-* } 0 } */
Index: gcc/testsuite/gcc.dg/cpp/unc4.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/unc4.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/unc4.c (working copy)
@@ -1,5 +1,4 @@
/* { dg-do preprocess } */
-/* { dg-options "-fno-show-column" } */
/* Tests for un-terminated conditional diagnostics.
Copyright (c) 1999 Free Software Foundation.
Index: gcc/testsuite/gcc.dg/cpp/tr-warn3.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/tr-warn3.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/tr-warn3.c (working copy)
@@ -3,7 +3,7 @@
warnings inside unused clauses because they are often hidden this
way on purpose. However they do still require indentation for K&R. */
/* { dg-do preprocess } */
-/* { dg-options "-pedantic -Wtraditional -fno-show-column" } */
+/* { dg-options "-pedantic -Wtraditional" } */
#if 1
Index: gcc/testsuite/gcc.dg/cpp/syshdr.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/syshdr.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/syshdr.c (working copy)
@@ -8,5 +8,6 @@
/* { dg-do preprocess } */
/* { dg-error "include_next" "good error" { target *-*-* } 4 } */
-#include "syshdr1.h" /* { dg-message "" "In file included from:" } */
+#include "syshdr1.h"
+/* { dg-message "" "In file included from:" { target *-*-* } 0 } */
#include "syshdr2.h"
Index: gcc/testsuite/gcc.dg/cpp/pr29612-2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/pr29612-2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/pr29612-2.c (working copy)
@@ -1,6 +1,6 @@
/* PR preprocessor/29612 */
/* { dg-do preprocess } */
-/* { dg-options "-Wtraditional -fno-show-column" } */
+/* { dg-options "-Wtraditional" } */
# 6 "pr29612-2.c"
Index: gcc/testsuite/gcc.dg/cpp/tr-warn4.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/tr-warn4.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/tr-warn4.c (working copy)
@@ -2,7 +2,7 @@
Note, gcc should omit these warnings in system header files.
By Kaveh R. Ghazi <ghazi@caip.rutgers.edu> 8/22/2000. */
/* { dg-do preprocess } */
-/* { dg-options "-Wtraditional -fno-show-column" } */
+/* { dg-options "-Wtraditional" } */
#if 1U /* { dg-warning "traditional C rejects" "numeric constant suffix" } */
#endif
Index: gcc/testsuite/gcc.dg/cpp/Wtrigraphs.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/Wtrigraphs.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/Wtrigraphs.c (working copy)
@@ -1,5 +1,5 @@
/* { dg-do preprocess } */
-/* { dg-options "-std=gnu99 -Wtrigraphs -fno-show-column" } */
+/* { dg-options "-std=gnu99 -Wtrigraphs" } */
/* Test we don't double warn for trigraphs immediately after preceding
text. Source Neil Booth. 22 Nov 2000. */
Index: gcc/testsuite/gcc.dg/cpp/arith-3.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/arith-3.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/arith-3.c (working copy)
@@ -9,7 +9,7 @@
Please keep changes to arith-2.c and arith-3.c in sync. */
/* { dg-do preprocess } */
-/* { dg-options "-std=c99 -fno-show-column" } */
+/* { dg-options "-std=c99" } */
#include <limits.h>
Index: gcc/testsuite/gcc.dg/cpp/poison.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/poison.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/poison.c (working copy)
@@ -1,5 +1,4 @@
-/* { dg-do preprocess }
- { dg-options "-fno-show-column" } */
+/* { dg-do preprocess } */
#pragma GCC poison foo
foo /* { dg-error "foo" "use of foo" } */
Index: gcc/testsuite/gcc.dg/cpp/sysmac2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/sysmac2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/sysmac2.c (working copy)
@@ -1,7 +1,7 @@
/* Copyright (C) 2001 Free Software Foundation, Inc. */
/* { dg-do compile } */
-/* { dg-options "-std=gnu99 -pedantic -Wtraditional -fno-show-column" } */
+/* { dg-options "-std=gnu99 -pedantic -Wtraditional" } */
/* Tests diagnostics are suppressed for some macros defined in system
headers. */
Index: gcc/testsuite/gcc.dg/cpp/cpp.exp
===================================================================
--- gcc/testsuite/gcc.dg/cpp/cpp.exp (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/cpp.exp (working copy)
@@ -37,7 +37,7 @@ dg-init
# Main loop.
dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{c,S} ]] \
- "-fno-show-column" $DEFAULT_CFLAGS
+ "" $DEFAULT_CFLAGS
# All done.
dg-finish
Index: gcc/testsuite/gcc.dg/cpp/tr-warn5.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/tr-warn5.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/tr-warn5.c (working copy)
@@ -2,7 +2,7 @@
Note, gcc should omit these warnings in system header files.
By Kaveh R. Ghazi <ghazi@caip.rutgers.edu> 8/22/2000. */
/* { dg-do preprocess } */
-/* { dg-options "-Wtraditional -fno-show-column" } */
+/* { dg-options "-Wtraditional" } */
#if +1 /* { dg-warning "unary plus operator" "unary plus operator" } */
#endif
Index: gcc/testsuite/gcc.dg/cpp/include2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/include2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/include2.c (working copy)
@@ -11,5 +11,5 @@
/* These error is No such file or directory, just once. However, this
message is locale-dependent, so don't test for it. */
-/* { dg-error "silly" "" { target *-*-* } 10 } */
+/* { dg-error "silly" "" { target *-*-* } 0 } */
/* { dg-message "terminated" "" { target *-*-* } 0 } */
Index: gcc/testsuite/gcc.dg/cpp/Wmissingdirs.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/Wmissingdirs.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/Wmissingdirs.c (working copy)
@@ -1,5 +1,5 @@
/* { dg-do preprocess } */
-/* { dg-options "-std=gnu99 -I /jolly/well/better/not/exist -Wmissing-include-dirs -fno-show-column" } */
+/* { dg-options "-std=gnu99 -I /jolly/well/better/not/exist -Wmissing-include-dirs" } */
/* Test that -Wmissing-include-dirs issues a warning when a specified
directory does not exist. Source Ben Elliston, 2004-05-13. */
Index: gcc/testsuite/gcc.dg/cpp/tr-warn6.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/tr-warn6.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/tr-warn6.c (working copy)
@@ -2,7 +2,7 @@
Note, gcc should omit these warnings in system header files.
By Kaveh R. Ghazi <ghazi@caip.rutgers.edu> 9/8/2000. */
/* { dg-do preprocess } */
-/* { dg-options "-Wtraditional -fno-show-column" } */
+/* { dg-options "-Wtraditional" } */
#define foo1(h) sdf "h3" fds "h" /* { dg-warning "macro argument \"h\" would be stringified" "traditional stringification" } */
#define foo2(h2) sdf "h2" fds "h3" /* { dg-warning "macro argument \"h2\" would be stringified" "traditional stringification" } */
Index: gcc/testsuite/gcc.dg/cpp/Wtrigraphs-2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/Wtrigraphs-2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/Wtrigraphs-2.c (working copy)
@@ -1,5 +1,5 @@
/* { dg-do preprocess } */
-/* { dg-options "-std=c99 -Wtrigraphs -fno-show-column" } */
+/* { dg-options "-std=c99 -Wtrigraphs" } */
/* Test warnings for trigraphs in comments, with trigraphs enabled.
Neil Booth. 4 May 2003. */
Index: gcc/testsuite/gcc.dg/cpp/macspace1.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/macspace1.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/macspace1.c (working copy)
@@ -1,6 +1,6 @@
/* PR preprocessor/19475 */
/* { dg-do preprocess } */
-/* { dg-options "-std=iso9899:1990 -pedantic-errors -fno-show-column" } */
+/* { dg-options "-std=iso9899:1990 -pedantic-errors" } */
#define a! /* { dg-warning "missing whitespace" } */
#define b" /* { dg-warning "missing whitespace" } */
Index: gcc/testsuite/gcc.dg/cpp/escape-2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/escape-2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/escape-2.c (working copy)
@@ -1,7 +1,7 @@
/* Copyright (C) 2001 Free Software Foundation, Inc. */
/* { dg-do compile } */
-/* { dg-options "-pedantic -std=c99 -fno-show-column" } */
+/* { dg-options "-pedantic -std=c99" } */
/* This tests various diagnostics with -pedantic about escape
sequences, for both the preprocessor and the compiler.
Index: gcc/testsuite/gcc.dg/cpp/escape.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/escape.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/escape.c (working copy)
@@ -1,7 +1,7 @@
/* Copyright (C) 2001 Free Software Foundation, Inc. */
/* { dg-do compile } */
-/* { dg-options "-Wtraditional -std=c89 -fno-show-column" } */
+/* { dg-options "-Wtraditional -std=c89" } */
/* This tests various diagnostics with -Wtraditioanl about escape
sequences, for both the preprocessor and the compiler.
Index: gcc/testsuite/gcc.dg/cpp/19940712-1.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/19940712-1.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/19940712-1.c (working copy)
@@ -5,8 +5,9 @@
/* { dg-error "unterminated comment" "" { target *-*-* } 4 } */
/* { dg-error "unterminated comment" "header error" { target *-*-* } 8 } */
-#include "19940712-1.h" /* { dg-message "" } // In file included from: */
-#include "19940712-1a.h" /* { dg-message "" } // In file included from: */
+#include "19940712-1.h"
+/* { dg-message "" "In file included from:" { target *-*-* } 0 } */
+#include "19940712-1a.h"
#include "19940712-1b.h"
/* comment start in comment error
Index: gcc/testsuite/gcc.dg/cpp/assert2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/assert2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/assert2.c (working copy)
@@ -1,6 +1,6 @@
/* Malformed assertion tests. */
/* { dg-do preprocess } */
-/* { dg-options "-fno-show-column -Wno-deprecated" } */
+/* { dg-options "-Wno-deprecated" } */
#assert /* { dg-error "without predicate" "assert w/o predicate" } */
#assert % /* { dg-error "an identifier" "assert punctuation" } */
Index: gcc/testsuite/gcc.dg/cpp/undef2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/undef2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/undef2.c (working copy)
@@ -1,9 +1,7 @@
/* C99 6.10.8 para 4: None of [the predefined macro names] shall be
- the subject of a #define or an #undef preprocessing directive. We
- pass -fno-show-column as otherwise dejagnu gets confused. */
+ the subject of a #define or an #undef preprocessing directive. */
/* { dg-do preprocess } */
-/* { dg-options "-fno-show-column" } */
#undef __DATE__ /* { dg-warning "undefining" "__DATE__" } */
#undef __TIME__ /* { dg-warning "undefining" "__TIME__" } */
Index: gcc/testsuite/gcc.dg/cpp/macspace2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/macspace2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/macspace2.c (working copy)
@@ -1,6 +1,6 @@
/* PR preprocessor/19475 */
/* { dg-do preprocess } */
-/* { dg-options "-std=iso9899:1999 -pedantic-errors -fno-show-column" } */
+/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
#define a! /* { dg-error "requires whitespace" } */
#define b" /* { dg-error "requires whitespace" } */
Index: gcc/testsuite/gcc.dg/cpp/missing-header-1.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/missing-header-1.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/missing-header-1.c (working copy)
@@ -2,7 +2,8 @@
/* { dg-do compile } */
/* { dg-options "" } */
-#include "nonexistent.h" /* { dg-error "nonexistent.h" } */
+#include "nonexistent.h"
+/* { dg-message "nonexistent.h" "" { target *-*-* } 0 } */
/* { dg-message "terminated" "" { target *-*-* } 0 } */
/* This declaration should not receive any diagnostic. */
Index: gcc/testsuite/gcc.dg/cpp/tr-warn1.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/tr-warn1.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/tr-warn1.c (working copy)
@@ -1,6 +1,6 @@
/* Test for warnings about nontraditional directives. */
/* { dg-do preprocess } */
-/* { dg-options "-pedantic -Wtraditional -fno-show-column" } */
+/* { dg-options "-pedantic -Wtraditional" } */
/* Block 1: K+R directives should have the # indented. */
Index: gcc/testsuite/gcc.dg/cpp/extratokens2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/extratokens2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/extratokens2.c (working copy)
@@ -1,7 +1,7 @@
/* Copyright (C) 2002 Free Software Foundation, Inc. */
/* { dg-do preprocess } */
-/* { dg-options "-fno-show-column -Wno-endif-labels" } */
+/* { dg-options "-Wno-endif-labels" } */
/* Tests that -Wno-endif-labels correctly disables the checks done by
default (and tested in extratokens.c). */
Index: gcc/testsuite/gcc.dg/cpp/strify2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/strify2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/strify2.c (working copy)
@@ -1,7 +1,7 @@
/* Copyright (C) 2000 Free Software Foundation, Inc. */
/* { dg-do run } */
-/* { dg-options "-std=c99 -pedantic-errors -fno-show-column" } */
+/* { dg-options "-std=c99 -pedantic-errors" } */
/* Tests a whole bunch of things are correctly stringified. */
Index: gcc/testsuite/gcc.dg/cpp/Wsignprom.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/Wsignprom.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/Wsignprom.c (working copy)
@@ -1,5 +1,5 @@
/* { dg-do preprocess } */
-/* { dg-options "-Wall -fshow-column" } */
+/* { dg-options "-Wall" } */
/* Test that -Wall emits the warnings about integer promotion changing
the sign of an operand. */
Index: gcc/testsuite/gcc.dg/cpp/redef2.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/redef2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/redef2.c (working copy)
@@ -1,7 +1,7 @@
/* Test for redefining macros with significant differences. */
/* { dg-do preprocess }
- { dg-options "-ansi -Wall -fno-show-column" } */
+ { dg-options "-ansi -Wall" } */
#define mac(a, b) (a) + (b)
#define mac(a, b) (a) * (b)
Index: gcc/testsuite/gcc.dg/cpp/trad/trad.exp
===================================================================
--- gcc/testsuite/gcc.dg/cpp/trad/trad.exp (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/trad/trad.exp (working copy)
@@ -37,7 +37,7 @@ dg-init
# Main loop.
dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \
- "-fno-show-column" $DEFAULT_TRADCPPFLAGS
+ "" $DEFAULT_TRADCPPFLAGS
# All done.
dg-finish
Index: gcc/testsuite/gcc.dg/cpp/arith-1.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/arith-1.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/arith-1.c (working copy)
@@ -7,7 +7,7 @@
independent of target precision. */
/* { dg-do preprocess } */
-/* { dg-options -fno-show-column } */
+/* { dg-options "" } */
/* Test || operator and its short circuiting. */
#if 0 || 0
Index: gcc/testsuite/gcc.dg/cpp/extratokens.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/extratokens.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/extratokens.c (working copy)
@@ -1,7 +1,7 @@
/* Copyright (C) 2000, 2008 Free Software Foundation, Inc. */
/* { dg-do preprocess } */
-/* { dg-options "-fno-show-column -Wno-deprecated" } */
+/* { dg-options "-Wno-deprecated" } */
/* Tests all directives that do not permit excess tokens at the end of
the line. */
Index: gcc/testsuite/gcc.dg/cpp/if-mpar.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/if-mpar.c (revision 147662)
+++ gcc/testsuite/gcc.dg/cpp/if-mpar.c (working copy)
@@ -4,7 +4,6 @@
missing parenthesis message. */
/* { dg-do preprocess } */
-/* { dg-options "-fshow-column" } */
#if (1 /* { dg-error "5:missing '\\)'" "missing ')' no. 1" } */
#endif
Index: gcc/testsuite/gcc.dg/pch/counter-2.c
===================================================================
--- gcc/testsuite/gcc.dg/pch/counter-2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/pch/counter-2.c (working copy)
@@ -8,7 +8,7 @@
#endif
#include "counter-2.h" /* { dg-warning "not used because `__COUNTER__' is invalid" } */
-/* { dg-error "counter-2.h: No such file or directory" "no such file" { target *-*-* } 10 } */
+/* { dg-error "counter-2.h: No such file or directory" "no such file" { target *-*-* } 0 } */
/* { dg-error "one or more PCH files were found, but they were invalid" "invalid files" { target *-*-* } 10 } */
/* { dg-message "terminated" "" { target *-*-* } 0 } */
Index: gcc/testsuite/gcc.dg/pch/valid-2.c
===================================================================
--- gcc/testsuite/gcc.dg/pch/valid-2.c (revision 147662)
+++ gcc/testsuite/gcc.dg/pch/valid-2.c (working copy)
@@ -1,7 +1,7 @@
/* { dg-options "-I. -Winvalid-pch -fexceptions" } */
#include "valid-2.h" /* { dg-warning "settings for -fexceptions do not match" } */
-/* { dg-error "No such file" "no such file" { target *-*-* } 3 } */
-/* { dg-error "they were invalid" "invalid files" { target *-*-* } 3 } */
+/* { dg-error "No such file" "no such file" { target *-*-* } 0 } */
+/* { dg-error "they were invalid" "invalid files" { target *-*-* } 0 } */
/* { dg-message "terminated" "" { target *-*-* } 0 } */
int x;
Index: gcc/testsuite/gcc.dg/pch/warn-1.c
===================================================================
--- gcc/testsuite/gcc.dg/pch/warn-1.c (revision 147662)
+++ gcc/testsuite/gcc.dg/pch/warn-1.c (working copy)
@@ -3,8 +3,8 @@
#define DEFINED_VALUE 3
#include "warn-1.h"/* { dg-warning "not used because .DEFINED_VALUE. is defined" } */
-/* { dg-error "No such file" "no such file" { target *-*-* } 5 } */
-/* { dg-error "they were invalid" "invalid files" { target *-*-* } 5 } */
+/* { dg-error "No such file" "no such file" { target *-*-* } 0 } */
+/* { dg-error "they were invalid" "invalid files" { target *-*-* } 0 } */
/* { dg-message "terminated" "" { target *-*-* } 0 } */
Index: gcc/testsuite/gcc.dg/pch/valid-1.c
===================================================================
--- gcc/testsuite/gcc.dg/pch/valid-1.c (revision 147662)
+++ gcc/testsuite/gcc.dg/pch/valid-1.c (working copy)
@@ -1,8 +1,8 @@
/* { dg-options "-I. -Winvalid-pch -g" } */
#include "valid-1.h"/* { dg-warning "created with -gnone, but used with -g" } */
-/* { dg-error "No such file" "no such file" { target *-*-* } 3 } */
-/* { dg-error "they were invalid" "invalid files" { target *-*-* } 3 } */
+/* { dg-error "No such file" "no such file" { target *-*-* } 0 } */
+/* { dg-error "they were invalid" "invalid files" { target *-*-* } 0 } */
/* { dg-message "terminated" "" { target *-*-* } 0 } */
int x;
Index: gcc/testsuite/lib/gcc-dg.exp
===================================================================
--- gcc/testsuite/lib/gcc-dg.exp (revision 147662)
+++ gcc/testsuite/lib/gcc-dg.exp (working copy)
@@ -620,6 +620,17 @@ if { [info procs saved-dg-error] == [lis
process-message saved-dg-error "$gcc_error_prefix" "$args"
}
+
+ # Override dg-bogus at the same time. It doesn't handle a prefix
+ # but its expression should include a column number. Otherwise the
+ # line number can match the column number for other messages, leading
+ # to insanity.
+ rename dg-bogus saved-dg-bogus
+
+ proc dg-bogus { args } {
+ upvar dg-messages dg-messages
+ process-message saved-dg-bogus "" $args
+ }
}
# Modify the regular expression saved by a DejaGnu message directive to
@@ -641,20 +652,26 @@ proc process-message { msgproc msgprefix
return;
}
- # Prepend the message prefix to the regular expression and make
- # it match a single line.
+ # Get the entry for the new message. Prepend the message prefix to
+ # the regular expression and make it match a single line.
set newentry [lindex ${dg-messages} end]
set expmsg [lindex $newentry 2]
- # If we have a column...
+ # Handle column numbers from the specified expression (if there is
+ # one) and set up the search expression that will be used by DejaGnu.
if [regexp "^(\[0-9\]+):" $expmsg "" column] {
- # Remove "COLUMN:"
+ # The expression in the directive included a column number.
+ # Remove "COLUMN:" from the original expression and move it
+ # to the proper place in the search expression.
regsub "^\[0-9\]+:" $expmsg "" expmsg
-
- # Include the column in the search expression.
- set expmsg "$column: $msgprefix\[^\n]*$expmsg"
+ set expmsg "$column: $msgprefix\[^\n\]*$expmsg"
+ } elseif [string match "" [lindex $newentry 0]] {
+ # The specified line number is 0; don't expect a column number.
+ set expmsg "$msgprefix\[^\n\]*$expmsg"
} else {
- set expmsg "$msgprefix\[^\n]*$expmsg"
+ # There is no column number in the search expression, but we
+ # should expect one in the message itself.
+ set expmsg "\[0-9\]+: $msgprefix\[^\n\]*$expmsg"
}
set newentry [lreplace $newentry 2 2 $expmsg]
Index: gcc/cp/error.c
===================================================================
--- gcc/cp/error.c (revision 147662)
+++ gcc/cp/error.c (working copy)
@@ -2705,19 +2705,29 @@ print_instantiation_partial_context (dia
struct tinst_level *t, location_t loc)
{
expanded_location xloc;
+ const char *str;
for (; ; t = t->next)
{
xloc = expand_location (loc);
if (t == NULL)
break;
- pp_verbatim (context->printer, _("%s:%d: instantiated from %qs\n"),
- xloc.file, xloc.line,
- decl_as_string_translate (t->decl,
- TFF_DECL_SPECIFIERS | TFF_RETURN_TYPE));
+ str = decl_as_string (t->decl, TFF_DECL_SPECIFIERS | TFF_RETURN_TYPE);
+ if (flag_show_column)
+ pp_verbatim (context->printer,
+ _("%s:%d:%d: instantiated from %qs\n"),
+ xloc.file, xloc.line, xloc.column, str);
+ else
+ pp_verbatim (context->printer,
+ _("%s:%d: instantiated from %qs\n"),
+ xloc.file, xloc.line, str);
loc = t->locus;
}
- pp_verbatim (context->printer, _("%s:%d: instantiated from here"),
- xloc.file, xloc.line);
+ if (flag_show_column)
+ pp_verbatim (context->printer, _("%s:%d:%d: instantiated from here"),
+ xloc.file, xloc.line, xloc.column);
+ else
+ pp_verbatim (context->printer, _("%s:%d: instantiated from here"),
+ xloc.file, xloc.line);
pp_base_newline (context->printer);
}
Index: gcc/common.opt
===================================================================
--- gcc/common.opt (revision 147662)
+++ gcc/common.opt (working copy)
@@ -1049,8 +1049,8 @@ Common Report Var(flag_see) Init(0)
Eliminate redundant sign extensions using LCM.
fshow-column
-Common C ObjC C++ ObjC++ Report Var(flag_show_column) Init(0)
-Show column numbers in diagnostics, when available. Default off
+Common C ObjC C++ ObjC++ Report Var(flag_show_column) Init(1)
+Show column numbers in diagnostics, when available. Default on
fsignaling-nans
Common Report Var(flag_signaling_nans) Optimization
Index: libcpp/include/line-map.h
===================================================================
--- libcpp/include/line-map.h (revision 147662)
+++ libcpp/include/line-map.h (working copy)
@@ -154,6 +154,8 @@ extern const struct line_map *linemap_lo
of the #include, or other directive, that caused a map change. */
#define LAST_SOURCE_LINE(MAP) \
SOURCE_LINE (MAP, LAST_SOURCE_LINE_LOCATION (MAP))
+#define LAST_SOURCE_COLUMN(MAP) \
+ SOURCE_COLUMN (MAP, LAST_SOURCE_LINE_LOCATION (MAP))
#define LAST_SOURCE_LINE_LOCATION(MAP) \
((((MAP)[1].start_location - 1 - (MAP)->start_location) \
& ~((1 << (MAP)->column_bits) - 1)) \