From patchwork Fri May 23 11:02:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 351800 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 863C5140076 for ; Fri, 23 May 2014 21:03:25 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; q=dns; s=default; b=I0xZEmk1PHoPTLUiSkoNblfEWqbhVJGqSqzKmn/kWsc3nUAjta FFkmbegg/TKv65LUM40FNpmIOha8cLXOLuEyyy5kcPmEx3CzbtGulf4cOwXyqohd E2sNW5j76nbpg+i/59wvtSpOanB1hlsgmGrXBfzLpPh7E2cxSKy1LsawI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type; s= default; bh=x/dGzKv9uZnH5ob1nS7AKlc1MqM=; b=soSQSB/NsJaR3kP7yAWn qEfbDh5RcU7dFLXALnXBmyN70z5Ro48Ph2Fzfp/RMJzBSmCuxhnC7ckZYIO76xkx Caix/1HuPf8xgVn4Ik9+td3cX+87eCQoTPEM7C96TguGEI6wPdWfCzhr3+j/p8IE oUevJE+DJ28HekSOvKFDSnI= Received: (qmail 15529 invoked by alias); 23 May 2014 11:03:18 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 15512 invoked by uid 89); 23 May 2014 11:03:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 May 2014 11:03:16 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1WnnFp-000588-1j from Thomas_Schwinge@mentor.com ; Fri, 23 May 2014 04:03:13 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 23 May 2014 04:03:12 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.2.247.3; Fri, 23 May 2014 12:03:11 +0100 From: Thomas Schwinge To: CC: Subject: [COMMITTED] Fix some bool vs. tree confusion. Date: Fri, 23 May 2014 13:02:51 +0200 Message-ID: <1400842973-2334-1-git-send-email-thomas@codesourcery.com> MIME-Version: 1.0 From: tschwinge gcc/c/ * c-parser.c (c_parser_omp_target): Return bool values. gcc/cp/ * parser.c (cp_parser_omp_target): Return bool values. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210851 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/c/ChangeLog | 4 ++++ gcc/c/c-parser.c | 14 +++++++++----- gcc/cp/ChangeLog | 4 ++++ gcc/cp/parser.c | 14 +++++++++----- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git gcc/c/ChangeLog gcc/c/ChangeLog index 9acc6f7..c21f68f 100644 --- gcc/c/ChangeLog +++ gcc/c/ChangeLog @@ -1,3 +1,7 @@ +2014-05-23 Thomas Schwinge + + * c-parser.c (c_parser_omp_target): Return bool values. + 2014-05-22 Thomas Schwinge * c-parser.c (c_parser_omp_clause_thread_limit): Rename diff --git gcc/c/c-parser.c gcc/c/c-parser.c index a7e33b0..88edf36 100644 --- gcc/c/c-parser.c +++ gcc/c/c-parser.c @@ -12720,15 +12720,19 @@ c_parser_omp_target (c_parser *parser, enum pragma_context context) c_parser_consume_token (parser); strcpy (p_name, "#pragma omp target"); if (!flag_openmp) /* flag_openmp_simd */ - return c_parser_omp_teams (loc, parser, p_name, - OMP_TARGET_CLAUSE_MASK, cclauses); + { + tree stmt = c_parser_omp_teams (loc, parser, p_name, + OMP_TARGET_CLAUSE_MASK, + cclauses); + return stmt != NULL_TREE; + } keep_next_level (); tree block = c_begin_compound_stmt (true); tree ret = c_parser_omp_teams (loc, parser, p_name, OMP_TARGET_CLAUSE_MASK, cclauses); block = c_end_compound_stmt (loc, block, true); - if (ret == NULL) - return ret; + if (ret == NULL_TREE) + return false; tree stmt = make_node (OMP_TARGET); TREE_TYPE (stmt) = void_type_node; OMP_TARGET_CLAUSES (stmt) = cclauses[C_OMP_CLAUSE_SPLIT_TARGET]; @@ -12739,7 +12743,7 @@ c_parser_omp_target (c_parser *parser, enum pragma_context context) else if (!flag_openmp) /* flag_openmp_simd */ { c_parser_skip_to_pragma_eol (parser); - return NULL_TREE; + return false; } else if (strcmp (p, "data") == 0) { diff --git gcc/cp/ChangeLog gcc/cp/ChangeLog index a594e93..b9a22f9 100644 --- gcc/cp/ChangeLog +++ gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2014-05-23 Thomas Schwinge + + * parser.c (cp_parser_omp_target): Return bool values. + 2014-05-22 Paolo Carlini PR c++/61088 diff --git gcc/cp/parser.c gcc/cp/parser.c index 7f06106..c4440af 100644 --- gcc/cp/parser.c +++ gcc/cp/parser.c @@ -30337,8 +30337,12 @@ cp_parser_omp_target (cp_parser *parser, cp_token *pragma_tok, cp_lexer_consume_token (parser->lexer); strcpy (p_name, "#pragma omp target"); if (!flag_openmp) /* flag_openmp_simd */ - return cp_parser_omp_teams (parser, pragma_tok, p_name, - OMP_TARGET_CLAUSE_MASK, cclauses); + { + tree stmt = cp_parser_omp_teams (parser, pragma_tok, p_name, + OMP_TARGET_CLAUSE_MASK, + cclauses); + return stmt != NULL_TREE; + } keep_next_level (true); tree sb = begin_omp_structured_block (); unsigned save = cp_parser_begin_omp_structured_block (parser); @@ -30346,8 +30350,8 @@ cp_parser_omp_target (cp_parser *parser, cp_token *pragma_tok, OMP_TARGET_CLAUSE_MASK, cclauses); cp_parser_end_omp_structured_block (parser, save); tree body = finish_omp_structured_block (sb); - if (ret == NULL) - return ret; + if (ret == NULL_TREE) + return false; tree stmt = make_node (OMP_TARGET); TREE_TYPE (stmt) = void_type_node; OMP_TARGET_CLAUSES (stmt) = cclauses[C_OMP_CLAUSE_SPLIT_TARGET]; @@ -30358,7 +30362,7 @@ cp_parser_omp_target (cp_parser *parser, cp_token *pragma_tok, else if (!flag_openmp) /* flag_openmp_simd */ { cp_parser_require_pragma_eol (parser, pragma_tok); - return NULL_TREE; + return false; } else if (strcmp (p, "data") == 0) {