summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/alias.c2
-rw-r--r--gcc/gengtype-lex.l5
3 files changed, 13 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef2336f439e..14b1c413ce3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-31 Geoffrey Keating <geoffk@apple.com>
+
+ * gengtype-lex.l: Catch stray GTY markers in the files gengtype
+ looks at.
+ * alias.c (alias_invariant_size): Make alias_invariant_size
+ static, fix GTY marker.
+
2004-05-31 Kazu Hirata <kazu@cs.umass.edu>
PR tree-optimization/15743.
diff --git a/gcc/alias.c b/gcc/alias.c
index 18566c564c5..9eed42d3d45 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -182,7 +182,7 @@ static GTY (()) rtx static_reg_base_value[FIRST_PSEUDO_REGISTER];
Because this array contains only pseudo registers it has no effect
after reload. */
static GTY((length("alias_invariant_size"))) rtx *alias_invariant;
-unsigned GTY(()) int alias_invariant_size;
+static GTY(()) unsigned int alias_invariant_size;
/* Vector indexed by N giving the initial (unchanging) value known for
pseudo-register N. This array is initialized in init_alias_analysis,
diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index d7fa27ff3bc..c5af2003f65 100644
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -333,6 +333,11 @@ ITYPE {IWORD}({WS}{IWORD})*
"unterminated comment or string; unexpected EOF");
}
+^"#define"{WS}"GTY(" /* do nothing */
+{WS}"GTY"{WS}?"(" {
+ error_at_line (&lexer_line, "stray GTY marker");
+}
+
%%
void