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

trans.h (struct gfc_ss, [...]): Move member struct gfc_ss::data::temp into gfc_ss_info::data. 

* trans.h (struct gfc_ss, struct gfc_ss_info): Move member struct
	gfc_ss::data::temp into gfc_ss_info::data.
	* trans-array.c (gfc_get_temp_ss, gfc_conv_loop_setup): Update reference
	chains.

From-SVN: r180872
This commit is contained in:
Mikael Morin 2011-11-03 22:16:29 +00:00
parent 99dd5a2990
commit 961e73ace2
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View File

@ -1,3 +1,10 @@
2011-11-03 Mikael Morin <mikael@gcc.gnu.org>
* trans.h (struct gfc_ss, struct gfc_ss_info): Move member struct
gfc_ss::data::temp into gfc_ss_info::data.
* trans-array.c (gfc_get_temp_ss, gfc_conv_loop_setup): Update reference
chains.
2011-11-03 Mikael Morin <mikael@gcc.gnu.org> 2011-11-03 Mikael Morin <mikael@gcc.gnu.org>
* trans.h (struct gfc_ss, struct gfc_ss_info): Move member struct * trans.h (struct gfc_ss, struct gfc_ss_info): Move member struct

8
gcc/fortran/trans-array.c
View File

@ -558,11 +558,11 @@ gfc_get_temp_ss (tree type, tree string_length, int dimen)
ss_info = gfc_get_ss_info (); ss_info = gfc_get_ss_info ();
ss_info->type = GFC_SS_TEMP; ss_info->type = GFC_SS_TEMP;
ss_info->string_length = string_length; ss_info->string_length = string_length;
ss_info->data.temp.type = type;
ss = gfc_get_ss (); ss = gfc_get_ss ();
ss->info = ss_info; ss->info = ss_info;
ss->next = gfc_ss_terminator; ss->next = gfc_ss_terminator;
ss->data.temp.type = type;
ss->dimen = dimen; ss->dimen = dimen;
for (i = 0; i < ss->dimen; i++) for (i = 0; i < ss->dimen; i++)
ss->dim[i] = i; ss->dim[i] = i;
@ -4127,12 +4127,12 @@ gfc_conv_loop_setup (gfc_loopinfo * loop, locus * where)
/* Make absolutely sure that this is a complete type. */ /* Make absolutely sure that this is a complete type. */
if (tmp_ss_info->string_length) if (tmp_ss_info->string_length)
loop->temp_ss->data.temp.type tmp_ss_info->data.temp.type
= gfc_get_character_type_len_for_eltype = gfc_get_character_type_len_for_eltype
(TREE_TYPE (loop->temp_ss->data.temp.type), (TREE_TYPE (tmp_ss_info->data.temp.type),
tmp_ss_info->string_length); tmp_ss_info->string_length);
tmp = loop->temp_ss->data.temp.type; tmp = tmp_ss_info->data.temp.type;
memset (&loop->temp_ss->data.info, 0, sizeof (gfc_array_info)); memset (&loop->temp_ss->data.info, 0, sizeof (gfc_array_info));
tmp_ss_info->type = GFC_SS_SECTION; tmp_ss_info->type = GFC_SS_SECTION;

13
gcc/fortran/trans.h
View File

@ -197,6 +197,13 @@ typedef struct gfc_ss_info
tree value; tree value;
} }
scalar; scalar;
/* GFC_SS_TEMP. */
struct
{
tree type;
}
temp;
} }
data; data;
} }
@ -219,12 +226,6 @@ typedef struct gfc_ss
union union
{ {
/* GFC_SS_TEMP. */
struct
{
tree type;
}
temp;
/* All other types. */ /* All other types. */
gfc_array_info info; gfc_array_info info;
} }