Skip to content

R
riscv-gcc-1
Commit 80fdaad1 by Jason Merrill Committed by Jason Merrill
Options

PR c++/80227 - SFINAE and negative array size. 

	* decl.c (compute_array_index_type): Use
	build_converted_constant_expr and valid_constant_size_p.

From-SVN: r258604
parent 929a0122
Showing with 140 additions and 153 deletions
gcc/cp/ChangeLog
2018-03-16 Jason Merrill <jason@redhat.com> 2018-03-16 Jason Merrill <jason@redhat.com>
PR c++/80227 - SFINAE and negative array size.
* decl.c (compute_array_index_type): Use
build_converted_constant_expr and valid_constant_size_p.
PR c++/84906 - silent wrong code with ambiguous conversion. PR c++/84906 - silent wrong code with ambiguous conversion.
* call.c (build_user_type_conversion_1): Set need_temporary_p on * call.c (build_user_type_conversion_1): Set need_temporary_p on
ambiguous conversion. ambiguous conversion.
......
gcc/cp/decl.c
...@@ -9514,8 +9514,6 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain) ...@@ -9514,8 +9514,6 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
if (!type_dependent_expression_p (size)) if (!type_dependent_expression_p (size))
{ {
tree type = TREE_TYPE (size);
size = mark_rvalue_use (size); size = mark_rvalue_use (size);
if (cxx_dialect < cxx11 && TREE_CODE (size) == NOP_EXPR if (cxx_dialect < cxx11 && TREE_CODE (size) == NOP_EXPR
...@@ -9525,28 +9523,7 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain) ...@@ -9525,28 +9523,7 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
else else
{ {
size = instantiate_non_dependent_expr_sfinae (size, complain); size = instantiate_non_dependent_expr_sfinae (size, complain);
size = build_converted_constant_expr (size_type_node, size, complain);
if (CLASS_TYPE_P (type)
&& CLASSTYPE_LITERAL_P (type))
{
size = build_expr_type_conversion (WANT_INT, size, true);
if (!size)
{
if (!(complain & tf_error))
return error_mark_node;
if (name)
error ("size of array %qD has non-integral type %qT",
name, type);
else
error ("size of array has non-integral type %qT", type);
size = integer_one_node;
}
if (size == error_mark_node)
return error_mark_node;
type = TREE_TYPE (size);
}
if (INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P (type))
size = maybe_constant_value (size); size = maybe_constant_value (size);
if (!TREE_CONSTANT (size)) if (!TREE_CONSTANT (size))
...@@ -9557,6 +9534,7 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain) ...@@ -9557,6 +9534,7 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
return error_mark_node; return error_mark_node;
/* The array bound must be an integer type. */ /* The array bound must be an integer type. */
tree type = TREE_TYPE (size);
if (!INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P (type)) if (!INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P (type))
{ {
if (!(complain & tf_error)) if (!(complain & tf_error))
...@@ -9566,7 +9544,6 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain) ...@@ -9566,7 +9544,6 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
else else
error ("size of array has non-integral type %qT", type); error ("size of array has non-integral type %qT", type);
size = integer_one_node; size = integer_one_node;
type = TREE_TYPE (size);
} }
} }
...@@ -9604,15 +9581,12 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain) ...@@ -9604,15 +9581,12 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
/* Normally, the array-bound will be a constant. */ /* Normally, the array-bound will be a constant. */
if (TREE_CODE (size) == INTEGER_CST) if (TREE_CODE (size) == INTEGER_CST)
{ {
/* Check to see if the array bound overflowed. Make that an
error, no matter how generous we're being. */
constant_expression_error (size);
/* An array must have a positive number of elements. */ /* An array must have a positive number of elements. */
if (tree_int_cst_lt (size, integer_zero_node)) if (!valid_constant_size_p (size))
{ {
if (!(complain & tf_error)) if (!(complain & tf_error))
return error_mark_node; return error_mark_node;
if (name) if (name)
error ("size of array %qD is negative", name); error ("size of array %qD is negative", name);
else else
......
gcc/testsuite/g++.dg/cpp0x/fntmpdefarg8.C 0 → 100644
// PR c++/80227
// { dg-do compile { target c++11 } }
template <class T>
int foo (T);
template <class T, class U = T [sizeof (T) - 5]>
int foo (T, U* = 0);
int i = foo (123);
gcc/testsuite/g++.dg/gomp/pr47963.C
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
void void
foo (float n) foo (float n)
{ {
int A[n][n]; // { dg-error "has non-integral type" } int A[n][n]; // { dg-error "has non-integral type|converted constant expression" }
#pragma omp parallel private(A) #pragma omp parallel private(A)
; ;
} }
gcc/testsuite/g++.dg/init/new37.C
...@@ -32,7 +32,7 @@ template <typename T> ...@@ -32,7 +32,7 @@ template <typename T>
void * void *
callnew_fail_3() callnew_fail_3()
{ {
return new T[2][T::n]; // { dg-error "size of array has non-integral type" } return new T[2][T::n]; // { dg-error "size of array has non-integral type|converted constant expression" }
} }
struct T1 { struct T1 {
......
gcc/testsuite/g++.dg/init/new44.C
...@@ -87,10 +87,10 @@ test_one_dim_short_array () ...@@ -87,10 +87,10 @@ test_one_dim_short_array ()
static void __attribute__ ((used)) static void __attribute__ ((used))
test_two_dim_char_array () test_two_dim_char_array ()
{ {
p = new char [1][MAX]; // { dg-error "size of unnamed array" } p = new char [1][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [1][MAX - 1]; // { dg-error "size of unnamed array" } p = new char [1][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [1][MAX - 2]; // { dg-error "size of unnamed array" } p = new char [1][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [1][MAX - 99]; // { dg-error "size of unnamed array" } p = new char [1][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new char [1][MAX / 2]; // { dg-error "size of array" } p = new char [1][MAX / 2]; // { dg-error "size of array" }
p = new char [1][MAX / 2 - 1]; // { dg-error "size of array" } p = new char [1][MAX / 2 - 1]; // { dg-error "size of array" }
p = new char [1][MAX / 2 - 2]; // { dg-error "size of array" } p = new char [1][MAX / 2 - 2]; // { dg-error "size of array" }
...@@ -104,18 +104,18 @@ test_two_dim_char_array () ...@@ -104,18 +104,18 @@ test_two_dim_char_array ()
p = new char [1][MAX / 2 - 7]; // okay p = new char [1][MAX / 2 - 7]; // okay
p = new char [1][MAX / 2 - 8]; // okay p = new char [1][MAX / 2 - 8]; // okay
p = new char [2][MAX]; // { dg-error "size of unnamed array" } p = new char [2][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX - 1]; // { dg-error "size of unnamed array" } p = new char [2][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX - 2]; // { dg-error "size of unnamed array" } p = new char [2][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2]; // { dg-error "size of array" } p = new char [2][MAX / 2]; // { dg-error "size of array" }
p = new char [2][MAX / 2 - 1]; // { dg-error "size of array" } p = new char [2][MAX / 2 - 1]; // { dg-error "size of array" }
p = new char [2][MAX / 2 - 2]; // { dg-error "size of array" } p = new char [2][MAX / 2 - 2]; // { dg-error "size of array" }
p = new char [2][MAX / 2 - 7]; // { dg-error "size of array" } p = new char [2][MAX / 2 - 7]; // { dg-error "size of array" }
p = new char [2][MAX / 2 - 8]; // { dg-error "size of array" } p = new char [2][MAX / 2 - 8]; // { dg-error "size of array" }
p = new char [MAX][MAX]; // { dg-error "size of unnamed array" } p = new char [MAX][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [MAX][MAX - 1]; // { dg-error "size of unnamed array" } p = new char [MAX][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [MAX][MAX - 2]; // { dg-error "size of unnamed array" } p = new char [MAX][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [MAX][MAX / 2]; // { dg-error "size of array" } p = new char [MAX][MAX / 2]; // { dg-error "size of array" }
p = new char [MAX][MAX / 2 - 1]; // { dg-error "size of array" } p = new char [MAX][MAX / 2 - 1]; // { dg-error "size of array" }
p = new char [MAX][MAX / 2 - 2]; // { dg-error "size of array" } p = new char [MAX][MAX / 2 - 2]; // { dg-error "size of array" }
...@@ -142,10 +142,10 @@ test_two_dim_char_array () ...@@ -142,10 +142,10 @@ test_two_dim_char_array ()
static __attribute__ ((used)) void static __attribute__ ((used)) void
test_three_dim_char_array () test_three_dim_char_array ()
{ {
p = new char [1][1][MAX]; // { dg-error "size of unnamed array" } p = new char [1][1][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [1][1][MAX - 1]; // { dg-error "size of unnamed array" } p = new char [1][1][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [1][1][MAX - 2]; // { dg-error "size of unnamed array" } p = new char [1][1][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [1][1][MAX - 99]; // { dg-error "size of unnamed array" } p = new char [1][1][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new char [1][1][MAX / 2]; // { dg-error "size of array" } p = new char [1][1][MAX / 2]; // { dg-error "size of array" }
p = new char [1][1][MAX / 2 - 1]; // { dg-error "size of array" } p = new char [1][1][MAX / 2 - 1]; // { dg-error "size of array" }
p = new char [1][1][MAX / 2 - 2]; // { dg-error "size of array" } p = new char [1][1][MAX / 2 - 2]; // { dg-error "size of array" }
...@@ -159,19 +159,19 @@ test_three_dim_char_array () ...@@ -159,19 +159,19 @@ test_three_dim_char_array ()
p = new char [1][1][MAX / 2 - 7]; // okay p = new char [1][1][MAX / 2 - 7]; // okay
p = new char [1][1][MAX / 2 - 8]; // okay p = new char [1][1][MAX / 2 - 8]; // okay
p = new char [1][2][MAX]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX - 1]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX - 2]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX - 99]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2 - 1]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2 - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2 - 2]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2 - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2 - 3]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2 - 3]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2 - 4]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2 - 4]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2 - 5]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2 - 5]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2 - 6]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2 - 6]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2 - 7]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2 - 7]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 2 - 8]; // { dg-error "size of unnamed array" } p = new char [1][2][MAX / 2 - 8]; // { dg-error "size of (unnamed )?array" }
p = new char [1][2][MAX / 4]; // { dg-error "size of array" } p = new char [1][2][MAX / 4]; // { dg-error "size of array" }
// Avoid exercising data model-dependent expressions. // Avoid exercising data model-dependent expressions.
...@@ -181,10 +181,10 @@ test_three_dim_char_array () ...@@ -181,10 +181,10 @@ test_three_dim_char_array ()
p = new char [1][2][MAX / 4 - 3]; // okay p = new char [1][2][MAX / 4 - 3]; // okay
p = new char [1][2][MAX / 4 - 4]; // okay p = new char [1][2][MAX / 4 - 4]; // okay
p = new char [2][1][MAX]; // { dg-error "size of unnamed array" } p = new char [2][1][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [2][1][MAX - 1]; // { dg-error "size of unnamed array" } p = new char [2][1][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [2][1][MAX - 2]; // { dg-error "size of unnamed array" } p = new char [2][1][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][1][MAX - 99]; // { dg-error "size of unnamed array" } p = new char [2][1][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new char [2][1][MAX / 2]; // { dg-error "size of array" } p = new char [2][1][MAX / 2]; // { dg-error "size of array" }
p = new char [2][1][MAX / 2 - 1]; // { dg-error "size of array" } p = new char [2][1][MAX / 2 - 1]; // { dg-error "size of array" }
p = new char [2][1][MAX / 2 - 2]; // { dg-error "size of array" } p = new char [2][1][MAX / 2 - 2]; // { dg-error "size of array" }
...@@ -203,19 +203,19 @@ test_three_dim_char_array () ...@@ -203,19 +203,19 @@ test_three_dim_char_array ()
p = new char [2][1][MAX / 4 - 3]; // okay p = new char [2][1][MAX / 4 - 3]; // okay
p = new char [2][1][MAX / 4 - 4]; // okay p = new char [2][1][MAX / 4 - 4]; // okay
p = new char [2][2][MAX]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX - 1]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX - 2]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX - 99]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2 - 1]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2 - 1]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2 - 2]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2 - 2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2 - 3]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2 - 3]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2 - 4]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2 - 4]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2 - 5]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2 - 5]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2 - 6]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2 - 6]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2 - 7]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2 - 7]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 2 - 8]; // { dg-error "size of unnamed array" } p = new char [2][2][MAX / 2 - 8]; // { dg-error "size of (unnamed )?array" }
p = new char [2][2][MAX / 4]; // { dg-error "size of array" } p = new char [2][2][MAX / 4]; // { dg-error "size of array" }
p = new char [2][2][MAX / 4 - 1]; // { dg-error "size of array" } p = new char [2][2][MAX / 4 - 1]; // { dg-error "size of array" }
p = new char [2][2][MAX / 4 - 2]; // { dg-error "size of array" } p = new char [2][2][MAX / 4 - 2]; // { dg-error "size of array" }
...@@ -227,19 +227,19 @@ test_three_dim_char_array () ...@@ -227,19 +227,19 @@ test_three_dim_char_array ()
p = new char [2][2][MAX / 8 - 2]; p = new char [2][2][MAX / 8 - 2];
p = new char [2][2][MAX / 8 - 3]; p = new char [2][2][MAX / 8 - 3];
p = new char [2][MAX][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX - 1][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX - 1][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX - 2][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX - 2][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX - 99][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX - 99][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2 - 1][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2 - 1][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2 - 2][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2 - 2][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2 - 3][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2 - 3][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2 - 4][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2 - 4][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2 - 5][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2 - 5][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2 - 6][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2 - 6][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2 - 7][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2 - 7][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 2 - 8][2]; // { dg-error "size of unnamed array" } p = new char [2][MAX / 2 - 8][2]; // { dg-error "size of (unnamed )?array" }
p = new char [2][MAX / 4][2]; // { dg-error "size of array" } p = new char [2][MAX / 4][2]; // { dg-error "size of array" }
p = new char [2][MAX / 4 - 1][2]; // { dg-error "size of array" } p = new char [2][MAX / 4 - 1][2]; // { dg-error "size of array" }
p = new char [2][MAX / 4 - 2][2]; // { dg-error "size of array" } p = new char [2][MAX / 4 - 2][2]; // { dg-error "size of array" }
...@@ -275,11 +275,11 @@ test_three_dim_char_array () ...@@ -275,11 +275,11 @@ test_three_dim_char_array ()
p = new char [MAX / 8 - 2][2][2]; p = new char [MAX / 8 - 2][2][2];
p = new char [MAX / 8 - 3][2][2]; p = new char [MAX / 8 - 3][2][2];
p = new char [MAX][MAX][MAX]; // { dg-error "size of unnamed array" } p = new char [MAX][MAX][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [MAX][MAX][MAX / 2]; // { dg-error "size of unnamed array" } p = new char [MAX][MAX][MAX / 2]; // { dg-error "size of (unnamed )?array" }
p = new char [MAX][MAX / 2][MAX]; // { dg-error "size of unnamed array" } p = new char [MAX][MAX / 2][MAX]; // { dg-error "size of (unnamed )?array" }
p = new char [MAX][MAX / 2][MAX / 2]; // { dg-error "size of unnamed array" } p = new char [MAX][MAX / 2][MAX / 2]; // { dg-error "size of (unnamed )?array" }
p = new char [MAX / 2][MAX / 2][MAX / 2]; // { dg-error "size of unnamed array" } p = new char [MAX / 2][MAX / 2][MAX / 2]; // { dg-error "size of (unnamed )?array" }
} }
// Exercise new expression with N-dimensional arrays where N is // Exercise new expression with N-dimensional arrays where N is
...@@ -342,10 +342,10 @@ test_one_dim_byte_array (void *p) ...@@ -342,10 +342,10 @@ test_one_dim_byte_array (void *p)
static void __attribute__ ((used)) static void __attribute__ ((used))
test_placement_two_dim_byte_struct_array (void *p) test_placement_two_dim_byte_struct_array (void *p)
{ {
p = new (p) B [1][MAX]; // { dg-error "size of unnamed array" } p = new (p) B [1][MAX]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][MAX - 1]; // { dg-error "size of unnamed array" } p = new (p) B [1][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][MAX - 2]; // { dg-error "size of unnamed array" } p = new (p) B [1][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][MAX - 99]; // { dg-error "size of unnamed array" } p = new (p) B [1][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][MAX / 2]; // { dg-error "size of array" } p = new (p) B [1][MAX / 2]; // { dg-error "size of array" }
p = new (p) B [1][MAX / 2 - 1]; // { dg-error "size of array" } p = new (p) B [1][MAX / 2 - 1]; // { dg-error "size of array" }
p = new (p) B [1][MAX / 2 - 2]; // { dg-error "size of array" } p = new (p) B [1][MAX / 2 - 2]; // { dg-error "size of array" }
...@@ -359,18 +359,18 @@ test_placement_two_dim_byte_struct_array (void *p) ...@@ -359,18 +359,18 @@ test_placement_two_dim_byte_struct_array (void *p)
p = new (p) B [1][MAX / 2 - 7]; // okay p = new (p) B [1][MAX / 2 - 7]; // okay
p = new (p) B [1][MAX / 2 - 8]; // okay p = new (p) B [1][MAX / 2 - 8]; // okay
p = new (p) B [2][MAX]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX - 1]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX - 2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2]; // { dg-error "size of array" } p = new (p) B [2][MAX / 2]; // { dg-error "size of array" }
p = new (p) B [2][MAX / 2 - 1]; // { dg-error "size of array" } p = new (p) B [2][MAX / 2 - 1]; // { dg-error "size of array" }
p = new (p) B [2][MAX / 2 - 2]; // { dg-error "size of array" } p = new (p) B [2][MAX / 2 - 2]; // { dg-error "size of array" }
p = new (p) B [2][MAX / 2 - 7]; // { dg-error "size of array" } p = new (p) B [2][MAX / 2 - 7]; // { dg-error "size of array" }
p = new (p) B [2][MAX / 2 - 8]; // { dg-error "size of array" } p = new (p) B [2][MAX / 2 - 8]; // { dg-error "size of array" }
p = new (p) B [MAX][MAX]; // { dg-error "size of unnamed array" } p = new (p) B [MAX][MAX]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [MAX][MAX - 1]; // { dg-error "size of unnamed array" } p = new (p) B [MAX][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [MAX][MAX - 2]; // { dg-error "size of unnamed array" } p = new (p) B [MAX][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [MAX][MAX / 2]; // { dg-error "size of array" } p = new (p) B [MAX][MAX / 2]; // { dg-error "size of array" }
p = new (p) B [MAX][MAX / 2 - 1]; // { dg-error "size of array" } p = new (p) B [MAX][MAX / 2 - 1]; // { dg-error "size of array" }
p = new (p) B [MAX][MAX / 2 - 2]; // { dg-error "size of array" } p = new (p) B [MAX][MAX / 2 - 2]; // { dg-error "size of array" }
...@@ -397,10 +397,10 @@ test_placement_two_dim_byte_struct_array (void *p) ...@@ -397,10 +397,10 @@ test_placement_two_dim_byte_struct_array (void *p)
static __attribute__ ((used)) void static __attribute__ ((used)) void
test_placement_three_dim_byte_struct_array (void *p) test_placement_three_dim_byte_struct_array (void *p)
{ {
p = new (p) B [1][1][MAX]; // { dg-error "size of unnamed array" } p = new (p) B [1][1][MAX]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][1][MAX - 1]; // { dg-error "size of unnamed array" } p = new (p) B [1][1][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][1][MAX - 2]; // { dg-error "size of unnamed array" } p = new (p) B [1][1][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][1][MAX - 99]; // { dg-error "size of unnamed array" } p = new (p) B [1][1][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][1][MAX / 2]; // { dg-error "size of array" } p = new (p) B [1][1][MAX / 2]; // { dg-error "size of array" }
p = new (p) B [1][1][MAX / 2 - 1]; // { dg-error "size of array" } p = new (p) B [1][1][MAX / 2 - 1]; // { dg-error "size of array" }
p = new (p) B [1][1][MAX / 2 - 2]; // { dg-error "size of array" } p = new (p) B [1][1][MAX / 2 - 2]; // { dg-error "size of array" }
...@@ -414,19 +414,19 @@ test_placement_three_dim_byte_struct_array (void *p) ...@@ -414,19 +414,19 @@ test_placement_three_dim_byte_struct_array (void *p)
p = new (p) B [1][1][MAX / 2 - 7]; // okay p = new (p) B [1][1][MAX / 2 - 7]; // okay
p = new (p) B [1][1][MAX / 2 - 8]; // okay p = new (p) B [1][1][MAX / 2 - 8]; // okay
p = new (p) B [1][2][MAX]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX - 1]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX - 2]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX - 99]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2 - 1]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2 - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2 - 2]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2 - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2 - 3]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2 - 3]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2 - 4]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2 - 4]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2 - 5]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2 - 5]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2 - 6]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2 - 6]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2 - 7]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2 - 7]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 2 - 8]; // { dg-error "size of unnamed array" } p = new (p) B [1][2][MAX / 2 - 8]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [1][2][MAX / 4]; // { dg-error "size of array" } p = new (p) B [1][2][MAX / 4]; // { dg-error "size of array" }
// Avoid exercising data model-dependent expressions. // Avoid exercising data model-dependent expressions.
...@@ -436,10 +436,10 @@ test_placement_three_dim_byte_struct_array (void *p) ...@@ -436,10 +436,10 @@ test_placement_three_dim_byte_struct_array (void *p)
p = new (p) B [1][2][MAX / 4 - 3]; // okay p = new (p) B [1][2][MAX / 4 - 3]; // okay
p = new (p) B [1][2][MAX / 4 - 4]; // okay p = new (p) B [1][2][MAX / 4 - 4]; // okay
p = new (p) B [2][1][MAX]; // { dg-error "size of unnamed array" } p = new (p) B [2][1][MAX]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][1][MAX - 1]; // { dg-error "size of unnamed array" } p = new (p) B [2][1][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][1][MAX - 2]; // { dg-error "size of unnamed array" } p = new (p) B [2][1][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][1][MAX - 99]; // { dg-error "size of unnamed array" } p = new (p) B [2][1][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][1][MAX / 2]; // { dg-error "size of array" } p = new (p) B [2][1][MAX / 2]; // { dg-error "size of array" }
p = new (p) B [2][1][MAX / 2 - 1]; // { dg-error "size of array" } p = new (p) B [2][1][MAX / 2 - 1]; // { dg-error "size of array" }
p = new (p) B [2][1][MAX / 2 - 2]; // { dg-error "size of array" } p = new (p) B [2][1][MAX / 2 - 2]; // { dg-error "size of array" }
...@@ -458,19 +458,19 @@ test_placement_three_dim_byte_struct_array (void *p) ...@@ -458,19 +458,19 @@ test_placement_three_dim_byte_struct_array (void *p)
p = new (p) B [2][1][MAX / 4 - 3]; // okay p = new (p) B [2][1][MAX / 4 - 3]; // okay
p = new (p) B [2][1][MAX / 4 - 4]; // okay p = new (p) B [2][1][MAX / 4 - 4]; // okay
p = new (p) B [2][2][MAX]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX - 1]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX - 2]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX - 99]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX - 99]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2 - 1]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2 - 1]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2 - 2]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2 - 2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2 - 3]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2 - 3]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2 - 4]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2 - 4]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2 - 5]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2 - 5]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2 - 6]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2 - 6]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2 - 7]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2 - 7]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 2 - 8]; // { dg-error "size of unnamed array" } p = new (p) B [2][2][MAX / 2 - 8]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][2][MAX / 4]; // { dg-error "size of array" } p = new (p) B [2][2][MAX / 4]; // { dg-error "size of array" }
p = new (p) B [2][2][MAX / 4 - 1]; // { dg-error "size of array" } p = new (p) B [2][2][MAX / 4 - 1]; // { dg-error "size of array" }
p = new (p) B [2][2][MAX / 4 - 2]; // { dg-error "size of array" } p = new (p) B [2][2][MAX / 4 - 2]; // { dg-error "size of array" }
...@@ -482,19 +482,19 @@ test_placement_three_dim_byte_struct_array (void *p) ...@@ -482,19 +482,19 @@ test_placement_three_dim_byte_struct_array (void *p)
p = new (p) B [2][2][MAX / 8 - 2]; p = new (p) B [2][2][MAX / 8 - 2];
p = new (p) B [2][2][MAX / 8 - 3]; p = new (p) B [2][2][MAX / 8 - 3];
p = new (p) B [2][MAX][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX - 1][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX - 1][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX - 2][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX - 2][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX - 99][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX - 99][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2 - 1][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2 - 1][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2 - 2][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2 - 2][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2 - 3][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2 - 3][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2 - 4][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2 - 4][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2 - 5][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2 - 5][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2 - 6][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2 - 6][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2 - 7][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2 - 7][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 2 - 8][2]; // { dg-error "size of unnamed array" } p = new (p) B [2][MAX / 2 - 8][2]; // { dg-error "size of (unnamed )?array" }
p = new (p) B [2][MAX / 4][2]; // { dg-error "size of array" } p = new (p) B [2][MAX / 4][2]; // { dg-error "size of array" }
p = new (p) B [2][MAX / 4 - 1][2]; // { dg-error "size of array" } p = new (p) B [2][MAX / 4 - 1][2]; // { dg-error "size of array" }
p = new (p) B [2][MAX / 4 - 2][2]; // { dg-error "size of array" } p = new (p) B [2][MAX / 4 - 2][2]; // { dg-error "size of array" }
......
gcc/testsuite/g++.dg/ubsan/pr81530.C
...@@ -2,5 +2,4 @@ ...@@ -2,5 +2,4 @@
/* { dg-do compile } */ /* { dg-do compile } */
/* { dg-options "-fsanitize=undefined" } */ /* { dg-options "-fsanitize=undefined" } */
int a[(long) 4e20]; /* { dg-error "overflow in constant expression" } */ int a[(long) 4e20]; /* { dg-error "size of array .a. is (too large|negative)" } */
/* { dg-error "size of array .a. is too large" "" { target *-*-* } .-1 } */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment