+2002-02-19 Jason Merrill <jason@redhat.com>
+
+ ABI change: Mangle `void (A::*)() const' as
+ M1AKFvvE, not MK1AFvvE.
+ * mangle.c (write_function_type): Write cv-quals for member
+ function type here.
+ (write_pointer_to_member_type): Not here.
+
2002-02-18 Jason Merrill <jason@redhat.com>
* pt.c (do_type_instantiation): Don't pedwarn if in_system_header.
{
MANGLE_TRACE_TREE ("function-type", type);
+ /* For a pointer to member function, the function type may have
+ cv-qualifiers, indicating the quals for the artificial 'this'
+ parameter. */
+ if (TREE_CODE (type) == METHOD_TYPE)
+ {
+ /* The first parameter must be a POINTER_TYPE pointing to the
+ `this' parameter. */
+ tree this_type = TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (type)));
+ write_CV_qualifiers_for_type (this_type);
+ }
+
write_char ('F');
/* We don't track whether or not a type is `extern "C"'. Note that
you can have an `extern "C"' function that does not have
tree type;
{
write_char ('M');
- /* For a pointer-to-function member, the class type may be
- cv-qualified, but that won't be reflected in
- TYPE_PTRMEM_CLASS_TYPE. So, we go fishing around in
- TYPE_PTRMEM_POINTED_TO_TYPE instead. */
- if (TYPE_PTRMEMFUNC_P (type))
- {
- tree fn_type;
- tree this_type;
-
- fn_type = TYPE_PTRMEM_POINTED_TO_TYPE (type);
- /* The first parameter must be a POINTER_TYPE pointing to the
- `this' parameter. */
- this_type = TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (fn_type)));
- write_type (this_type);
- }
- /* For a pointer-to-data member, things are simpler. */
- else
- write_type (TYPE_PTRMEM_CLASS_TYPE (type));
+ write_type (TYPE_PTRMEM_CLASS_TYPE (type));
write_type (TYPE_PTRMEM_POINTED_TO_TYPE (type));
}