This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH][gcc] libgccjit: check result_type in gcc_jit_context_new_unary_op
- From: Andrea Corallo <Andrea dot Corallo at arm dot com>
- To: "jit at gcc dot gnu dot org" <jit at gcc dot gnu dot org>, "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>
- Cc: nd <nd at arm dot com>
- Date: Thu, 18 Jul 2019 14:20:33 +0000
- Subject: [PATCH][gcc] libgccjit: check result_type in gcc_jit_context_new_unary_op
- Arc-authentication-results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=arm.com;dmarc=pass action=none header.from=arm.com;dkim=pass header.d=arm.com;arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DPXl9wYdsSjgT4uxT83y5ctbZLaGO5ipV85qnegsQwk=; b=V4aru3SaD97kZ9iEE++HYDGgX5BHwTy4uK5qjVSQBBx3DhQPKp0ekQ7ob3+9s2dOa6pwE31FnLDqdSMs+TJUkzaPnOiNpAOvdbqSxE8HMhxIpK77Iz8JxiHSOOg2iOBagFwtG9yylvV3MeSe1xn79sylOoLfld+rmEUm1mEHamNC6iHaCqLBSii1M5MpqzDbBm2I6KJSqhWrixs/Wy5FbdU1hnCH0AEWbZPCML49zR+WlBaJsESyEhwiVlkfgrYqhmP4s36CaUAENeQ2QWMcXF/NYv3K7xvJpwHdpP0aeGEyFAppR9H401OlV4BVgqsIRafcMytD9jmGLa40LopHSA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WmonyXuW3RSpK5eHAqejEl28gFgT1GlaI35rp0HBTJZ+bXh6gi+qBpcwrlq6Sw8pHUzvX6345UdNWcT4JY2DiQWML3uXc1Us1F8ddkDS3NIp94SjK7nON92oi1005pqouQagZGK9OS9Vca3crFbF+G+5AV6G1nHjeAkzCm4plDCE8ZBghvur7jo9MRSp2jI9c7YYtFqWBa+hGNgesXSBuztQlxqQpmh0EJMWlpdt7Q/Vowi/t4kewHWiWETHI8IedIWMs542klTIwAJujc+x7QlsOhgsPt6WPdayEEmmdB8VwSakESZCdVXhUssz8oTubbzMyedxG0TYpAtNcxo/3A==
- Original-authentication-results: spf=none (sender IP is ) smtp.mailfrom=Andrea dot Corallo at arm dot com;
Hi all,
I've just realized that what we has been done recently for
gcc_jit_context_new_binary_op should be done also for the unary
version.
This patch checks at record time for the result type of
gcc_jit_context_new_unary_op to be numeric type plus add a testcase
for the new check.
make check-jit runs clean
Is it okay for trunk?
Bests
Andrea
gcc/jit/ChangeLog
2019-07-18 Andrea Corallo <andrea.corallo@arm.com>
* libgccjit.c (gcc_jit_context_new_unary_op): Check result_type to be a
numeric type.
* libgccjit.c (gcc_jit_context_new_binary_op): Fix nit in error message.
gcc/testsuite/ChangeLog
2019-07-04 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:
Fix nit in error message.
diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
index 23e83e2..bea840f 100644
--- a/gcc/jit/libgccjit.c
+++ b/gcc/jit/libgccjit.c
@@ -1336,6 +1336,12 @@ 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 %i with operand %s "
+ "has non-numeric result_type: %s",
+ 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);
@@ -1388,7 +1394,7 @@ gcc_jit_context_new_binary_op (gcc_jit_context *ctxt,
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",
+ "has non-numeric result_type: %s",
op, a->get_debug_string (), b->get_debug_string (),
result_type->get_debug_string ());
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 abadc9f..d2a0963 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
@@ -36,6 +36,6 @@ 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 "
+ " 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 0000000..f547974
--- /dev/null
+++ b/gcc/testsuite/jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c
@@ -0,0 +1,37 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#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 2 with "
+ "operand (int)1 has non-numeric result_type: void *");
+}