11972 resync smatch

*** 22,35 ****
  static int my_id;
  
  STATE(uninitialized);
  STATE(initialized);
  
! static void pre_merge_hook(struct sm_state *sm)
  {
          if (is_impossible_path())
!                 set_state(my_id, sm->name, sm->sym, &initialized);
  }
  
  static void mark_members_uninitialized(struct symbol *sym)
  {
          struct symbol *struct_type, *tmp, *base_type;
--- 22,35 ----
  static int my_id;
  
  STATE(uninitialized);
  STATE(initialized);
  
! static void pre_merge_hook(struct sm_state *cur, struct sm_state *other)
  {
          if (is_impossible_path())
!                 set_state(my_id, cur->name, cur->sym, &initialized);
  }
  
  static void mark_members_uninitialized(struct symbol *sym)
  {
          struct symbol *struct_type, *tmp, *base_type;
*** 111,121 ****
          if (option_project != PROJ_KERNEL)
                  return;
  
          if (expr->type != EXPR_COMPARE || expr->op != '<')
                  return;
!         if (!is_zero(expr->right))
                  return;
          if (get_implied_max(expr->left, &max) && max.value == 0)
                  return;
  
          success = compare_expression(expr->left, SPECIAL_EQUAL, expr->right);
--- 111,121 ----
          if (option_project != PROJ_KERNEL)
                  return;
  
          if (expr->type != EXPR_COMPARE || expr->op != '<')
                  return;
!         if (!expr_is_zero(expr->right))
                  return;
          if (get_implied_max(expr->left, &max) && max.value == 0)
                  return;
  
          success = compare_expression(expr->left, SPECIAL_EQUAL, expr->right);