fold-const.c (fold_read_from_constant_string): Convert result to requested type.

	* fold-const.c (fold_read_from_constant_string): Convert result to
	requested type.

From-SVN: r82120

gcc/ChangeLog

+2004-05-21  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* fold-const.c (fold_read_from_constant_string): Convert result to
+	requested type.
+
 2004-05-21  Richard Henderson  <rth@redhat.com>
 
 	* gimplify.c (mostly_copy_tree_r): Don't attempt to copy decls.

gcc/fold-const.c

@@ -9692,8 +9692,9 @@ fold_read_from_constant_string (tree exp)
 	  && (GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_TYPE (string))))
 	      == MODE_INT)
 	  && (GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (TREE_TYPE (string)))) == 1))
-	return build_int_2 ((TREE_STRING_POINTER (string)
-			     [TREE_INT_CST_LOW (index)]), 0);
+	return fold_convert (TREE_TYPE (exp),
+			     build_int_2 ((TREE_STRING_POINTER (string)
+					  [TREE_INT_CST_LOW (index)]), 0));
     }
   return NULL;
 }