From 28dc567e46f5c1db5110196837094881762a6ae9 Mon Sep 17 00:00:00 2001 From: dj Date: Thu, 2 Jun 2005 22:02:59 +0000 Subject: * convert.c (convert_to_pointer): Avoid recursion if no conversion is needed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100518 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/convert.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gcc/convert.c') diff --git a/gcc/convert.c b/gcc/convert.c index fbd18dee23e..dc9f41f648a 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"); -- cgit v1.2.1