gengtype-lex.l: Catch stray GTY markers in the files gengtype looks at.

	* 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.

From-SVN: r82493

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef2336f439efcfbbd2ad96f0c832611e95bc33dd..14b1c413ce3b5fed18ce2ae0cea05d22ef7595bb 100644 (file)
--- 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 18566c564c564a791dfc1d507c1e4832db0fdda8..9eed42d3d45b21ad2d8425c4f4a68c02d059c49f 100644 (file)
--- 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 d7fa27ff3bcf631a28c56ada5410a0a0f1542b54..c5af2003f652eb1301ff24cdc8f8ecf2a97d1b71 100644 (file)
--- 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