OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/38054 (Assertion failed in change_decl_assembler_name())

Browse Source 
PR target/38054
	* config/i386/winnt.c (i386_pe_encode_section_info): Condition stdcall
	decoration of function RTL names here on Ada language.

From-SVN: r142347
This commit is contained in:
Danny Smith 2008-12-02 08:02:07 +00:00 committed by Danny Smith
parent a40fff0edb
commit bfb139b409
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2008-12-02 Danny Smith <dannysmith@users.sourceforge.net>
PR target/38054
* config/i386/winnt.c (i386_pe_encode_section_info): Condition stdcall
decoration of function RTL names here on Ada language.
2008-12-01 Vladimir Makarov <vmakarov@redhat.com> 2008-12-01 Vladimir Makarov <vmakarov@redhat.com>
PR rtl-optimization/38280 PR rtl-optimization/38280

31
gcc/config/i386/winnt.c
View File

@ -32,6 +32,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h" #include "tm_p.h"
#include "toplev.h" #include "toplev.h"
#include "hashtab.h" #include "hashtab.h"
#include "langhooks.h"
#include "ggc.h" #include "ggc.h"
#include "target.h" #include "target.h"
@ -258,27 +259,19 @@ i386_pe_encode_section_info (tree decl, rtx rtl, int first)
switch (TREE_CODE (decl)) switch (TREE_CODE (decl))
{ {
case FUNCTION_DECL: case FUNCTION_DECL:
if (first) /* FIXME: Imported stdcall names are not modified by the Ada frontend.
Check and decorate the RTL name now. */
if (strcmp (lang_hooks.name, "GNU Ada") == 0)
{ {
/* FIXME: In Ada, and perhaps other language frontends, tree new_id;
imported stdcall names may not yet have been modified. tree old_id = DECL_ASSEMBLER_NAME (decl);
Check and do it know. */ const char* asm_str = IDENTIFIER_POINTER (old_id);
tree new_id; /* Do not change the identifier if a verbatim asmspec
tree old_id = DECL_ASSEMBLER_NAME (decl);
const char* asm_str = IDENTIFIER_POINTER (old_id);
/* Do not change the identifier if a verbatim asmspec
or if stdcall suffix already added. */ or if stdcall suffix already added. */
if (*asm_str == '*' || strchr (asm_str, '@')) if (!(*asm_str == '*' || strchr (asm_str, '@'))
break; && (new_id = i386_pe_maybe_mangle_decl_assembler_name (decl,
if ((new_id = i386_pe_maybe_mangle_decl_assembler_name (decl, old_id))) old_id)))
{ XSTR (symbol, 0) = IDENTIFIER_POINTER (new_id);
/* These attributes must be present on first declaration,
change_decl_assembler_name will warn if they are added
later and the decl has been referenced, but duplicate_decls
should catch the mismatch first. */
change_decl_assembler_name (decl, new_id);
XSTR (symbol, 0) = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
}
} }
break; break;