From patchwork Thu Nov 23 20:02:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 840891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-467816-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="fiV35QHZ"; dkim-atps=neutral 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 3yjVbn0qScz9s7g for ; Fri, 24 Nov 2017 07:02:28 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=xpRghurhPs4NBHAs3p3hN6la8IyqhbVjHTqPP+ZXr/INVnR+I2 OggzfbNgfPXlddsDv7OtSeWeGjzLpeOcHG0OFgI0r1ROMG07jhVE/NsOnTOe79cv xD9bSJF4CxpYNMqTqQrk6DUFpgsKctf4e0yAQnQdpLCVgZK864jFFQ5AY= 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:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=sIZQJqvl/p0zS7mZybGq/+2NZcI=; b=fiV35QHZ92qq+z6i/Xyw iRg76AEwh79tYrkGG1hpsNWSjq0oMIClQJ7D/f7d7WgZS51kq2cMjE9yuuTCksB3 Av8u4jPnkk5zgOMn3eTpIt5s6i9avqmWLHR1EEpfv/PQTWbyiKOyinfTnAQBd8y6 EgDj2cf5u6s4d6+M9CTpz/M= Received: (qmail 108723 invoked by alias); 23 Nov 2017 20:02:21 -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 108711 invoked by uid 89); 23 Nov 2017 20:02:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= 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; Thu, 23 Nov 2017 20:02:20 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-03.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1eHxhS-00010r-C9 from Tom_deVries@mentor.com ; Thu, 23 Nov 2017 12:02:18 -0800 Received: from [172.30.72.35] (137.202.0.87) by SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Thu, 23 Nov 2017 20:02:14 +0000 To: GCC Patches CC: David Malcolm From: Tom de Vries Subject: [libgccjit, committed] Wrap RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE in JIT_{BEGIN, END}_STMT. Message-ID: <6751bb96-9784-8e3b-3181-e3f5aa8a0a00@mentor.com> Date: Thu, 23 Nov 2017 21:02:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) Hi, this patch wraps RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE in JIT_{BEGIN,END}_STMT. This allows the macro to be used in if-then-elses without curly braces. Tested by doing x86_64 build with jitfe enabled. Committed as obvious. Thanks, - Tom [libgccjit] Wrap RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE in JIT_{BEGIN,END}_STMT. 2017-11-23 Tom de Vries * libgccjit.c (RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE): Wrap in JIT_{BEGIN,END}_STMT. --- gcc/jit/libgccjit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c index c00acbf..8bad4f6 100644 --- a/gcc/jit/libgccjit.c +++ b/gcc/jit/libgccjit.c @@ -1115,11 +1115,13 @@ gcc_jit_rvalue_get_type (gcc_jit_rvalue *rvalue) result of gcc_jit_context_get_type (GCC_JIT_TYPE_INT). */ #define RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE(CTXT, NUMERIC_TYPE) \ + JIT_BEGIN_STMT \ RETURN_NULL_IF_FAIL (NUMERIC_TYPE, CTXT, NULL, "NULL type"); \ RETURN_NULL_IF_FAIL_PRINTF1 ( \ NUMERIC_TYPE->is_numeric (), ctxt, NULL, \ "not a numeric type: %s", \ - NUMERIC_TYPE->get_debug_string ()); + NUMERIC_TYPE->get_debug_string ()); \ + JIT_END_STMT /* Public entrypoint. See description in libgccjit.h.