KJ16609/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2026-02-22 03:46:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[PATCH] libcpp: suppress builtin macro redefined warnings for __LINE__"

Browse Source 
This reverts commit e7ce7c4905.
This commit is contained in:
Jeff Law
2023-04-30 17:12:19 -06:00
parent b159026b73
commit 33b6b79197
3 changed files with 5 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
gcc/testsuite/gcc.dg/builtin-redefine-1.c
View File

@@ -1,49 +0,0 @@
/* Test default warnings for redefining builtin macros. */
/* { dg-do compile } */
/* { dg-options "-D__TIMESTAMP__=x -D__TIME__=x -D__DATE__=x -D__FILE__=x -D__FILE_NAME__=x -D__BASE_FILE__=x -D__LINE__=0" } */
/* Check default behavior for builtin macros redefinition. */
/* { dg-message "\"__TIMESTAMP__\" redefined" "" {target "*-*-*"} 0 } */
#ifndef __TIMESTAMP__
#error "__TIMESTAMP__ builtin is not defined"
/* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */
#endif
/* { dg-message "\"__TIME__\" redefined" "" {target "*-*-*"} 0 } */
#ifndef __TIME__
#error "__TIME__ builtin is not defined"
/* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */
#endif
/* { dg-message "\"__DATE__\" redefined" "" {target "*-*-*"} 0 } */
#ifndef __DATE__
#error "__DATE__ builtin is not defined"
/* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */
#endif
/* { dg-message "\"__FILE__\" redefined" "" {target "*-*-*"} 0 } */
#ifndef __FILE__
#error "__FILE__ builtin is not defined"
/* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */
#endif
/* { dg-message "\"__FILE_NAME__\" redefined" "" {target "*-*-*"} 0 } */
#ifndef __FILE_NAME__
#error "__FILE_NAME__ builtin is not defined"
/* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */
#endif
/* { dg-message "\"__BASE_FILE__\" redefined" "" {target "*-*-*"} 0 } */
#ifndef __BASE_FILE__
#error "__BASE_FILE__ builtin is not defined"
/* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */
#endif
/* { dg-message "\"__LINE__\" redefined" "" {target "*-*-*"} 0 } */
#ifndef __LINE__
#error "__LINE__ builtin is not defined"
/* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */
#endif

24
gcc/testsuite/gcc.dg/builtin-redefine.c
View File

@@ -1,9 +1,9 @@
/* Test -Wno-builtin-macro-redefined warnings. */
/* { dg-do compile } */
/* { dg-options "-Wno-builtin-macro-redefined -U__DATE__ -D__TIME__=X -D__LINE__=0" } */
/* { dg-options "-Wno-builtin-macro-redefined -U__DATE__ -D__TIME__=X" } */
/* Check date, time, datestamp and line built-ins warnings may be suppressed. */
/* Check date, time, and datestamp built-ins warnings may be suppressed. */
#if defined(__DATE__)
#error "__DATE__ is defined, but should not be (-U command line error)"
@@ -15,11 +15,6 @@
/* { dg-bogus "__TIME__ is not defined" "" { target *-*-* } .-1 } */
#endif
#if __LINE__ != 0
#error "__LINE__ is not defined as expected (-D command line error)"
/* { dg-bogus "__LINE__ is not defined" "" { target *-*-* } .-1 } */
#endif
#if !defined(__TIMESTAMP__)
#error "__TIMESTAMP__ is not defined (built-in macro expectation error)"
/* { dg-bogus "__TIMESTAMP__ is not defined" "" { target *-*-* } .-1 } */
@@ -58,18 +53,6 @@
#undef __TIMESTAMP__ /* Undefine while defined. */
#undef __LINE__ /* Undefine while defined. */
#undef __LINE__ /* Undefine while already undefined. */
#define __LINE__ "1" /* Define while undefined. */
#define __LINE__ "1" /* Re-define while defined. */ /* { dg-line line_prev } */
#define __LINE__ "2" /* { dg-warning "-:\"__LINE__\" redefined" } */
/* { dg-message "-:previous definition" "" { target *-*-* } line_prev } */
#undef __LINE__ /* Undefine while defined. */
/* Check other built-ins with warnings that may be suppressed. */
#if !defined(__FILE__) || !defined(__BASE_FILE__)
@@ -83,11 +66,12 @@
/* Check selected built-ins not affected by warning suppression. */
#if !defined(__INCLUDE_LEVEL__) || !defined(__COUNTER__)
#if !defined(__LINE__) || !defined(__INCLUDE_LEVEL__) || !defined(__COUNTER__)
#error "Expected built-in is not defined (built-in macro expectation error)"
/* { dg-bogus "Expected built-in is not defined" "" { target *-*-* } .-1 } */
#endif
#define __LINE__ 0 /* { dg-warning "-:\"__LINE__\" redef" } */
#define __INCLUDE_LEVEL__ 0 /* { dg-warning "-:\"__INCLUDE_LEVEL__\" redef" } */
#define __COUNTER__ 0 /* { dg-warning "-:\"__COUNTER__\" redef" } */

2
libcpp/init.cc
View File

@@ -421,7 +421,7 @@ static const struct builtin_macro builtin_array[] =
B("__FILE__", BT_FILE, false),
B("__FILE_NAME__", BT_FILE_NAME, false),
B("__BASE_FILE__", BT_BASE_FILE, false),
B("__LINE__", BT_SPECLINE, false),
B("__LINE__", BT_SPECLINE, true),
B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL, true),
B("__COUNTER__", BT_COUNTER, true),
/* Make sure to update the list of built-in