diff options
| author | Joern Rennecke <joern.rennecke@st.com> | 2009-04-07 18:32:19 +0000 |
|---|---|---|
| committer | Joern Rennecke <joern.rennecke@st.com> | 2009-04-07 18:32:19 +0000 |
| commit | c8f3e958cb3a3ff38bcb98fc1f906b4590d44769 (patch) | |
| tree | d81c0729241f666fed195c5d3ab2cf9a74bc566b /gcc/matrix-reorg.c | |
| parent | 21c32a2af97610f3ef27b15eb5475406aa7491cf (diff) | |
Merge gcc-in-cxx branch into multi-target-4_4-branch.
svn merge svn+ssh://amylaar@gcc.gnu.org/svn/gcc/trunk@144602 svn+ssh://amylaar@gcc.gnu.org/svn/gcc/branches/gcc-in-cxx@145084 .
and resolved conflicts:
C gcc/ChangeLog (entry moved to gcc/ChangeLog.cxx)
C gcc/cp/cp-tree.h
C gcc/df.h
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/multi-target-4_4-branch@145698 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/matrix-reorg.c')
| -rw-r--r-- | gcc/matrix-reorg.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gcc/matrix-reorg.c b/gcc/matrix-reorg.c index d916f70266c..8f4280b5b02 100644 --- a/gcc/matrix-reorg.c +++ b/gcc/matrix-reorg.c @@ -245,6 +245,13 @@ typedef struct access_site_info *access_site_info_p; DEF_VEC_P (access_site_info_p); DEF_VEC_ALLOC_P (access_site_info_p, heap); +/* See 'free_stmts' in struct matrix_info. */ +struct free_info +{ + gimple stmt; + tree func; +}; + /* Information about matrix to flatten. */ struct matrix_info { @@ -277,11 +284,7 @@ struct matrix_info tree allocation_function_decl; /* The calls to free for each level of indirection. */ - struct free_info - { - gimple stmt; - tree func; - } *free_stmts; + struct free_info *free_stmts; /* An array which holds for each dimension its size. where dimension 0 is the outer most (one that contains all the others). @@ -735,7 +738,8 @@ add_allocation_site (struct matrix_info *mi, gimple stmt, int level) must be set accordingly. */ for (min_malloc_level = 0; min_malloc_level < mi->max_malloced_level - && mi->malloc_for_level[min_malloc_level]; min_malloc_level++); + && mi->malloc_for_level[min_malloc_level]; min_malloc_level++) + ; if (level < min_malloc_level) { mi->allocation_function_decl = current_function_decl; @@ -2419,7 +2423,7 @@ struct simple_ipa_opt_pass pass_ipa_matrix_reorg = NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ - 0, /* tv_id */ + TV_NONE, /* tv_id */ 0, /* properties_required */ PROP_trees, /* properties_provided */ 0, /* properties_destroyed */ |