diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2003-04-28 06:13:23 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2003-04-28 06:13:23 +0000 |
| commit | 9e6aaf5ea5a8d86aaf1732c37753c1693add36e5 (patch) | |
| tree | 9366da5f4d023e7b78b9a4fe3a3b3172fbad3972 /gcc/cp | |
| parent | 772f8889ca98d1a237c43258336d4735a21e1daa (diff) | |
| download | gcc-9e6aaf5ea5a8d86aaf1732c37753c1693add36e5.zip gcc-9e6aaf5ea5a8d86aaf1732c37753c1693add36e5.tar.gz gcc-9e6aaf5ea5a8d86aaf1732c37753c1693add36e5.tar.bz2 | |
* decl.c (maybe_commonize_var): Fix thinko in last patch.
From-SVN: r66154
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d75773f..84578bd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 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. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 575a612..6fe39c8 100644 --- 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))))) |