diff options
| -rw-r--r-- | gcc/jit/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/jit/libgccjit.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c | 41 |
4 files changed, 57 insertions, 0 deletions
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index 8323e2f..41cb60f 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,5 +1,10 @@ 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. * docs/topics/types.rst: Add gcc_jit_context_new_bitfield. * jit-common.h (namespace recording): Add class bitfield. diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c index abf7019..23e83e2 100644 --- 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 77949d9..73847a9 100644 --- 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 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 *"); +} |