decl2.c (finish_vtable_vardecl): Check DECL_INTERFACE_KNOWN instead of linkage.

	* decl2.c (finish_vtable_vardecl): Check DECL_INTERFACE_KNOWN
	instead of linkage.

From-SVN: r22793

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bb2a13bcc64d75be78e6b09ebd591906d97a4333..23ae36950158a8c4006ba1ca355a047b8f8ba860 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-10-03  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * decl2.c (finish_vtable_vardecl): Check DECL_INTERFACE_KNOWN
+       instead of linkage.
+
 1998-10-01  Jason Merrill  <jason@yorick.cygnus.com>
 
        * cp-tree.h (FORMAT_VBASE_NAME): New macro.

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 34d2c93617fa879b12da693ebe50dbed5f7f69ee..ed24a2ff16faec57bddfeb980d2402d251c583b5 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2703,8 +2703,7 @@ finish_vtable_vardecl (prev, vars)
      tree prev, vars;
 {
   if (! DECL_EXTERNAL (vars)
-      && ((TREE_PUBLIC (vars) && ! DECL_WEAK (vars) && ! DECL_ONE_ONLY (vars))
-         || CLASSTYPE_EXPLICIT_INSTANTIATION (DECL_CONTEXT (vars))
+      && (DECL_INTERFACE_KNOWN (vars)
          || TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (vars))
          || (hack_decl_function_context (vars) && TREE_USED (vars)))
       && ! TREE_ASM_WRITTEN (vars))