diff options
Diffstat (limited to 'gcc/tree-ssa-operands.c')
| -rw-r--r-- | gcc/tree-ssa-operands.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c index 953ef8d..55cebf2 100644 --- a/gcc/tree-ssa-operands.c +++ b/gcc/tree-ssa-operands.c @@ -174,7 +174,7 @@ allocate_v_may_def_optype (unsigned num) v_may_def_optype v_may_def_ops; unsigned size; size = sizeof (struct v_may_def_optype_d) - + sizeof (v_may_def_operand_type_t) * (num - 1); + + sizeof (v_def_use_operand_type_t) * (num - 1); v_may_def_ops = ggc_alloc (size); v_may_def_ops->num_v_may_defs = num; return v_may_def_ops; @@ -202,7 +202,7 @@ allocate_v_must_def_optype (unsigned num) { v_must_def_optype v_must_def_ops; unsigned size; - size = sizeof (struct v_must_def_optype_d) + sizeof (tree) * (num - 1); + size = sizeof (struct v_must_def_optype_d) + sizeof (v_def_use_operand_type_t) * (num - 1); v_must_def_ops = ggc_alloc (size); v_must_def_ops->num_v_must_defs = num; return v_must_def_ops; @@ -650,7 +650,7 @@ finalize_ssa_v_must_defs (v_must_def_optype *old_ops_p, build_diff = false; for (x = 0; x < num; x++) { - tree var = old_ops->v_must_defs[x]; + tree var = old_ops->v_must_defs[x].def; if (TREE_CODE (var) == SSA_NAME) var = SSA_NAME_VAR (var); if (var != VARRAY_TREE (build_v_must_defs, x)) @@ -677,17 +677,21 @@ finalize_ssa_v_must_defs (v_must_def_optype *old_ops_p, /* Look for VAR in the original vector. */ for (i = 0; i < old_num; i++) { - result = old_ops->v_must_defs[i]; + result = old_ops->v_must_defs[i].def; if (TREE_CODE (result) == SSA_NAME) result = SSA_NAME_VAR (result); if (result == var) { - v_must_def_ops->v_must_defs[x] = old_ops->v_must_defs[i]; + v_must_def_ops->v_must_defs[x].def = old_ops->v_must_defs[i].def; + v_must_def_ops->v_must_defs[x].use = old_ops->v_must_defs[i].use; break; } } if (i == old_num) - v_must_def_ops->v_must_defs[x] = var; + { + v_must_def_ops->v_must_defs[x].def = var; + v_must_def_ops->v_must_defs[x].use = var; + } } } VARRAY_POP_ALL (build_v_must_defs); @@ -1672,7 +1676,10 @@ copy_virtual_operands (tree dst, tree src) { *v_must_defs_new = allocate_v_must_def_optype (NUM_V_MUST_DEFS (v_must_defs)); for (i = 0; i < NUM_V_MUST_DEFS (v_must_defs); i++) - SET_V_MUST_DEF_OP (*v_must_defs_new, i, V_MUST_DEF_OP (v_must_defs, i)); + { + SET_V_MUST_DEF_RESULT (*v_must_defs_new, i, V_MUST_DEF_RESULT (v_must_defs, i)); + SET_V_MUST_DEF_KILL (*v_must_defs_new, i, V_MUST_DEF_KILL (v_must_defs, i)); + } } } @@ -1701,7 +1708,7 @@ create_ssa_artficial_load_stmt (stmt_operands_p old_ops, tree new_stmt) free_vuses (&(ann->operands.vuse_ops)); free_v_may_defs (&(ann->operands.v_may_def_ops)); free_v_must_defs (&(ann->operands.v_must_def_ops)); - + /* For each VDEF on the original statement, we want to create a VUSE of the V_MAY_DEF result or V_MUST_DEF op on the new statement. */ @@ -1713,7 +1720,7 @@ create_ssa_artficial_load_stmt (stmt_operands_p old_ops, tree new_stmt) for (j = 0; j < NUM_V_MUST_DEFS (old_ops->v_must_def_ops); j++) { - op = V_MUST_DEF_OP (old_ops->v_must_def_ops, j); + op = V_MUST_DEF_RESULT (old_ops->v_must_def_ops, j); append_vuse (op); } |