diff options
| author | DJ Delorie <dj@redhat.com> | 2005-06-02 18:02:59 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@gcc.gnu.org> | 2005-06-02 18:02:59 -0400 |
| commit | 4e9cd9d8aa3ccfe72fecce5f2ab4419c6028d52d (patch) | |
| tree | 8010e83f4706bb42901012ce2feacce4fc9beab5 /gcc/convert.c | |
| parent | 1c1205fb0b9a3270c1bc43e6ad21cd23669081b2 (diff) | |
| download | gcc-4e9cd9d8aa3ccfe72fecce5f2ab4419c6028d52d.zip gcc-4e9cd9d8aa3ccfe72fecce5f2ab4419c6028d52d.tar.gz gcc-4e9cd9d8aa3ccfe72fecce5f2ab4419c6028d52d.tar.bz2 | |
convert.c (convert_to_pointer): Avoid recursion if no conversion is needed.
* convert.c (convert_to_pointer): Avoid recursion if no conversion
is needed.
From-SVN: r100518
Diffstat (limited to 'gcc/convert.c')
| -rw-r--r-- | gcc/convert.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gcc/convert.c b/gcc/convert.c index fbd18de..dc9f41f 100644 --- a/gcc/convert.c +++ b/gcc/convert.c @@ -42,10 +42,7 @@ tree convert_to_pointer (tree type, tree expr) { if (integer_zerop (expr)) - { - expr = build_int_cst (type, 0); - return expr; - } + return build_int_cst (type, 0); switch (TREE_CODE (TREE_TYPE (expr))) { @@ -57,13 +54,12 @@ convert_to_pointer (tree type, tree expr) case ENUMERAL_TYPE: case BOOLEAN_TYPE: case CHAR_TYPE: - if (TYPE_PRECISION (TREE_TYPE (expr)) == POINTER_SIZE) - return build1 (CONVERT_EXPR, type, expr); + if (TYPE_PRECISION (TREE_TYPE (expr)) != POINTER_SIZE) + expr = fold_build1 (NOP_EXPR, + lang_hooks.types.type_for_size (POINTER_SIZE, 0), + expr); + return fold_build1 (CONVERT_EXPR, type, expr); - return - convert_to_pointer (type, - convert (lang_hooks.types.type_for_size - (POINTER_SIZE, 0), expr)); default: error ("cannot convert to a pointer type"); |