diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index dec7e0b79ed367191b750f33ebe8762f51b4939c..da52f91b76f646f91c159786e367cd0d564d061f 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-29  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/48819
+	* constants.c (build_constants_constructor): Use ptr_type_node for
+	temp.
+
 2011-04-20  Jim Meyering  <meyering@redhat.com>
 
 	* jcf-parse.c (java_parse_file): Remove useless if-before-free.
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index 4425338f6b2ce065f65bd78c0abc6827d4ae56c2..2cc911f33bd167eac657413ca0e646f6a0ffbdd0 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -1,6 +1,6 @@
 /* Handle the constant pool of the Java(TM) Virtual Machine.
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-   2007, 2008, 2010  Free Software Foundation, Inc.
+   2007, 2008, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -544,10 +544,7 @@ build_constants_constructor (void)
 	    temp <<= ((POINTER_SIZE > 32) ? POINTER_SIZE - 32 : 0);
 
           CONSTRUCTOR_PREPEND_VALUE (t, get_tag_node (outgoing_cpool->tags[i]));
-          CONSTRUCTOR_PREPEND_VALUE (d,
-                                     fold_convert (ptr_type_node, 
-                                                   (build_int_cst (NULL_TREE,
-                                                                   temp))));
+          CONSTRUCTOR_PREPEND_VALUE (d, build_int_cst (ptr_type_node, temp));
 	}
 	break;