jit: gcc_jit_context_new_binary_op check res type

gcc/jit/ChangeLog:
2019-07-04  Andrea Corallo <andrea.corallo@arm.com>

	* libgccjit.c (gcc_jit_context_new_binary_op): Check result_type to be a
	numeric type.

gcc/testsuite/ChangeLog:
2019-07-04  Andrea Corallo <andrea.corallo@arm.com>

	* jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c:
	New testcase.

From-SVN: r273089

diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 8323e2f488e5dfd52d8245a7ff67258c0a2c041c..41cb60f1266498b99c946912e9e6648482f6a5c9 100644 (file)
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-04  Andrea Corallo <andrea.corallo@arm.com>
+
+       * libgccjit.c (gcc_jit_context_new_binary_op): Check result_type to be a
+       numeric type.
+
 2019-07-04  Andrea Corallo <andrea.corallo@arm.com>
 
        * docs/topics/compatibility.rst (LIBGCCJIT_ABI_12): New ABI tag.

diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
index abf701919a293cb8ea3e4b04cac8a619c9770f1b..23e83e2e42c032d0742126d44151375499e1cf79 100644 (file)
--- a/gcc/jit/libgccjit.c
+++ b/gcc/jit/libgccjit.c
@@ -1385,6 +1385,12 @@ gcc_jit_context_new_binary_op (gcc_jit_context *ctxt,
     a->get_type ()->get_debug_string (),
     b->get_debug_string (),
     b->get_type ()->get_debug_string ());
+  RETURN_NULL_IF_FAIL_PRINTF4 (
+    result_type->is_numeric (), ctxt, loc,
+    "gcc_jit_binary_op %i with operands a: %s b: %s "
+    "has non numeric result_type: %s",
+    op, a->get_debug_string (), b->get_debug_string (),
+    result_type->get_debug_string ());
 
   return (gcc_jit_rvalue *)ctxt->new_binary_op (loc, op, result_type, a, b);
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 77949d954fbfc1810f2da2db738d2d9db5d3505b..73847a9388b73879f60e9ce3ea1ffed313c38598 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-04  Andrea Corallo <andrea.corallo@arm.com>
+
+       * jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c:
+       New testcase.
+
 2019-07-04  Wilco Dijkstra  <wdijkstr@arm.com>
 
        * gcc.dg/tree-ssa/cunroll-15.c: Remove XFAIL on arm.

diff --git a/gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c b/gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c
new file mode 100644 (file)
index 0000000..abadc9f
--- /dev/null
+++ b/gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c
@@ -0,0 +1,41 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "libgccjit.h"
+
+#include "harness.h"
+
+/* Try to create a binary operator with invalid result type.  */
+
+void
+create_code (gcc_jit_context *ctxt, void *user_data)
+{
+  gcc_jit_type *int_type =
+    gcc_jit_context_get_type (ctxt, GCC_JIT_TYPE_INT);
+  gcc_jit_type *void_ptr_type =
+    gcc_jit_context_get_type (ctxt, GCC_JIT_TYPE_VOID_PTR);
+
+  gcc_jit_context_new_binary_op (
+    ctxt,
+    NULL,
+    GCC_JIT_BINARY_OP_MINUS,
+    void_ptr_type,
+    gcc_jit_context_new_rvalue_from_int (ctxt,
+                                        int_type,
+                                        1),
+    gcc_jit_context_new_rvalue_from_int (ctxt,
+                                        int_type,
+                                        2));
+}
+
+void
+verify_code (gcc_jit_context *ctxt, gcc_jit_result *result)
+{
+  CHECK_VALUE (result, NULL);
+
+  /* Verify that the correct error message was emitted.         */
+  CHECK_STRING_VALUE (gcc_jit_context_get_first_error (ctxt),
+                     "gcc_jit_context_new_binary_op: gcc_jit_binary_op 1 with"
+                     " operands a: (int)1 b: (int)2 has non numeric "
+                     "result_type: void *");
+}