From fdf390e6c61f928da9e2b6a7af63c277e2d3b0eb Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Fri, 29 Apr 2011 19:36:12 +0000 Subject: [PATCH] re PR middle-end/48819 (350 execution failures in 64-bit libjava testsuite on SPARC) 2011-04-29 Richard Guenther PR middle-end/48819 * constants.c (build_constants_constructor): Use ptr_type_node for temp. From-SVN: r173183 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/constants.c | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index dec7e0b79ed..da52f91b76f 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2011-04-29 Richard Guenther + + PR middle-end/48819 + * constants.c (build_constants_constructor): Use ptr_type_node for + temp. + 2011-04-20 Jim Meyering * jcf-parse.c (java_parse_file): Remove useless if-before-free. diff --git a/gcc/java/constants.c b/gcc/java/constants.c index 4425338f6b2..2cc911f33bd 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; -- 2.30.2