Cleanup

Author: antoyo

gcc/cgraph.h

@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "ipa-ref.h"
 #include "plugin-api.h"
 #include "ipa-param-manipulation.h"
-#include "print-tree.h"
 
 extern void debuginfo_early_init (void);
 extern void debuginfo_init (void);

gcc/cgraphunit.cc

@@ -240,14 +240,9 @@ symtab_node::needed_p (void)
   /* Double check that no one output the function into assembly file
      early.  */
   if (!native_rtl_p ())
-  {
-      if (!(!DECL_ASSEMBLER_NAME_SET_P (decl)
-	 || !TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl))))
-          debug_tree (decl);
       gcc_checking_assert
 	(!DECL_ASSEMBLER_NAME_SET_P (decl)
 	 || !TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)));
-  }
 
   if (!definition)
     return false;
@@ -1395,7 +1390,7 @@ analyze_functions (bool first_time)
 		      || cnode->alias
 		      || gimple_has_body_p (decl)
 		      || cnode->native_rtl_p ());
-          gcc_assert (cnode->analyzed == cnode->definition);
+	  gcc_assert (cnode->analyzed == cnode->definition);
 	}
       node->aux = NULL;
     }

gcc/dwarf2asm.cc

@@ -938,7 +938,7 @@ compare_strings (const void *a, const void *b)
   /* The strings are always those from IDENTIFIER_NODEs, and,
      therefore, we should never have two copies of the same
      string.  */
-  //gcc_assert (ret);
+  gcc_assert (ret);
 
   return ret;
 }

gcc/ipa-visibility.cc

@@ -709,15 +709,6 @@ function_and_variable_visibility (bool whole_program)
 	    }
 	  node->dissolve_same_comdat_group_list ();
 	}
