From 9afb91b2d1aeabf49a2b76556ec6fe18dd5790f9 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Mon, 22 Jul 2019 15:33:58 +0000 Subject: [PATCH] [jit] check result_type in gcc_jit_context_new_unary_op 2019-07-22 Andrea Corallo * jit-recording.c (unary_op_reproducer_strings): Make it extern. (binary_op_reproducer_strings): Likewise. * jit-recording.h (unary_op_reproducer_strings): Likewise. (binary_op_reproducer_strings): Likewise. * libgccjit.c (gcc_jit_context_new_unary_op): Check result_type to be a numeric type. * libgccjit.c (gcc_jit_context_new_binary_op): Improve error message. 2019-07-22 Andrea Corallo * jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c: New testcase. * jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c: Adjust error message. From-SVN: r273700 --- gcc/jit/ChangeLog | 10 +++++ gcc/jit/jit-recording.c | 4 +- gcc/jit/jit-recording.h | 3 ++ gcc/jit/libgccjit.c | 14 +++++-- gcc/testsuite/ChangeLog | 7 ++++ ...c_jit_context_new_binary_op-bad-res-type.c | 6 +-- ...cc_jit_context_new_unary_op-bad-res-type.c | 38 +++++++++++++++++++ 7 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index 41cb60f1266..af3f6b70917 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,3 +1,13 @@ +2019-07-22 Andrea Corallo + + * jit-recording.c (unary_op_reproducer_strings): Make it extern. + (binary_op_reproducer_strings): Likewise. + * jit-recording.h (unary_op_reproducer_strings): Likewise. + (binary_op_reproducer_strings): Likewise. + * libgccjit.c (gcc_jit_context_new_unary_op): Check result_type to be a + numeric type. + * libgccjit.c (gcc_jit_context_new_binary_op): Improve error message. + 2019-07-04 Andrea Corallo * libgccjit.c (gcc_jit_context_new_binary_op): Check result_type to be a diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c index 495ac7f1ae9..2f75395989c 100644 --- a/gcc/jit/jit-recording.c +++ b/gcc/jit/jit-recording.c @@ -4888,7 +4888,7 @@ recording::unary_op::make_debug_string () m_a->get_debug_string ()); } -static const char * const unary_op_reproducer_strings[] = { +const char * const unary_op_reproducer_strings[] = { "GCC_JIT_UNARY_OP_MINUS", "GCC_JIT_UNARY_OP_BITWISE_NEGATE", "GCC_JIT_UNARY_OP_LOGICAL_NEGATE", @@ -4968,7 +4968,7 @@ recording::binary_op::make_debug_string () m_b->get_debug_string_parens (prec)); } -static const char * const binary_op_reproducer_strings[] = { +const char * const binary_op_reproducer_strings[] = { "GCC_JIT_BINARY_OP_PLUS", "GCC_JIT_BINARY_OP_MINUS", "GCC_JIT_BINARY_OP_MULT", diff --git a/gcc/jit/jit-recording.h b/gcc/jit/jit-recording.h index 13ec7eabefa..4bd346e0131 100644 --- a/gcc/jit/jit-recording.h +++ b/gcc/jit/jit-recording.h @@ -30,6 +30,9 @@ namespace gcc { namespace jit { +extern const char * const unary_op_reproducer_strings[]; +extern const char * const binary_op_reproducer_strings[]; + class result; class dump; class reproducer; diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c index 23e83e2e42c..eec2f00c59e 100644 --- a/gcc/jit/libgccjit.c +++ b/gcc/jit/libgccjit.c @@ -1336,6 +1336,13 @@ gcc_jit_context_new_unary_op (gcc_jit_context *ctxt, "unrecognized value for enum gcc_jit_unary_op: %i", op); RETURN_NULL_IF_FAIL (result_type, ctxt, loc, "NULL result_type"); + RETURN_NULL_IF_FAIL_PRINTF3 ( + result_type->is_numeric (), ctxt, loc, + "gcc_jit_unary_op %s with operand %s " + "has non-numeric result_type: %s", + gcc::jit::unary_op_reproducer_strings[op], + rvalue->get_debug_string (), + result_type->get_debug_string ()); RETURN_NULL_IF_FAIL (rvalue, ctxt, loc, "NULL rvalue"); return (gcc_jit_rvalue *)ctxt->new_unary_op (loc, op, result_type, rvalue); @@ -1387,9 +1394,10 @@ gcc_jit_context_new_binary_op (gcc_jit_context *ctxt, 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 (), + "gcc_jit_binary_op %s with operands a: %s b: %s " + "has non-numeric result_type: %s", + gcc::jit::binary_op_reproducer_strings[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 d005ca6f750..d45620e4817 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2019-07-22 Andrea Corallo + + * jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c: + New testcase. + * jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c: + Adjust error message. + 2019-07-22 Paul A. Clarke * gcc.target/powerpc/sse4_1-check.h: New. 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 index abadc9f941a..fbbb2e704d3 100644 --- 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 @@ -35,7 +35,7 @@ verify_code (gcc_jit_context *ctxt, gcc_jit_result *result) /* 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 *"); + "gcc_jit_context_new_binary_op: gcc_jit_binary_op " + "GCC_JIT_BINARY_OP_MINUS with operands a: " + "(int)1 b: (int)2 has non-numeric result_type: void *"); } diff --git a/gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c b/gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c new file mode 100644 index 00000000000..fae722abaa0 --- /dev/null +++ b/gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c @@ -0,0 +1,38 @@ +#include +#include + +#include "libgccjit.h" + +#include "harness.h" + +/* Try to create an unary 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_unary_op ( + ctxt, + NULL, + GCC_JIT_UNARY_OP_LOGICAL_NEGATE, + void_ptr_type, + gcc_jit_context_new_rvalue_from_int (ctxt, + int_type, + 1)); +} + +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_unary_op: gcc_jit_unary_op " + "GCC_JIT_UNARY_OP_LOGICAL_NEGATE with operand " + "(int)1 has non-numeric result_type: void *"); +} -- 2.30.2