[llvm-commits] [llvm-gcc-4.2] r64610 - in /llvm-gcc-4.2/trunk/gcc/fortran: decl.c intrinsic.c match.c matchexp.c module.c primary.c symbol.c
Anton Korobeynikov
asl at math.spbu.ru
Sun Feb 15 14:33:20 PST 2009
Author: asl
Date: Sun Feb 15 16:33:20 2009
New Revision: 64610
URL: http://llvm.org/viewvc/llvm-project?rev=64610&view=rev
Log:
Add LLVM LOCAL markers
Modified:
llvm-gcc-4.2/trunk/gcc/fortran/decl.c
llvm-gcc-4.2/trunk/gcc/fortran/intrinsic.c
llvm-gcc-4.2/trunk/gcc/fortran/match.c
llvm-gcc-4.2/trunk/gcc/fortran/matchexp.c
llvm-gcc-4.2/trunk/gcc/fortran/module.c
llvm-gcc-4.2/trunk/gcc/fortran/primary.c
llvm-gcc-4.2/trunk/gcc/fortran/symbol.c
Modified: llvm-gcc-4.2/trunk/gcc/fortran/decl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/fortran/decl.c?rev=64610&r1=64609&r2=64610&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/fortran/decl.c (original)
+++ llvm-gcc-4.2/trunk/gcc/fortran/decl.c Sun Feb 15 16:33:20 2009
@@ -367,7 +367,9 @@
gfc_free_expr (expr);
if (msg != NULL)
{
+ /* LLVM LOCAL begin */
gfc_error ("%s", msg);
+ /* LLVM LOCAL end */
return MATCH_ERROR;
}
tail->repeat = tmp;
@@ -1450,7 +1452,9 @@
msg = gfc_extract_int (e, &ts->kind);
if (msg != NULL)
{
+ /* LLVM LOCAL begin */
gfc_error ("%s", msg);
+ /* LLVM LOCAL end */
m = MATCH_ERROR;
goto no_match;
}
Modified: llvm-gcc-4.2/trunk/gcc/fortran/intrinsic.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/fortran/intrinsic.c?rev=64610&r1=64609&r2=64610&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/fortran/intrinsic.c (original)
+++ llvm-gcc-4.2/trunk/gcc/fortran/intrinsic.c Sun Feb 15 16:33:20 2009
@@ -126,7 +126,9 @@
sprintf (name, "__convert_%c%d_%c%d", gfc_type_letter (from->type),
from->kind, gfc_type_letter (to->type), to->kind);
+ /* LLVM LOCAL begin */
return gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
}
@@ -249,11 +251,15 @@
break;
case SZ_NOTHING:
+ /* LLVM LOCAL begin */
next_sym->name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
strcpy (buf, "_gfortran_");
strcat (buf, name);
+ /* LLVM LOCAL begin */
next_sym->lib_name = gfc_get_string ("%s", buf);
+ /* LLVM LOCAL end */
next_sym->elemental = elemental;
next_sym->actual_ok = actual_ok;
@@ -871,7 +877,9 @@
case SZ_NOTHING:
next_sym[0] = next_sym[-1];
+ /* LLVM LOCAL begin */
next_sym->name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
next_sym++;
break;
Modified: llvm-gcc-4.2/trunk/gcc/fortran/match.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/fortran/match.c?rev=64610&r1=64609&r2=64610&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/fortran/match.c (original)
+++ llvm-gcc-4.2/trunk/gcc/fortran/match.c Sun Feb 15 16:33:20 2009
@@ -212,7 +212,9 @@
if (p != NULL)
{
+ /* LLVM LOCAL begin */
gfc_error ("%s", p);
+ /* LLVM LOCAL end */
m = MATCH_ERROR;
}
Modified: llvm-gcc-4.2/trunk/gcc/fortran/matchexp.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/fortran/matchexp.c?rev=64610&r1=64609&r2=64610&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/fortran/matchexp.c (original)
+++ llvm-gcc-4.2/trunk/gcc/fortran/matchexp.c Sun Feb 15 16:33:20 2009
@@ -198,7 +198,9 @@
return MATCH_YES;
syntax:
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
return MATCH_ERROR;
}
@@ -493,7 +495,9 @@
m = match_ext_add_operand (&e);
if (m == MATCH_NO)
{
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
m = MATCH_ERROR;
}
}
@@ -532,7 +536,9 @@
m = match_ext_add_operand (&e);
if (m == MATCH_NO)
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
if (m != MATCH_YES)
{
gfc_free_expr (all);
@@ -583,7 +589,9 @@
m = match_level_2 (&e);
if (m == MATCH_NO)
{
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
gfc_free_expr (all);
}
if (m != MATCH_YES)
@@ -641,7 +649,9 @@
m = match_level_3 (&right);
if (m == MATCH_NO)
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
if (m != MATCH_YES)
{
gfc_free_expr (left);
@@ -744,7 +754,9 @@
m = match_and_operand (&e);
if (m == MATCH_NO)
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
if (m != MATCH_YES)
{
gfc_free_expr (all);
@@ -787,7 +799,9 @@
m = match_or_operand (&e);
if (m == MATCH_NO)
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
if (m != MATCH_YES)
{
gfc_free_expr (all);
@@ -841,7 +855,9 @@
m = match_equiv_operand (&e);
if (m == MATCH_NO)
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
if (m != MATCH_YES)
{
gfc_free_expr (all);
@@ -900,7 +916,9 @@
m = match_level_5 (&e);
if (m == MATCH_NO)
+ /* LLVM LOCAL begin */
gfc_error ("%s", expression_syntax);
+ /* LLVM LOCAL end */
if (m != MATCH_YES)
{
gfc_free_expr (all);
Modified: llvm-gcc-4.2/trunk/gcc/fortran/module.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/fortran/module.c?rev=64610&r1=64609&r2=64610&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/fortran/module.c (original)
+++ llvm-gcc-4.2/trunk/gcc/fortran/module.c Sun Feb 15 16:33:20 2009
@@ -716,9 +716,13 @@
gfc_symbol sym;
int c;
+ /* LLVM LOCAL begin */
sym.name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
if (module != NULL)
+ /* LLVM LOCAL begin */
sym.module = gfc_get_string ("%s", module);
+ /* LLVM LOCAL end */
else
sym.module = NULL;
t.sym = &sym;
@@ -1404,7 +1408,9 @@
else
{
require_atom (ATOM_STRING);
+ /* LLVM LOCAL begin */
*stringp = atom_string[0] == '\0' ? NULL : gfc_get_string ("%s", atom_string);
+ /* LLVM LOCAL end */
gfc_free (atom_string);
}
}
@@ -2617,7 +2623,9 @@
else
{
require_atom (ATOM_STRING);
+ /* LLVM LOCAL begin */
e->value.function.name = gfc_get_string ("%s", atom_string);
+ /* LLVM LOCAL end */
gfc_free (atom_string);
mio_integer (&flag);
@@ -3198,7 +3206,9 @@
}
sym = gfc_new_symbol (p->u.rsym.true_name, ns);
+ /* LLVM LOCAL begin */
sym->module = gfc_get_string ("%s", p->u.rsym.module);
+ /* LLVM LOCAL end */
associate_integer_pointer (p, sym);
}
@@ -3420,7 +3430,9 @@
gfc_new_symbol (info->u.rsym.true_name,
gfc_current_ns);
+ /* LLVM LOCAL begin */
sym->module = gfc_get_string ("%s", info->u.rsym.module);
+ /* LLVM LOCAL end */
}
st->n.sym = sym;
@@ -3656,7 +3668,9 @@
sym = st->n.sym;
if (sym->module == NULL)
+ /* LLVM LOCAL begin */
sym->module = gfc_get_string ("%s", module_name);
+ /* LLVM LOCAL end */
if (sym->attr.flavor == FL_PROCEDURE && sym->attr.generic
&& !sym->attr.subroutine && !sym->attr.function)
@@ -3735,7 +3749,9 @@
return;
if (sym->module == NULL)
+ /* LLVM LOCAL begin */
sym->module = gfc_get_string ("%s", module_name);
+ /* LLVM LOCAL end */
mio_symbol_interface (&sym->name, &sym->module, &sym->generic);
}
Modified: llvm-gcc-4.2/trunk/gcc/fortran/primary.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/fortran/primary.c?rev=64610&r1=64609&r2=64610&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/fortran/primary.c (original)
+++ llvm-gcc-4.2/trunk/gcc/fortran/primary.c Sun Feb 15 16:33:20 2009
@@ -254,7 +254,9 @@
msg = gfc_extract_int (e, &num);
if (msg != NULL)
{
+ /* LLVM LOCAL begin */
gfc_error ("%s", msg);
+ /* LLVM LOCAL end */
goto cleanup;
}
if (num == 0)
@@ -925,7 +927,9 @@
q = gfc_extract_int (sym->value, &kind);
if (q != NULL)
{
+ /* LLVM LOCAL begin */
gfc_error ("%s", q);
+ /* LLVM LOCAL end */
return MATCH_ERROR;
}
}
@@ -1432,7 +1436,9 @@
}
}
+ /* LLVM LOCAL begin */
actual->name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
return MATCH_YES;
cleanup:
Modified: llvm-gcc-4.2/trunk/gcc/fortran/symbol.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/fortran/symbol.c?rev=64610&r1=64609&r2=64610&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/fortran/symbol.c (original)
+++ llvm-gcc-4.2/trunk/gcc/fortran/symbol.c Sun Feb 15 16:33:20 2009
@@ -1327,7 +1327,9 @@
else
tail->next = p;
+ /* LLVM LOCAL begin */
p->name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
p->loc = gfc_current_locus;
*component = p;
@@ -1788,7 +1790,9 @@
gfc_symtree *st;
st = gfc_getmem (sizeof (gfc_symtree));
+ /* LLVM LOCAL begin */
st->name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
gfc_insert_bbt (root, st, compare_symtree);
return st;
@@ -1804,7 +1808,9 @@
st0 = gfc_find_symtree (*root, name);
+ /* LLVM LOCAL begin */
st.name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
gfc_delete_bbt (root, &st, compare_symtree);
gfc_free (st0);
@@ -1849,7 +1855,9 @@
st = gfc_new_symtree (&gfc_current_ns->uop_root, name);
uop = st->n.uop = gfc_getmem (sizeof (gfc_user_op));
+ /* LLVM LOCAL begin */
uop->name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
uop->access = ACCESS_UNKNOWN;
uop->ns = gfc_current_ns;
@@ -1919,7 +1927,9 @@
if (strlen (name) > GFC_MAX_SYMBOL_LEN)
gfc_internal_error ("new_symbol(): Symbol name too long");
+ /* LLVM LOCAL begin */
p->name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
return p;
}
@@ -2702,7 +2712,9 @@
s = gfc_getmem (sizeof (gfc_gsymbol));
s->type = GSYM_UNKNOWN;
+ /* LLVM LOCAL begin */
s->name = gfc_get_string ("%s", name);
+ /* LLVM LOCAL end */
gfc_insert_bbt (&gfc_gsym_root, s, gsym_compare);
More information about the llvm-commits
mailing list