diff options
Diffstat (limited to 'gcc/tree-mudflap.c')
| -rw-r--r-- | gcc/tree-mudflap.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c index 4f8e1742f2d..a10b5d78b23 100644 --- a/gcc/tree-mudflap.c +++ b/gcc/tree-mudflap.c @@ -76,9 +76,8 @@ mf_build_string (const char *string) size_t len = strlen (string); tree result = mf_mark (build_string (len + 1, string)); - TREE_TYPE (result) - = build_array_type (char_type_node, - build_index_type (build_int_2 (len, 0))); + TREE_TYPE (result) = build_array_type + (char_type_node, build_index_type (build_int_cst (NULL_TREE, len, 0))); TREE_CONSTANT (result) = 1; TREE_INVARIANT (result) = 1; TREE_READONLY (result) = 1; @@ -917,8 +916,9 @@ mx_register_decls (tree decl, tree *stmt_list) decl))), tree_cons (NULL_TREE, size, - tree_cons (NULL_TREE, - build_int_2 (3, 0), /* __MF_TYPE_STACK */ + tree_cons (NULL_TREE, + /* __MF_TYPE_STACK */ + build_int_cst (NULL_TREE, 3, 0), NULL_TREE))); /* __mf_unregister (...) */ unregister_fncall = build_function_call_expr (mf_unregister_fndecl, @@ -935,7 +935,8 @@ mx_register_decls (tree decl, tree *stmt_list) tree_cons (NULL_TREE, size, tree_cons (NULL_TREE, - build_int_2 (3, 0), /* __MF_TYPE_STACK */ + /* __MF_TYPE_STACK */ + build_int_cst (NULL_TREE, 3, 0), tree_cons (NULL_TREE, variable_name, NULL_TREE)))); @@ -1078,7 +1079,7 @@ mudflap_register_call (tree obj, tree object_size, tree varname) args = tree_cons (NULL_TREE, varname, NULL_TREE); - arg = build_int_2 (4, 0); /* __MF_TYPE_STATIC */ + arg = build_int_cst (NULL_TREE, 4, 0); /* __MF_TYPE_STATIC */ args = tree_cons (NULL_TREE, arg, args); arg = convert (size_type_node, object_size); @@ -1160,7 +1161,7 @@ mudflap_enqueue_constant (tree obj) return; if (TREE_CODE (obj) == STRING_CST) - object_size = build_int_2 (TREE_STRING_LENGTH (obj), 0); + object_size = build_int_cst (NULL_TREE, TREE_STRING_LENGTH (obj), 0); else object_size = size_in_bytes (TREE_TYPE (obj)); |