I forget to guard against some more cases. 

Committed as obvious.


Martin


    c: Add missing conditions in Walloc-size to avoid ICEs [PR112347]
    
    Fix ICE because of forgotten checks for pointers to void
    and incomplete arrays.
    
    Committed as obvious.
    
            PR c/112347
    
    gcc/c:
            * c-typeck.cc (convert_for_assignment): Add missing check.
    
    gcc/testsuite:
    
            * gcc.dg/Walloc-size-3.c: New test.

diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc
index 16fadfb5468..bdd57aae3ff 100644
--- a/gcc/c/c-typeck.cc
+++ b/gcc/c/c-typeck.cc
@@ -7367,6 +7367,7 @@ convert_for_assignment (location_t location, location_t 
expr_loc, tree type,
                idx = TREE_INT_CST_LOW (TREE_VALUE (TREE_CHAIN (args))) - 1;
              tree arg = CALL_EXPR_ARG (rhs, idx);
              if (TREE_CODE (arg) == INTEGER_CST
+                 && !VOID_TYPE_P (ttl) && TYPE_SIZE_UNIT (ttl)
                  && INTEGER_CST == TREE_CODE (TYPE_SIZE_UNIT (ttl))
                  && tree_int_cst_lt (arg, TYPE_SIZE_UNIT (ttl)))
                 warning_at (location, OPT_Walloc_size, "allocation of "
diff --git a/gcc/testsuite/gcc.dg/Walloc-size-3.c 
b/gcc/testsuite/gcc.dg/Walloc-size-3.c
new file mode 100644
index 00000000000..b95e04a8d99
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Walloc-size-3.c
@@ -0,0 +1,15 @@
+/* PR 112347 
+   { dg-do compile }
+   { dg-options "-Walloc-size" }
+ * */
+
+// Test that various types without size do not crash with -Walloc-size
+
+int * mallocx(unsigned long) __attribute__((malloc)) 
__attribute__((alloc_size(1)));
+void test_oom(void) { void *a_ = mallocx(1); }
+
+void parse_args(char (**child_args_ptr_ptr)[]) {
+  *child_args_ptr_ptr = __builtin_calloc(1, sizeof(char));
+}
+
+


Reply via email to