]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libgccjit: Implement sizeof operator
authorAntoni Boucher <bouanto@zoho.com>
Wed, 20 Sep 2023 02:10:47 +0000 (22:10 -0400)
committerAntoni Boucher <bouanto@zoho.com>
Fri, 2 Feb 2024 20:30:31 +0000 (15:30 -0500)
gcc/jit/ChangeLog:

* docs/topics/compatibility.rst (LIBGCCJIT_ABI_27): New ABI tag.
* docs/topics/expressions.rst: Document gcc_jit_context_new_sizeof.
* jit-playback.cc (new_sizeof): New method.
* jit-playback.h (new_sizeof): New method.
* jit-recording.cc (recording::context::new_sizeof,
recording::memento_of_sizeof::replay_into,
recording::memento_of_sizeof::make_debug_string,
recording::memento_of_sizeof::write_reproducer): New methods.
* jit-recording.h (class memento_of_sizeof): New class.
* libgccjit.cc (gcc_jit_context_new_sizeof): New function.
* libgccjit.h (gcc_jit_context_new_sizeof): New function.
* libgccjit.map: New function.

gcc/testsuite/ChangeLog:

* jit.dg/all-non-failing-tests.h: New test.
* jit.dg/test-sizeof.c: New test.

gcc/jit/docs/topics/compatibility.rst
gcc/jit/docs/topics/expressions.rst
gcc/jit/jit-playback.cc
gcc/jit/jit-playback.h
gcc/jit/jit-recording.cc
gcc/jit/jit-recording.h
gcc/jit/libgccjit.cc
gcc/jit/libgccjit.h
gcc/jit/libgccjit.map
gcc/testsuite/jit.dg/all-non-failing-tests.h
gcc/testsuite/jit.dg/test-sizeof.c [new file with mode: 0644]

index cbf5b414d8cb986fc6d49b72a2c9f45dfc7016b3..9cfb054f6539cb9c94ed23f7d1a1c4c17a77d2be 100644 (file)
@@ -390,3 +390,10 @@ on functions and variables:
   * :func:`gcc_jit_function_add_string_attribute`
   * :func:`gcc_jit_function_add_integer_array_attribute`
   * :func:`gcc_jit_lvalue_add_string_attribute`
+
+.. _LIBGCCJIT_ABI_27:
+
+``LIBGCCJIT_ABI_27``
+--------------------
+``LIBGCCJIT_ABI_27`` covers the addition of
+:func:`gcc_jit_context_new_sizeof`
index 35ee05ca597a28c92a216e4c181c4ee0dfe0757a..c3f4f61eb061f04d390f1d010c8900e8822b2782 100644 (file)
@@ -126,6 +126,20 @@ Simple expressions
    underlying string, so it is valid to pass in a pointer to an on-stack
    buffer.
 
+.. function:: gcc_jit_rvalue *\
+              gcc_jit_context_new_sizeof (gcc_jit_context *ctxt, \
+                                          gcc_jit_type *type)
+
+   Generate an rvalue that is equal to the size of ``type``.
+
+   The parameter ``type`` must be non-NULL.
+
+   This is equivalent to this C code:
+
+   .. code-block:: c
+
+     sizeof (type)
+
 Constructor expressions
 ***********************
 
