Patches for backports of javac fixes
Joe Darcy
Joe.Darcy at Sun.COM
Mon Oct 27 18:40:20 PDT 2008
Hello.
The following patch fixes the pair of bugs
6725036 javac returns incorrect value for lastModifiedTime() when
source is a zip file archive
6657499 javac 1.6.0 fails to compile class with inner class
These fixes are in OpenJDK 6 build 13.
-Joe
--- old/src/share/classes/com/sun/tools/javac/zip/ZipFileIndexEntry.java Mon Oct 27 17:28:20 2008
+++ new/src/share/classes/com/sun/tools/javac/zip/ZipFileIndexEntry.java Mon Oct 27 17:28:20 2008
@@ -26,6 +26,7 @@
package com.sun.tools.javac.zip;
import java.io.File;
+import java.util.Calendar;
public final class ZipFileIndexEntry implements Comparable<ZipFileIndexEntry> {
public static final ZipFileIndexEntry[] EMPTY_ARRAY = {};
@@ -83,13 +84,20 @@
return javatime;
}
- // From java.util.zip
- private static long dosToJavaTime(int nativetime) {
- // Bootstrap build problems prevent me from using the code directly
- // Convert the raw/native time to a long for now
- return (long)nativetime;
+ // based on dosToJavaTime in java.util.Zip, but avoiding the
+ // use of deprecated Date constructor
+ private static long dosToJavaTime(int dtime) {
+ Calendar c = Calendar.getInstance();
+ c.set(Calendar.YEAR, ((dtime >> 25) & 0x7f) + 1980);
+ c.set(Calendar.MONTH, ((dtime >> 21) & 0x0f) - 1);
+ c.set(Calendar.DATE, ((dtime >> 16) & 0x1f));
+ c.set(Calendar.HOUR_OF_DAY, ((dtime >> 11) & 0x1f));
+ c.set(Calendar.MINUTE, ((dtime >> 5) & 0x3f));
+ c.set(Calendar.SECOND, ((dtime << 1) & 0x3e));
+ c.set(Calendar.MILLISECOND, 0);
+ return c.getTimeInMillis();
}
-
+
void setNativeTime(int natTime) {
nativetime = natTime;
}
--- old/src/share/classes/com/sun/tools/javac/comp/Attr.java Mon Oct 27 17:28:22 2008
+++ new/src/share/classes/com/sun/tools/javac/comp/Attr.java Mon Oct 27 17:28:22 2008
@@ -1820,7 +1820,7 @@
chk.earlyRefError(tree.pos(), sym.kind == VAR ? sym : thisSym(tree.pos(), env));
}
Env<AttrContext> env1 = env;
- if (sym.kind != ERR && sym.owner != null && sym.owner != env1.enclClass.sym) {
+ if (sym.kind != ERR && sym.kind != TYP && sym.owner != null && sym.owner != env1.enclClass.sym) {
// If the found symbol is inaccessible, then it is
// accessed through an enclosing instance. Locate this
// enclosing instance:
--- /dev/null Mon Oct 27 17:28:24 2008
+++ new/test/tools/javac/T6725036.java Mon Oct 27 17:28:24 2008
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6725036
+ * @summary javac returns incorrect value for lastModifiedTime() when
+ * source is a zip file archive
+ */
+
+import java.io.File;
+import java.util.Date;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import javax.tools.JavaFileObject;
+
+import com.sun.tools.javac.util.JavacFileManager;
+import com.sun.tools.javac.zip.ZipFileIndex;
+import com.sun.tools.javac.zip.ZipFileIndexEntry;
+import com.sun.tools.javac.util.JavacFileManager.ZipFileIndexArchive;
+import com.sun.tools.javac.util.Context;
+
+public class T6725036 {
+ public static void main(String... args) throws Exception {
+ new T6725036().run();
+ }
+
+ void run() throws Exception {
+ String TEST_ENTRY_NAME = "java/lang/String.class";
+
+ File f = new File(System.getProperty("java.home"));
+ if (!f.getName().equals("jre"))
+ f = new File(f, "jre");
+ File rt_jar = new File(new File(f, "lib"), "rt.jar");
+
+ JarFile j = new JarFile(rt_jar);
+ JarEntry je = j.getJarEntry(TEST_ENTRY_NAME);
+ long jarEntryTime = je.getTime();
+
+ ZipFileIndex zfi =
+ ZipFileIndex.getZipFileIndex(rt_jar, 0, false, null, false);
+ long zfiTime = zfi.getLastModified(TEST_ENTRY_NAME);
+
+ check(je, jarEntryTime, zfi + ":" + TEST_ENTRY_NAME, zfiTime);
+
+ Context context = new Context();
+ JavacFileManager fm = new JavacFileManager(context, false, null);
+ ZipFileIndexArchive zfia =
+ fm.new ZipFileIndexArchive(fm, zfi);
+ int sep = TEST_ENTRY_NAME.lastIndexOf("/");
+ JavaFileObject jfo =
+ zfia.getFileObject(TEST_ENTRY_NAME.substring(0, sep + 1),
+ TEST_ENTRY_NAME.substring(sep + 1));
+ long jfoTime = jfo.getLastModified();
+
+ check(je, jarEntryTime, jfo, jfoTime);
+
+ if (errors > 0)
+ throw new Exception(errors + " occurred");
+ }
+
+ void check(Object ref, long refTime, Object test, long testTime) {
+ if (refTime == testTime)
+ return;
+ System.err.println("Error: ");
+ System.err.println("Expected: " + getText(ref, refTime));
+ System.err.println(" Found: " + getText(test, testTime));
+ errors++;
+ }
+
+ String getText(Object x, long t) {
+ return String.format("%14d", t) + " (" + new Date(t) + ") from " + x;
+ }
+
+ int errors;
+}
--- /dev/null Mon Oct 27 17:28:24 2008
+++ new/test/tools/javac/generics/T6657499.java Mon Oct 27 17:28:24 2008
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ *
+ * @bug 6657499
+ * @summary generics: javac 1.6.0 fails to compile class with inner class
+ * @author Maurizio Cimadamore
+ *
+ */
+
+public class T6657499<T> {
+ T t;
+ public T test() {
+ class Local {private T t;};
+ class Local2 {T m() {return t;}};
+ T t3 = new Local().t;
+ return new Local2().m();
+ }
+ public static void main(String[] args) {
+ String s = new T6657499<String>().test();
+ }
+}
More information about the jdk6-dev
mailing list