@@ -1209,7 +1209,11 @@ c_fully_fold_internal (tree expr, bool in_init, bool *maybe_const_operands,
if (C_MAYBE_CONST_EXPR_NON_CONST (expr))
*maybe_const_operands = false;
if (C_MAYBE_CONST_EXPR_INT_OPERANDS (expr))
- *maybe_const_itself = false;
+ {
+ *maybe_const_itself = false;
+ inner = c_fully_fold_internal (inner, in_init, maybe_const_operands,
+ maybe_const_itself);
+ }
if (pre && !in_init)
ret = build2 (COMPOUND_EXPR, TREE_TYPE (expr), pre, inner);
else
@@ -6864,7 +6864,7 @@ digest_init (location_t init_loc, tree type, tree init, tree origtype,
inside_init = error_mark_node;
}
else if (require_constant && !maybe_const)
- pedwarn_init (init_loc, 0,
+ pedwarn_init (init_loc, OPT_Wpedantic,
"initializer element is not a constant expression");
/* Added to enable additional -Wsuggest-attribute=format warnings. */
@@ -1,6 +1,6 @@
/* PR c/14649 */
/* { dg-do compile } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2 -Wpedantic" } */
double atan(double);
@@ -1,6 +1,6 @@
/* PR c/19984 */
/* { dg-do compile } */
-/* { dg-options "-O2 -std=c99" } */
+/* { dg-options "-O2 -std=c99 -Wpedantic" } */
double nan (const char *);
@@ -0,0 +1,37 @@
+/* PR c/66066 */
+/* { dg-do compile } */
+/* { dg-options "-Wno-div-by-zero" } */
+
+/* Accept these unless -pedantic-errors/-Werror. */
+int a1 = -1 << 0;
+int a2 = -1 << 0 | 0;
+int a3 = -1 << 0 & 1;
+int a4 = -1 << 2 ^ 1;
+int a5 = 4 & -1 << 2;
+int a6 = (-1 << 2) ^ (1 >> 1);
+int a7 = 0 || (-1 << 1);
+int a8 = 0 ? 2 : (-1 << 1);
+int a9 = 1 && -1 << 0;
+int a10 = !(-1 << 0);
+
+/* Don't accept these. */
+int b1 = 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b2 = 1 / (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b3 = 0 ? 2 : 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b4 = 0 || 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b5 = 0 * (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b6 = 1 * (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b7 = (1 / 0) * 0; /* { dg-error "initializer element is not constant" } */
+int b8 = (1 / 0) * 1; /* { dg-error "initializer element is not constant" } */
+int b9 = 1 && 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b10 = !(1 / 0); /* { dg-error "initializer element is not constant" } */
+int c1 = 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c2 = 1 / (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c3 = 0 ? 2 : 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c4 = 0 || 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c5 = 0 * (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c6 = 1 * (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c7 = (1 % 0) * 0; /* { dg-error "initializer element is not constant" } */
+int c8 = (1 % 0) * 1; /* { dg-error "initializer element is not constant" } */
+int c9 = 1 && 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c10 = !(1 % 0); /* { dg-error "initializer element is not constant" } */
@@ -0,0 +1,37 @@
+/* PR c/66066 */
+/* { dg-do compile } */
+/* { dg-options "-Wno-div-by-zero -Wpedantic" } */
+
+/* Accept these unless -pedantic-errors/-Werror. */
+int a1 = -1 << 0; /* { dg-warning "initializer element is not a constant expression" } */
+int a2 = -1 << 0 | 0; /* { dg-warning "initializer element is not a constant expression" } */
+int a3 = -1 << 0 & 1; /* { dg-warning "initializer element is not a constant expression" } */
+int a4 = -1 << 2 ^ 1; /* { dg-warning "initializer element is not a constant expression" } */
+int a5 = 4 & -1 << 2; /* { dg-warning "initializer element is not a constant expression" } */
+int a6 = (-1 << 2) ^ (1 >> 1); /* { dg-warning "initializer element is not a constant expression" } */
+int a7 = 0 || (-1 << 1); /* { dg-warning "initializer element is not a constant expression" } */
+int a8 = 0 ? 2 : (-1 << 1); /* { dg-warning "initializer element is not a constant expression" } */
+int a9 = 1 && -1 << 0; /* { dg-warning "initializer element is not a constant expression" } */
+int a10 = !(-1 << 0); /* { dg-warning "initializer element is not a constant expression" } */
+
+/* Don't accept these. */
+int b1 = 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b2 = 1 / (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b3 = 0 ? 2 : 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b4 = 0 || 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b5 = 0 * (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b6 = 1 * (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b7 = (1 / 0) * 0; /* { dg-error "initializer element is not constant" } */
+int b8 = (1 / 0) * 1; /* { dg-error "initializer element is not constant" } */
+int b9 = 1 && 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b10 = !(1 / 0); /* { dg-error "initializer element is not constant" } */
+int c1 = 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c2 = 1 / (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c3 = 0 ? 2 : 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c4 = 0 || 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c5 = 0 * (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c6 = 1 * (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c7 = (1 % 0) * 0; /* { dg-error "initializer element is not constant" } */
+int c8 = (1 % 0) * 1; /* { dg-error "initializer element is not constant" } */
+int c9 = 1 && 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c10 = !(1 % 0); /* { dg-error "initializer element is not constant" } */
@@ -0,0 +1,37 @@
+/* PR c/66066 */
+/* { dg-do compile } */
+/* { dg-options "-Wno-div-by-zero -pedantic-errors" } */
+
+/* Accept these unless -pedantic-errors/-Werror. */
+int a1 = -1 << 0; /* { dg-error "initializer element is not a constant expression" } */
+int a2 = -1 << 0 | 0; /* { dg-error "initializer element is not a constant expression" } */
+int a3 = -1 << 0 & 1; /* { dg-error "initializer element is not a constant expression" } */
+int a4 = -1 << 2 ^ 1; /* { dg-error "initializer element is not a constant expression" } */
+int a5 = 4 & -1 << 2; /* { dg-error "initializer element is not a constant expression" } */
+int a6 = (-1 << 2) ^ (1 >> 1); /* { dg-error "initializer element is not a constant expression" } */
+int a7 = 0 || (-1 << 1); /* { dg-error "initializer element is not a constant expression" } */
+int a8 = 0 ? 2 : (-1 << 1); /* { dg-error "initializer element is not a constant expression" } */
+int a9 = 1 && -1 << 0; /* { dg-error "initializer element is not a constant expression" } */
+int a10 = !(-1 << 0); /* { dg-error "initializer element is not a constant expression" } */
+
+/* Don't accept these. */
+int b1 = 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b2 = 1 / (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b3 = 0 ? 2 : 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b4 = 0 || 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b5 = 0 * (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b6 = 1 * (1 / 0); /* { dg-error "initializer element is not constant" } */
+int b7 = (1 / 0) * 0; /* { dg-error "initializer element is not constant" } */
+int b8 = (1 / 0) * 1; /* { dg-error "initializer element is not constant" } */
+int b9 = 1 && 1 / 0; /* { dg-error "initializer element is not constant" } */
+int b10 = !(1 / 0); /* { dg-error "initializer element is not constant" } */
+int c1 = 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c2 = 1 / (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c3 = 0 ? 2 : 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c4 = 0 || 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c5 = 0 * (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c6 = 1 * (1 % 0); /* { dg-error "initializer element is not constant" } */
+int c7 = (1 % 0) * 0; /* { dg-error "initializer element is not constant" } */
+int c8 = (1 % 0) * 1; /* { dg-error "initializer element is not constant" } */
+int c9 = 1 && 1 % 0; /* { dg-error "initializer element is not constant" } */
+int c10 = !(1 % 0); /* { dg-error "initializer element is not constant" } */