Hi,
I just encountered the need to retrieve the name of an `rvalue` (if
there is one) while working on the Rust GCC backend.
This patch adds a getter to retrieve the information.
Cordially.
From d2ddeec950f23533e5e18bc0c10c4b49eef3cda3 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.go...@gmail.com>
Date: Sat, 20 Apr 2024 01:02:20 +0200
Subject: [PATCH] [PATCH] Add rvalue::get_name method
gcc/jit/ChangeLog:
* jit-recording.h: Add rvalue::get_name method
* libgccjit.cc (gcc_jit_rvalue_get_name): Likewise
* libgccjit.h (gcc_jit_rvalue_get_name): Likewise
* libgccjit.map: Likewise
gcc/testsuite/ChangeLog:
* jit.dg/test-tls.c: Add test for gcc_jit_rvalue_get_name
---
gcc/jit/jit-recording.h | 8 ++++++++
gcc/jit/libgccjit.cc | 16 ++++++++++++++++
gcc/jit/libgccjit.h | 4 ++++
gcc/jit/libgccjit.map | 5 +++++
gcc/testsuite/jit.dg/test-tls.c | 3 +++
5 files changed, 36 insertions(+)
diff --git a/gcc/jit/jit-recording.h b/gcc/jit/jit-recording.h
index d8d16f4fe29..3ae87c146ac 100644
--- a/gcc/jit/jit-recording.h
+++ b/gcc/jit/jit-recording.h
@@ -1213,6 +1213,8 @@ public:
virtual bool is_constant () const { return false; }
virtual bool get_wide_int (wide_int *) const { return false; }
+ virtual string * get_name () { return NULL; }
+
private:
virtual enum precedence get_precedence () const = 0;
@@ -1305,6 +1307,8 @@ public:
const char *access_as_rvalue (reproducer &r) final override;
const char *access_as_lvalue (reproducer &r) final override;
+ string * get_name () final override { return m_name; }
+
private:
string * make_debug_string () final override { return m_name; }
void write_reproducer (reproducer &r) final override;
@@ -1558,6 +1562,8 @@ public:
void set_rvalue_init (rvalue *val) { m_rvalue_init = val; }
+ string * get_name () final override { return m_name; }
+
private:
string * make_debug_string () final override { return m_name; }
template <typename T>
@@ -2148,6 +2154,8 @@ public:
void write_to_dump (dump &d) final override;
+ string * get_name () final override { return m_name; }
+
private:
string * make_debug_string () final override { return m_name; }
void write_reproducer (reproducer &r) final override;
diff --git a/gcc/jit/libgccjit.cc b/gcc/jit/libgccjit.cc
index 445c0d0e0e3..2b8706dc7fd 100644
--- a/gcc/jit/libgccjit.cc
+++ b/gcc/jit/libgccjit.cc
@@ -4377,3 +4377,19 @@ gcc_jit_context_add_top_level_asm (gcc_jit_context *ctxt,
RETURN_IF_FAIL (asm_stmts, ctxt, NULL, "NULL asm_stmts");
ctxt->add_top_level_asm (loc, asm_stmts);
}
+
+/* Public entrypoint. See description in libgccjit.h.
+
+ After error-checking, this calls the trivial
+ gcc::jit::recording::rvalue::get_name method, in jit-recording.h. */
+
+extern const char *
+gcc_jit_rvalue_get_name (gcc_jit_rvalue *rvalue)
+{
+ RETURN_NULL_IF_FAIL (rvalue, NULL, NULL, "NULL rvalue");
+ auto name = rvalue->get_name ();
+
+ if (!name)
+ return NULL;
+ return name->c_str ();
+}
diff --git a/gcc/jit/libgccjit.h b/gcc/jit/libgccjit.h
index 74e847b2dec..d4094610a16 100644
--- a/gcc/jit/libgccjit.h
+++ b/gcc/jit/libgccjit.h
@@ -2066,6 +2066,10 @@ gcc_jit_lvalue_add_string_attribute (gcc_jit_lvalue *variable,
enum gcc_jit_variable_attribute attribute,
const char* value);
+/* Returns the name of the `rvalue`, if any. Returns NULL otherwise. */
+extern const char *
+gcc_jit_rvalue_get_name (gcc_jit_rvalue *rvalue);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/gcc/jit/libgccjit.map b/gcc/jit/libgccjit.map
index 99aa5970be1..bbed8024263 100644
--- a/gcc/jit/libgccjit.map
+++ b/gcc/jit/libgccjit.map
@@ -289,3 +289,8 @@ LIBGCCJIT_ABI_27 {
global:
gcc_jit_context_new_sizeof;
} LIBGCCJIT_ABI_26;
+
+LIBGCCJIT_ABI_28 {
+ global:
+ gcc_jit_rvalue_get_name;
+} LIBGCCJIT_ABI_27;
diff --git a/gcc/testsuite/jit.dg/test-tls.c b/gcc/testsuite/jit.dg/test-tls.c
index 3b20182ac10..b651eb09b44 100644
--- a/gcc/testsuite/jit.dg/test-tls.c
+++ b/gcc/testsuite/jit.dg/test-tls.c
@@ -28,6 +28,9 @@ create_code (gcc_jit_context *ctxt, void *user_data)
ctxt, NULL, GCC_JIT_GLOBAL_EXPORTED, int_type, "foo");
gcc_jit_lvalue_set_tls_model (foo, GCC_JIT_TLS_MODEL_GLOBAL_DYNAMIC);
+ CHECK_STRING_VALUE (
+ gcc_jit_rvalue_get_name (gcc_jit_lvalue_as_rvalue (foo)), "foo");
+
/* Build the test_fn. */
gcc_jit_function *test_fn =
gcc_jit_context_new_function (ctxt, NULL,
--
2.24.1.2762.gfe2e4819b8