-      if (!((!DECL_WEAK (node->decl)
-		  && !DECL_COMDAT (node->decl))
-      	          || TREE_PUBLIC (node->decl)
-		  || node->weakref
-		  || DECL_EXTERNAL (node->decl)))
-      {
-          fprintf (stderr, "%d, %d, %d, %d, %d\n", DECL_WEAK (node->decl), DECL_COMDAT (node->decl), TREE_PUBLIC (node->decl), node->weakref, DECL_EXTERNAL (node->decl));
-          debug_tree (node->decl);
-      }
       gcc_assert ((!DECL_WEAK (node->decl)
 		  && !DECL_COMDAT (node->decl))
       	          || TREE_PUBLIC (node->decl)

gcc/jit/jit-playback.cc

@@ -2170,7 +2170,6 @@ void
 playback::function::
 set_personality_function (function *personality_function)
 {
-  //fprintf (stderr, "************* Setting personality function %s for %s\n", IDENTIFIER_POINTER (DECL_NAME (personality_function->as_fndecl ())), IDENTIFIER_POINTER (DECL_NAME (m_inner_fndecl)));
   DECL_FUNCTION_PERSONALITY (m_inner_fndecl) = personality_function->as_fndecl ();
 }
 
@@ -2336,8 +2335,8 @@ add_try_catch (location *loc,
   {
     tree success_body = alloc_stmt_list ();
 
-    // TODO: find a better way to keep the EH_ELSE_EXPR than creating a nop via inline asm.
-  tree t_string = build_string ("nop");
+    // TODO: find a better way to keep the EH_ELSE_EXPR than creating an empty inline asm.
+  tree t_string = build_string ("");
   tree asm_stmt
     = build5 (ASM_EXPR, void_type_node, t_string, NULL_TREE, NULL_TREE, NULL_TREE, NULL_TREE);
 
@@ -2347,6 +2346,8 @@ add_try_catch (location *loc,
   ASM_INPUT_P (asm_stmt) = 0;
     append_to_statement_list (asm_stmt, &success_body);
 
+    // TODO: Don't automatically add the `EH_ELSE_EXPR`. Make an API to create such a node and let the user of libgccjit
+    // add it manually.
     catch_body = build2 (EH_ELSE_EXPR, void_type_node, success_body, catch_body);
     add_stmt (build2 (TRY_FINALLY_EXPR, void_type_node,
             try_body, catch_body));

gcc/jit/jit-recording.cc

@@ -4632,8 +4632,6 @@ recording::block::add_try_catch (location *loc,
                    bool is_finally)
 {
   statement *result = new try_catch (this, loc, try_block, catch_block, is_finally);
-  //try_block->m_has_been_terminated = true;
-  //catch_block->m_has_been_terminated = true;
   try_block->m_is_reachable = true;
   catch_block->m_is_reachable = true;
   m_ctxt->record (result);
@@ -7127,8 +7125,13 @@ recording::try_catch::replay_into (replayer *r)
 recording::string *
 recording::try_catch::make_debug_string ()
 {
-    // TODO: handle m_is_finally.
-  return string::from_printf (m_ctxt,
+  if (m_is_finally)
+    return string::from_printf (m_ctxt,
+                  "try { %s } finally { %s };",
+                  m_try_block->get_debug_string (),
+                  m_catch_block->get_debug_string ());
+  else
+    return string::from_printf (m_ctxt,
                   "try { %s } catch { %s };",
                   m_try_block->get_debug_string (),
                   m_catch_block->get_debug_string ());
@@ -7140,11 +7143,14 @@ recording::try_catch::make_debug_string ()
 void
 recording::try_catch::write_reproducer (reproducer &r)
 {
-    // TODO: handle m_is_finally.
-  r.write ("  gcc_jit_block_add_try_catch (%s, /*gcc_jit_block *block */\n"
+  const char *func_name = "gcc_jit_block_add_try_catch";
+  if (m_is_finally)
+    func_name = "gcc_jit_block_add_try_finally";
+  r.write ("  %s (%s, /*gcc_jit_block *block */\n"
        "                                 %s, /* gcc_jit_location *loc */\n"
        "                                 %s, /* gcc_jit_block *try_block */\n"
        "                                 %s); /* gcc_jit_block *catch_block */\n",
+       func_name,
        r.get_identifier (get_block ()),
        r.get_identifier (get_loc ()),
        r.get_identifier (m_try_block),

gcc/jit/libgccjit.cc

@@ -2957,6 +2957,7 @@ gcc_jit_block_add_try_catch (gcc_jit_block *block,
 
   gcc::jit::recording::statement *stmt = block->add_try_catch (loc, try_block, catch_block);
 
+  // TODO: remove this or use it.
   /* "stmt" should be good enough to be usable in error-messages,
      but might still not be compilable; perform some more
      error-checking here.  We do this here so that the error messages
@@ -2985,6 +2986,7 @@ gcc_jit_block_add_try_finally (gcc_jit_block *block,
 
   gcc::jit::recording::statement *stmt = block->add_try_catch (loc, try_block, finally_block, true);
 
+  // TODO: remove this or use it.
   /* "stmt" should be good enough to be usable in error-messages,
      but might still not be compilable; perform some more
      error-checking here.  We do this here so that the error messages

gcc/tree-eh.cc

@@ -4882,13 +4882,10 @@ pass_cleanup_eh::execute (function *fun)
   /* If the function no longer needs an EH personality routine
      clear it.  This exposes cross-language inlining opportunities
      and avoids references to a never defined personality routine.  */
-  if (DECL_FUNCTION_PERSONALITY (current_function_decl)
+  // TODO: uncomment and find out why this doesn't work.
+  /*if (DECL_FUNCTION_PERSONALITY (current_function_decl)
       && function_needs_eh_personality (fun) != eh_personality_lang)
-  {
-      //fprintf(stderr, "Unset personality function for %s\n", IDENTIFIER_POINTER (DECL_NAME (current_function_decl)));
-      // TODO: uncomment:
-    //DECL_FUNCTION_PERSONALITY (current_function_decl) = NULL_TREE;
-  }
+    DECL_FUNCTION_PERSONALITY (current_function_decl) = NULL_TREE;*/
 
   return ret;
 }