diff options
| author | Andrea Corallo <andrea.corallo@arm.com> | 2019-07-22 15:33:58 +0000 |
|---|---|---|
| committer | Andrea Corallo <akrl@gcc.gnu.org> | 2019-07-22 15:33:58 +0000 |
| commit | 9afb91b2d1aeabf49a2b76556ec6fe18dd5790f9 (patch) | |
| tree | d309013fcabc632b20a4d484f748d686a4766c0f /gcc/jit | |
| parent | 1c4547f16138b69f955fdc24c9523e7f8d28aa15 (diff) | |
| download | gcc-9afb91b2d1aeabf49a2b76556ec6fe18dd5790f9.zip gcc-9afb91b2d1aeabf49a2b76556ec6fe18dd5790f9.tar.gz gcc-9afb91b2d1aeabf49a2b76556ec6fe18dd5790f9.tar.bz2 | |
[jit] check result_type in gcc_jit_context_new_unary_op
2019-07-22 Andrea Corallo <andrea.corallo@arm.com>
* 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 <andrea.corallo@arm.com>
* 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
Diffstat (limited to 'gcc/jit')
| -rw-r--r-- | gcc/jit/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/jit/jit-recording.c | 4 | ||||
| -rw-r--r-- | gcc/jit/jit-recording.h | 3 | ||||
| -rw-r--r-- | gcc/jit/libgccjit.c | 14 |
4 files changed, 26 insertions, 5 deletions
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index 41cb60f..af3f6b7 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,3 +1,13 @@ +2019-07-22 Andrea Corallo <andrea.corallo@arm.com> + + * 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 <andrea.corallo@arm.com> * 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 495ac7f..2f75395 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 13ec7ea..4bd346e 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 23e83e2..eec2f00 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); |