diff options
| -rw-r--r-- | gcc/rust/backend/rust-compile-expr.cc | 8 | ||||
| -rw-r--r-- | gcc/rust/rust-gcc.cc | 8 | ||||
| -rw-r--r-- | gcc/rust/rust-lang.cc | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc index e50df63..8df34c2 100644 --- a/gcc/rust/backend/rust-compile-expr.cc +++ b/gcc/rust/backend/rust-compile-expr.cc @@ -2278,13 +2278,13 @@ CompileExpr::type_cast_expression (tree type_to_cast_to, tree expr_tree, } else if (TREE_CODE (type_to_cast_to) == INTEGER_TYPE) { - tree cast = fold (convert_to_integer (type_to_cast_to, expr_tree)); + tree cast = convert_to_integer (type_to_cast_to, expr_tree); // FIXME check for TREE_OVERFLOW? return cast; } else if (TREE_CODE (type_to_cast_to) == REAL_TYPE) { - tree cast = fold (convert_to_real (type_to_cast_to, expr_tree)); + tree cast = convert_to_real (type_to_cast_to, expr_tree); // FIXME // We might need to check that the tree is MAX val and thusly saturate it // to inf. we can get the bounds and check the value if its >= or <= to @@ -2295,12 +2295,12 @@ CompileExpr::type_cast_expression (tree type_to_cast_to, tree expr_tree, } else if (TREE_CODE (type_to_cast_to) == COMPLEX_TYPE) { - return fold (convert_to_complex (type_to_cast_to, expr_tree)); + return convert_to_complex (type_to_cast_to, expr_tree); } else if (TREE_CODE (type_to_cast_to) == POINTER_TYPE && TREE_CODE (TREE_TYPE (expr_tree)) == INTEGER_TYPE) { - return fold (convert_to_pointer (type_to_cast_to, expr_tree)); + return convert_to_pointer (type_to_cast_to, expr_tree); } else if (TREE_CODE (type_to_cast_to) == RECORD_TYPE || TREE_CODE (type_to_cast_to) == ARRAY_TYPE) diff --git a/gcc/rust/rust-gcc.cc b/gcc/rust/rust-gcc.cc index e5dc6da..5bb5313 100644 --- a/gcc/rust/rust-gcc.cc +++ b/gcc/rust/rust-gcc.cc @@ -1171,14 +1171,14 @@ Gcc_backend::convert_expression (tree type_tree, tree expr_tree, ret = expr_tree; } else if (TREE_CODE (type_tree) == INTEGER_TYPE) - ret = fold (convert_to_integer (type_tree, expr_tree)); + ret = convert_to_integer (type_tree, expr_tree); else if (TREE_CODE (type_tree) == REAL_TYPE) - ret = fold (convert_to_real (type_tree, expr_tree)); + ret = convert_to_real (type_tree, expr_tree); else if (TREE_CODE (type_tree) == COMPLEX_TYPE) - ret = fold (convert_to_complex (type_tree, expr_tree)); + ret = convert_to_complex (type_tree, expr_tree); else if (TREE_CODE (type_tree) == POINTER_TYPE && TREE_CODE (TREE_TYPE (expr_tree)) == INTEGER_TYPE) - ret = fold (convert_to_pointer (type_tree, expr_tree)); + ret = convert_to_pointer (type_tree, expr_tree); else if (TREE_CODE (type_tree) == RECORD_TYPE || TREE_CODE (type_tree) == ARRAY_TYPE) ret = fold_build1_loc (location.gcc_location (), VIEW_CONVERT_EXPR, diff --git a/gcc/rust/rust-lang.cc b/gcc/rust/rust-lang.cc index 34778c8..d69f283 100644 --- a/gcc/rust/rust-lang.cc +++ b/gcc/rust/rust-lang.cc @@ -355,13 +355,13 @@ convert (tree type, tree expr) case BOOLEAN_TYPE: return fold_convert (type, expr); case INTEGER_TYPE: - return fold (convert_to_integer (type, expr)); + return convert_to_integer (type, expr); case POINTER_TYPE: - return fold (convert_to_pointer (type, expr)); + return convert_to_pointer (type, expr); case REAL_TYPE: - return fold (convert_to_real (type, expr)); + return convert_to_real (type, expr); case COMPLEX_TYPE: - return fold (convert_to_complex (type, expr)); + return convert_to_complex (type, expr); default: break; } |