2244c2244
< make_vlist_ctor_wrapper (fn)
---
> maybe_vlist_ctor_wrapper (fn, definep)
2245a2246
> int definep;
2250a2252,2255
> if (!flag_vtable_thunks_compat
> || !DECL_CONSTRUCTOR_FOR_PVBASE_P (fn))
> return;
>
2327,2329c2332,2334
< /* When fn is declared, DECL_INITIAL is null. When it is defined,
< DECL_INITIAL will be error_mark_node. */
< if (DECL_INITIAL (fn) == error_mark_node)
---
> /* If this is called from start_method, definep is -1. Then we
> are inside the class, and fn is inline by default. */
> if (definep)
2332,2335c2337,2348
< wrapper later. */
< TREE_USED (decl) = 1;
< DECL_NOT_REALLY_EXTERN (decl) = 1;
< DECL_INITIAL (decl) = NULL_TREE;
---
> wrapper later. */
> if (DECL_THIS_INLINE (fn) || (definep == -1))
> {
> DECL_THIS_INLINE (decl) = 1;
> DECL_INLINE (decl) = 1;
> pushdecl_top_level (decl);
> }
> else
> {
> TREE_USED (decl) = 1;
> TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)) = 1;
> }
2654,2656d2666
<
<
<