index 84df6c100e6d22234e708f454d87d541c31fb7c1..e277b0132596fd65a30cc39df7a26f634702ab93 100644 (file)
@@ -1110,6 +1110,16 @@ new_rvalue_from_const <void *> (type *type,
 
 /* Construct a playback::rvalue instance (wrapping a tree).  */
 
+playback::rvalue *
+playback::context::
+new_sizeof (type *type)
+{
+  tree inner = TYPE_SIZE_UNIT (type->as_tree ());
+  return new rvalue (this, inner);
+}
+
+/* Construct a playback::rvalue instance (wrapping a tree).  */
+
 playback::rvalue *
 playback::context::
 new_string_literal (const char *value)
index 05bafcd21c4092e22cbfe6e497725794061b5043..aa6a086613c51a431e136a696c630e6cab8dc442 100644 (file)
@@ -162,6 +162,9 @@ public:
   new_rvalue_from_const (type *type,
                         HOST_TYPE value);
 
+  rvalue *
+  new_sizeof (type *type);
+
   rvalue *
   new_string_literal (const char *value);
 
index 6ffadbea127a5d374680988cbe9403575540732b..68a2e860c1fbff7bd548afe11b99a883108bb51d 100644 (file)
@@ -1077,6 +1077,21 @@ recording::context::new_global_init_rvalue (lvalue *variable,
   gbl->set_rvalue_init (init); /* Needed by the global for write dump.  */
 }
 
+/* Create a recording::memento_of_sizeof instance and add it
+   to this context's list of mementos.
+
+   Implements the post-error-checking part of
+   gcc_jit_context_new_sizeof.  */
+
+recording::rvalue *
+recording::context::new_sizeof (recording::type *type)
+{
+  recording::rvalue *result =
+    new memento_of_sizeof (this, NULL, type);
+  record (result);
+  return result;
+}
+
 /* Create a recording::memento_of_new_string_literal instance and add it
    to this context's list of mementos.
 
@@ -5457,6 +5472,43 @@ memento_of_new_rvalue_from_const <void *>::write_reproducer (reproducer &r)
 
 } // namespace recording
 
+/* The implementation of class gcc::jit::recording::memento_of_sizeof.  */
+
+/* Implementation of pure virtual hook recording::memento::replay_into
+   for recording::memento_of_sizeof.  */
+
+void
+recording::memento_of_sizeof::replay_into (replayer *r)
+{
+  set_playback_obj (r->new_sizeof (m_type->playback_type ()));
+}
+
+/* Implementation of recording::memento::make_debug_string for
+   sizeof expressions.  */
+
+recording::string *
+recording::memento_of_sizeof::make_debug_string ()
+{
+  return string::from_printf (m_ctxt,
+                             "sizeof (%s)",
+                             m_type->get_debug_string ());
+}
+
+/* Implementation of recording::memento::write_reproducer for sizeof
+   expressions.  */
+
+void
+recording::memento_of_sizeof::write_reproducer (reproducer &r)
+{
+  const char *id = r.make_identifier (this, "rvalue");
+  r.write ("  gcc_jit_rvalue *%s =\n"
+    "    gcc_jit_context_new_sizeof (%s, /* gcc_jit_context *ctxt */\n"
+    "                                %s); /* gcc_jit_type *type */\n",
+    id,
+    r.get_identifier (get_context ()),
+    r.get_identifier (m_type));
+}
+
 /* The implementation of class gcc::jit::recording::memento_of_new_string_literal.  */
 
 /* Implementation of pure virtual hook recording::memento::replay_into
index ab5ba6c7fbe6b1614f44685b23c28c5edcf3c4ba..d8d16f4fe29ca8eb5e306f21cbed5f47a345c858 100644 (file)
@@ -169,6 +169,9 @@ public:
   new_rvalue_from_const (type *type,
                         HOST_TYPE value);
 
+  rvalue *
+  new_sizeof (type *type);
+
   rvalue *
   new_string_literal (const char *value);
 
@@ -1605,6 +1608,31 @@ private:
   HOST_TYPE m_value;
 };
 
+class memento_of_sizeof : public rvalue
+{
+public:
+  memento_of_sizeof (context *ctxt,
+                        location *loc,
+                        type *type)
+  : rvalue (ctxt, loc, ctxt->get_type (GCC_JIT_TYPE_INT)),
+    m_type (type) {}
+
+  void replay_into (replayer *r) final override;
+
+  void visit_children (rvalue_visitor *) final override {}
+
+private:
+  string * make_debug_string () final override;
+  void write_reproducer (reproducer &r) final override;
+  enum precedence get_precedence () const final override
+  {
+    return PRECEDENCE_PRIMARY;
+  }
+
+private:
+  type *m_type;
+};
+
 class memento_of_new_string_literal : public rvalue
 {
 public:
index bf0150f60479cd8636780acd7d949bb470b4cf78..f40a978140515538bf9ed07fb20499acbbc7b975 100644 (file)
@@ -2073,6 +2073,24 @@ gcc_jit_context_null (gcc_jit_context *ctxt,
   return gcc_jit_context_new_rvalue_from_ptr (ctxt, pointer_type, NULL);
 }
 
+/* Public entrypoint.  See description in libgccjit.h.
+
+   After error-checking, the real work is done by the
+   gcc::jit::recording::context::new_sizeof method in
+   jit-recording.cc.  */
+
+gcc_jit_rvalue *
+gcc_jit_context_new_sizeof (gcc_jit_context *ctxt,
+                           gcc_jit_type *type)
+{
+  RETURN_NULL_IF_FAIL (ctxt, NULL, NULL, "NULL context");
+  RETURN_NULL_IF_FAIL (type, ctxt, NULL, "NULL type");
+  JIT_LOG_FUNC (ctxt->get_logger ());
+
+  return ((gcc_jit_rvalue *)ctxt
+         ->new_sizeof (type));
+}
+
 /* Public entrypoint.  See description in libgccjit.h.
 
    After error-checking, the real work is done by the
index 235cab053e0e65b950217c6d28695c51cb41c363..74e847b2dec8c8b8ecef7d938559093160b9e82d 100644 (file)
@@ -1093,6 +1093,18 @@ extern gcc_jit_rvalue *
 gcc_jit_context_null (gcc_jit_context *ctxt,
                      gcc_jit_type *pointer_type);
 
+#define LIBGCCJIT_HAVE_gcc_jit_context_new_sizeof
+
+/* Generates an rvalue that is equal to the size of type.
+
+   This API entrypoint was added in LIBGCCJIT_ABI_27; you can test for its
+   presence using
+     #ifdef LIBGCCJIT_HAVE_gcc_jit_context_new_sizeof  */
+
+extern gcc_jit_rvalue *
+gcc_jit_context_new_sizeof (gcc_jit_context *ctxt,
+                           gcc_jit_type *type);
+
 /* String literals. */
 extern gcc_jit_rvalue *
 gcc_jit_context_new_string_literal (gcc_jit_context *ctxt,
index dfb8a9d51fbf26775902f71b6de1f1a175b9d4c4..99aa5970be1d387e89148f4383d29707e07ded59 100644 (file)
@@ -284,3 +284,8 @@ LIBGCCJIT_ABI_26 {
     gcc_jit_lvalue_add_string_attribute;
     gcc_jit_function_add_integer_array_attribute;
 } LIBGCCJIT_ABI_25;
+
+LIBGCCJIT_ABI_27 {
+  global:
+    gcc_jit_context_new_sizeof;
+} LIBGCCJIT_ABI_26;
index d09a31ec764e78499b8c71e4601ed7364cf3198a..14a0a321550571351cd6958b3bcbc5c30b4e465d 100644 (file)
 /* test-setting-alignment.c: This can't be in the testcases array as it
    is target-specific.  */
 
+/* test-sizeof.c */
+#define create_code create_code_sizeof
+#define verify_code verify_code_sizeof
+#include "test-sizeof.c"
+#undef create_code
+#undef verify_code
+
 /* test-string-literal.c */
 #define create_code create_code_string_literal
 #define verify_code verify_code_string_literal
@@ -553,6 +560,9 @@ const struct testcase testcases[] = {
   {"reflection",
    create_code_reflection ,
    verify_code_reflection },
+  {"sizeof",
+   create_code_sizeof,
+   verify_code_sizeof},
   {"string_literal",
    create_code_string_literal,
    verify_code_string_literal},
diff --git a/gcc/testsuite/jit.dg/test-sizeof.c b/gcc/testsuite/jit.dg/test-sizeof.c
new file mode 100644 (file)
index 0000000..6aef902
--- /dev/null
@@ -0,0 +1,50 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.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:
+int
+my_sizeof ()
+{
+   return sizeof(int32_t);
+}
+   */
+  gcc_jit_type *int32 =
+    gcc_jit_context_get_int_type (ctxt, 4, 1);
+  gcc_jit_type *int_type =
+    gcc_jit_context_get_type (ctxt, GCC_JIT_TYPE_INT);
+
+  gcc_jit_function *func =
+    gcc_jit_context_new_function (ctxt,
+                                 NULL,
+                                 GCC_JIT_FUNCTION_EXPORTED,
+                                 int_type,
+                                 "my_sizeof",
+                                 0, NULL, 0);
+
+  gcc_jit_block *initial =
+    gcc_jit_function_new_block (func, "initial");
+
+  gcc_jit_block_end_with_return(initial, NULL,
+    gcc_jit_context_new_sizeof(ctxt, int32));
+}
+
+void
+verify_code (gcc_jit_context *ctxt, gcc_jit_result *result)
+{
+  typedef int (*my_sizeof_type) ();
+  CHECK_NON_NULL (result);
+  my_sizeof_type my_sizeof =
+    (my_sizeof_type)gcc_jit_result_get_code (result, "my_sizeof");
+  CHECK_NON_NULL (my_sizeof);
+  int val = my_sizeof ();
+  CHECK_VALUE (val, 4);
+}