From 133f7a77c26701d555ecbd6ae7a894f8429c7cc1 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Mon, 31 May 2004 19:49:50 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 7 +++++++ gcc/alias.c | 2 +- gcc/gengtype-lex.l | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 + + * 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 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 -- 2.30.2