diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2006-01-28 22:11:42 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2006-01-28 22:11:42 +0000 |
| commit | 2ef06beb77833e951ce436d9b0b954090e4248b6 (patch) | |
| tree | 35aae564506e3c5cfe938e08bca9bf4463d4065c /gcc | |
| parent | 5f1f4746bec0ee6d3a40d9ad761870bcbd8d5f50 (diff) | |
| download | gcc-2ef06beb77833e951ce436d9b0b954090e4248b6.zip gcc-2ef06beb77833e951ce436d9b0b954090e4248b6.tar.gz gcc-2ef06beb77833e951ce436d9b0b954090e4248b6.tar.bz2 | |
re PR c++/25999 (compiler loses extern "C" for function after #pragma weak)
PR c++/25999
* decl.c (start_preparsed_function): Call maybe_apply_pragma_weak
here, not ...
(start_function): ... here.
PR c++/25999
* g++.dg/ext/pragmaweak1.C: New test.
From-SVN: r110340
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/pragmaweak1.C | 9 |
4 files changed, 32 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ad3be50..1071879 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,12 @@ 2006-01-28 Mark Mitchell <mark@codesourcery.com> + PR c++/25999 + * decl.c (start_preparsed_function): Call maybe_apply_pragma_weak + here, not ... + (start_function): ... here. + +2006-01-28 Mark Mitchell <mark@codesourcery.com> + PR c++/25855 * class.c (resolve_address_of_overloaded_function): Adjust use of return value from most_specialized_instantiation. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e4be9e0..ef7ed3a 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10287,6 +10287,17 @@ start_preparsed_function (tree decl1, tree attrs, int flags) DECL_CONTEXT (decl1) = DECL_CONTEXT (DECL_TI_TEMPLATE (decl1)); } fntype = TREE_TYPE (decl1); + + /* If #pragma weak applies, mark the decl appropriately now. + The pragma only applies to global functions. Because + determining whether or not the #pragma applies involves + computing the mangled name for the declaration, we cannot + apply the pragma until after we have merged this declaration + with any previous declarations; if the original declaration + has a linkage specification, that specification applies to + the definition as well, and may affect the mangled name. */ + if (!DECL_CONTEXT (decl1)) + maybe_apply_pragma_weak (decl1); } /* Determine the ELF visibility attribute for the function. We must @@ -10458,10 +10469,6 @@ start_function (cp_decl_specifier_seq *declspecs, if (decl1 == NULL_TREE || TREE_CODE (decl1) != FUNCTION_DECL) return 0; - /* If #pragma weak was used, mark the decl weak now. */ - if (global_scope_p (current_binding_level)) - maybe_apply_pragma_weak (decl1); - if (DECL_MAIN_P (decl1)) /* main must return int. grokfndecl should have corrected it (and issued a diagnostic) if the user got it wrong. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 70b6dee..5b40db8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2006-01-28 Mark Mitchell <mark@codesourcery.com> + PR c++/25999 + * g++.dg/ext/pragmaweak1.C: New test. + +2006-01-28 Mark Mitchell <mark@codesourcery.com> + PR c++/25855 * g++.dg/template/spec29.C: New test. diff --git a/gcc/testsuite/g++.dg/ext/pragmaweak1.C b/gcc/testsuite/g++.dg/ext/pragmaweak1.C new file mode 100644 index 0000000..68bf3fc --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/pragmaweak1.C @@ -0,0 +1,9 @@ +// PR c++/25999 +// { dg-final { scan-assembler-not "_Z3Foov" } } + +extern "C" { + void Foo(); +} +#pragma weak Random_Symbol +void Foo() { } + |