austern 02/09/23 22:57:38
Modified: gcc/cp decl2.c
Log:
More fixes to merge problems with coalescing of inline functions. I don't yet
understand how to solve the typeinfo coalescing problems that the merge created, so
I'm going to leave it be for now.
Revision Changes Path
1.93 +20 -15 gcc3/gcc/cp/decl2.c
Index: decl2.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/decl2.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- decl2.c 2002/09/24 05:26:22 1.92
+++ decl2.c 2002/09/24 05:57:37 1.93
@@ -1972,21 +1972,26 @@
}
}
else
- {
comdat_linkage (decl);
- /* APPLE LOCAL begin coalescing */
- /* coalesce inline member functions */
+ /* APPLE LOCAL begin coalescing */
+ /* coalesce inline member functions */
#ifdef MAKE_DECL_COALESCED
- if (DECL_DECLARED_INLINE_P (decl))
- {
- MAKE_DECL_COALESCED (decl);
- }
-#endif /* MAKE_DECL_COALESCED */
- /* APPLE LOCAL end coalescing */
+ if (DECL_DECLARED_INLINE_P (decl))
+ {
+ MAKE_DECL_COALESCED (decl);
}
+#endif /* MAKE_DECL_COALESCED */
+ /* APPLE LOCAL end coalescing */
}
+ /* APPLE LOCAL begin coalesce inline functions */
else
- comdat_linkage (decl);
+ {
+ comdat_linkage (decl);
+#ifdef MAKE_DECL_COALESCED
+ MAKE_DECL_COALESCED(decl);
+#endif /* MAKE_DECL_COALESCED */
+ }
+ /* APPLE LOCAL end coalesce inline functions */
DECL_INTERFACE_KNOWN (decl) = 1;
}
@@ -2018,14 +2023,14 @@
DECL_COMDAT (decl) = 0;
}
else
-#if 0 /* APPLE MERGE */
-#ifdef MAKE_DECL_COALESCED
- MAKE_DECL_COALESCED(decl);
-#endif /* MAKE_DECL_COALESCED */
-#endif
{
DECL_NOT_REALLY_EXTERN (decl) = 1;
DECL_COMDAT (decl) = 1;
+#if 0 /* APPLE MERGE */
+#ifdef MAKE_DECL_COALESCED
+ MAKE_DECL_COALESCED (decl);
+#endif /* MAKE_DECL_COALESCED */
+#endif /* APPLE MERGE */
}
/* Now override some cases. */
