[committed][nvptx] Factor out write_fn_proto_1
Tom de Vries
tdevries@suse.de
Sat Oct 10 21:35:19 GMT 2020
Hi,
Factor out write_fn_proto_1 from write_fn_proto.
Tested check-gcc on nvptx.
Tested libgomp on x86_64-linux with nvptx accelerator.
Committed to trunk.
Thanks,
- Tom
[nvptx] Factor out write_fn_proto_1
gcc/ChangeLog:
2020-10-10 Tom de Vries <tdevries@suse.de>
* config/nvptx/nvptx.c (write_fn_proto_1): New function, factored out
of ...
(write_fn_proto): ... here. Return void.
---
gcc/config/nvptx/nvptx.c | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index afac1bda45d..0c1d6d112ec 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -827,26 +827,12 @@ write_var_marker (FILE *file, bool is_defn, bool globalize, const char *name)
fputs ("\n", file);
}
-/* Write a .func or .kernel declaration or definition along with
- a helper comment for use by ld. S is the stream to write to, DECL
- the decl for the function with name NAME. For definitions, emit
- a declaration too. */
+/* Helper function for write_fn_proto. */
-static const char *
-write_fn_proto (std::stringstream &s, bool is_defn,
- const char *name, const_tree decl)
+static void
+write_fn_proto_1 (std::stringstream &s, bool is_defn,
+ const char *name, const_tree decl)
{
- if (is_defn)
- /* Emit a declaration. The PTX assembler gets upset without it. */
- name = write_fn_proto (s, false, name, decl);
- else
- {
- /* Avoid repeating the name replacement. */
- name = nvptx_name_replacement (name);
- if (name[0] == '*')
- name++;
- }
-
write_fn_marker (s, is_defn, TREE_PUBLIC (decl), name);
/* PTX declaration. */
@@ -929,8 +915,26 @@ write_fn_proto (std::stringstream &s, bool is_defn,
s << ")";
s << (is_defn ? "\n" : ";\n");
+}
- return name;
+/* Write a .func or .kernel declaration or definition along with
+ a helper comment for use by ld. S is the stream to write to, DECL
+ the decl for the function with name NAME. For definitions, emit
+ a declaration too. */
+
+static void
+write_fn_proto (std::stringstream &s, bool is_defn,
+ const char *name, const_tree decl)
+{
+ name = nvptx_name_replacement (name);
+ if (name[0] == '*')
+ name++;
+
+ if (is_defn)
+ /* Emit a declaration. The PTX assembler gets upset without it. */
+ write_fn_proto_1 (s, false, name, decl);
+
+ write_fn_proto_1 (s, is_defn, name, decl);
}
/* Construct a function declaration from a call insn. This can be
More information about the Gcc-patches
mailing list