Hi!

On Thu, 09 Jul 2015 20:25:22 -0400, Nathan Sidwell <nat...@acm.org> wrote:
> This is the patch I committed.  [...]

> 2015-07-09  Nathan Sidwell  <nat...@codesourcery.com>

>       * omp-low.c (omp_region): [...]
>       (enclosing_target_region, required_predication_mask,
>       generate_vector_broadcast, generate_oacc_broadcast,
>       make_predication_test, predicate_bb, find_predicatable_bbs,
>       predicate_omp_regions): Delete.
>       [...]

This removed all usage of bb_region_map.  Now cleaned up in
gomp-4_0-branch r231102:

commit ff7e1eb4e855aa16d14ae047172269bc7192a069
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Tue Dec 1 09:04:33 2015 +0000

    gcc/omp-low.c: Remove bb_region_map
    
        gcc/
        * omp-low.c (bb_region_map): Remove.  Adjust all users.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@231102 
138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog.gomp |  4 ++++
 gcc/omp-low.c      | 42 +++++++++++++++++-------------------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index 0e4f371..4842164 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,3 +1,7 @@
+2015-12-01  Thomas Schwinge  <tho...@codesourcery.com>
+
+       * omp-low.c (bb_region_map): Remove.  Adjust all users.
+
 2015-11-30  Cesar Philippidis  <ce...@codesourcery.com>
 
        * tree-nested.c (convert_nonlocal_omp_clauses): Handle optional
diff --git gcc/omp-low.c gcc/omp-low.c
index 1b52f6b..a1e7a14 100644
--- gcc/omp-low.c
+++ gcc/omp-low.c
@@ -13356,9 +13356,6 @@ expand_omp (struct omp_region *region)
     }
 }
 
-/* Map each basic block to an omp_region.  */
-static hash_map<basic_block, omp_region *> *bb_region_map;
-
 static void
 find_omp_for_region_data (struct omp_region *region, gomp_for *stmt)
 {
@@ -13394,8 +13391,6 @@ build_omp_regions_1 (basic_block bb, struct omp_region 
*parent,
   gimple *stmt;
   basic_block son;
 
-  bb_region_map->put (bb, parent);
-
   gsi = gsi_last_bb (bb);
   if (!gsi_end_p (gsi) && is_gimple_omp (gsi_stmt (gsi)))
     {
@@ -13536,31 +13531,28 @@ build_omp_regions (void)
 static unsigned int
 execute_expand_omp (void)
 {
-  bb_region_map = new hash_map<basic_block, omp_region *>;
-
   build_omp_regions ();
 
-  if (root_omp_region)
+  if (!root_omp_region)
+    return 0;
+
+  if (dump_file)
     {
-      if (dump_file)
-       {
-         fprintf (dump_file, "\nOMP region tree\n\n");
-         dump_omp_region (dump_file, root_omp_region, 0);
-         fprintf (dump_file, "\n");
-       }
-
-      remove_exit_barriers (root_omp_region);
-
-      expand_omp (root_omp_region);
-
-      if (flag_checking && !loops_state_satisfies_p (LOOPS_NEED_FIXUP))
-       verify_loop_structure ();
-      cleanup_tree_cfg ();
-
-      free_omp_regions ();
+      fprintf (dump_file, "\nOMP region tree\n\n");
+      dump_omp_region (dump_file, root_omp_region, 0);
+      fprintf (dump_file, "\n");
     }
 
-  delete bb_region_map;
+  remove_exit_barriers (root_omp_region);
+
+  expand_omp (root_omp_region);
+
+  if (flag_checking && !loops_state_satisfies_p (LOOPS_NEED_FIXUP))
+    verify_loop_structure ();
+  cleanup_tree_cfg ();
+
+  free_omp_regions ();
+
   return 0;
 }
 


Grüße
 Thomas

Attachment: signature.asc
Description: PGP signature

Reply via email to