11972 resync smatch

@@ -34,14 +34,14 @@
 {
         if (sm->state != &ok)
                 set_state(my_id, sm->name, sm->sym, &ok);
 }
 
-static void pre_merge_hook(struct sm_state *sm)
+static void pre_merge_hook(struct sm_state *cur, struct sm_state *other)
 {
         if (is_impossible_path())
-                set_state(my_id, sm->name, sm->sym, &ok);
+                set_state(my_id, cur->name, cur->sym, &ok);
 }
 
 static int is_freed(struct expression *expr)
 {
         struct sm_state *sm;