Fix DEBUG blocks based on feedback

Author: reuk

src/analyses/cfg_dominators.h

@@ -224,6 +224,13 @@ void dominators_pretty_print_node(const T &node, std::ostream &out)
   out << node;
 }
 
+inline void dominators_pretty_print_node(
+  const goto_programt::targett& target,
+  std::ostream& out)
+{
+  out << target->code.pretty();
+}
+
 /*******************************************************************\
 
 Function: cfg_dominators_templatet::output
@@ -241,7 +248,7 @@ void cfg_dominators_templatet<P, T, post_dom>::output(std::ostream &out) const
 {
   for(const auto &node : cfg.entry_map)
   {
-    T n=node.first;
+    auto n=node.first;
 
     dominators_pretty_print_node(n, out);
     if(post_dom)

src/analyses/natural_loops.h

@@ -90,6 +90,10 @@ void natural_loops_templatet<P, T>::compute(P &program)
 {
   cfg_dominators(program);
 
+#ifdef DEBUG
+  cfg_dominators.output(std::cout);
+#endif
+
   // find back-edges m->n
   for(T m_it=program.instructions.begin();
       m_it!=program.instructions.end();

src/cpp/parse.cpp

@@ -637,6 +637,12 @@ bool Parser::rDefinition(cpp_itemt &item)
 {
   int t=lex.LookAhead(0);
 
+  #ifdef DEBUG
+  indenter _i;
+  std::cout << std::string(__indent, ' ') << "Parser::rDefinition 1 " << t
+            << '\n';
+  #endif
+
   if(t==';')
     return rNullDeclaration(item.make_declaration());
   else if(t==TOK_TYPEDEF)
@@ -1229,6 +1235,12 @@ bool Parser::rTemplateDecl(cpp_declarationt &decl)
   switch(kind)
   {
   case tdk_decl:
+    #ifdef DEBUG
+    std::cout << std::string(__indent, ' ') << "BODY: "
+              << body.pretty() << '\n';
+    std::cout << std::string(__indent, ' ') << "TEMPLATE_TYPE: "
+              << template_type.pretty() << '\n';
+    #endif
     body.add(ID_template_type).swap(template_type);
     body.set(ID_is_template, true);
     decl.swap(body);
@@ -1895,6 +1907,11 @@ bool Parser::rIntegralDeclaration(
 
     if(lex.LookAhead(0)==';')
     {
+      #ifdef DEBUG
+      std::cout << std::string(__indent, ' ')
+                << "Parser::rIntegralDeclaration 8 "
+                << declaration.pretty() << '\n';
+      #endif
       lex.get_token(tk);
       return true;
     }
@@ -5098,6 +5115,10 @@ bool Parser::rClassBody(exprt &body)
       // body=Ptree::List(ob, nil, new Leaf(tk));
       return true;        // error recovery
     }
+    #ifdef DEBUG
+    std::cout << std::string(__indent, ' ') << "Parser::rClassBody "
+              << member.pretty() << '\n';
+    #endif
 
     members.move_to_operands(
       static_cast<exprt &>(static_cast<irept &>(member)));
@@ -7558,7 +7579,7 @@ bool Parser::rPrimaryExpr(exprt &exp)
   #ifdef DEBUG
   indenter _i;
   std::cout << std::string(__indent, ' ') << "Parser::rPrimaryExpr 0 "
-            << lex.LookAhead(0) << " " << lex.current_token().text <<"\n";
+            << lex.LookAhead(0) << ' ' << lex.current_token().text << '\n';
   #endif
 
   switch(lex.LookAhead(0))
@@ -9219,6 +9240,10 @@ bool Parser::rExprStatement(codet &statement)
 
     if(rDeclarationStatement(statement))
     {
+      #ifdef DEBUG
+      std::cout << std::string(__indent, ' ') << "rDe "
+                << statement.pretty() << '\n';
+      #endif
       return true;
     }
     else

src/goto-instrument/accelerate/scratch_program.cpp

@@ -28,6 +28,11 @@ bool scratch_programt::check_sat(bool do_slice)
   remove_skip(*this);
   update();
 
+#ifdef DEBUG
+  std::cout << "Checking following program for satness:\n";
+  output(ns, "scratch", std::cout);
+#endif
+
   symex.constant_propagation=constant_propagation;
   goto_symex_statet::propagationt::valuest constants;
 
@@ -42,13 +47,17 @@ bool scratch_programt::check_sat(bool do_slice)
   {
     // Symex sliced away all our assertions.
 #ifdef DEBUG
-    std::cout << "Trivially unsat" << std::endl;
+    std::cout << "Trivially unsat\n";
 #endif
     return false;
   }
 
   equation.convert(*checker);
 
+#ifdef DEBUG
+  std::cout << "Finished symex, invoking decision procedure.\n";
+#endif
+
   return (checker->dec_solve()==decision_proceduret::D_SATISFIABLE);
 }
 

src/goto-instrument/accelerate/trace_automaton.cpp

@@ -75,6 +75,11 @@ void trace_automatont::add_path(patht &path)
   {
     goto_programt::targett l=step.loc;
 
+#ifdef DEBUG
+    std::cout << ", " << l->location_number << ':'
+              << l->source_location.as_string();
+#endif
+
     if(in_alphabet(l))
     {
 #ifdef DEBUG
@@ -103,6 +108,13 @@ void trace_automatont::add_path(patht &path)
  */
 void trace_automatont::determinise()
 {
+#ifdef DEBUG
+  std::cout << "Determinising automaton with " << nta.num_states
+            << " states and " << nta.accept_states.size()
+            << " accept states and " << nta.count_transitions()
+            << " transitions\n";
+#endif
+
   dstates.clear();
   unmarked_dstates.clear();
   dta.clear();
@@ -111,6 +123,10 @@ void trace_automatont::determinise()
   init_states.insert(nta.init_state);
   epsilon_closure(init_states);
 
+#ifdef DEBUG
+  std::cout << "There are " << init_states.size() << " init states\n";
+#endif
+
   dta.init_state=add_dstate(init_states);
 
   while(!unmarked_dstates.empty())
@@ -371,7 +387,7 @@ void automatont::reverse(goto_programt::targett epsilon)
 
   std::cout << "Reversing automaton, old init=" << init_state
             << ", new init=" << new_init << ", old accept="
-            << *(accept_states.begin()) << "/" << accept_states.size()
+            << *(accept_states.begin()) << '/' << accept_states.size()
             << " new accept=" << init_state << std::endl;
 
   accept_states.clear();
@@ -455,7 +471,7 @@ void automatont::output(std::ostream &str)
   str << "Accept states: ";
 
   for(const auto &state : accept_states)
-    str << state << " ";
+    str << state << ' ';
 
   str << std::endl;
 

src/java_bytecode/java_local_variable_table.cpp

@@ -352,7 +352,7 @@ static void populate_predecessor_map(
             // handling is presently vague (any subroutine is assumed to
             // be able to return to any callsite)
             msg.warning() << "Local variable table: ignoring flow from "
-                          << "out of range for " << it->var.name << " "
+                          << "out of range for " << it->var.name << ' '
                           << pred << " -> " << amapit->first
                           << messaget::eom;
             continue;
@@ -375,7 +375,7 @@ static void populate_predecessor_map(
             // assumed to be able to return to any callsite)
             msg.warning() << "Local variable table: ignoring flow from "
                           << "clashing variable for "
-                          << it->var.name << " " << pred << " -> "
+                          << it->var.name << ' ' << pred << " -> "
                           << amapit->first << messaget::eom;
             continue;
           }
@@ -546,6 +546,13 @@ static void merge_variable_table_entries(
   merge_into.var.start_pc=found_dominator;
   merge_into.var.length=last_pc-found_dominator;
 
+#ifdef DEBUG
+  debug_out << "Merged " << merge_vars.size() << " variables named "
+            << merge_into.var.name << "; new live range "
+            << merge_into.var.start_pc << '-'
+            << merge_into.var.start_pc + merge_into.var.length << '\n';
+#endif
+
   // Nuke the now-subsumed var-table entries:
   for(auto &v : merge_vars)
     if(v!=&merge_into)