aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2019-02-26 22:27:33 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2019-02-26 22:27:33 +0100
commit8735903781aabdb48683d24d783eba6c76fd8c99 (patch)
tree7bdb2c7cc9100224603610317f3e4551bef40e1c /gcc
parent1405bf4c9c5324639ca4b0a6529b5e4a43eb31db (diff)
downloadgcc-8735903781aabdb48683d24d783eba6c76fd8c99.zip
gcc-8735903781aabdb48683d24d783eba6c76fd8c99.tar.gz
gcc-8735903781aabdb48683d24d783eba6c76fd8c99.tar.bz2
re PR c++/89507 (bogus "size of array exceeds maximum object size")
PR c++/89507 * tree.c (valid_constant_size_p): Deal with size INTEGER_CSTs with types other than sizetype/ssizetype. * g++.dg/other/new2.C: New test. From-SVN: r269233
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/other/new2.C5
-rw-r--r--gcc/tree.c17
4 files changed, 21 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bf5cf95..41afdd1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-26 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/89507
+ * tree.c (valid_constant_size_p): Deal with size INTEGER_CSTs
+ with types other than sizetype/ssizetype.
+
2019-02-26 Eric Botcazou <ebotcazou@adacore.com>
* config/sparc/sparc-opts.h (enum processor_type): Rename to...
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6e3c5f7..14a8f54 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2019-02-26 Jakub Jelinek <jakub@redhat.com>
+ PR c++/89507
+ * g++.dg/other/new2.C: New test.
+
PR tree-optimization/89500
* gcc.dg/pr89500.c: New test.
* gcc.dg/Wstringop-overflow-10.c: New test.
diff --git a/gcc/testsuite/g++.dg/other/new2.C b/gcc/testsuite/g++.dg/other/new2.C
new file mode 100644
index 0000000..b086b9c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/new2.C
@@ -0,0 +1,5 @@
+// PR c++/89507
+// { dg-do compile }
+
+unsigned char const n = 128;
+int *p = new int[n]; // { dg-bogus "array exceeds maximum object size" }
diff --git a/gcc/tree.c b/gcc/tree.c
index 30e01df..0c70bb9 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -7533,19 +7533,16 @@ valid_constant_size_p (const_tree size, cst_size_error *perr /* = NULL */)
return false;
}
- tree type = TREE_TYPE (size);
- if (TYPE_UNSIGNED (type))
+ if (tree_int_cst_sgn (size) < 0)
{
- if (!tree_fits_uhwi_p (size)
- || tree_int_cst_sign_bit (size))
- {
- *perr = cst_size_too_big;
- return false;
- }
+ *perr = cst_size_negative;
+ return false;
}
- else if (tree_int_cst_sign_bit (size))
+ if (!tree_fits_uhwi_p (size)
+ || (wi::to_widest (TYPE_MAX_VALUE (sizetype))
+ < wi::to_widest (size) * 2))
{
- *perr = cst_size_negative;
+ *perr = cst_size_too_big;
return false;
}