[2/4] PR c++/13403 and PR c++/15154: Fix gnuv3_pass_by_reference to lookup copy c-tors with qualified args
Commit Message
Before this, a copy constructor declared as in the following snippet was
not being treated as a copy constructor.
class A
{
public:
A (A &); // OK.
A (const A &); // Not being treated as a copy constructor because of the
// 'const' qualifier.
};
gdb/ChangeLog:
2014-09-11 Siva Chandra Reddy <sivachandra@google.com>
PR c++/13403
PR c++/15154
* gdbtypes.c (make_qualified_type): Make non-static.
* gdbtypes.h (make_qualified_type): Declare.
* gnu-v3-abi.c (gnuv3_pass_by_reference): Lookup copy
constructors with qualified args
Comments
On Thu, Sep 11, 2014 at 11:37 AM, Siva Chandra <sivachandra@google.com> wrote:
> Before this, a copy constructor declared as in the following snippet was
> not being treated as a copy constructor.
>
> class A
> {
> public:
> A (A &); // OK.
> A (const A &); // Not being treated as a copy constructor because of the
> // 'const' qualifier.
> };
>
> gdb/ChangeLog:
>
> 2014-09-11 Siva Chandra Reddy <sivachandra@google.com>
>
> PR c++/13403
> PR c++/15154
> * gdbtypes.c (make_qualified_type): Make non-static.
> * gdbtypes.h (make_qualified_type): Declare.
> * gnu-v3-abi.c (gnuv3_pass_by_reference): Lookup copy
> constructors with qualified args
Can you use class_types_same_p here (instead of comparing with the
result of make_qualified_type) ?
@@ -568,7 +568,7 @@ address_space_int_to_name (struct gdbarch *gdbarch, int space_flag)
If STORAGE is non-NULL, create the new type instance there.
STORAGE must be in the same obstack as TYPE. */
-static struct type *
+struct type *
make_qualified_type (struct type *type, int new_flags,
struct type *storage)
{
@@ -1647,6 +1647,9 @@ extern int address_space_name_to_int (struct gdbarch *, char *);
extern const char *address_space_int_to_name (struct gdbarch *, int);
+extern struct type *make_qualified_type (struct type *type, int new_flags,
+ struct type *storage);
+
extern struct type *make_type_with_address_space (struct type *type,
int space_identifier);
@@ -1313,11 +1313,19 @@ gnuv3_pass_by_reference (struct type *type)
/* If this method takes two arguments, and the second argument is
a reference to this class, then it is a copy constructor. */
- if (TYPE_NFIELDS (fieldtype) == 2
- && TYPE_CODE (TYPE_FIELD_TYPE (fieldtype, 1)) == TYPE_CODE_REF
- && check_typedef (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (fieldtype,
- 1))) == type)
- return 1;
+ if (TYPE_NFIELDS (fieldtype) == 2)
+ {
+ struct type *arg_type = TYPE_FIELD_TYPE (fieldtype, 1);
+ struct type *arg_target_type;
+ int flags;
+
+ arg_target_type = check_typedef (TYPE_TARGET_TYPE (arg_type));
+ flags = TYPE_INSTANCE_FLAGS (arg_target_type);
+
+ if (TYPE_CODE (arg_type) == TYPE_CODE_REF
+ && arg_target_type == make_qualified_type (type, flags, NULL))
+ return 1;
+ }
}
/* Even if all the constructors and destructors were artificial, one