--- trunk/gcc/testsuite/gcc.dg/multiple-overflow-warn-1.c 2007-01-06 00:20:24.000000000 +0100 +++ trunk/gcc/testsuite/g++.dg/warn/multiple-overflow-warn-1.C 2007-01-06 00:25:06.000000000 +0100 @@ -1,6 +1,6 @@ /* PR c/19978 : Test for duplicated warnings (unary operators). */ /* { dg-do compile } */ -/* { dg-options "-std=c99 -Woverflow" } */ +/* { dg-options "-Woverflow" } */ #include --- trunk/gcc/testsuite/gcc.dg/multiple-overflow-warn-2.c 2007-01-06 00:21:02.000000000 +0100 +++ trunk/gcc/testsuite/g++.dg/warn/multiple-overflow-warn-2.C 2007-01-07 13:36:56.000000000 +0100 @@ -1,6 +1,6 @@ /* PR c/19978 : Test for duplicated warnings (binary operators). */ /* { dg-do compile } */ -/* { dg-options "-std=c99 -Woverflow" } */ +/* { dg-options "-Woverflow" } */ #include --- trunk/gcc/testsuite/gcc.dg/overflow-warn-1.c 2006-12-02 03:16:46.000000000 +0100 +++ trunk/gcc/testsuite/g++.dg/warn/overflow-warn-1.C 2007-01-07 13:36:56.000000000 +0100 @@ -1,7 +1,7 @@ /* Test for diagnostics for constant overflow. */ /* Origin: Joseph Myers */ /* { dg-do compile } */ -/* { dg-options "-std=c99" } */ +/* { dg-options "" } */ #include @@ -11,7 +11,7 @@ enum e { E1 = UINT_MAX + 1, /* Overflow in an unevaluated part of an expression is OK (example in the standard). */ - E2 = 2 || 1 / 0, + E2 = 2 || 1 / 0, /* { dg-bogus "warning: division by zero" "" { xfail *-*-* } 14 } */ E3 = 1 / 0, /* { dg-warning "warning: division by zero" } */ /* { dg-error "error: enumerator value for 'E3' is not an integer constant" "enum error" { target *-*-* } 15 } */ /* But as in DR#031, the 1/0 in an evaluated subexpression means the @@ -39,17 +39,20 @@ f (void) int c = INT_MAX + 1; /* { dg-warning "warning: integer overflow in expression" } */ } -/* But this expression does need to be constant. */ +/* This expression is neither required to be constant. */ static int sc = INT_MAX + 1; /* { dg-warning "warning: integer overflow in expression" } */ + +// Test for overflow in null pointer constant. +void *n = 0; /* The first two of these involve overflow, so are not null pointer constants. The third has the overflow in an unevaluated subexpression, so is a null pointer constant. */ void *p = 0 * (INT_MAX + 1); /* { dg-warning "warning: integer overflow in expression" } */ -/* { dg-warning "warning: initialization makes pointer from integer without a cast" "null" { target *-*-* } 48 } */ +/* { dg-error "invalid conversion from 'int' to 'void" "null" { target *-*-* } 51 } */ void *q = 0 * (1 / 0); /* { dg-warning "warning: division by zero" } */ -/* { dg-warning "warning: initialization makes pointer from integer without a cast" "null" { xfail *-*-* } 50 } */ -void *r = (1 ? 0 : INT_MAX+1); +/* { dg-error "invalid conversion from 'int' to 'void*'" "null" { xfail *-*-* } 53 } */ +void *r = (1 ? 0 : INT_MAX+1); /* { dg-bogus "integer overflow in expression" "" { xfail *-*-* } 55 } */ void g (int i) --- trunk/gcc/testsuite/gcc.dg/overflow-warn-2.c 2006-12-02 03:17:12.000000000 +0100 +++ trunk/gcc/testsuite/g++.dg/warn/overflow-warn-2.C 1970-01-01 01:00:00.000000000 +0100 @@ -1,132 +0,0 @@ -/* Test for diagnostics for constant overflow. Test with -Wtraditional-conversion. */ -/* Origin: Joseph Myers */ -/* { dg-do compile } */ -/* { dg-options "-std=c99 -Wtraditional-conversion" } */ - -#include - -enum e { - E0 = INT_MAX, - /* Unsigned overflow wraps around. */ - E1 = UINT_MAX + 1, - /* Overflow in an unevaluated part of an expression is OK (example - in the standard). */ - E2 = 2 || 1 / 0, - E3 = 1 / 0, /* { dg-warning "warning: division by zero" } */ - /* { dg-error "error: enumerator value for 'E3' is not an integer constant" "enum error" { target *-*-* } 15 } */ - /* But as in DR#031, the 1/0 in an evaluated subexpression means the - whole expression violates the constraints. */ - E4 = 0 * (1 / 0), /* { dg-warning "warning: division by zero" } */ - /* { dg-error "error: enumerator value for 'E4' is not an integer constant" "enum error" { xfail *-*-* } 19 } */ - E5 = INT_MAX + 1, /* { dg-warning "warning: integer overflow in expression" } */ - /* Again, overflow in evaluated subexpression. */ - E6 = 0 * (INT_MAX + 1), /* { dg-warning "warning: integer overflow in expression" } */ - /* A cast does not constitute overflow in conversion. */ - E7 = (char) INT_MAX -}; - -struct s { - int a; - int : 0 * (1 / 0); /* { dg-warning "warning: division by zero" } */ - int : 0 * (INT_MAX + 1); /* { dg-warning "warning: integer overflow in expression" } */ -}; - -void -f (void) -{ - /* This expression is not required to be a constant expression, so - it should just involve undefined behavior at runtime. */ - int c = INT_MAX + 1; /* { dg-warning "warning: integer overflow in expression" } */ -} - -/* But this expression does need to be constant. */ -static int sc = INT_MAX + 1; /* { dg-warning "warning: integer overflow in expression" } */ - -/* The first two of these involve overflow, so are not null pointer - constants. The third has the overflow in an unevaluated - subexpression, so is a null pointer constant. */ -void *p = 0 * (INT_MAX + 1); /* { dg-warning "warning: integer overflow in expression" } */ -/* { dg-warning "warning: initialization makes pointer from integer without a cast" "null" { target *-*-* } 48 } */ -void *q = 0 * (1 / 0); /* { dg-warning "warning: division by zero" } */ -/* { dg-warning "warning: initialization makes pointer from integer without a cast" "null" { xfail *-*-* } 50 } */ -void *r = (1 ? 0 : INT_MAX+1); - -void -g (int i) -{ - switch (i) - { - case 0 * (1/0): /* { dg-warning "warning: division by zero" } */ - ; - case 1 + 0 * (INT_MAX + 1): /* { dg-warning "warning: integer overflow in expression" } */ - ; - } -} - -int -h (void) -{ - return INT_MAX + 1; /* { dg-warning "warning: integer overflow in expression" } */ -} - -int -h1 (void) -{ - return INT_MAX + 1 - INT_MAX; /* { dg-warning "warning: integer overflow in expression" } */ -} - -void fuc (unsigned char); -void fsc (signed char); - -void -h2 (void) -{ - fsc (SCHAR_MAX + 1); - /* { dg-warning "warning: passing argument 1 of 'fsc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 84 } */ - fsc (SCHAR_MIN - 1); /* { dg-warning "warning: overflow in implicit constant conversion" } */ - /* { dg-warning "warning: passing argument 1 of 'fsc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 86 } */ - fsc (UCHAR_MAX); - /* { dg-warning "warning: passing argument 1 of 'fsc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 88 } */ - fsc (UCHAR_MAX + 1); /* { dg-warning "warning: overflow in implicit constant conversion" } */ - /* { dg-warning "warning: passing argument 1 of 'fsc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 90 } */ - fuc (-1); - /* { dg-warning "warning: passing argument 1 of 'fuc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 92 } */ - fuc (UCHAR_MAX + 1); /* { dg-warning "warning: large integer implicitly truncated to unsigned type" } */ - /* { dg-warning "warning: passing argument 1 of 'fuc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 94 } */ - fuc (SCHAR_MIN); - /* { dg-warning "warning: passing argument 1 of 'fuc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 96 } */ - fuc (SCHAR_MIN - 1); /* { dg-warning "warning: large integer implicitly truncated to unsigned type" } */ - /* { dg-warning "warning: passing argument 1 of 'fuc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 98 } */ - fuc (-UCHAR_MAX); /* { dg-warning "warning: large integer implicitly truncated to unsigned type" } */ - /* { dg-warning "warning: passing argument 1 of 'fuc' with different width due to prototype" "-Wtraditional-conversion" { target *-*-* } 100 } */ -} - -void fui (unsigned int); -void fsi (signed int); - -int si; -unsigned ui; - -void -h2i (int x) -{ - /* For some reason, we only give certain warnings for implicit - conversions among values of the same precision with -Wtraditional-conversion, - while we don't give others at all. */ - fsi ((unsigned)INT_MAX + 1); /* { dg-warning "warning: passing argument 1 of 'fsi' as signed due to prototype" } */ - si = (unsigned)INT_MAX + 1; - si = x ? (unsigned)INT_MAX + 1 : 1; - fsi ((unsigned)INT_MAX + 2); /* { dg-warning "warning: passing argument 1 of 'fsi' as signed due to prototype" } */ - si = (unsigned)INT_MAX + 2; - si = x ? (unsigned)INT_MAX + 2 : 1; - fsi (UINT_MAX); /* { dg-warning "warning: passing argument 1 of 'fsi' as signed due to prototype" } */ - si = UINT_MAX; - fui (-1); - /* { dg-warning "warning: passing argument 1 of 'fui' as unsigned due to prototype" "-Wtraditional-conversion" { target *-*-* } 124 } */ - ui = -1; - ui = x ? -1 : 1U; - fui (INT_MIN); - /* { dg-warning "warning: passing argument 1 of 'fui' as unsigned due to prototype" "-Wtraditional-conversion" { target *-*-* } 128 } */ - ui = INT_MIN; - ui = x ? INT_MIN : 1U; -} --- trunk/gcc/testsuite/gcc.dg/overflow-warn-3.c 2007-01-06 00:20:24.000000000 +0100 +++ trunk/gcc/testsuite/g++.dg/warn/overflow-warn-3.C 2007-01-07 13:36:56.000000000 +0100 @@ -1,7 +1,7 @@ /* Test for diagnostics for constant overflow. Test with -pedantic. */ /* Origin: Joseph Myers */ /* { dg-do compile } */ -/* { dg-options "-std=c99 -pedantic" } */ +/* { dg-options "-fpermissive -pedantic" } */ #include @@ -11,7 +11,7 @@ enum e { E1 = UINT_MAX + 1, /* Overflow in an unevaluated part of an expression is OK (example in the standard). */ - E2 = 2 || 1 / 0, + E2 = 2 || 1 / 0, /* { dg-bogus "warning: division by zero" "" { xfail *-*-* } 14 } */ E3 = 1 / 0, /* { dg-warning "warning: division by zero" } */ /* { dg-error "error: enumerator value for 'E3' is not an integer constant" "enum error" { target *-*-* } 15 } */ /* But as in DR#031, the 1/0 in an evaluated subexpression means the @@ -43,19 +43,21 @@ f (void) } -/* But this expression does need to be constant. */ +/* This expression is neither required to be constant. */ static int sc = INT_MAX + 1; /* { dg-warning "warning: integer overflow in expression" } */ -/* { dg-warning "warning: overflow in constant expression" "constant" { target *-*-* } 47 } */ + +// Test for overflow in null pointer constant. +void *n = 0; /* The first two of these involve overflow, so are not null pointer constants. The third has the overflow in an unevaluated subexpression, so is a null pointer constant. */ void *p = 0 * (INT_MAX + 1); /* { dg-warning "warning: integer overflow in expression" } */ -/* { dg-warning "warning: overflow in constant expression" "constant" { target *-*-* } 53 } */ -/* { dg-warning "warning: initialization makes pointer from integer without a cast" "null" { target *-*-* } 53 } */ +/* { dg-error "invalid conversion from 'int' to 'void" "null" { target *-*-* } 55 } */ + void *q = 0 * (1 / 0); /* { dg-warning "warning: division by zero" } */ -/* { dg-warning "warning: initialization makes pointer from integer without a cast" "null" { xfail *-*-* } 56 } */ -void *r = (1 ? 0 : INT_MAX+1); +/* { dg-error "invalid conversion from 'int' to 'void*'" "null" { xfail *-*-* } 58 } */ +void *r = (1 ? 0 : INT_MAX+1); /* { dg-bogus "integer overflow in expression" "" { xfail *-*-* } 60 } */ void g (int i) @@ -65,7 +67,7 @@ g (int i) case 0 * (1/0): /* { dg-warning "warning: division by zero" } */ ; case 1 + 0 * (INT_MAX + 1): /* { dg-warning "warning: integer overflow in expression" } */ - /* { dg-warning "warning: overflow in constant expression" "constant" { target *-*-* } 67 } */ + /* { dg-warning "warning: overflow in constant expression" "constant" { target *-*-* } 69 } */ ; } } --- trunk/gcc/testsuite/gcc.dg/overflow-warn-4.c 2007-01-06 00:20:24.000000000 +0100 +++ trunk/gcc/testsuite/g++.dg/warn/overflow-warn-4.C 2007-01-07 13:36:56.000000000 +0100 @@ -1,7 +1,7 @@ /* Test for diagnostics for constant overflow. Test with -pedantic-errors. */ /* Origin: Joseph Myers */ /* { dg-do compile } */ -/* { dg-options "-std=c99 -pedantic-errors" } */ +/* { dg-options "-pedantic-errors" } */ #include @@ -11,7 +11,7 @@ enum e { E1 = UINT_MAX + 1, /* Overflow in an unevaluated part of an expression is OK (example in the standard). */ - E2 = 2 || 1 / 0, + E2 = 2 || 1 / 0, /* { dg-bogus "warning: division by zero" "" { xfail *-*-* } 14 } */ E3 = 1 / 0, /* { dg-warning "warning: division by zero" } */ /* { dg-error "error: enumerator value for 'E3' is not an integer constant" "enum error" { target *-*-* } 15 } */ /* But as in DR#031, the 1/0 in an evaluated subexpression means the @@ -43,19 +43,21 @@ f (void) } -/* But this expression does need to be constant. */ +/* This expression is neither required to be constant. */ static int sc = INT_MAX + 1; /* { dg-warning "warning: integer overflow in expression" } */ -/* { dg-error "error: overflow in constant expression" "constant" { target *-*-* } 47 } */ + +// Test for overflow in null pointer constant. +void *n = 0; /* The first two of these involve overflow, so are not null pointer constants. The third has the overflow in an unevaluated subexpression, so is a null pointer constant. */ void *p = 0 * (INT_MAX + 1); /* { dg-warning "warning: integer overflow in expression" } */ -/* { dg-error "error: overflow in constant expression" "constant" { target *-*-* } 53 } */ -/* { dg-error "error: initialization makes pointer from integer without a cast" "null" { target *-*-* } 53 } */ +/* { dg-error "invalid conversion from 'int' to 'void" "null" { target *-*-* } 55 } */ + void *q = 0 * (1 / 0); /* { dg-warning "warning: division by zero" } */ -/* { dg-error "error: initialization makes pointer from integer without a cast" "null" { xfail *-*-* } 56 } */ -void *r = (1 ? 0 : INT_MAX+1); +/* { dg-error "invalid conversion from 'int' to 'void*'" "null" { xfail *-*-* } 58 } */ +void *r = (1 ? 0 : INT_MAX+1); /* { dg-bogus "integer overflow in expression" "" { xfail *-*-* } 60 } */ void g (int i) @@ -65,7 +67,7 @@ g (int i) case 0 * (1/0): /* { dg-warning "warning: division by zero" } */ ; case 1 + 0 * (INT_MAX + 1): /* { dg-warning "warning: integer overflow in expression" } */ - /* { dg-error "error: overflow in constant expression" "constant" { target *-*-* } 67 } */ + /* { dg-error "error: overflow in constant expression" "constant" { target *-*-* } 69 } */ ; } } --- trunk/gcc/testsuite/gcc.dg/overflow-warn-6.c 2007-01-06 00:22:02.000000000 +0100 +++ trunk/gcc/testsuite/g++.dg/warn/overflow-warn-6.C 2007-01-07 13:36:56.000000000 +0100 @@ -1,6 +1,6 @@ /* Test non-constant operands in overflowed expressions. */ /* { dg-do compile } */ -/* { dg-options "-std=c99 -Woverflow" } */ +/* { dg-options "-Woverflow" } */ #include