https://gcc.gnu.org/g:e945d322fcbc68f91388b1d1297bdf6a6c6fcbaa

commit r14-9762-ge945d322fcbc68f91388b1d1297bdf6a6c6fcbaa
Author: David Malcolm <dmalc...@redhat.com>
Date:   Tue Apr 2 17:42:16 2024 -0400

    analyzer: prevent ICEs with null types
    
    Fixes some ICEs seen analyzing the Linux kernel.
    
    gcc/analyzer/ChangeLog:
            * region-model-manager.cc (maybe_undo_optimize_bit_field_compare):
            Guard against null types.
            * region-model.cc (apply_constraints_for_gswitch): Likewise.
    
    Signed-off-by: David Malcolm <dmalc...@redhat.com>

Diff:
---
 gcc/analyzer/region-model-manager.cc | 2 ++
 gcc/analyzer/region-model.cc         | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gcc/analyzer/region-model-manager.cc 
b/gcc/analyzer/region-model-manager.cc
index 4feb349c914..f155eeb87c0 100644
--- a/gcc/analyzer/region-model-manager.cc
+++ b/gcc/analyzer/region-model-manager.cc
@@ -616,6 +616,8 @@ maybe_undo_optimize_bit_field_compare (tree type,
                                       tree cst,
                                       const svalue *arg1)
 {
+  if (!type)
+    return nullptr;
   if (!INTEGRAL_TYPE_P (type))
     return NULL;
 
diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc
index 902b887fc07..98f287145c6 100644
--- a/gcc/analyzer/region-model.cc
+++ b/gcc/analyzer/region-model.cc
@@ -5781,7 +5781,8 @@ apply_constraints_for_gswitch (const switch_cfg_superedge 
&edge,
          && is_a <const initial_svalue *> (unaryop->get_arg ()))
        if (const initial_svalue *initvalop = (as_a <const initial_svalue *>
                                               (unaryop->get_arg ())))
-         if (TREE_CODE (initvalop->get_type ()) == ENUMERAL_TYPE)
+         if (initvalop->get_type ()
+             && TREE_CODE (initvalop->get_type ()) == ENUMERAL_TYPE)
            {
              index_sval = initvalop;
              check_index_type = false;

Reply via email to