0f237df286
This changes libcc1 to use the 'deleter' template in a few more places. The template and basic specializations are moved to a new header, then some unmarshall functions are changed to use this code. This change avoids the need to repeat cleanup code in the unmarshallers. libcc1 * rpc.hh (deleter): Move template and some specializations to deleter.hh. (argument_wrapper<const T *>): Use cc1_plugin::unique_ptr. * marshall.cc (cc1_plugin::unmarshall): Use cc1_plugin::unique_ptr. * marshall-cp.hh (deleter): New specializations. (unmarshall): Use cc1_plugin::unique_ptr. * deleter.hh: New file.
245 lines
5.5 KiB
C++
245 lines
5.5 KiB
C++
/* Marshalling and unmarshalling of C++-specific types.
|
|
Copyright (C) 2014-2021 Free Software Foundation, Inc.
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free
|
|
Software Foundation; either version 3, or (at your option) any later
|
|
version.
|
|
|
|
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef CC1_PLUGIN_MARSHALL_CXX_HH
|
|
#define CC1_PLUGIN_MARSHALL_CXX_HH
|
|
|
|
#include "marshall.hh"
|
|
#include "gcc-cp-interface.h"
|
|
#include "deleter.hh"
|
|
|
|
namespace cc1_plugin
|
|
{
|
|
template<>
|
|
struct deleter<gcc_vbase_array>
|
|
{
|
|
void operator() (gcc_vbase_array *p)
|
|
{
|
|
delete[] p->flags;
|
|
delete[] p->elements;
|
|
delete p;
|
|
}
|
|
};
|
|
|
|
template<>
|
|
struct deleter<gcc_cp_template_args>
|
|
{
|
|
void operator() (gcc_cp_template_args *p)
|
|
{
|
|
delete[] p->elements;
|
|
delete[] p->kinds;
|
|
delete p;
|
|
}
|
|
};
|
|
|
|
template<>
|
|
struct deleter<gcc_cp_function_args>
|
|
{
|
|
void operator() (gcc_cp_function_args *p)
|
|
{
|
|
delete[] p->elements;
|
|
delete p;
|
|
}
|
|
};
|
|
|
|
// Send a gcc_vbase_array marker followed by the array.
|
|
status
|
|
marshall (connection *conn, const gcc_vbase_array *a)
|
|
{
|
|
size_t len;
|
|
|
|
if (a)
|
|
len = a->n_elements;
|
|
else
|
|
len = (size_t)-1;
|
|
|
|
if (!marshall_array_start (conn, 'v', len))
|
|
return FAIL;
|
|
|
|
if (!a)
|
|
return OK;
|
|
|
|
if (!marshall_array_elmts (conn, len * sizeof (a->elements[0]),
|
|
a->elements))
|
|
return FAIL;
|
|
|
|
return marshall_array_elmts (conn, len * sizeof (a->flags[0]),
|
|
a->flags);
|
|
}
|
|
|
|
// Read a gcc_vbase_array marker, followed by a gcc_vbase_array. The
|
|
// resulting array must be freed by the caller, using 'delete[]' on
|
|
// elements and virtualp, and 'delete' on the array object itself.
|
|
status
|
|
unmarshall (connection *conn, struct gcc_vbase_array **result)
|
|
{
|
|
size_t len;
|
|
|
|
if (!unmarshall_array_start (conn, 'v', &len))
|
|
return FAIL;
|
|
|
|
if (len == (size_t)-1)
|
|
{
|
|
*result = NULL;
|
|
return OK;
|
|
}
|
|
|
|
cc1_plugin::unique_ptr<gcc_vbase_array> gva (new gcc_vbase_array {});
|
|
|
|
gva->n_elements = len;
|
|
gva->elements = new gcc_type[len];
|
|
|
|
if (!unmarshall_array_elmts (conn,
|
|
len * sizeof (gva->elements[0]),
|
|
gva->elements))
|
|
return FAIL;
|
|
|
|
gva->flags = new enum gcc_cp_symbol_kind[len];
|
|
|
|
if (!unmarshall_array_elmts (conn,
|
|
len * sizeof (gva->flags[0]),
|
|
gva->flags))
|
|
return FAIL;
|
|
|
|
*result = gva.release ();
|
|
return OK;
|
|
}
|
|
|
|
// Send a gcc_cp_template_args marker followed by the array.
|
|
status
|
|
marshall (connection *conn, const gcc_cp_template_args *a)
|
|
{
|
|
size_t len;
|
|
|
|
if (a)
|
|
len = a->n_elements;
|
|
else
|
|
len = (size_t)-1;
|
|
|
|
if (!marshall_array_start (conn, 't', len))
|
|
return FAIL;
|
|
|
|
if (!a)
|
|
return OK;
|
|
|
|
if (!marshall_array_elmts (conn, len * sizeof (a->kinds[0]),
|
|
a->kinds))
|
|
return FAIL;
|
|
|
|
return marshall_array_elmts (conn, len * sizeof (a->elements[0]),
|
|
a->elements);
|
|
}
|
|
|
|
// Read a gcc_vbase_array marker, followed by a gcc_vbase_array. The
|
|
// resulting array must be freed by the caller, using 'delete[]' on
|
|
// elements and virtualp, and 'delete' on the array object itself.
|
|
status
|
|
unmarshall (connection *conn, struct gcc_cp_template_args **result)
|
|
{
|
|
size_t len;
|
|
|
|
if (!unmarshall_array_start (conn, 't', &len))
|
|
return FAIL;
|
|
|
|
if (len == (size_t)-1)
|
|
{
|
|
*result = NULL;
|
|
return OK;
|
|
}
|
|
|
|
cc1_plugin::unique_ptr<gcc_cp_template_args> gva
|
|
(new gcc_cp_template_args {});
|
|
|
|
gva->n_elements = len;
|
|
gva->kinds = new char[len];
|
|
|
|
if (!unmarshall_array_elmts (conn,
|
|
len * sizeof (gva->kinds[0]),
|
|
gva->kinds))
|
|
return FAIL;
|
|
|
|
gva->elements = new gcc_cp_template_arg[len];
|
|
|
|
if (!unmarshall_array_elmts (conn,
|
|
len * sizeof (gva->elements[0]),
|
|
gva->elements))
|
|
return FAIL;
|
|
|
|
*result = gva.release ();
|
|
return OK;
|
|
}
|
|
|
|
// Send a gcc_cp_function_args marker followed by the array.
|
|
status
|
|
marshall (connection *conn, const gcc_cp_function_args *a)
|
|
{
|
|
size_t len;
|
|
|
|
if (a)
|
|
len = a->n_elements;
|
|
else
|
|
len = (size_t)-1;
|
|
|
|
if (!marshall_array_start (conn, 'd', len))
|
|
return FAIL;
|
|
|
|
if (!a)
|
|
return OK;
|
|
|
|
return marshall_array_elmts (conn, len * sizeof (a->elements[0]),
|
|
a->elements);
|
|
}
|
|
|
|
// Read a gcc_cp_function_args marker, followed by a
|
|
// gcc_cp_function_args. The resulting array must be freed
|
|
// by the caller, using 'delete[]' on elements and virtualp, and
|
|
// 'delete' on the array object itself.
|
|
status
|
|
unmarshall (connection *conn, struct gcc_cp_function_args **result)
|
|
{
|
|
size_t len;
|
|
|
|
if (!unmarshall_array_start (conn, 'd', &len))
|
|
return FAIL;
|
|
|
|
if (len == (size_t)-1)
|
|
{
|
|
*result = NULL;
|
|
return OK;
|
|
}
|
|
|
|
cc1_plugin::unique_ptr<gcc_cp_function_args> gva
|
|
(new gcc_cp_function_args {});
|
|
|
|
gva->n_elements = len;
|
|
gva->elements = new gcc_expr[len];
|
|
|
|
if (!unmarshall_array_elmts (conn,
|
|
len * sizeof (gva->elements[0]),
|
|
gva->elements))
|
|
return FAIL;
|
|
|
|
*result = gva.release ();
|
|
|
|
return OK;
|
|
}
|
|
}
|
|
|
|
#endif // CC1_PLUGIN_MARSHALL_CP_HH
|