This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[3.4 JAVA] Backport aph's fix for PR java/14104
- From: Roger Sayle <roger at eyesopen dot com>
- To: java-patches at gcc dot gnu dot org
- Cc: gcc-patches at gcc dot gnu dot org, Andrew Haley <aph at redhat dot com>
- Date: Sat, 11 Dec 2004 12:32:37 -0700 (MST)
- Subject: [3.4 JAVA] Backport aph's fix for PR java/14104
I've been bootstrapping and regression testing the backport of a
middle-end patch that addresses a gcc 3.4 performance regression.
Unfortunately, this patch appears to be one that exposed the bug
PR java/14104 on mainline, which is currently present but latent
on the gcc-3_4-branch. Applying Andrew Haley's fix for PR14104
to the release branch would allow me to resolve the regression.
The following patch has been tested against the gcc-3_4-branch on
i686-pc-linux-gnu with a full "make bootstrap", all default languages,
and regression tested with a top-level "make -k check" with no new
failures.
Ok for the gcc-3_4-branch?
2004-12-11 Roger Sayle <roger@eyesopen.com>
PR java/14104
Backport from mainline
2004-03-31 Andrew Haley <aph@redhat.com>
* jcf-io.c (opendir_in_zip): Tidy up error handling.
Index: jcf-io.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/jcf-io.c,v
retrieving revision 1.48
diff -c -3 -p -r1.48 jcf-io.c
*** jcf-io.c 20 Dec 2003 15:38:27 -0000 1.48
--- jcf-io.c 11 Dec 2004 17:53:01 -0000
*************** opendir_in_zip (const char *zipfile, int
*** 120,126 ****
zipf->next = SeenZipFiles;
zipf->name = (char*)(zipf+1);
strcpy (zipf->name, zipfile);
- SeenZipFiles = zipf;
fd = open (zipfile, O_RDONLY | O_BINARY);
zipf->fd = fd;
if (fd < 0)
--- 120,125 ----
*************** opendir_in_zip (const char *zipfile, int
*** 140,145 ****
--- 139,146 ----
if (read_zip_archive (zipf) != 0)
return NULL;
}
+
+ SeenZipFiles = zipf;
return zipf;
}
Roger
--
Roger Sayle, E-mail: roger@eyesopen.com
OpenEye Scientific Software, WWW: http://www.eyesopen.com/
Suite 1107, 3600 Cerrillos Road, Tel: (+1) 505-473-7385
Santa Fe, New Mexico, 87507. Fax: (+1) 505-473-0833