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

cpphash.c (collect_objlike_expansion): Add sanity check.

Browse Source 
* cpphash.c (collect_objlike_expansion): Add sanity check.
	(special_symbol): Remove case T_CONST, T_XCONST, T_MCONST.  If
	the buffer is the empty string, return.  Mark __DATE__ and
	__TIME__ as XCONST nodes, not MCONST.
	(_cpp_macroexpand): Avoid pushing an empty buffer.
	(funlike_macroexpand): Don't pop token_buffer here.

From-SVN: r33360
This commit is contained in:
Zack Weinberg 2000-04-23 21:50:59 +00:00 committed by Zack Weinberg
parent a204fec0cb
commit a6a69fc2ad
3 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2000-04-23 Zack Weinberg <zack@wolery.cumb.org>
* cpphash.c (collect_objlike_expansion): Add sanity check.
(special_symbol): Remove case T_CONST, T_XCONST, T_MCONST. If
the buffer is the empty string, return. Mark __DATE__ and
__TIME__ as XCONST nodes, not MCONST.
(_cpp_macroexpand): Avoid pushing an empty buffer.
(funlike_macroexpand): Don't pop token_buffer here.
Sun Apr 23 18:37:53 2000 Alexandre Oliva <aoliva@cygnus.com>
* config/mn10300/mn10300.h (REGNO_IN_RANGE_P): New macro.

42
gcc/cpphash.c
View File

@ -476,6 +476,9 @@ collect_objlike_expansion (pfile, list)
len = CPP_WRITTEN (pfile) - start;
CPP_SET_WRITTEN (pfile, start);
if (len <= 4)
cpp_ice (pfile, "empty object-like macro went through full #define");
exp = (U_CHAR *) xmalloc (len + 1);
memcpy (exp, pfile->token_buffer + start, len);
exp[len] = '\0';
@ -1101,16 +1104,10 @@ special_symbol (pfile, hp)
return;
}
#endif
/* else fall through */
case T_CONST:
case T_MCONST:
case T_XCONST:
constant:
buf = hp->value.cpval;
if (!buf)
if (!buf || *buf == '\0')
return;
if (*buf == '\0')
buf = "\r \r ";
CPP_PUTS (pfile, buf, strlen (buf));
return;
@ -1130,7 +1127,7 @@ special_symbol (pfile, hp)
case T_DATE:
case T_TIME:
/* Generate both __DATE__ and __TIME__, stuff them into their
respective hash nodes, and mark the nodes T_MCONST so we
respective hash nodes, and mark the nodes T_XCONST so we
don't have to do this again. We don't generate these strings
at init time because time() and localtime() are very slow on
some systems. */
@ -1147,12 +1144,12 @@ special_symbol (pfile, hp)
d->value.cpval = xmalloc (sizeof "'Oct 11 1347'");
sprintf ((char *)d->value.cpval, "\"%s %2d %4d\"",
monthnames[tb->tm_mon], tb->tm_mday, tb->tm_year + 1900);
d->type = T_MCONST;
d->type = T_XCONST;
t->value.cpval = xmalloc (sizeof "'12:34:56'");
sprintf ((char *)t->value.cpval, "\"%02d:%02d:%02d\"",
tb->tm_hour, tb->tm_min, tb->tm_sec);
t->type = T_MCONST;
t->type = T_XCONST;
goto constant;
}
@ -1198,9 +1195,8 @@ _cpp_macroexpand (pfile, hp)
if (hp->type == T_MCONST || hp->type == T_CONST || hp->type == T_XCONST)
{
const U_CHAR *cpval = hp->value.cpval;
if (!cpval || *cpval == '\0')
cpval = (const U_CHAR *) "\r \r ";
push_macro_expansion (pfile, cpval, strlen (cpval), hp);
if (cpval && *cpval != '\0')
push_macro_expansion (pfile, cpval, strlen (cpval), hp);
return;
}
@ -1213,6 +1209,9 @@ _cpp_macroexpand (pfile, hp)
special_symbol (pfile, hp);
len = CPP_WRITTEN (pfile) - old_written;
CPP_SET_WRITTEN (pfile, old_written);
if (len == 0)
return;
xbuf = (U_CHAR *) xmalloc (len + 1);
memcpy (xbuf, CPP_PWRITTEN (pfile), len);
xbuf[len] = '\0';
@ -1239,13 +1238,14 @@ _cpp_macroexpand (pfile, hp)
Read directly from the macro definition. */
if (defn->nargs == 0 || defn->pattern == 0)
{
CPP_SET_WRITTEN (pfile, old_written);
pfile->output_escapes--;
push_macro_expansion (pfile, defn->expansion, defn->length, hp);
return;
/* If the defn is the empty string, don't bother pushing it. */
if (defn->length > 4)
push_macro_expansion (pfile, defn->expansion, defn->length, hp);
}
else
funlike_macroexpand (pfile, hp, args);
funlike_macroexpand (pfile, hp, args);
CPP_SET_WRITTEN (pfile, old_written);
pfile->output_escapes--;
}
@ -1433,7 +1433,6 @@ funlike_macroexpand (pfile, hp, args)
DEFINITION *defn = hp->value.defn;
register U_CHAR *xbuf;
int xbuf_len;
long old_written = CPP_WRITTEN (pfile);
U_CHAR *exp = defn->expansion;
int offset; /* offset in expansion, copied a piece at a time */
int totlen; /* total amount of exp buffer filled so far */
@ -1601,9 +1600,6 @@ funlike_macroexpand (pfile, hp, args)
/* Now put the expansion on the input stack
so our caller will commence reading from it. */
push_macro_expansion (pfile, xbuf, totlen, hp);
/* Pop the space we've used in the token_buffer for argument expansion. */
CPP_SET_WRITTEN (pfile, old_written);
}
/* Return 1 iff a token ending in C1 followed directly by a token C2
@ -1703,7 +1699,7 @@ push_macro_expansion (pfile, xbuf, len, hp)
&& !unsafe_chars (pfile, xbuf[len-3], CPP_BUF_PEEK (CPP_BUFFER (pfile))))
len -= 2;
/* If the total expansion is "\r \r", we must not trim both escapes. */
/* If the total expansion is "\r \r ", we must not trim both escapes. */
if (len == 2 && advance_cur)
advance_cur = 0;

23
gcc/testsuite/gcc.dg/undef-2.c Normal file
View File

@ -0,0 +1,23 @@
/* C99 6.10.8 para 4: None of [the predefined macro names] shall be the
subject of a #define or an #undef preprocessing directive. */
/* { dg-do preprocess } */
#undef __DATE__ /* { dg-warning "undefining" "__DATE__" } */
#undef __TIME__ /* { dg-warning "undefining" "__TIME__" } */
#undef __FILE__ /* { dg-warning "undefining" "__FILE__" } */
#undef __LINE__ /* { dg-warning "undefining" "__LINE__" } */
#undef __STDC__ /* { dg-warning "undefining" "__STDC__" } */
/* These should be protected from #undef, but aren't, because they
are set with normal #define commands - and on top of that, some
of them are library properties, outside our control. To consider:
warn about undefining/redefining any identifier beginning with
__STDC_ .
__STDC_HOSTED__
__STDC_VERSION__
__STDC_IEC_559__
__STDC_IEC_559_COMPLEX__
__STDC_ISO_10646__
*/