procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgccjit: Add type checks in gcc_jit_block_add_assignment_op

Browse source 
gcc/jit/ChangeLog:

	* libgccjit.cc (RETURN_IF_FAIL_PRINTF3): New macro.
	(gcc_jit_block_add_assignment_op): Add numeric checks.

gcc/testsuite/ChangeLog:

	* jit.dg/test-error-bad-assignment-op.c: New test.
This commit is contained in:
Antoni Boucher 2023-10-18 18:33:18 -04:00
parent 04b67ac1e8
commit efdc80a8bf
2 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gcc/jit/libgccjit.cc
View file

@ -267,6 +267,16 @@ struct gcc_jit_extended_asm : public gcc::jit::recording::extended_asm
} \
JIT_END_STMT
#define RETURN_IF_FAIL_PRINTF3(TEST_EXPR, CTXT, LOC, ERR_FMT, A0, A1, A2) \
JIT_BEGIN_STMT \
if (!(TEST_EXPR)) \
{ \
jit_error ((CTXT), (LOC), "%s: " ERR_FMT, \
__func__, (A0), (A1), (A2)); \
return; \
} \
JIT_END_STMT
#define RETURN_IF_FAIL_PRINTF4(TEST_EXPR, CTXT, LOC, ERR_FMT, A0, A1, A2, A3) \
JIT_BEGIN_STMT \
if (!(TEST_EXPR)) \
@ -2984,6 +2994,17 @@ gcc_jit_block_add_assignment_op (gcc_jit_block *block,
lvalue->get_type ()->get_debug_string (),
rvalue->get_debug_string (),
rvalue->get_type ()->get_debug_string ());
// TODO: check if it is a numeric vector?
RETURN_IF_FAIL_PRINTF3 (
lvalue->get_type ()->is_numeric (), ctxt, loc,
"gcc_jit_block_add_assignment_op %s has non-numeric lvalue %s (type: %s)",
gcc::jit::binary_op_reproducer_strings[op],
lvalue->get_debug_string (), lvalue->get_type ()->get_debug_string ());
RETURN_IF_FAIL_PRINTF3 (
rvalue->get_type ()->is_numeric (), ctxt, loc,
"gcc_jit_block_add_assignment_op %s has non-numeric rvalue %s (type: %s)",
gcc::jit::binary_op_reproducer_strings[op],
rvalue->get_debug_string (), rvalue->get_type ()->get_debug_string ());
gcc::jit::recording::statement *stmt = block->add_assignment_op (loc, lvalue, op, rvalue);

57
gcc/testsuite/jit.dg/test-error-bad-assignment-op.c Normal file
View file

@ -0,0 +1,57 @@
#include <stdlib.h>
#include <stdio.h>
#include "libgccjit.h"
#include "harness.h"
void
create_code (gcc_jit_context *ctxt, void *user_data)
{
/* Let's try to inject the equivalent of:
void
test_fn ()
{
const char *variable;
variable += "test";
}
and verify that the API complains about the mismatching types
in the assignments.
*/
gcc_jit_type *void_type =
gcc_jit_context_get_type (ctxt, GCC_JIT_TYPE_VOID);
gcc_jit_type *const_char_ptr_type =
gcc_jit_context_get_type (ctxt, GCC_JIT_TYPE_CONST_CHAR_PTR);
gcc_jit_function *func =
gcc_jit_context_new_function (ctxt, NULL,
GCC_JIT_FUNCTION_EXPORTED,
void_type,
"test_fn",
0, NULL,
0);
gcc_jit_lvalue *variable = gcc_jit_function_new_local (func, NULL, const_char_ptr_type, "variable");
gcc_jit_block *initial =
gcc_jit_function_new_block (func, "initial");
gcc_jit_rvalue *string =
gcc_jit_context_new_string_literal (ctxt, "test");
gcc_jit_block_add_assignment_op (initial, NULL, variable, GCC_JIT_BINARY_OP_PLUS, string);
gcc_jit_block_end_with_void_return (initial, NULL);
}
void
verify_code (gcc_jit_context *ctxt, gcc_jit_result *result)
{
CHECK_VALUE (result, NULL);
/* Verify that the correct error messages were emitted. */
CHECK_STRING_VALUE (gcc_jit_context_get_first_error (ctxt),
"gcc_jit_block_add_assignment_op:"
" gcc_jit_block_add_assignment_op GCC_JIT_BINARY_OP_PLUS"
" has non-numeric lvalue variable (type: const char *)");
}