* varasm.c: Do not include c-pragma.h

[pf3gnuchains/gcc-fork.git] / gcc / matrix-reorg.c

diff --git a/gcc/matrix-reorg.c b/gcc/matrix-reorg.c
index 8f71be5..9c53694 100644 (file)
--- a/gcc/matrix-reorg.c
+++ b/gcc/matrix-reorg.c
@@ -115,7 +115,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "tree.h"
 #include "rtl.h"
-#include "c-tree.h"
 #include "tree-inline.h"
 #include "tree-flow.h"
 #include "tree-flow-inline.h"
@@ -131,7 +130,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "timevar.h"
 #include "params.h"
 #include "fibheap.h"
-#include "c-common.h"
 #include "intl.h"
 #include "function.h"
 #include "basic-block.h"
@@ -1865,8 +1863,9 @@ transform_access_sites (void **slot, void *data ATTRIBUTE_UNUSED)
                    tmp = create_tmp_var (TREE_TYPE (lhs), "new");
                    add_referenced_var (tmp);
                    rhs = gimple_assign_rhs1 (acc_info->stmt);
-                   new_stmt = gimple_build_assign (tmp,
-                                                   TREE_OPERAND (rhs, 0));
+                   rhs = fold_convert (TREE_TYPE (tmp),
+                                       TREE_OPERAND (rhs, 0));
+                   new_stmt = gimple_build_assign (tmp, rhs);
                    tmp = make_ssa_name (tmp, new_stmt);
                    gimple_assign_set_lhs (new_stmt, tmp);
                    gsi = gsi_for_stmt (acc_info->stmt);
@@ -2419,7 +2418,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 */
   0,                           /* properties_provided */
   0,                           /* properties_destroyed */
@@ -2427,4 +2426,3 @@ struct simple_ipa_opt_pass pass_ipa_matrix_reorg =
   TODO_dump_cgraph | TODO_dump_func    /* todo_flags_finish */
  }
 };
-