omp-low.c (lower_omp_target): Remove unreachable code & merge ifs.

	* omp-low.c (lower_omp_target): Remove unreachable code & merge
	ifs.

From-SVN: r229535

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b723870b95d797a6a6fad38c8ae9936ce3c8673..8229fa39c88fc909fb5849ba13d7bc2c337218ef 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-29  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * omp-low.c (lower_omp_target): Remove unreachable code & merge
+       ifs.
+
 2015-10-29  Marc Glisse  <marc.glisse@inria.fr>
 
        * match.pd (X-(X/Y)*Y): Properly handle conversions and commutativity.

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 1c4bbca77e3739c0b60843022208a02f85989d9e..d0264e9ce67b67cc36b9010f196a90ac80f8b278 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -15929,14 +15929,12 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx)
              }
            break;
          }
+
       gimple_seq_add_seq (&new_body, tgt_body);
+
       if (offloaded)
        new_body = maybe_catch_exception (new_body);
-    }
-  else if (data_region)
-    new_body = tgt_body;
-  if (offloaded || data_region)
-    {
+
       gimple_seq_add_stmt (&new_body, gimple_build_omp_return (false));
       gimple_omp_set_body (stmt, new_body);
     }