[2/4] PR c++/13403 and PR c++/15154: Fix gnuv3_pass_by_reference to lookup copy c-tors with qualified args
Commit Message
On Sun, Sep 28, 2014 at 11:01 PM, Doug Evans <dje@google.com> wrote:
>> 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) ?
Yes, I made this change now. The patch is attached.
I am assuming that the other patches in this series are approved
modulo making the test regexes more specific.
gdb/ChangeLog:
2014-09-29 Siva Chandra Reddy <sivachandra@google.com>
PR c++/13403
PR c++/15154
* gnu-v3-abi.c (gnuv3_pass_by_reference): Lookup copy constructors
with qualified args.
Comments
On Mon, Sep 29, 2014 at 2:11 PM, Siva Chandra <sivachandra@google.com> wrote:
> On Sun, Sep 28, 2014 at 11:01 PM, Doug Evans <dje@google.com> wrote:
>>> 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) ?
>
> Yes, I made this change now. The patch is attached.
>
> I am assuming that the other patches in this series are approved
> modulo making the test regexes more specific.
>
> gdb/ChangeLog:
>
> 2014-09-29 Siva Chandra Reddy <sivachandra@google.com>
>
> PR c++/13403
> PR c++/15154
> * gnu-v3-abi.c (gnuv3_pass_by_reference): Lookup copy constructors
> with qualified args.
Ping.
On Mon, Sep 29, 2014 at 2:11 PM, Siva Chandra <sivachandra@google.com> wrote:
> On Sun, Sep 28, 2014 at 11:01 PM, Doug Evans <dje@google.com> wrote:
>>> * 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) ?
>
> Yes, I made this change now. The patch is attached.
>
> I am assuming that the other patches in this series are approved
> modulo making the test regexes more specific.
>
> gdb/ChangeLog:
>
> 2014-09-29 Siva Chandra Reddy <sivachandra@google.com>
>
> PR c++/13403
> PR c++/15154
> * gnu-v3-abi.c (gnuv3_pass_by_reference): Lookup copy constructors
> with qualified args.
Ping. Link: https://sourceware.org/ml/gdb-patches/2014-09/msg00854.html
Siva Chandra writes:
> On Sun, Sep 28, 2014 at 11:01 PM, Doug Evans <dje@google.com> wrote:
> >> 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) ?
>
> Yes, I made this change now. The patch is attached.
>
> I am assuming that the other patches in this series are approved
> modulo making the test regexes more specific.
>
> gdb/ChangeLog:
>
> 2014-09-29 Siva Chandra Reddy <sivachandra@google.com>
>
> PR c++/13403
> PR c++/15154
> * gnu-v3-abi.c (gnuv3_pass_by_reference): Lookup copy constructors
> with qualified args.
LGTM.
And yeah, the rest of the patch set is approved.
[Modulo the potential addition of a comment in 4/4.]
@@ -1313,11 +1313,17 @@ 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;
+
+ arg_target_type = check_typedef (TYPE_TARGET_TYPE (arg_type));
+
+ if (TYPE_CODE (arg_type) == TYPE_CODE_REF
+ && class_types_same_p (arg_target_type, type))
+ return 1;
+ }
}
/* Even if all the constructors and destructors were artificial, one