* decl.c (maybe_commonize_var): Fix thinko in last patch.

From-SVN: r66154

* decl.c (maybe_commonize_var): Fix thinko in last patch.
From-SVN: r66154
9e6aaf5e · Mark Mitchell · Mark Mitchell · 772f8889 · 9e6aaf5e · 9e6aaf5e
Commit 9e6aaf5e authored Apr 28, 2003 by Mark Mitchell Committed by Mark Mitchell Apr 28, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/decl.c
+1 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 2003-04-27  Mark Mitchell  <mark@codesourcery.com>

+	* decl.c (maybe_commonize_var): Fix thinko in last patch.
+
+2003-04-27  Mark Mitchell  <mark@codesourcery.com>
+
 	PR c++/10506
 	* method.c (use_thunk): Decrement immediate_size_expand.


--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7341,7 +7341,7 @@ maybe_commonize_var (tree decl)
      /* Unfortunately, import_export_decl has not always been called
 	 before the function is processed, so we cannot simply check
 	 DECL_COMDAT.  */ 
-      && (DECL_COMDAT (decl)
+      && (DECL_COMDAT (DECL_CONTEXT (decl))
 	  || ((DECL_DECLARED_INLINE_P (DECL_CONTEXT (decl))
 	       || DECL_TEMPLATE_INSTANTIATION (DECL_CONTEXT (decl)))
 	      && TREE_PUBLIC (DECL_CONTEXT (decl)))))