11506 smatch resync

          --- old/usr/src/tools/smatch/src/smatch_param_used.c
          +++ new/usr/src/tools/smatch/src/smatch_param_used.c

   1    1  /*
   2    2   * Copyright (C) 2015 Oracle.
   3    3   *
   4    4   * This program is free software; you can redistribute it and/or
   5    5   * modify it under the terms of the GNU General Public License
   6    6   * as published by the Free Software Foundation; either version 2
   7    7   * of the License, or (at your option) any later version.
   8    8   *
   9    9   * This program is distributed in the hope that it will be useful,
  10   10   * but WITHOUT ANY WARRANTY; without even the implied warranty of
  11   11   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  12   12   * GNU General Public License for more details.
  13   13   *
  14   14   * You should have received a copy of the GNU General Public License
  15   15   * along with this program; if not, see http://www.gnu.org/copyleft/gpl.txt
  16   16   */
  17   17  
  18   18  #include "smatch.h"
  19   19  #include "smatch_slist.h"
  20   20  
  21   21  static int my_id;
  22   22  
  23   23  static struct stree *used_stree;

  24   24  static struct stree_stack *saved_stack;
  25   25  
  26   26  STATE(used);
  27   27  
  28   28  static void get_state_hook(int owner, const char *name, struct symbol *sym)
  29   29  {
  30   30          int arg;
  31   31  
  32   32          if (!option_info)
  33   33                  return;
  34      -        if (__in_fake_assign)
       34 +        if (__in_fake_assign || __in_fake_parameter_assign || __in_function_def)
  35   35                  return;
  36   36  
  37   37          arg = get_param_num_from_sym(sym);
  38   38          if (arg >= 0)
  39   39                  set_state_stree(&used_stree, my_id, name, sym, &used);
  40   40  }
  41   41  
  42   42  static void set_param_used(struct expression *call, struct expression *arg, char *key, char *unused)
  43   43  {
  44   44          struct symbol *sym;
  45   45          char *name;
  46   46          int arg_nr;
  47   47  
  48   48          name = get_variable_from_key(arg, key, &sym);
  49   49          if (!name || !sym)
  50   50                  goto free;
  51   51  
  52   52          arg_nr = get_param_num_from_sym(sym);
  53   53          if (arg_nr >= 0)
  54      -                set_state(my_id, name, sym, &used);
       54 +                set_state_stree(&used_stree, my_id, name, sym, &used);
  55   55  free:
  56   56          free_string(name);
  57   57  }
  58   58  
  59   59  static void process_states(void)
  60   60  {
  61   61          struct sm_state *tmp;
  62   62          int arg;
  63   63          const char *name;
  64   64  
  65   65          FOR_EACH_SM(used_stree, tmp) {
  66   66                  arg = get_param_num_from_sym(tmp->sym);
  67   67                  if (arg < 0)
  68   68                          continue;
  69   69                  name = get_param_name(tmp);
  70   70                  if (!name)
  71   71                          continue;
       72 +                if (is_recursive_member(name))
       73 +                        continue;
  72   74  
       75 +                if (is_ignored_kernel_data(name))
       76 +                        continue;
       77 +
  73   78                  sql_insert_return_implies(PARAM_USED, arg, name, "");
  74   79          } END_FOR_EACH_SM(tmp);
  75   80  
  76   81          free_stree(&used_stree);
  77   82  }
  78   83  
  79   84  static void match_function_def(struct symbol *sym)
  80   85  {
  81   86          free_stree(&used_stree);
  82   87  }

  83   88  
  84   89  static void match_save_states(struct expression *expr)
  85   90  {
  86   91          push_stree(&saved_stack, used_stree);
  87   92          used_stree = NULL;
  88   93  }
  89   94  
  90   95  static void match_restore_states(struct expression *expr)
  91   96  {
  92   97          free_stree(&used_stree);
  93   98          used_stree = pop_stree(&saved_stack);
  94   99  }
  95  100  
  96  101  void register_param_used(int id)
  97  102  {
  98  103          my_id = id;
  99  104  
 100  105          add_hook(&match_function_def, FUNC_DEF_HOOK);
 101  106  
 102  107          add_get_state_hook(&get_state_hook);
 103  108  
 104  109          add_hook(&match_save_states, INLINE_FN_START);
 105  110          add_hook(&match_restore_states, INLINE_FN_END);
 106  111  
 107  112          select_return_implies_hook(PARAM_USED, &set_param_used);
 108  113          all_return_states_hook(&process_states);
 109  114  }

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX