12257 resync smatch to 0.6.1-rc1-il-4

@@ -76,15 +76,17 @@
 
 void __print_stree(struct stree *stree)
 {
         struct sm_state *sm;
 
-        printf("dumping stree at %d [%ld states]\n", get_lineno(), stree_count(stree));
+        option_debug++;
+        sm_msg("dumping stree [%ld states]", stree_count(stree));
         FOR_EACH_SM(stree, sm) {
-                printf("%s\n", show_sm(sm));
+                sm_printf("%s\n", show_sm(sm));
         } END_FOR_EACH_SM(sm);
-        printf("---\n");
+        sm_printf("---\n");
+        option_debug--;
 }
 
 /* NULL states go at the end to simplify merge_slist */
 int cmp_tracker(const struct sm_state *a, const struct sm_state *b)
 {