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

re PR middle-end/24135 (nonlocal goto from nested function gets 'undefined symbol' in assembler) 

PR 24135
        * tree-nested.c (convert_nl_goto_reference): Lookup a translation
        before creating a new one.

From-SVN: r104911
This commit is contained in:
Richard Henderson 2005-10-03 13:57:45 -07:00 committed by Richard Henderson
parent bb13c3502b
commit 1718a2aa9b
3 changed files with 69 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2005-10-03 Richard Henderson <rth@redhat.com>
PR 24135
* tree-nested.c (convert_nl_goto_reference): Lookup a translation
before creating a new one.
2005-10-03 David Edelsohn <edelsohn@gnu.org>
* config/rs6000/t-aix43 (LDFLAGS): New.

46
gcc/testsuite/gcc.c-torture/execute/pr24135.c Normal file
View File

@ -0,0 +1,46 @@
#ifndef NO_TRAMPOLINES
extern void abort (void);
int x(int a, int b)
{
__label__ xlab;
__label__ xlab2;
void y(int b)
{
switch (b)
{
case 1: goto xlab;
case 2: goto xlab;
}
}
a = a + 2;
y (b);
xlab:
return a;
xlab2:
a++;
return a;
}
int main ()
{
int i, j;
for (j = 1; j <= 2; ++j)
for (i = 1; i <= 2; ++i)
{
int a = x (j, i);
if (a != 2 + j)
abort ();
}
return 0;
}
#else
int main() { return 0; }
#endif

28
gcc/tree-nested.c
View File

@ -1089,7 +1089,7 @@ convert_nl_goto_reference (tree *tp, int *walk_subtrees, void *data)
struct walk_stmt_info *wi = data;
struct nesting_info *info = wi->info, *i;
tree t = *tp, label, new_label, target_context, x, arg, field;
struct var_map_elt *elt;
struct var_map_elt *elt, dummy;
void **slot;
*walk_subtrees = 0;
@ -1110,17 +1110,23 @@ convert_nl_goto_reference (tree *tp, int *walk_subtrees, void *data)
control transfer. This new label will be marked LABEL_NONLOCAL; this
mark will trigger proper behavior in the cfg, as well as cause the
(hairy target-specific) non-local goto receiver code to be generated
when we expand rtl. */
new_label = create_artificial_label ();
DECL_NONLOCAL (new_label) = 1;
when we expand rtl. Enter this association into var_map so that we
can insert the new label into the IL during a second pass. */
dummy.old = label;
slot = htab_find_slot (i->var_map, &dummy, INSERT);
elt = *slot;
if (elt == NULL)
{
new_label = create_artificial_label ();
DECL_NONLOCAL (new_label) = 1;
/* Enter this association into var_map so that we can insert the new
label into the IL during a second pass. */
elt = ggc_alloc (sizeof (*elt));
elt->old = label;
elt->new = new_label;
slot = htab_find_slot (i->var_map, elt, INSERT);
*slot = elt;
elt = ggc_alloc (sizeof (*elt));
elt->old = label;
elt->new = new_label;
*slot = elt;
}
else
new_label = elt->new;
/* Build: __builtin_nl_goto(new_label, &chain->nl_goto_field). */
field = get_nl_goto_field (i);