This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[nvptx] fix some c++ tests
- From: Nathan Sidwell <nathan at acm dot org>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Cc: Thomas Schwinge <thomas at codesourcery dot com>
- Date: Thu, 8 Oct 2015 13:33:55 -0400
- Subject: [nvptx] fix some c++ tests
- Authentication-results: sourceware.org; auth=none
I've committed this to trunk. The C++ ABI now returns a pointer to the
passed-in artificial arg that points to the return area. consequently
return-in-mem and type_mode(return_type) == VOIDmode are not tautologies.
nathan
2015-10-08 Nathan Sidwell <nathan@acm.org>
* config/nvptx/nvptx.h (struct machine_function): Add comment.
* config/nvptx/nvptx.c (nvptx_declare_function_name): Functions
may return pointer as well as in memory.
(nvptx_output_return): Likewise.
Index: gcc/config/nvptx/nvptx.c
===================================================================
--- gcc/config/nvptx/nvptx.c (revision 228617)
+++ gcc/config/nvptx/nvptx.c (working copy)
@@ -531,13 +531,8 @@ nvptx_declare_function_name (FILE *file,
nvptx_write_function_decl (s, name, decl);
fprintf (file, "%s", s.str().c_str());
- bool return_in_mem = false;
- if (TYPE_MODE (result_type) != VOIDmode)
- {
- machine_mode mode = TYPE_MODE (result_type);
- if (!RETURN_IN_REG_P (mode))
- return_in_mem = true;
- }
+ bool return_in_mem = (TYPE_MODE (result_type) != VOIDmode
+ && !RETURN_IN_REG_P (TYPE_MODE (result_type)));
fprintf (file, "\n{\n");
@@ -547,9 +542,13 @@ nvptx_declare_function_name (FILE *file,
false, return_in_mem);
if (return_in_mem)
fprintf (file, "\t.reg.u%d %%ar1;\n", GET_MODE_BITSIZE (Pmode));
- else if (TYPE_MODE (result_type) != VOIDmode)
+
+ /* C++11 ABI causes us to return a reference to the passed in
+ pointer for return_in_mem. */
+ if (cfun->machine->ret_reg_mode != VOIDmode)
{
- machine_mode mode = arg_promotion (TYPE_MODE (result_type));
+ machine_mode mode = arg_promotion
+ ((machine_mode)cfun->machine->ret_reg_mode);
fprintf (file, "\t.reg%s %%retval;\n",
nvptx_ptx_type_from_mode (mode, false));
}
@@ -635,17 +634,13 @@ nvptx_declare_function_name (FILE *file,
const char *
nvptx_output_return (void)
{
- tree fntype = TREE_TYPE (current_function_decl);
- tree result_type = TREE_TYPE (fntype);
- if (TYPE_MODE (result_type) != VOIDmode)
+ machine_mode mode = (machine_mode)cfun->machine->ret_reg_mode;
+
+ if (mode != VOIDmode)
{
- machine_mode mode = TYPE_MODE (result_type);
- if (RETURN_IN_REG_P (mode))
- {
- mode = arg_promotion (mode);
- fprintf (asm_out_file, "\tst.param%s\t[%%out_retval], %%retval;\n",
- nvptx_ptx_type_from_mode (mode, false));
- }
+ mode = arg_promotion (mode);
+ fprintf (asm_out_file, "\tst.param%s\t[%%out_retval], %%retval;\n",
+ nvptx_ptx_type_from_mode (mode, false));
}
return "ret;";
Index: gcc/config/nvptx/nvptx.h
===================================================================
--- gcc/config/nvptx/nvptx.h (revision 228617)
+++ gcc/config/nvptx/nvptx.h (working copy)
@@ -228,7 +228,7 @@ struct GTY(()) machine_function
bool has_call_with_varargs;
bool has_call_with_sc;
HOST_WIDE_INT outgoing_stdarg_size;
- int ret_reg_mode;
+ int ret_reg_mode; /* machine_mode not defined yet. */
int punning_buffer_size;
};
#endif