From: Tom de Vries <tom@codesourcery.com>
Date: Thu, 23 Nov 2017 15:03:48 +0000 (+0000)
Subject: [libgccjit] Wrap RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE in JIT_{BEGIN,END}_STMT.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=120e92fc5e94fc7d18f6d5ff27a33291cc549b9a;p=gcc.git

[libgccjit] Wrap RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE in JIT_{BEGIN,END}_STMT.

2017-11-23  Tom de Vries  <tom@codesourcery.com>

	* libgccjit.c (RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE): Wrap in
	JIT_{BEGIN,END}_STMT.

From-SVN: r255101
---

diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 87b5473922a..35f21084116 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-23  Tom de Vries  <tom@codesourcery.com>
+
+	* libgccjit.c (RETURN_NULL_IF_FAIL_NONNULL_NUMERIC_TYPE): Wrap in
+	JIT_{BEGIN,END}_STMT.
+
 2017-10-31  David Malcolm  <dmalcolm@redhat.com>
 
 	* docs/internals/index.rst (Running the test suite): Document
diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
index c00acbfd814..8bad4f6481a 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.