This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch] bug fix for gengtype in plugin mode
- From: Rafael Espindola <espindola at google dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Cc: Diego Novillo <dnovillo at google dot com>, Basile STARYNKEVITCH <basile at starynkevitch dot net>
- Date: Wed, 23 Sep 2009 17:39:50 -0400
- Subject: [patch] bug fix for gengtype in plugin mode
2009-09-23 Basile Starynkevitch <basile@starynkevitch.net>
Rafael Avila de Espindola <espindola@google.com>
* gengtype.c (nb_plugin_files): Make it unsigned to match
num_gt_files. Adjust other variables
to avoid warnings.
(main): Allocate an all zero lang_bitmap before each plugin file name
to match regular
file names.
Cheers,
--
Rafael Ãvila de EspÃndola
commit 9f314b365470fbb85dd8c32c6499a8f4eb7c4b76
Author: Rafael Espindola <espindola@destiny.tor.corp.google.com>
Date: Wed Sep 23 17:07:24 2009 -0400
fix
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 7d7f9d1..7f10d6c 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -144,7 +144,7 @@ static outf_p output_files;
corresponding gt-<plugin>.h are generated in the current
directory. */
static char** plugin_files;
-static int nb_plugin_files;
+static size_t nb_plugin_files;
/* The output header file that is included into pretty much every
source file. */
@@ -464,7 +464,7 @@ read_input_list (const char *listname)
/* Add the plugin files if provided. */
if (plugin_files)
{
- int i;
+ size_t i;
for (i = 0; i < nb_plugin_files; i++)
gt_files[nfiles++] = plugin_files[i];
}
@@ -1716,7 +1716,8 @@ get_output_file_with_visibility (const char *input_file)
plugin_files. */
if (plugin_files && nb_plugin_files > 0)
{
- int ix= -1, i;
+ int ix= -1;
+ size_t i;
for (i = 0; i < nb_plugin_files && ix < 0; i++)
if (strcmp (input_file, plugin_files[i]) == 0)
ix = i;
@@ -3657,8 +3658,17 @@ main (int argc, char **argv)
{
srcdir = argv[2];
inputlist = argv[3];
- plugin_files = argv+4;
nb_plugin_files = argc-4;
+ plugin_files = XNEWVEC (char *, nb_plugin_files);
+ for (i = 0; i < nb_plugin_files; i++)
+ {
+ /* Place an all zero lang_bitmap before the plugin file
+ name. */
+ char *name = argv[i + 4];
+ int len = strlen(name) + 1 + sizeof (lang_bitmap);
+ plugin_files[i] = XNEWVEC (char, len) + sizeof (lang_bitmap);
+ strcpy (plugin_files[i], name);
+ }
}
else if (argc == 3)
{
@@ -3709,6 +3719,13 @@ main (int argc, char **argv)
write_rtx_next ();
close_output_files ();
+ if (plugin_files)
+ {
+ for (i = 0; i < nb_plugin_files; i++)
+ free (plugin_files[i] - sizeof (lang_bitmap));
+ free (plugin_files);
+ }
+
if (hit_error)
return 1;
return 0;