expr.c (expand_load_internal): Convert to destination type.

2005-07-15  Andrew Haley  <aph@redhat.com>

        * expr.c (expand_load_internal): Convert to destination type.

From-SVN: r102485

gcc/java/ChangeLog

+2005-07-15  Andrew Haley  <aph@redhat.com>
+
+	* expr.c (expand_load_internal): Convert to destination type.
+
 2005-07-22  Manfred Hollstein  <mh@suse.com>
 
 	* verify-impl.c (check_class_constant): Fix uninitialised warnings.

gcc/java/expr.c

@@ -1321,7 +1321,7 @@ expand_load_internal (int index, tree type, int pc)
      value into it.  Then we push this new local on the stack.
      Hopefully this all gets optimized out.  */
   copy = build_decl (VAR_DECL, NULL_TREE, type);
-  if (INTEGRAL_TYPE_P (type)
+  if (INTEGRAL_TYPE_P (type) || POINTER_TYPE_P (type)
       && TREE_TYPE (copy) != TREE_TYPE (var))
     var = convert (type, var);
   java_add_local_var (copy);