From: Jeff Law <law@redhat.com>
Date: Fri, 18 Oct 2013 15:50:04 +0000 (-0600)
Subject: tree-ssa-threadupdate.c: Do not include "tm.h" or "tm_p.h".
X-Git-Tag: releases/gcc-4.9.0~3360
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01e127b1dd90a951a602832070047e2723f072f5;p=thirdparty%2Fgcc.git

tree-ssa-threadupdate.c: Do not include "tm.h" or "tm_p.h".

       * tree-ssa-threadupdate.c: Do not include "tm.h" or "tm_p.h".

        * tree-ssa-threadupdate.c: Include "dbgcnt.h".
        (register_jump_thread): Add "registered_jump_thread" debug counter support.
        * dbgcnt.def (registered_jump_thread): New debug counter.

From-SVN: r203825
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05535185d152..e18ad6f70c80 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-18  Jeff Law  <law@redhat.com>
+
+	* tree-ssa-threadupdate.c: Do not include "tm.h" or "tm_p.h".
+
+	* tree-ssa-threadupdate.c: Include "dbgcnt.h".
+	(register_jump_thread): Add "registered_jump_thread" debug counter support.
+	* dbgcnt.def (registered_jump_thread): New debug counter.
+
 2013-10-18  Andrew MacLeod  <amacleod@redhat.com>
 
 	* config/rs6000/rs6000.c: Include cgraph.h.
diff --git a/gcc/dbgcnt.def b/gcc/dbgcnt.def
index 45b8eed85afb..6f86253a6ed7 100644
--- a/gcc/dbgcnt.def
+++ b/gcc/dbgcnt.def
@@ -188,3 +188,4 @@ DEBUG_COUNTER (store_motion)
 DEBUG_COUNTER (split_for_sched2)
 DEBUG_COUNTER (tail_call)
 DEBUG_COUNTER (ira_move)
+DEBUG_COUNTER (registered_jump_thread)
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 3e34567d8c12..e791269ebaca 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -20,10 +20,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "tree.h"
 #include "flags.h"
-#include "tm_p.h"
 #include "basic-block.h"
 #include "function.h"
 #include "tree-ssa.h"
@@ -31,6 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "dumpfile.h"
 #include "cfgloop.h"
 #include "hash-table.h"
+#include "dbgcnt.h"
 
 /* Given a block B, update the CFG and SSA graph to reflect redirecting
    one or more in-edges to B to instead reach the destination of an
@@ -1534,6 +1533,14 @@ dump_jump_thread_path (FILE *dump_file, vec<jump_thread_edge *> path)
 void
 register_jump_thread (vec<jump_thread_edge *> *path)
 {
+  if (!dbg_cnt (registered_jump_thread))
+    {
+      for (unsigned int i = 0; i < path->length (); i++)
+	delete (*path)[i];
+      path->release ();
+      return;
+    }
+
   /* First make sure there are no NULL outgoing edges on the jump threading
      path.  That can happen for jumping to a constant address.  */
   for (unsigned int i = 0; i < path->length (); i++)