From: Chung-Lin Tang <cltang@codesourcery.com>
Date: Wed, 9 Dec 2015 07:18:51 +0000 (+0000)
Subject: c-omp.c (c_finish_oacc_wait): Remove add_stmt() call.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=04d2fbcc5fa0a0464e847d1bf3faeb83d67711c2;p=gcc.git

c-omp.c (c_finish_oacc_wait): Remove add_stmt() call.

2015-12-09  Chung-Lin Tang  <cltang@codesourcery.com>

	* c-family/c-omp.c (c_finish_oacc_wait): Remove add_stmt() call.
	* c/c-parser.c (c_parser_oacc_wait): Add add_stmt() call.
	* cp/parser.c (cp_parser_oacc_wait): Add finish_expr_stmt() call.

From-SVN: r231441
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5153e2089c7..1a4c3e651f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-09  Chung-Lin Tang  <cltang@codesourcery.com>
+
+	* c-family/c-omp.c (c_finish_oacc_wait): Remove add_stmt() call.
+	* c/c-parser.c (c_parser_oacc_wait): Add add_stmt() call.
+	* cp/parser.c (cp_parser_oacc_wait): Add finish_expr_stmt() call.
+
 2015-12-08  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR ipa/61886
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index e3d41a61b55..cf75a728481 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -63,7 +63,6 @@ c_finish_oacc_wait (location_t loc, tree parms, tree clauses)
     }
 
   stmt = build_call_expr_loc_vec (loc, stmt, args);
-  add_stmt (stmt);
 
   vec_free (args);
 
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 4611e5b2358..124c30b9939 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -13960,6 +13960,7 @@ c_parser_oacc_wait (location_t loc, c_parser *parser, char *p_name)
   strcpy (p_name, " wait");
   clauses = c_parser_oacc_all_clauses (parser, OACC_WAIT_CLAUSE_MASK, p_name);
   stmt = c_finish_oacc_wait (loc, list, clauses);
+  add_stmt (stmt);
 
   return stmt;
 }
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 3e90f11dc03..a420cf1eff5 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -35385,6 +35385,7 @@ cp_parser_oacc_wait (cp_parser *parser, cp_token *pragma_tok)
 					"#pragma acc wait", pragma_tok);
 
   stmt = c_finish_oacc_wait (loc, list, clauses);
+  stmt = finish_expr_stmt (stmt);
 
   return stmt;
 }