--- a/.hgtags Mon Dec 05 12:50:00 2011 -0500
+++ b/.hgtags Tue Dec 06 05:28:17 2011 -0800
@@ -134,3 +134,5 @@
f651ce87127980c58e3599daba964eba2f3b4026 jdk8-b10
cc1f5ce8e504d350e0b0c28c5f84333f8d540132 jdk8-b11
86db042b3385c338e17f7664447fdc7d406dd19e jdk8-b12
+4cc0ef72c812943743ef4765f1100e2fbe2b1a08 jdk8-b13
+9ffaa48dbfb0f5936c2b789867d0785faec7071d jdk8-b14
--- a/.hgtags-top-repo Mon Dec 05 12:50:00 2011 -0500
+++ b/.hgtags-top-repo Tue Dec 06 05:28:17 2011 -0800
@@ -134,3 +134,5 @@
a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10
1defbc57940a56f0aa41e9dee87b71e8c8b71103 jdk8-b11
8e2104d565baee473895d5eba20e39f85ab4bf9f jdk8-b12
+26fb81a1e9ceb9baffba216acd9ded62e9e9d5ab jdk8-b13
+23aa7f2c80a2fa354c80decf03e7c2018177ef4e jdk8-b14
--- a/corba/.hgtags Mon Dec 05 12:50:00 2011 -0500
+++ b/corba/.hgtags Tue Dec 06 05:28:17 2011 -0800
@@ -134,3 +134,5 @@
cda87f7fefcee3b89742a57ce5ad9b03a54c210d jdk8-b10
0199e4fef5cc2bd234c65b93220459ef7a3bb3b1 jdk8-b11
31d70911b712c6b4e580a3110363d5f044cfed7a jdk8-b12
+5b9d9b839d3d7fe02347827221c97c6d242a6f96 jdk8-b13
+e59c47de1ad8982ff3b0e843773a6902b36c2337 jdk8-b14
--- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. 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
@@ -423,6 +423,13 @@
impl.setByteBufferWithInfo(bbwi);
}
+ /**
+ * return true if our ByteBuffer is sharing/equal to bb
+ */
+ protected final boolean isSharing(ByteBuffer bb) {
+ return (getByteBuffer() == bb);
+ }
+
public final int getBufferLength() {
return impl.getBufferLength();
}
--- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Mon Dec 05 12:50:00 2011 -0500
+++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. 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
@@ -2412,7 +2412,6 @@
if (bbwi != null && getByteBuffer() != null)
{
- int bbHash = System.identityHashCode(bbwi.byteBuffer);
MessageMediator messageMediator = parent.getMessageMediator();
if (messageMediator != null)
{
@@ -2420,19 +2419,12 @@
(CDROutputObject)messageMediator.getOutputObject();
if (outputObj != null)
{
- ByteBuffer outputBb = outputObj.getByteBuffer();
-
- int oBbHash = 0;
- if (outputBb != null)
+ if (outputObj.isSharing(getByteBuffer()))
{
- oBbHash = System.identityHashCode(outputBb);
- if (bbHash == oBbHash) // shared?
- {
- // Set OutputStream's ByteBuffer and bbwi to null
- // so its ByteBuffer cannot be released to the pool
- outputObj.setByteBuffer(null);
- outputObj.setByteBufferWithInfo(null);
- }
+ // Set OutputStream's ByteBuffer and bbwi to null
+ // so its ByteBuffer cannot be released to the pool
+ outputObj.setByteBuffer(null);
+ outputObj.setByteBufferWithInfo(null);
}
}
}
--- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. 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
@@ -357,6 +357,13 @@
impl.setByteBuffer(byteBuffer);
}
+ /**
+ * return true if our ByteBuffer is sharing/equal to bb
+ */
+ protected final boolean isSharing(ByteBuffer bb) {
+ return (getByteBuffer() == bb);
+ }
+
public final boolean isLittleEndian() {
return impl.isLittleEndian();
}
--- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Mon Dec 05 12:50:00 2011 -0500
+++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. 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
@@ -1902,7 +1902,6 @@
if (getByteBufferWithInfo() != null && getByteBuffer() != null)
{
- int bbHash = System.identityHashCode(bbwi.byteBuffer);
MessageMediator messageMediator = parent.getMessageMediator();
if (messageMediator != null)
{
@@ -1910,19 +1909,12 @@
(CDRInputObject)messageMediator.getInputObject();
if (inputObj != null)
{
- ByteBuffer inputBb = inputObj.getByteBuffer();
-
- int iBbHash = 0;
- if (inputBb != null)
+ if (inputObj.isSharing(getByteBuffer()))
{
- iBbHash = System.identityHashCode(inputBb);
- if (bbHash == iBbHash) // shared?
- {
- // Set InputStream's ByteBuffer and bbwi to null
- // so its ByteBuffer cannot be released to the pool
- inputObj.setByteBuffer(null);
- inputObj.setByteBufferWithInfo(null);
- }
+ // Set InputStream's ByteBuffer and bbwi to null
+ // so its ByteBuffer cannot be released to the pool
+ inputObj.setByteBuffer(null);
+ inputObj.setByteBufferWithInfo(null);
}
}
}
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. 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
@@ -2243,6 +2243,10 @@
}
try {
+ Class fieldCl = fields[i].getClazz();
+ if (objectValue != null && !fieldCl.isInstance(objectValue)) {
+ throw new IllegalArgumentException();
+ }
bridge.putObject( o, fields[i].getFieldID(), objectValue ) ;
// reflective code: fields[i].getField().set( o, objectValue ) ;
} catch (IllegalArgumentException e) {
@@ -2553,6 +2557,10 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
+ Class fieldCl = fld.getType();
+ if(v != null && !fieldCl.isInstance(v)) {
+ throw new Exception();
+ }
long key = bridge.objectFieldOffset( fld ) ;
bridge.putObject( o, key, v ) ;
} catch (Exception e) {
--- a/hotspot/.hgtags Mon Dec 05 12:50:00 2011 -0500
+++ b/hotspot/.hgtags Tue Dec 06 05:28:17 2011 -0800
@@ -197,3 +197,6 @@
6534482ff68ad79066dfe15dfb6d8905f09681bd hs23-b04
1d3900713a67a0a39faf4e12c9c158d55aebef87 jdk8-b12
3e609627e780736f372eb14d29bb9b5e53b21fbf hs23-b05
+b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13
+088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14
+6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06
--- a/hotspot/make/bsd/makefiles/buildtree.make Mon Dec 05 12:50:00 2011 -0500
+++ b/hotspot/make/bsd/makefiles/buildtree.make Tue Dec 06 05:28:17 2011 -0800
@@ -55,6 +55,9 @@
# The makefiles are split this way so that "make foo" will run faster by not
# having to read the dependency files for the vm.
+# needs to be set here since this Makefile doesn't include defs.make
+OS_VENDOR:=$(shell uname -s)
+
include $(GAMMADIR)/make/scm.make
include $(GAMMADIR)/make/altsrc.make
@@ -159,8 +162,15 @@
endif
endif
-# MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
-ifdef ALWAYS_PASS_TEST_GAMMA
+ifeq ($(OS_VENDOR), Darwin)
+ # MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
+ ifeq ($(ALWAYS_PASS_TEST_GAMMA),)
+ # ALWAYS_PASS_TEST_GAMMA wasn't set so we default to true on MacOS X
+ # until MACOSX_PORT-214 is fixed
+ ALWAYS_PASS_TEST_GAMMA=true
+ endif
+endif
+ifeq ($(ALWAYS_PASS_TEST_GAMMA), true)
TEST_GAMMA_STATUS= echo 'exit 0';
else
TEST_GAMMA_STATUS=
--- a/hotspot/make/bsd/makefiles/sa.make Mon Dec 05 12:50:00 2011 -0500
+++ b/hotspot/make/bsd/makefiles/sa.make Tue Dec 06 05:28:17 2011 -0800
@@ -37,11 +37,24 @@
TOPDIR = $(shell echo `pwd`)
GENERATED = $(TOPDIR)/../generated
-# tools.jar is needed by the JDI - SA binding
-ifeq ($(SA_APPLE_BOOT_JAVA),true)
- SA_CLASSPATH = $(BOOT_JAVA_HOME)/bundle/Classes/classes.jar
+# SA-JDI depends on the standard JDI classes.
+# Default SA_CLASSPATH location:
+DEF_SA_CLASSPATH=$(BOOT_JAVA_HOME)/lib/tools.jar
+ifeq ($(ALT_SA_CLASSPATH),)
+ # no alternate specified; see if default exists
+ SA_CLASSPATH=$(shell test -f $(DEF_SA_CLASSPATH) && echo $(DEF_SA_CLASSPATH))
+ ifeq ($(SA_CLASSPATH),)
+ # the default doesn't exist
+ ifeq ($(OS_VENDOR), Darwin)
+ # A JDK from Apple doesn't have tools.jar; the JDI classes are
+ # are in the regular classes.jar file.
+ APPLE_JAR=$(BOOT_JAVA_HOME)/bundle/Classes/classes.jar
+ SA_CLASSPATH=$(shell test -f $(APPLE_JAR) && echo $(APPLE_JAR))
+ endif
+ endif
else
- SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
+ _JUNK_ := $(shell echo >&2 "INFO: ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)")
+ SA_CLASSPATH=$(shell test -f $(ALT_SA_CLASSPATH) && echo $(ALT_SA_CLASSPATH))
endif
# TODO: if it's a modules image, check if SA module is installed.
@@ -72,8 +85,8 @@
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
exit 1; \
fi
- $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
- echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
+ $(QUIETLY) if [ ! -f "$(SA_CLASSPATH)" -a ! -d $(MODULELIB_PATH) ] ; then \
+ echo "Cannot find JDI classes. Use 1.6.0 or later version of JDK."; \
echo ""; \
exit 1; \
fi
--- a/jaxp/.hgtags Mon Dec 05 12:50:00 2011 -0500
+++ b/jaxp/.hgtags Tue Dec 06 05:28:17 2011 -0800
@@ -134,3 +134,5 @@
d21a4d5141c04bc9e88f2c0253121d449b66d667 jdk8-b10
d1b7a4f6dd2065fdeafbcdfd9dcc0072da8c6881 jdk8-b11
ca977d167697a561c04894187fc1c4d927582ffa jdk8-b12
+bcc739229f6384786c7ac0b52c1822c85674dcf1 jdk8-b13
+9d0c9d638757cb09de18933b946fa04b4f3fb94f jdk8-b14
--- a/jaxws/.hgtags Mon Dec 05 12:50:00 2011 -0500
+++ b/jaxws/.hgtags Tue Dec 06 05:28:17 2011 -0800
@@ -134,3 +134,5 @@
8e7fdc8e3c758644ca6d0fd70bb255e9d2e64cda jdk8-b10
a12ab897a249feb7859a6e6cd84b49411f4c06ac jdk8-b11
e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12
+adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13
+54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14
--- a/jaxws/jaxws.properties Mon Dec 05 12:50:00 2011 -0500
+++ b/jaxws/jaxws.properties Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. 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
@@ -25,15 +25,15 @@
drops.master.copy.base=${drops.dir}
-jaxws_src.bundle.name=jdk7-jaxws2_2_4-b03-2011_05_27.zip
-jaxws_src.bundle.md5.checksum=2f5b829ade70f67fe272d0b322e3e702
+jaxws_src.bundle.name=jdk8-jaxws2_2_4-b01-2011_07_22.zip
+jaxws_src.bundle.md5.checksum=f64bedd3c512e6b1ca265fda2feb0905
jaxws_src.master.bundle.dir=${drops.master.copy.base}
-jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7
+jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8
-jaf_src.bundle.name=jdk7-jaf-2010_08_19.zip
+jaf_src.bundle.name=jdk8-jaf-2011_07_22.zip
jaf_src.bundle.md5.checksum=18d15dfd71117daadb332af003d08212
jaf_src.master.bundle.dir=${drops.master.copy.base}
-jaf_src.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
+jaf_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8
#jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
#jaxws_tests.master.bundle.dir=${drops.master.copy.base}
--- a/jdk/.hgtags Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/.hgtags Tue Dec 06 05:28:17 2011 -0800
@@ -134,3 +134,5 @@
4788745572ef2bde34924ef34e7e4d55ba07e979 jdk8-b10
7ab0d613cd1a271a9763ffb894dc1f0a5b95a7e4 jdk8-b11
09fd2067f715e4505c44b01c301258a4e8f8964e jdk8-b12
+4cb2e8679b27432854690cb688ea06d3b2d8e008 jdk8-b13
+99632935785e2038b2fc836da9f2ede69dea294b jdk8-b14
--- a/jdk/make/docs/Makefile Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/make/docs/Makefile Tue Dec 06 05:28:17 2011 -0800
@@ -71,7 +71,7 @@
ifeq ($(ARCH_DATA_MODEL),64)
MAX_VM_MEMORY = 1024
else
- MAX_VM_MEMORY = 512
+ MAX_VM_MEMORY = 612
endif
# List of all possible directories for javadoc to look for sources
--- a/jdk/make/java/nio/FILES_java.gmk Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/make/java/nio/FILES_java.gmk Tue Dec 06 05:28:17 2011 -0800
@@ -232,6 +232,7 @@
sun/nio/cs/UTF_16BE.java \
sun/nio/cs/UTF_16LE.java \
sun/nio/cs/UTF_8.java \
+ sun/nio/cs/CESU_8.java \
sun/nio/cs/Unicode.java \
sun/nio/cs/UnicodeDecoder.java \
sun/nio/cs/UnicodeEncoder.java \
--- a/jdk/make/sun/net/Makefile Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/make/sun/net/Makefile Tue Dec 06 05:28:17 2011 -0800
@@ -28,6 +28,7 @@
PRODUCT = sun
SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
+SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
include $(BUILDDIR)/common/Defs.gmk
SUBDIRS = others spi
--- a/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. 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
@@ -179,6 +179,12 @@
throw new IllegalArgumentException(
"no SSLSocketFactory specified");
}
+
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkSetFactory();
+ }
+
sslSocketFactory = sf;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java Tue Dec 06 05:28:17 2011 -0800
@@ -250,6 +250,8 @@
int index=s==null ? elementIndex : names.indexOf(n.getNamespaceURI());
index=(index<0) ? namesLength : index;
String name=n.getLocalName();
+ if (name == null)
+ name = n.getName();
if (name.length()>2)
continue;
String value=n.getNodeValue();
--- a/jdk/src/share/classes/java/awt/AWTKeyStroke.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/awt/AWTKeyStroke.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. 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
@@ -25,6 +25,7 @@
package java.awt;
import java.awt.event.KeyEvent;
+import sun.awt.AppContext;
import java.awt.event.InputEvent;
import java.util.Collections;
import java.util.HashMap;
@@ -66,9 +67,6 @@
public class AWTKeyStroke implements Serializable {
static final long serialVersionUID = -6430539691155161871L;
- private static Map cache;
- private static AWTKeyStroke cacheKey;
- private static Constructor ctor = getCtor(AWTKeyStroke.class);
private static Map modifierKeywords;
/**
* Associates VK_XXX (as a String) with code (as Integer). This is
@@ -77,6 +75,25 @@
*/
private static VKCollection vks;
+ //A key for the collection of AWTKeyStrokes within AppContext.
+ private static Object APP_CONTEXT_CACHE_KEY = new Object();
+ //A key withing the cache
+ private static AWTKeyStroke APP_CONTEXT_KEYSTROKE_KEY = new AWTKeyStroke();
+
+ /*
+ * Reads keystroke class from AppContext and if null, puts there the
+ * AWTKeyStroke class.
+ * Must be called under locked AWTKeyStro
+ */
+ private static Class getAWTKeyStrokeClass() {
+ Class clazz = (Class)AppContext.getAppContext().get(AWTKeyStroke.class);
+ if (clazz == null) {
+ clazz = AWTKeyStroke.class;
+ AppContext.getAppContext().put(AWTKeyStroke.class, AWTKeyStroke.class);
+ }
+ return clazz;
+ }
+
private char keyChar = KeyEvent.CHAR_UNDEFINED;
private int keyCode = KeyEvent.VK_UNDEFINED;
private int modifiers;
@@ -164,9 +181,12 @@
if (subclass == null) {
throw new IllegalArgumentException("subclass cannot be null");
}
- if (AWTKeyStroke.ctor.getDeclaringClass().equals(subclass)) {
- // Already registered
- return;
+ synchronized (AWTKeyStroke.class) {
+ Class keyStrokeClass = (Class)AppContext.getAppContext().get(AWTKeyStroke.class);
+ if (keyStrokeClass != null && keyStrokeClass.equals(subclass)){
+ // Already registered
+ return;
+ }
}
if (!AWTKeyStroke.class.isAssignableFrom(subclass)) {
throw new ClassCastException("subclass is not derived from AWTKeyStroke");
@@ -197,9 +217,9 @@
}
synchronized (AWTKeyStroke.class) {
- AWTKeyStroke.ctor = ctor;
- cache = null;
- cacheKey = null;
+ AppContext.getAppContext().put(AWTKeyStroke.class, subclass);
+ AppContext.getAppContext().remove(APP_CONTEXT_CACHE_KEY);
+ AppContext.getAppContext().remove(APP_CONTEXT_KEYSTROKE_KEY);
}
}
@@ -229,13 +249,19 @@
private static synchronized AWTKeyStroke getCachedStroke
(char keyChar, int keyCode, int modifiers, boolean onKeyRelease)
{
+ Map cache = (Map)AppContext.getAppContext().get(APP_CONTEXT_CACHE_KEY);
+ AWTKeyStroke cacheKey = (AWTKeyStroke)AppContext.getAppContext().get(APP_CONTEXT_KEYSTROKE_KEY);
+
if (cache == null) {
cache = new HashMap();
+ AppContext.getAppContext().put(APP_CONTEXT_CACHE_KEY, cache);
}
if (cacheKey == null) {
try {
- cacheKey = (AWTKeyStroke)ctor.newInstance((Object[]) null);
+ Class clazz = getAWTKeyStrokeClass();
+ cacheKey = (AWTKeyStroke)getCtor(clazz).newInstance((Object[]) null);
+ AppContext.getAppContext().put(APP_CONTEXT_KEYSTROKE_KEY, cacheKey);
} catch (InstantiationException e) {
assert(false);
} catch (IllegalAccessException e) {
@@ -253,9 +279,8 @@
if (stroke == null) {
stroke = cacheKey;
cache.put(stroke, stroke);
- cacheKey = null;
+ AppContext.getAppContext().remove(APP_CONTEXT_KEYSTROKE_KEY);
}
-
return stroke;
}
--- a/jdk/src/share/classes/java/io/FileInputStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/io/FileInputStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -124,7 +124,7 @@
throw new NullPointerException();
}
fd = new FileDescriptor();
- fd.incrementAndGetUseCount();
+ fd.attach(this);
open(name);
}
@@ -164,10 +164,9 @@
/*
* FileDescriptor is being shared by streams.
- * Ensure that it's GC'ed only when all the streams/channels are done
- * using it.
+ * Register this stream with FileDescriptor tracker.
*/
- fd.incrementAndGetUseCount();
+ fd.attach(this);
}
/**
@@ -294,27 +293,14 @@
closed = true;
}
if (channel != null) {
- /*
- * Decrement the FD use count associated with the channel
- * The use count is incremented whenever a new channel
- * is obtained from this stream.
- */
- fd.decrementAndGetUseCount();
channel.close();
}
- /*
- * Decrement the FD use count associated with this stream
- */
- int useCount = fd.decrementAndGetUseCount();
-
- /*
- * If FileDescriptor is still in use by another stream, we
- * will not close it.
- */
- if (useCount <= 0) {
- close0();
- }
+ fd.closeAll(new Closeable() {
+ public void close() throws IOException {
+ close0();
+ }
+ });
}
/**
@@ -328,7 +314,9 @@
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
- if (fd != null) return fd;
+ if (fd != null) {
+ return fd;
+ }
throw new IOException();
}
@@ -352,13 +340,6 @@
synchronized (this) {
if (channel == null) {
channel = FileChannelImpl.open(fd, true, false, this);
-
- /*
- * Increment fd's use count. Invoking the channel's close()
- * method will result in decrementing the use count set for
- * the channel.
- */
- fd.incrementAndGetUseCount();
}
return channel;
}
@@ -381,7 +362,12 @@
*/
protected void finalize() throws IOException {
if ((fd != null) && (fd != FileDescriptor.in)) {
- close();
+ /* if fd is shared, the references in FileDescriptor
+ * will ensure that finalizer is only called when
+ * safe to do so. All references using the fd have
+ * become unreachable. We can call close()
+ */
+ close();
}
}
}
--- a/jdk/src/share/classes/java/io/FileOutputStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/io/FileOutputStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -197,9 +197,9 @@
throw new NullPointerException();
}
this.fd = new FileDescriptor();
+ fd.attach(this);
this.append = append;
- fd.incrementAndGetUseCount();
open(name, append);
}
@@ -237,12 +237,7 @@
this.fd = fdObj;
this.append = false;
- /*
- * FileDescriptor is being shared by streams.
- * Ensure that it's GC'ed only when all the streams/channels are done
- * using it.
- */
- fd.incrementAndGetUseCount();
+ fd.attach(this);
}
/**
@@ -331,27 +326,14 @@
}
if (channel != null) {
- /*
- * Decrement FD use count associated with the channel
- * The use count is incremented whenever a new channel
- * is obtained from this stream.
- */
- fd.decrementAndGetUseCount();
channel.close();
}
- /*
- * Decrement FD use count associated with this stream
- */
- int useCount = fd.decrementAndGetUseCount();
-
- /*
- * If FileDescriptor is still in use by another stream, we
- * will not close it.
- */
- if (useCount <= 0) {
- close0();
- }
+ fd.closeAll(new Closeable() {
+ public void close() throws IOException {
+ close0();
+ }
+ });
}
/**
@@ -365,7 +347,9 @@
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
- if (fd != null) return fd;
+ if (fd != null) {
+ return fd;
+ }
throw new IOException();
}
@@ -390,13 +374,6 @@
synchronized (this) {
if (channel == null) {
channel = FileChannelImpl.open(fd, false, true, append, this);
-
- /*
- * Increment fd's use count. Invoking the channel's close()
- * method will result in decrementing the use count set for
- * the channel.
- */
- fd.incrementAndGetUseCount();
}
return channel;
}
@@ -415,7 +392,12 @@
if (fd == FileDescriptor.out || fd == FileDescriptor.err) {
flush();
} else {
- close();
+ /* if fd is shared, the references in FileDescriptor
+ * will ensure that finalizer is only called when
+ * safe to do so. All references using the fd have
+ * become unreachable. We can call close()
+ */
+ close();
}
}
}
--- a/jdk/src/share/classes/java/io/InputStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/io/InputStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -44,10 +44,9 @@
*/
public abstract class InputStream implements Closeable {
- // SKIP_BUFFER_SIZE is used to determine the size of skipBuffer
- private static final int SKIP_BUFFER_SIZE = 2048;
- // skipBuffer is initialized in skip(long), if needed.
- private static byte[] skipBuffer;
+ // MAX_SKIP_BUFFER_SIZE is used to determine the maximum buffer size to
+ // use when skipping.
+ private static final int MAX_SKIP_BUFFER_SIZE = 2048;
/**
* Reads the next byte of data from the input stream. The value byte is
@@ -212,18 +211,15 @@
long remaining = n;
int nr;
- if (skipBuffer == null)
- skipBuffer = new byte[SKIP_BUFFER_SIZE];
-
- byte[] localSkipBuffer = skipBuffer;
if (n <= 0) {
return 0;
}
+ int size = (int)Math.min(MAX_SKIP_BUFFER_SIZE, remaining);
+ byte[] skipBuffer = new byte[size];
while (remaining > 0) {
- nr = read(localSkipBuffer, 0,
- (int) Math.min(SKIP_BUFFER_SIZE, remaining));
+ nr = read(skipBuffer, 0, (int)Math.min(size, remaining));
if (nr < 0) {
break;
}
--- a/jdk/src/share/classes/java/io/RandomAccessFile.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/io/RandomAccessFile.java Tue Dec 06 05:28:17 2011 -0800
@@ -229,7 +229,7 @@
throw new NullPointerException();
}
fd = new FileDescriptor();
- fd.incrementAndGetUseCount();
+ fd.attach(this);
open(name, imode);
}
@@ -242,7 +242,9 @@
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
- if (fd != null) return fd;
+ if (fd != null) {
+ return fd;
+ }
throw new IOException();
}
@@ -268,17 +270,6 @@
synchronized (this) {
if (channel == null) {
channel = FileChannelImpl.open(fd, true, rw, this);
-
- /*
- * FileDescriptor could be shared by FileInputStream or
- * FileOutputStream.
- * Ensure that FD is GC'ed only when all the streams/channels
- * are done using it.
- * Increment fd's use count. Invoking the channel's close()
- * method will result in decrementing the use count set for
- * the channel.
- */
- fd.incrementAndGetUseCount();
}
return channel;
}
@@ -577,28 +568,14 @@
closed = true;
}
if (channel != null) {
- /*
- * Decrement FD use count associated with the channel. The FD use
- * count is incremented whenever a new channel is obtained from
- * this stream.
- */
- fd.decrementAndGetUseCount();
channel.close();
}
- /*
- * Decrement FD use count associated with this stream.
- * The count got incremented by FileDescriptor during its construction.
- */
- int useCount = fd.decrementAndGetUseCount();
-
- /*
- * If FileDescriptor is still in use by another stream, we
- * will not close it.
- */
- if (useCount <= 0) {
- close0();
- }
+ fd.closeAll(new Closeable() {
+ public void close() throws IOException {
+ close0();
+ }
+ });
}
//
--- a/jdk/src/share/classes/java/io/Writer.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/io/Writer.java Tue Dec 06 05:28:17 2011 -0800
@@ -57,7 +57,7 @@
/**
* Size of writeBuffer, must be >= 1
*/
- private final int writeBufferSize = 1024;
+ private static final int WRITE_BUFFER_SIZE = 1024;
/**
* The object used to synchronize operations on this stream. For
@@ -107,7 +107,7 @@
public void write(int c) throws IOException {
synchronized (lock) {
if (writeBuffer == null){
- writeBuffer = new char[writeBufferSize];
+ writeBuffer = new char[WRITE_BUFFER_SIZE];
}
writeBuffer[0] = (char) c;
write(writeBuffer, 0, 1);
@@ -180,9 +180,9 @@
public void write(String str, int off, int len) throws IOException {
synchronized (lock) {
char cbuf[];
- if (len <= writeBufferSize) {
+ if (len <= WRITE_BUFFER_SIZE) {
if (writeBuffer == null) {
- writeBuffer = new char[writeBufferSize];
+ writeBuffer = new char[WRITE_BUFFER_SIZE];
}
cbuf = writeBuffer;
} else { // Don't permanently allocate very large buffers.
--- a/jdk/src/share/classes/java/lang/AssertionError.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/lang/AssertionError.java Tue Dec 06 05:28:17 2011 -0800
@@ -71,7 +71,7 @@
* @see Throwable#getCause()
*/
public AssertionError(Object detailMessage) {
- this("" + detailMessage);
+ this(String.valueOf(detailMessage));
if (detailMessage instanceof Throwable)
initCause((Throwable) detailMessage);
}
@@ -85,7 +85,7 @@
* @param detailMessage value to be used in constructing detail message
*/
public AssertionError(boolean detailMessage) {
- this("" + detailMessage);
+ this(String.valueOf(detailMessage));
}
/**
@@ -97,7 +97,7 @@
* @param detailMessage value to be used in constructing detail message
*/
public AssertionError(char detailMessage) {
- this("" + detailMessage);
+ this(String.valueOf(detailMessage));
}
/**
@@ -109,7 +109,7 @@
* @param detailMessage value to be used in constructing detail message
*/
public AssertionError(int detailMessage) {
- this("" + detailMessage);
+ this(String.valueOf(detailMessage));
}
/**
@@ -121,7 +121,7 @@
* @param detailMessage value to be used in constructing detail message
*/
public AssertionError(long detailMessage) {
- this("" + detailMessage);
+ this(String.valueOf(detailMessage));
}
/**
@@ -133,7 +133,7 @@
* @param detailMessage value to be used in constructing detail message
*/
public AssertionError(float detailMessage) {
- this("" + detailMessage);
+ this(String.valueOf(detailMessage));
}
/**
@@ -145,7 +145,7 @@
* @param detailMessage value to be used in constructing detail message
*/
public AssertionError(double detailMessage) {
- this("" + detailMessage);
+ this(String.valueOf(detailMessage));
}
/**
--- a/jdk/src/share/classes/java/lang/Class.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/lang/Class.java Tue Dec 06 05:28:17 2011 -0800
@@ -3008,7 +3008,7 @@
/**
* Casts this {@code Class} object to represent a subclass of the class
- * represented by the specified class object. Checks that that the cast
+ * represented by the specified class object. Checks that the cast
* is valid, and throws a {@code ClassCastException} if it is not. If
* this method succeeds, it always returns a reference to this class object.
*
--- a/jdk/src/share/classes/java/lang/Double.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/lang/Double.java Tue Dec 06 05:28:17 2011 -0800
@@ -607,8 +607,7 @@
* @see java.lang.Double#valueOf(java.lang.String)
*/
public Double(String s) throws NumberFormatException {
- // REMIND: this is inefficient
- this(valueOf(s).doubleValue());
+ value = parseDouble(s);
}
/**
--- a/jdk/src/share/classes/java/lang/Float.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/lang/Float.java Tue Dec 06 05:28:17 2011 -0800
@@ -529,8 +529,7 @@
* @see java.lang.Float#valueOf(java.lang.String)
*/
public Float(String s) throws NumberFormatException {
- // REMIND: this is inefficient
- this(valueOf(s).floatValue());
+ value = parseFloat(s);
}
/**
--- a/jdk/src/share/classes/java/lang/invoke/CallSite.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/lang/invoke/CallSite.java Tue Dec 06 05:28:17 2011 -0800
@@ -266,7 +266,7 @@
/*package-private*/
void setTargetNormal(MethodHandle newTarget) {
- target = newTarget;
+ MethodHandleNatives.setCallSiteTargetNormal(this, newTarget);
}
/*package-private*/
MethodHandle getTargetVolatile() {
@@ -274,7 +274,7 @@
}
/*package-private*/
void setTargetVolatile(MethodHandle newTarget) {
- unsafe.putObjectVolatile(this, TARGET_OFFSET, newTarget);
+ MethodHandleNatives.setCallSiteTargetVolatile(this, newTarget);
}
// this implements the upcall from the JVM, MethodHandleNatives.makeDynamicCallSite:
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -934,12 +934,4 @@
return THROW_EXCEPTION;
}
static <T extends Throwable> Empty throwException(T t) throws T { throw t; }
-
- // Linkage support:
- static void registerBootstrap(Class<?> callerClass, MethodHandle bootstrapMethod) {
- MethodHandleNatives.registerBootstrap(callerClass, bootstrapMethod);
- }
- static MethodHandle getBootstrap(Class<?> callerClass) {
- return MethodHandleNatives.getBootstrap(callerClass);
- }
}
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Tue Dec 06 05:28:17 2011 -0800
@@ -61,15 +61,6 @@
/** Initialize a method type, once per form. */
static native void init(MethodType self);
- /** Tell the JVM about a class's bootstrap method. */
- static native void registerBootstrap(Class<?> caller, MethodHandle bootstrapMethod);
-
- /** Ask the JVM about a class's bootstrap method. */
- static native MethodHandle getBootstrap(Class<?> caller);
-
- /** Tell the JVM that we need to change the target of an invokedynamic. */
- static native void setCallSiteTarget(CallSite site, MethodHandle target);
-
/** Fetch the vmtarget field.
* It will be sanitized as necessary to avoid exposing non-Java references.
* This routine is for debugging and reflection.
@@ -122,6 +113,12 @@
static final boolean COUNT_GWT;
+ /// CallSite support
+
+ /** Tell the JVM that we need to change the target of a CallSite. */
+ static native void setCallSiteTargetNormal(CallSite site, MethodHandle target);
+ static native void setCallSiteTargetVolatile(CallSite site, MethodHandle target);
+
private static native void registerNatives();
static {
registerNatives();
--- a/jdk/src/share/classes/java/lang/ref/Reference.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/lang/ref/Reference.java Tue Dec 06 05:28:17 2011 -0800
@@ -27,7 +27,6 @@
import sun.misc.Cleaner;
-
/**
* Abstract base class for reference objects. This class defines the
* operations common to all reference objects. Because reference objects are
@@ -69,7 +68,7 @@
* null.
*
* Pending: queue = ReferenceQueue with which instance is registered;
- * next = Following instance in queue, or this if at end of list.
+ * next = this
*
* Enqueued: queue = ReferenceQueue.ENQUEUED; next = Following instance
* in queue, or this if at end of list.
@@ -81,17 +80,28 @@
* the next field is null then the instance is active; if it is non-null,
* then the collector should treat the instance normally.
*
- * To ensure that concurrent collector can discover active Reference
+ * To ensure that a concurrent collector can discover active Reference
* objects without interfering with application threads that may apply
* the enqueue() method to those objects, collectors should link
- * discovered objects through the discovered field.
+ * discovered objects through the discovered field. The discovered
+ * field is also used for linking Reference objects in the pending list.
*/
private T referent; /* Treated specially by GC */
ReferenceQueue<? super T> queue;
+ /* When active: NULL
+ * pending: this
+ * Enqueued: next reference in queue (or this if last)
+ * Inactive: this
+ */
Reference next;
+
+ /* When active: next element in a discovered reference list maintained by GC (or this if last)
+ * pending: next element in the pending list (or null if last)
+ * otherwise: NULL
+ */
transient private Reference<T> discovered; /* used by VM */
@@ -106,7 +116,8 @@
/* List of References waiting to be enqueued. The collector adds
* References to this list, while the Reference-handler thread removes
- * them. This list is protected by the above lock object.
+ * them. This list is protected by the above lock object. The
+ * list uses the discovered field to link its elements.
*/
private static Reference pending = null;
@@ -120,14 +131,12 @@
public void run() {
for (;;) {
-
Reference r;
synchronized (lock) {
if (pending != null) {
r = pending;
- Reference rn = r.next;
- pending = (rn == r) ? null : rn;
- r.next = r;
+ pending = r.discovered;
+ r.discovered = null;
} else {
try {
lock.wait();
@@ -201,10 +210,8 @@
* been enqueued
*/
public boolean isEnqueued() {
- /* In terms of the internal states, this predicate actually tests
- whether the instance is either Pending or Enqueued */
synchronized (this) {
- return (this.queue != ReferenceQueue.NULL) && (this.next != null);
+ return (this.next != null && this.queue == ReferenceQueue.ENQUEUED);
}
}
--- a/jdk/src/share/classes/java/net/InetAddress.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/net/InetAddress.java Tue Dec 06 05:28:17 2011 -0800
@@ -876,10 +876,12 @@
nameService = java.security.AccessController.doPrivileged(
new java.security.PrivilegedExceptionAction<NameService>() {
public NameService run() {
- Iterator itr = Service.providers(NameServiceDescriptor.class);
+ // sun.misc.Service.providers returns a raw Iterator
+ @SuppressWarnings("unchecked")
+ Iterator<NameServiceDescriptor> itr =
+ Service.providers(NameServiceDescriptor.class);
while (itr.hasNext()) {
- NameServiceDescriptor nsd
- = (NameServiceDescriptor)itr.next();
+ NameServiceDescriptor nsd = itr.next();
if (providerName.
equalsIgnoreCase(nsd.getType()+","
+nsd.getProviderName())) {
--- a/jdk/src/share/classes/java/net/ServerSocket.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/net/ServerSocket.java Tue Dec 06 05:28:17 2011 -0800
@@ -267,10 +267,9 @@
AccessController.doPrivileged(
new PrivilegedExceptionAction<Void>() {
public Void run() throws NoSuchMethodException {
- Class[] cl = new Class[2];
- cl[0] = SocketAddress.class;
- cl[1] = Integer.TYPE;
- impl.getClass().getDeclaredMethod("connect", cl);
+ impl.getClass().getDeclaredMethod("connect",
+ SocketAddress.class,
+ int.class);
return null;
}
});
--- a/jdk/src/share/classes/java/nio/charset/Charset.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/nio/charset/Charset.java Tue Dec 06 05:28:17 2011 -0800
@@ -435,7 +435,7 @@
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
try {
- Class epc
+ Class<?> epc
= Class.forName("sun.nio.cs.ext.ExtendedCharsets");
extendedProvider = (CharsetProvider)epc.newInstance();
} catch (ClassNotFoundException x) {
--- a/jdk/src/share/classes/java/nio/file/Files.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/nio/file/Files.java Tue Dec 06 05:28:17 2011 -0800
@@ -363,6 +363,17 @@
// -- Directories --
+ private static class AcceptAllFilter
+ implements DirectoryStream.Filter<Path>
+ {
+ private AcceptAllFilter() { }
+
+ @Override
+ public boolean accept(Path entry) { return true; }
+
+ static final AcceptAllFilter FILTER = new AcceptAllFilter();
+ }
+
/**
* Opens a directory, returning a {@link DirectoryStream} to iterate over
* all entries in the directory. The elements returned by the directory
@@ -397,12 +408,7 @@
public static DirectoryStream<Path> newDirectoryStream(Path dir)
throws IOException
{
- return provider(dir).newDirectoryStream(dir, new DirectoryStream.Filter<Path>() {
- @Override
- public boolean accept(Path entry) {
- return true;
- }
- });
+ return provider(dir).newDirectoryStream(dir, AcceptAllFilter.FILTER);
}
/**
--- a/jdk/src/share/classes/java/security/Policy.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/security/Policy.java Tue Dec 06 05:28:17 2011 -0800
@@ -28,6 +28,7 @@
import java.util.Enumeration;
import java.util.WeakHashMap;
+import java.util.concurrent.atomic.AtomicReference;
import sun.security.jca.GetInstance;
import sun.security.util.Debug;
import sun.security.util.SecurityConstants;
@@ -60,8 +61,8 @@
* with a standard type. The default policy type is "JavaPolicy".
*
* <p> Once a Policy instance has been installed (either by default, or by
- * calling <code>setPolicy</code>),
- * the Java runtime invokes its <code>implies</code> when it needs to
+ * calling <code>setPolicy</code>), the Java runtime invokes its
+ * <code>implies</code> method when it needs to
* determine whether executing code (encapsulated in a ProtectionDomain)
* can perform SecurityManager-protected operations. How a Policy object
* retrieves its policy data is up to the Policy implementation itself.
@@ -94,18 +95,33 @@
public static final PermissionCollection UNSUPPORTED_EMPTY_COLLECTION =
new UnsupportedEmptyCollection();
- /** the system-wide policy. */
- private static Policy policy; // package private for AccessControlContext
+ // Information about the system-wide policy.
+ private static class PolicyInfo {
+ // the system-wide policy
+ final Policy policy;
+ // a flag indicating if the system-wide policy has been initialized
+ final boolean initialized;
+
+ PolicyInfo(Policy policy, boolean initialized) {
+ this.policy = policy;
+ this.initialized = initialized;
+ }
+ }
+
+ // PolicyInfo is stored in an AtomicReference
+ private static AtomicReference<PolicyInfo> policy =
+ new AtomicReference<>(new PolicyInfo(null, false));
private static final Debug debug = Debug.getInstance("policy");
// Cache mapping ProtectionDomain.Key to PermissionCollection
private WeakHashMap<ProtectionDomain.Key, PermissionCollection> pdMapping;
- /** package private for AccessControlContext */
+ /** package private for AccessControlContext and ProtectionDomain */
static boolean isSet()
{
- return policy != null;
+ PolicyInfo pi = policy.get();
+ return pi.policy != null && pi.initialized == true;
}
private static void checkPermission(String type) {
@@ -143,80 +159,92 @@
/**
* Returns the installed Policy object, skipping the security check.
- * Used by SecureClassLoader and getPolicy.
+ * Used by ProtectionDomain and getPolicy.
*
* @return the installed Policy.
- *
*/
- static synchronized Policy getPolicyNoCheck()
+ static Policy getPolicyNoCheck()
{
- if (policy == null) {
- String policy_class = null;
- policy_class = AccessController.doPrivileged(
- new PrivilegedAction<String>() {
- public String run() {
- return Security.getProperty("policy.provider");
- }
- });
- if (policy_class == null) {
- policy_class = "sun.security.provider.PolicyFile";
- }
-
- try {
- policy = (Policy)
- Class.forName(policy_class).newInstance();
- } catch (Exception e) {
- /*
- * The policy_class seems to be an extension
- * so we have to bootstrap loading it via a policy
- * provider that is on the bootclasspath
- * If it loads then shift gears to using the configured
- * provider.
- */
-
- // install the bootstrap provider to avoid recursion
- policy = new sun.security.provider.PolicyFile();
-
- final String pc = policy_class;
- Policy p = AccessController.doPrivileged(
- new PrivilegedAction<Policy>() {
- public Policy run() {
- try {
- ClassLoader cl =
- ClassLoader.getSystemClassLoader();
- // we want the extension loader
- ClassLoader extcl = null;
- while (cl != null) {
- extcl = cl;
- cl = cl.getParent();
- }
- return (extcl != null ? (Policy)Class.forName(
- pc, true, extcl).newInstance() : null);
- } catch (Exception e) {
- if (debug != null) {
- debug.println("policy provider " +
- pc +
- " not available");
- e.printStackTrace();
- }
- return null;
- }
+ PolicyInfo pi = policy.get();
+ // Use double-check idiom to avoid locking if system-wide policy is
+ // already initialized
+ if (pi.initialized == false || pi.policy == null) {
+ synchronized (Policy.class) {
+ PolicyInfo pinfo = policy.get();
+ if (pinfo.policy == null) {
+ String policy_class = AccessController.doPrivileged(
+ new PrivilegedAction<String>() {
+ public String run() {
+ return Security.getProperty("policy.provider");
}
});
- /*
- * if it loaded install it as the policy provider. Otherwise
- * continue to use the system default implementation
- */
- if (p != null) {
- policy = p;
- } else {
- if (debug != null) {
- debug.println("using sun.security.provider.PolicyFile");
+ if (policy_class == null) {
+ policy_class = "sun.security.provider.PolicyFile";
}
+
+ try {
+ pinfo = new PolicyInfo(
+ (Policy) Class.forName(policy_class).newInstance(),
+ true);
+ } catch (Exception e) {
+ /*
+ * The policy_class seems to be an extension
+ * so we have to bootstrap loading it via a policy
+ * provider that is on the bootclasspath.
+ * If it loads then shift gears to using the configured
+ * provider.
+ */
+
+ // install the bootstrap provider to avoid recursion
+ Policy polFile = new sun.security.provider.PolicyFile();
+ pinfo = new PolicyInfo(polFile, false);
+ policy.set(pinfo);
+
+ final String pc = policy_class;
+ Policy pol = AccessController.doPrivileged(
+ new PrivilegedAction<Policy>() {
+ public Policy run() {
+ try {
+ ClassLoader cl =
+ ClassLoader.getSystemClassLoader();
+ // we want the extension loader
+ ClassLoader extcl = null;
+ while (cl != null) {
+ extcl = cl;
+ cl = cl.getParent();
+ }
+ return (extcl != null ? (Policy)Class.forName(
+ pc, true, extcl).newInstance() : null);
+ } catch (Exception e) {
+ if (debug != null) {
+ debug.println("policy provider " +
+ pc +
+ " not available");
+ e.printStackTrace();
+ }
+ return null;
+ }
+ }
+ });
+ /*
+ * if it loaded install it as the policy provider. Otherwise
+ * continue to use the system default implementation
+ */
+ if (pol != null) {
+ pinfo = new PolicyInfo(pol, true);
+ } else {
+ if (debug != null) {
+ debug.println("using sun.security.provider.PolicyFile");
+ }
+ pinfo = new PolicyInfo(polFile, true);
+ }
+ }
+ policy.set(pinfo);
}
+ return pinfo.policy;
}
}
- return policy;
+ return pi.policy;
}
/**
@@ -245,7 +273,7 @@
initPolicy(p);
}
synchronized (Policy.class) {
- Policy.policy = p;
+ policy.set(new PolicyInfo(p, p != null));
}
}
@@ -292,14 +320,14 @@
PermissionCollection policyPerms = null;
synchronized (p) {
if (p.pdMapping == null) {
- p.pdMapping =
- new WeakHashMap<ProtectionDomain.Key, PermissionCollection>();
+ p.pdMapping = new WeakHashMap<>();
}
}
if (policyDomain.getCodeSource() != null) {
- if (Policy.isSet()) {
- policyPerms = policy.getPermissions(policyDomain);
+ Policy pol = policy.get().policy;
+ if (pol != null) {
+ policyPerms = pol.getPermissions(policyDomain);
}
if (policyPerms == null) { // assume it has all
@@ -434,7 +462,7 @@
type,
params);
} catch (NoSuchAlgorithmException nsae) {
- return handleException (nsae);
+ return handleException(nsae);
}
}
@@ -494,7 +522,7 @@
type,
params);
} catch (NoSuchAlgorithmException nsae) {
- return handleException (nsae);
+ return handleException(nsae);
}
}
@@ -808,7 +836,7 @@
*
* @param permission the Permission object to compare.
*
- * @return true if "permission" is implied by the permissions in
+ * @return true if "permission" is implied by the permissions in
* the collection, false if not.
*/
@Override public boolean implies(Permission permission) {
--- a/jdk/src/share/classes/java/security/Security.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/security/Security.java Tue Dec 06 05:28:17 2011 -0800
@@ -814,7 +814,7 @@
public Void run() {
try {
/* Get the class via the bootstrap class loader. */
- Class cl = Class.forName(
+ Class<?> cl = Class.forName(
"java.lang.SecurityManager", false, null);
Field f = null;
boolean accessible = false;
--- a/jdk/src/share/classes/java/sql/PreparedStatement.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/sql/PreparedStatement.java Tue Dec 06 05:28:17 2011 -0800
@@ -767,7 +767,7 @@
/**
- * Sets the designated paramter to the given <code>String</code> object.
+ * Sets the designated parameter to the given <code>String</code> object.
* The driver converts this to a SQL <code>NCHAR</code> or
* <code>NVARCHAR</code> or <code>LONGNVARCHAR</code> value
* (depending on the argument's
--- a/jdk/src/share/classes/java/sql/Statement.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/sql/Statement.java Tue Dec 06 05:28:17 2011 -0800
@@ -991,7 +991,7 @@
/**
* Requests that a <code>Statement</code> be pooled or not pooled. The value
* specified is a hint to the statement pool implementation indicating
- * whether the applicaiton wants the statement to be pooled. It is up to
+ * whether the application wants the statement to be pooled. It is up to
* the statement pool manager as to whether the hint is used.
* <p>
* The poolable value of a statement is applicable to both internal
--- a/jdk/src/share/classes/java/text/BreakIterator.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/text/BreakIterator.java Tue Dec 06 05:28:17 2011 -0800
@@ -443,7 +443,7 @@
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#word">word breaks</a>
+ * for <a href="BreakIterator.html#word">word breaks</a>
* for the {@linkplain Locale#getDefault() default locale}.
* @return A break iterator for word breaks
*/
@@ -454,7 +454,7 @@
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#word">word breaks</a>
+ * for <a href="BreakIterator.html#word">word breaks</a>
* for the given locale.
* @param locale the desired locale
* @return A break iterator for word breaks
@@ -470,7 +470,7 @@
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#line">line breaks</a>
+ * for <a href="BreakIterator.html#line">line breaks</a>
* for the {@linkplain Locale#getDefault() default locale}.
* @return A break iterator for line breaks
*/
@@ -481,7 +481,7 @@
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#line">line breaks</a>
+ * for <a href="BreakIterator.html#line">line breaks</a>
* for the given locale.
* @param locale the desired locale
* @return A break iterator for line breaks
@@ -497,7 +497,7 @@
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#character">character breaks</a>
+ * for <a href="BreakIterator.html#character">character breaks</a>
* for the {@linkplain Locale#getDefault() default locale}.
* @return A break iterator for character breaks
*/
@@ -508,7 +508,7 @@
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#character">character breaks</a>
+ * for <a href="BreakIterator.html#character">character breaks</a>
* for the given locale.
* @param locale the desired locale
* @return A break iterator for character breaks
@@ -524,7 +524,7 @@
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#sentence">sentence breaks</a>
+ * for <a href="BreakIterator.html#sentence">sentence breaks</a>
* for the {@linkplain Locale#getDefault() default locale}.
* @return A break iterator for sentence breaks
*/
@@ -535,7 +535,7 @@
/**
* Returns a new <code>BreakIterator</code> instance
- * for <a href="#sentence">sentence breaks</a>
+ * for <a href="BreakIterator.html#sentence">sentence breaks</a>
* for the given locale.
* @param locale the desired locale
* @return A break iterator for sentence breaks
--- a/jdk/src/share/classes/java/util/Collections.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/util/Collections.java Tue Dec 06 05:28:17 2011 -0800
@@ -3202,6 +3202,102 @@
}
/**
+ * Returns the empty sorted set (immutable). This set is serializable.
+ *
+ * <p>This example illustrates the type-safe way to obtain an empty sorted
+ * set:
+ * <pre>
+ * SortedSet<String> s = Collections.emptySortedSet();
+ * </pre>
+ * Implementation note: Implementations of this method need not
+ * create a separate <tt>SortedSet</tt> object for each call.
+ *
+ * @since 1.8
+ */
+ @SuppressWarnings("unchecked")
+ public static final <E> SortedSet<E> emptySortedSet() {
+ return (SortedSet<E>) new EmptySortedSet<>();
+ }
+
+ /**
+ * @serial include
+ */
+ private static class EmptySortedSet<E>
+ extends AbstractSet<E>
+ implements SortedSet<E>, Serializable
+ {
+ private static final long serialVersionUID = 6316515401502265487L;
+ public Iterator<E> iterator() { return emptyIterator(); }
+ public int size() {return 0;}
+ public boolean isEmpty() {return true;}
+ public boolean contains(Object obj) {return false;}
+ public boolean containsAll(Collection<?> c) { return c.isEmpty(); }
+ public Object[] toArray() { return new Object[0]; }
+
+ public <E> E[] toArray(E[] a) {
+ if (a.length > 0)
+ a[0] = null;
+ return a;
+ }
+
+ // Preserves singleton property
+ private Object readResolve() {
+ return new EmptySortedSet<>();
+ }
+
+ public Comparator comparator() {
+ return null;
+ }
+
+ public SortedSet<E> subSet(Object fromElement, Object toElement) {
+ Objects.requireNonNull(fromElement);
+ Objects.requireNonNull(toElement);
+
+ if (!(fromElement instanceof Comparable) ||
+ !(toElement instanceof Comparable))
+ {
+ throw new ClassCastException();
+ }
+
+ if ((((Comparable)fromElement).compareTo(toElement) >= 0) ||
+ (((Comparable)toElement).compareTo(fromElement) < 0))
+ {
+ throw new IllegalArgumentException();
+ }
+
+ return emptySortedSet();
+ }
+
+ public SortedSet<E> headSet(Object toElement) {
+ Objects.requireNonNull(toElement);
+
+ if (!(toElement instanceof Comparable)) {
+ throw new ClassCastException();
+ }
+
+ return emptySortedSet();
+ }
+
+ public SortedSet<E> tailSet(Object fromElement) {
+ Objects.requireNonNull(fromElement);
+
+ if (!(fromElement instanceof Comparable)) {
+ throw new ClassCastException();
+ }
+
+ return emptySortedSet();
+ }
+
+ public E first() {
+ throw new NoSuchElementException();
+ }
+
+ public E last() {
+ throw new NoSuchElementException();
+ }
+ }
+
+ /**
* The empty list (immutable). This list is serializable.
*
* @see #emptyList()
--- a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java Tue Dec 06 05:28:17 2011 -0800
@@ -742,6 +742,8 @@
throw new NullPointerException();
if (c == this)
throw new IllegalArgumentException();
+ if (maxElements <= 0)
+ return 0;
final ReentrantLock lock = this.lock;
lock.lock();
try {
--- a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java Tue Dec 06 05:28:17 2011 -0800
@@ -332,7 +332,7 @@
// Note: convention in all put/take/etc is to preset local var
// holding count negative to indicate failure unless set.
int c = -1;
- Node<E> node = new Node(e);
+ Node<E> node = new Node<E>(e);
final ReentrantLock putLock = this.putLock;
final AtomicInteger count = this.count;
putLock.lockInterruptibly();
@@ -412,7 +412,7 @@
if (count.get() == capacity)
return false;
int c = -1;
- Node<E> node = new Node(e);
+ Node<E> node = new Node<E>(e);
final ReentrantLock putLock = this.putLock;
putLock.lock();
try {
@@ -728,6 +728,8 @@
throw new NullPointerException();
if (c == this)
throw new IllegalArgumentException();
+ if (maxElements <= 0)
+ return 0;
boolean signalNotFull = false;
final ReentrantLock takeLock = this.takeLock;
takeLock.lock();
--- a/jdk/src/share/classes/java/util/jar/Attributes.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/java/util/jar/Attributes.java Tue Dec 06 05:28:17 2011 -0800
@@ -629,7 +629,7 @@
public static final Name IMPLEMENTATION_VENDOR_ID = new Name("Implementation-Vendor-Id");
/**
- * <code>Name</code> object for <code>Implementation-Vendor-URL</code>
+ * <code>Name</code> object for <code>Implementation-URL</code>
* manifest attribute used for package versioning.
* @see <a href="../../../../technotes/guides/versioning/spec/versioning2.html#wp90779">
* Java Product Versioning Specification</a>
--- a/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. 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
@@ -347,6 +347,9 @@
* @param sf the SSL socket factory
* @throws IllegalArgumentException if the <code>SSLSocketFactory</code>
* parameter is null.
+ * @throws SecurityException if a security manager exists and its
+ * <code>checkSetFactory</code> method does not allow
+ * a socket factory to be specified.
* @see #getSSLSocketFactory()
*/
public void setSSLSocketFactory(SSLSocketFactory sf) {
@@ -355,6 +358,10 @@
"no SSLSocketFactory specified");
}
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkSetFactory();
+ }
sslSocketFactory = sf;
}
--- a/jdk/src/share/classes/javax/net/ssl/SSLEngine.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/javax/net/ssl/SSLEngine.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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
@@ -538,7 +538,7 @@
* If this <code>SSLEngine</code> has not yet started its initial
* handshake, this method will automatically start the handshake.
* <P>
- * This method will attempt to produce one SSL/TLS packet, and will
+ * This method will attempt to produce SSL/TLS records, and will
* consume as much source data as possible, but will never consume
* more than the sum of the bytes remaining in each buffer. Each
* <code>ByteBuffer</code>'s position is updated to reflect the
--- a/jdk/src/share/classes/javax/swing/JTable.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/javax/swing/JTable.java Tue Dec 06 05:28:17 2011 -0800
@@ -1828,6 +1828,8 @@
* table. While the {@code autoCreateRowSorter} property remains
* {@code true}, every time the model is changed, a new {@code
* TableRowSorter} is created and set as the table's row sorter.
+ * The default value for the {@code autoCreateRowSorter}
+ * property is {@code false}.
*
* @param autoCreateRowSorter whether or not a {@code RowSorter}
* should be automatically created
--- a/jdk/src/share/classes/javax/swing/JTree.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/javax/swing/JTree.java Tue Dec 06 05:28:17 2011 -0800
@@ -1838,7 +1838,9 @@
* nodes, or <code>null</code> if nothing is currently selected
*/
public TreePath[] getSelectionPaths() {
- return getSelectionModel().getSelectionPaths();
+ TreePath[] selectionPaths = getSelectionModel().getSelectionPaths();
+
+ return (selectionPaths != null && selectionPaths.length > 0) ? selectionPaths : null;
}
/**
--- a/jdk/src/share/classes/javax/swing/text/DefaultCaret.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/javax/swing/text/DefaultCaret.java Tue Dec 06 05:28:17 2011 -0800
@@ -1326,7 +1326,7 @@
if ( ! SwingUtilities2.canCurrentEventAccessSystemClipboard() ) {
return;
}
- if (this.dot != this.mark && component != null) {
+ if (this.dot != this.mark && component != null && component.hasFocus()) {
Clipboard clip = getSystemSelection();
if (clip != null) {
String selectedText;
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Tue Dec 06 05:28:17 2011 -0800
@@ -1181,7 +1181,12 @@
public void insertAfterStart(Element elem, String htmlText) throws
BadLocationException, IOException {
verifyParser();
- if (elem != null && elem.isLeaf()) {
+
+ if (elem == null || htmlText == null) {
+ return;
+ }
+
+ if (elem.isLeaf()) {
throw new IllegalArgumentException
("Can not insert HTML after start of a leaf");
}
--- a/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2011, Oracle and/or its affiliates. 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
@@ -185,7 +185,7 @@
theConsumer.setDimensions(image.getWidth(), image.getHeight());
theConsumer.setProperties(properties);
sendPixels();
- theConsumer.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
+ theConsumer.imageComplete(ImageConsumer.STATICIMAGEDONE);
} catch (NullPointerException e) {
if (theConsumer != null) {
theConsumer.imageComplete(ImageConsumer.IMAGEERROR);
--- a/jdk/src/share/classes/sun/net/ResourceManager.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/net/ResourceManager.java Tue Dec 06 05:28:17 2011 -0800
@@ -41,13 +41,14 @@
/* default maximum number of udp sockets per VM
* when a security manager is enabled.
- * The default is 1024 which is high enough to be useful
+ * The default is 25 which is high enough to be useful
* but low enough to be well below the maximum number
- * of port numbers actually available on all OSes for
- * such sockets (5000 on some versions of windows)
+ * of port numbers actually available on all OSes
+ * when multiplied by the maximum feasible number of VM processes
+ * that could practically be spawned.
*/
- private static final int DEFAULT_MAX_SOCKETS = 1024;
+ private static final int DEFAULT_MAX_SOCKETS = 25;
private static final int maxSockets;
private static final AtomicInteger numSockets;
--- a/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -402,10 +402,10 @@
} catch (IOException e) {
logger.log (Level.FINER, "Dispatcher (4)", e);
} catch (Exception e) {
- e.printStackTrace();
logger.log (Level.FINER, "Dispatcher (7)", e);
}
}
+ try {selector.close(); } catch (Exception e) {}
}
private void handleException (SelectionKey key, Exception e) {
--- a/jdk/src/share/classes/sun/nio/ch/Util.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/nio/ch/Util.java Tue Dec 06 05:28:17 2011 -0800
@@ -363,10 +363,10 @@
try {
Class<?> cl = Class.forName("java.nio.DirectByteBuffer");
Constructor<?> ctor = cl.getDeclaredConstructor(
- new Class[] { int.class,
- long.class,
- FileDescriptor.class,
- Runnable.class });
+ new Class<?>[] { int.class,
+ long.class,
+ FileDescriptor.class,
+ Runnable.class });
ctor.setAccessible(true);
directByteBufferConstructor = ctor;
} catch (ClassNotFoundException |
@@ -408,10 +408,10 @@
try {
Class<?> cl = Class.forName("java.nio.DirectByteBufferR");
Constructor<?> ctor = cl.getDeclaredConstructor(
- new Class[] { int.class,
- long.class,
- FileDescriptor.class,
- Runnable.class });
+ new Class<?>[] { int.class,
+ long.class,
+ FileDescriptor.class,
+ Runnable.class });
ctor.setAccessible(true);
directByteBufferRConstructor = ctor;
} catch (ClassNotFoundException |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/nio/cs/CESU_8.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,604 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.nio.cs;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+
+/* Legal CESU-8 Byte Sequences
+ *
+ * # Code Points Bits Bit/Byte pattern
+ * 1 7 0xxxxxxx
+ * U+0000..U+007F 00..7F
+ *
+ * 2 11 110xxxxx 10xxxxxx
+ * U+0080..U+07FF C2..DF 80..BF
+ *
+ * 3 16 1110xxxx 10xxxxxx 10xxxxxx
+ * U+0800..U+0FFF E0 A0..BF 80..BF
+ * U+1000..U+FFFF E1..EF 80..BF 80..BF
+ *
+ */
+
+class CESU_8 extends Unicode
+{
+ public CESU_8() {
+ super("CESU-8", StandardCharsets.aliases_CESU_8);
+ }
+
+ public String historicalName() {
+ return "CESU8";
+ }
+
+ public CharsetDecoder newDecoder() {
+ return new Decoder(this);
+ }
+
+ public CharsetEncoder newEncoder() {
+ return new Encoder(this);
+ }
+
+ private static final void updatePositions(Buffer src, int sp,
+ Buffer dst, int dp) {
+ src.position(sp - src.arrayOffset());
+ dst.position(dp - dst.arrayOffset());
+ }
+
+ private static class Decoder extends CharsetDecoder
+ implements ArrayDecoder {
+ private Decoder(Charset cs) {
+ super(cs, 1.0f, 1.0f);
+ }
+
+ private static boolean isNotContinuation(int b) {
+ return (b & 0xc0) != 0x80;
+ }
+
+ // [E0] [A0..BF] [80..BF]
+ // [E1..EF] [80..BF] [80..BF]
+ private static boolean isMalformed3(int b1, int b2, int b3) {
+ return (b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
+ (b2 & 0xc0) != 0x80 || (b3 & 0xc0) != 0x80;
+ }
+
+ // only used when there is only one byte left in src buffer
+ private static boolean isMalformed3_2(int b1, int b2) {
+ return (b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
+ (b2 & 0xc0) != 0x80;
+ }
+
+
+ // [F0] [90..BF] [80..BF] [80..BF]
+ // [F1..F3] [80..BF] [80..BF] [80..BF]
+ // [F4] [80..8F] [80..BF] [80..BF]
+ // only check 80-be range here, the [0xf0,0x80...] and [0xf4,0x90-...]
+ // will be checked by Character.isSupplementaryCodePoint(uc)
+ private static boolean isMalformed4(int b2, int b3, int b4) {
+ return (b2 & 0xc0) != 0x80 || (b3 & 0xc0) != 0x80 ||
+ (b4 & 0xc0) != 0x80;
+ }
+
+ // only used when there is less than 4 bytes left in src buffer
+ private static boolean isMalformed4_2(int b1, int b2) {
+ return (b1 == 0xf0 && b2 == 0x90) ||
+ (b2 & 0xc0) != 0x80;
+ }
+
+ private static boolean isMalformed4_3(int b3) {
+ return (b3 & 0xc0) != 0x80;
+ }
+
+ private static CoderResult malformedN(ByteBuffer src, int nb) {
+ switch (nb) {
+ case 1:
+ case 2: // always 1
+ return CoderResult.malformedForLength(1);
+ case 3:
+ int b1 = src.get();
+ int b2 = src.get(); // no need to lookup b3
+ return CoderResult.malformedForLength(
+ ((b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
+ isNotContinuation(b2)) ? 1 : 2);
+ case 4: // we don't care the speed here
+ b1 = src.get() & 0xff;
+ b2 = src.get() & 0xff;
+ if (b1 > 0xf4 ||
+ (b1 == 0xf0 && (b2 < 0x90 || b2 > 0xbf)) ||
+ (b1 == 0xf4 && (b2 & 0xf0) != 0x80) ||
+ isNotContinuation(b2))
+ return CoderResult.malformedForLength(1);
+ if (isNotContinuation(src.get()))
+ return CoderResult.malformedForLength(2);
+ return CoderResult.malformedForLength(3);
+ default:
+ assert false;
+ return null;
+ }
+ }
+
+ private static CoderResult malformed(ByteBuffer src, int sp,
+ CharBuffer dst, int dp,
+ int nb)
+ {
+ src.position(sp - src.arrayOffset());
+ CoderResult cr = malformedN(src, nb);
+ updatePositions(src, sp, dst, dp);
+ return cr;
+ }
+
+
+ private static CoderResult malformed(ByteBuffer src,
+ int mark, int nb)
+ {
+ src.position(mark);
+ CoderResult cr = malformedN(src, nb);
+ src.position(mark);
+ return cr;
+ }
+
+ private static CoderResult malformedForLength(ByteBuffer src,
+ int sp,
+ CharBuffer dst,
+ int dp,
+ int malformedNB)
+ {
+ updatePositions(src, sp, dst, dp);
+ return CoderResult.malformedForLength(malformedNB);
+ }
+
+ private static CoderResult malformedForLength(ByteBuffer src,
+ int mark,
+ int malformedNB)
+ {
+ src.position(mark);
+ return CoderResult.malformedForLength(malformedNB);
+ }
+
+
+ private static CoderResult xflow(Buffer src, int sp, int sl,
+ Buffer dst, int dp, int nb) {
+ updatePositions(src, sp, dst, dp);
+ return (nb == 0 || sl - sp < nb)
+ ? CoderResult.UNDERFLOW : CoderResult.OVERFLOW;
+ }
+
+ private static CoderResult xflow(Buffer src, int mark, int nb) {
+ src.position(mark);
+ return (nb == 0 || src.remaining() < nb)
+ ? CoderResult.UNDERFLOW : CoderResult.OVERFLOW;
+ }
+
+ private CoderResult decodeArrayLoop(ByteBuffer src,
+ CharBuffer dst)
+ {
+ // This method is optimized for ASCII input.
+ byte[] sa = src.array();
+ int sp = src.arrayOffset() + src.position();
+ int sl = src.arrayOffset() + src.limit();
+
+ char[] da = dst.array();
+ int dp = dst.arrayOffset() + dst.position();
+ int dl = dst.arrayOffset() + dst.limit();
+ int dlASCII = dp + Math.min(sl - sp, dl - dp);
+
+ // ASCII only loop
+ while (dp < dlASCII && sa[sp] >= 0)
+ da[dp++] = (char) sa[sp++];
+ while (sp < sl) {
+ int b1 = sa[sp];
+ if (b1 >= 0) {
+ // 1 byte, 7 bits: 0xxxxxxx
+ if (dp >= dl)
+ return xflow(src, sp, sl, dst, dp, 1);
+ da[dp++] = (char) b1;
+ sp++;
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
+ // 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+ if (sl - sp < 2 || dp >= dl)
+ return xflow(src, sp, sl, dst, dp, 2);
+ int b2 = sa[sp + 1];
+ if (isNotContinuation(b2))
+ return malformedForLength(src, sp, dst, dp, 1);
+ da[dp++] = (char) (((b1 << 6) ^ b2)
+ ^
+ (((byte) 0xC0 << 6) ^
+ ((byte) 0x80 << 0)));
+ sp += 2;
+ } else if ((b1 >> 4) == -2) {
+ // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
+ int srcRemaining = sl - sp;
+ if (srcRemaining < 3 || dp >= dl) {
+ if (srcRemaining > 1 && isMalformed3_2(b1, sa[sp + 1]))
+ return malformedForLength(src, sp, dst, dp, 1);
+ return xflow(src, sp, sl, dst, dp, 3);
+ }
+ int b2 = sa[sp + 1];
+ int b3 = sa[sp + 2];
+ if (isMalformed3(b1, b2, b3))
+ return malformed(src, sp, dst, dp, 3);
+ da[dp++] = (char)
+ ((b1 << 12) ^
+ (b2 << 6) ^
+ (b3 ^
+ (((byte) 0xE0 << 12) ^
+ ((byte) 0x80 << 6) ^
+ ((byte) 0x80 << 0))));
+ sp += 3;
+ } else {
+ return malformed(src, sp, dst, dp, 1);
+ }
+ }
+ return xflow(src, sp, sl, dst, dp, 0);
+ }
+
+ private CoderResult decodeBufferLoop(ByteBuffer src,
+ CharBuffer dst)
+ {
+ int mark = src.position();
+ int limit = src.limit();
+ while (mark < limit) {
+ int b1 = src.get();
+ if (b1 >= 0) {
+ // 1 byte, 7 bits: 0xxxxxxx
+ if (dst.remaining() < 1)
+ return xflow(src, mark, 1); // overflow
+ dst.put((char) b1);
+ mark++;
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
+ // 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+ if (limit - mark < 2|| dst.remaining() < 1)
+ return xflow(src, mark, 2);
+ int b2 = src.get();
+ if (isNotContinuation(b2))
+ return malformedForLength(src, mark, 1);
+ dst.put((char) (((b1 << 6) ^ b2)
+ ^
+ (((byte) 0xC0 << 6) ^
+ ((byte) 0x80 << 0))));
+ mark += 2;
+ } else if ((b1 >> 4) == -2) {
+ // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
+ int srcRemaining = limit - mark;
+ if (srcRemaining < 3 || dst.remaining() < 1) {
+ if (srcRemaining > 1 && isMalformed3_2(b1, src.get()))
+ return malformedForLength(src, mark, 1);
+ return xflow(src, mark, 3);
+ }
+ int b2 = src.get();
+ int b3 = src.get();
+ if (isMalformed3(b1, b2, b3))
+ return malformed(src, mark, 3);
+ dst.put((char)
+ ((b1 << 12) ^
+ (b2 << 6) ^
+ (b3 ^
+ (((byte) 0xE0 << 12) ^
+ ((byte) 0x80 << 6) ^
+ ((byte) 0x80 << 0)))));
+ mark += 3;
+ } else {
+ return malformed(src, mark, 1);
+ }
+ }
+ return xflow(src, mark, 0);
+ }
+
+ protected CoderResult decodeLoop(ByteBuffer src,
+ CharBuffer dst)
+ {
+ if (src.hasArray() && dst.hasArray())
+ return decodeArrayLoop(src, dst);
+ else
+ return decodeBufferLoop(src, dst);
+ }
+
+ private static ByteBuffer getByteBuffer(ByteBuffer bb, byte[] ba, int sp)
+ {
+ if (bb == null)
+ bb = ByteBuffer.wrap(ba);
+ bb.position(sp);
+ return bb;
+ }
+
+ // returns -1 if there is/are malformed byte(s) and the
+ // "action" for malformed input is not REPLACE.
+ public int decode(byte[] sa, int sp, int len, char[] da) {
+ final int sl = sp + len;
+ int dp = 0;
+ int dlASCII = Math.min(len, da.length);
+ ByteBuffer bb = null; // only necessary if malformed
+
+ // ASCII only optimized loop
+ while (dp < dlASCII && sa[sp] >= 0)
+ da[dp++] = (char) sa[sp++];
+
+ while (sp < sl) {
+ int b1 = sa[sp++];
+ if (b1 >= 0) {
+ // 1 byte, 7 bits: 0xxxxxxx
+ da[dp++] = (char) b1;
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
+ // 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+ if (sp < sl) {
+ int b2 = sa[sp++];
+ if (isNotContinuation(b2)) {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ sp--; // malformedN(bb, 2) always returns 1
+ } else {
+ da[dp++] = (char) (((b1 << 6) ^ b2)^
+ (((byte) 0xC0 << 6) ^
+ ((byte) 0x80 << 0)));
+ }
+ continue;
+ }
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ return dp;
+ } else if ((b1 >> 4) == -2) {
+ // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
+ if (sp + 1 < sl) {
+ int b2 = sa[sp++];
+ int b3 = sa[sp++];
+ if (isMalformed3(b1, b2, b3)) {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ sp -=3;
+ bb = getByteBuffer(bb, sa, sp);
+ sp += malformedN(bb, 3).length();
+ } else {
+ da[dp++] = (char)((b1 << 12) ^
+ (b2 << 6) ^
+ (b3 ^
+ (((byte) 0xE0 << 12) ^
+ ((byte) 0x80 << 6) ^
+ ((byte) 0x80 << 0))));
+ }
+ continue;
+ }
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ if (sp < sl && isMalformed3_2(b1, sa[sp])) {
+ da[dp++] = replacement().charAt(0);
+ continue;
+
+ }
+ da[dp++] = replacement().charAt(0);
+ return dp;
+ } else {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ }
+ }
+ return dp;
+ }
+ }
+
+ private static class Encoder extends CharsetEncoder
+ implements ArrayEncoder {
+
+ private Encoder(Charset cs) {
+ super(cs, 1.1f, 3.0f);
+ }
+
+ public boolean canEncode(char c) {
+ return !Character.isSurrogate(c);
+ }
+
+ public boolean isLegalReplacement(byte[] repl) {
+ return ((repl.length == 1 && repl[0] >= 0) ||
+ super.isLegalReplacement(repl));
+ }
+
+ private static CoderResult overflow(CharBuffer src, int sp,
+ ByteBuffer dst, int dp) {
+ updatePositions(src, sp, dst, dp);
+ return CoderResult.OVERFLOW;
+ }
+
+ private static CoderResult overflow(CharBuffer src, int mark) {
+ src.position(mark);
+ return CoderResult.OVERFLOW;
+ }
+
+ private static void to3Bytes(byte[] da, int dp, char c) {
+ da[dp] = (byte)(0xe0 | ((c >> 12)));
+ da[dp + 1] = (byte)(0x80 | ((c >> 6) & 0x3f));
+ da[dp + 2] = (byte)(0x80 | (c & 0x3f));
+ }
+
+ private static void to3Bytes(ByteBuffer dst, char c) {
+ dst.put((byte)(0xe0 | ((c >> 12))));
+ dst.put((byte)(0x80 | ((c >> 6) & 0x3f)));
+ dst.put((byte)(0x80 | (c & 0x3f)));
+ }
+
+ private Surrogate.Parser sgp;
+ private char[] c2;
+ private CoderResult encodeArrayLoop(CharBuffer src,
+ ByteBuffer dst)
+ {
+ char[] sa = src.array();
+ int sp = src.arrayOffset() + src.position();
+ int sl = src.arrayOffset() + src.limit();
+
+ byte[] da = dst.array();
+ int dp = dst.arrayOffset() + dst.position();
+ int dl = dst.arrayOffset() + dst.limit();
+ int dlASCII = dp + Math.min(sl - sp, dl - dp);
+
+ // ASCII only loop
+ while (dp < dlASCII && sa[sp] < '\u0080')
+ da[dp++] = (byte) sa[sp++];
+ while (sp < sl) {
+ char c = sa[sp];
+ if (c < 0x80) {
+ // Have at most seven bits
+ if (dp >= dl)
+ return overflow(src, sp, dst, dp);
+ da[dp++] = (byte)c;
+ } else if (c < 0x800) {
+ // 2 bytes, 11 bits
+ if (dl - dp < 2)
+ return overflow(src, sp, dst, dp);
+ da[dp++] = (byte)(0xc0 | (c >> 6));
+ da[dp++] = (byte)(0x80 | (c & 0x3f));
+ } else if (Character.isSurrogate(c)) {
+ // Have a surrogate pair
+ if (sgp == null)
+ sgp = new Surrogate.Parser();
+ int uc = sgp.parse(c, sa, sp, sl);
+ if (uc < 0) {
+ updatePositions(src, sp, dst, dp);
+ return sgp.error();
+ }
+ if (dl - dp < 6)
+ return overflow(src, sp, dst, dp);
+ to3Bytes(da, dp, Character.highSurrogate(uc));
+ dp += 3;
+ to3Bytes(da, dp, Character.lowSurrogate(uc));
+ dp += 3;
+ sp++; // 2 chars
+ } else {
+ // 3 bytes, 16 bits
+ if (dl - dp < 3)
+ return overflow(src, sp, dst, dp);
+ to3Bytes(da, dp, c);
+ dp += 3;
+ }
+ sp++;
+ }
+ updatePositions(src, sp, dst, dp);
+ return CoderResult.UNDERFLOW;
+ }
+
+ private CoderResult encodeBufferLoop(CharBuffer src,
+ ByteBuffer dst)
+ {
+ int mark = src.position();
+ while (src.hasRemaining()) {
+ char c = src.get();
+ if (c < 0x80) {
+ // Have at most seven bits
+ if (!dst.hasRemaining())
+ return overflow(src, mark);
+ dst.put((byte)c);
+ } else if (c < 0x800) {
+ // 2 bytes, 11 bits
+ if (dst.remaining() < 2)
+ return overflow(src, mark);
+ dst.put((byte)(0xc0 | (c >> 6)));
+ dst.put((byte)(0x80 | (c & 0x3f)));
+ } else if (Character.isSurrogate(c)) {
+ // Have a surrogate pair
+ if (sgp == null)
+ sgp = new Surrogate.Parser();
+ int uc = sgp.parse(c, src);
+ if (uc < 0) {
+ src.position(mark);
+ return sgp.error();
+ }
+ if (dst.remaining() < 6)
+ return overflow(src, mark);
+ to3Bytes(dst, Character.highSurrogate(uc));
+ to3Bytes(dst, Character.lowSurrogate(uc));
+ mark++; // 2 chars
+ } else {
+ // 3 bytes, 16 bits
+ if (dst.remaining() < 3)
+ return overflow(src, mark);
+ to3Bytes(dst, c);
+ }
+ mark++;
+ }
+ src.position(mark);
+ return CoderResult.UNDERFLOW;
+ }
+
+ protected final CoderResult encodeLoop(CharBuffer src,
+ ByteBuffer dst)
+ {
+ if (src.hasArray() && dst.hasArray())
+ return encodeArrayLoop(src, dst);
+ else
+ return encodeBufferLoop(src, dst);
+ }
+
+ // returns -1 if there is malformed char(s) and the
+ // "action" for malformed input is not REPLACE.
+ public int encode(char[] sa, int sp, int len, byte[] da) {
+ int sl = sp + len;
+ int dp = 0;
+ int dlASCII = dp + Math.min(len, da.length);
+
+ // ASCII only optimized loop
+ while (dp < dlASCII && sa[sp] < '\u0080')
+ da[dp++] = (byte) sa[sp++];
+
+ while (sp < sl) {
+ char c = sa[sp++];
+ if (c < 0x80) {
+ // Have at most seven bits
+ da[dp++] = (byte)c;
+ } else if (c < 0x800) {
+ // 2 bytes, 11 bits
+ da[dp++] = (byte)(0xc0 | (c >> 6));
+ da[dp++] = (byte)(0x80 | (c & 0x3f));
+ } else if (Character.isSurrogate(c)) {
+ if (sgp == null)
+ sgp = new Surrogate.Parser();
+ int uc = sgp.parse(c, sa, sp - 1, sl);
+ if (uc < 0) {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement()[0];
+ } else {
+ to3Bytes(da, dp, Character.highSurrogate(uc));
+ dp += 3;
+ to3Bytes(da, dp, Character.lowSurrogate(uc));
+ dp += 3;
+ sp++; // 2 chars
+ }
+ } else {
+ // 3 bytes, 16 bits
+ to3Bytes(da, dp, c);
+ dp += 3;
+ }
+ }
+ return dp;
+ }
+ }
+}
--- a/jdk/src/share/classes/sun/nio/cs/UTF_8.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/nio/cs/UTF_8.java Tue Dec 06 05:28:17 2011 -0800
@@ -72,8 +72,8 @@
return new Encoder(this);
}
- static final void updatePositions(Buffer src, int sp,
- Buffer dst, int dp) {
+ private static final void updatePositions(Buffer src, int sp,
+ Buffer dst, int dp) {
src.position(sp - src.arrayOffset());
dst.position(dp - dst.arrayOffset());
}
@@ -88,11 +88,6 @@
return (b & 0xc0) != 0x80;
}
- // [C2..DF] [80..BF]
- private static boolean isMalformed2(int b1, int b2) {
- return (b1 & 0x1e) == 0x0 || (b2 & 0xc0) != 0x80;
- }
-
// [E0] [A0..BF] [80..BF]
// [E1..EF] [80..BF] [80..BF]
private static boolean isMalformed3(int b1, int b2, int b3) {
@@ -100,6 +95,12 @@
(b2 & 0xc0) != 0x80 || (b3 & 0xc0) != 0x80;
}
+ // only used when there is only one byte left in src buffer
+ private static boolean isMalformed3_2(int b1, int b2) {
+ return (b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
+ (b2 & 0xc0) != 0x80;
+ }
+
// [F0] [90..BF] [80..BF] [80..BF]
// [F1..F3] [80..BF] [80..BF] [80..BF]
// [F4] [80..8F] [80..BF] [80..BF]
@@ -110,6 +111,16 @@
(b4 & 0xc0) != 0x80;
}
+ // only used when there is less than 4 bytes left in src buffer
+ private static boolean isMalformed4_2(int b1, int b2) {
+ return (b1 == 0xf0 && b2 == 0x90) ||
+ (b2 & 0xc0) != 0x80;
+ }
+
+ private static boolean isMalformed4_3(int b3) {
+ return (b3 & 0xc0) != 0x80;
+ }
+
private static CoderResult lookupN(ByteBuffer src, int n)
{
for (int i = 1; i < n; i++) {
@@ -122,28 +133,14 @@
private static CoderResult malformedN(ByteBuffer src, int nb) {
switch (nb) {
case 1:
- int b1 = src.get();
- if ((b1 >> 2) == -2) {
- // 5 bytes 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- if (src.remaining() < 4)
- return CoderResult.UNDERFLOW;
- return lookupN(src, 5);
- }
- if ((b1 >> 1) == -2) {
- // 6 bytes 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- if (src.remaining() < 5)
- return CoderResult.UNDERFLOW;
- return lookupN(src, 6);
- }
- return CoderResult.malformedForLength(1);
case 2: // always 1
return CoderResult.malformedForLength(1);
case 3:
- b1 = src.get();
+ int b1 = src.get();
int b2 = src.get(); // no need to lookup b3
return CoderResult.malformedForLength(
((b1 == (byte)0xe0 && (b2 & 0xe0) == 0x80) ||
- isNotContinuation(b2))?1:2);
+ isNotContinuation(b2)) ? 1 : 2);
case 4: // we don't care the speed here
b1 = src.get() & 0xff;
b2 = src.get() & 0xff;
@@ -171,6 +168,7 @@
return cr;
}
+
private static CoderResult malformed(ByteBuffer src,
int mark, int nb)
{
@@ -180,18 +178,36 @@
return cr;
}
+ private static CoderResult malformedForLength(ByteBuffer src,
+ int sp,
+ CharBuffer dst,
+ int dp,
+ int malformedNB)
+ {
+ updatePositions(src, sp, dst, dp);
+ return CoderResult.malformedForLength(malformedNB);
+ }
+
+ private static CoderResult malformedForLength(ByteBuffer src,
+ int mark,
+ int malformedNB)
+ {
+ src.position(mark);
+ return CoderResult.malformedForLength(malformedNB);
+ }
+
+
private static CoderResult xflow(Buffer src, int sp, int sl,
Buffer dst, int dp, int nb) {
updatePositions(src, sp, dst, dp);
return (nb == 0 || sl - sp < nb)
- ?CoderResult.UNDERFLOW:CoderResult.OVERFLOW;
+ ? CoderResult.UNDERFLOW : CoderResult.OVERFLOW;
}
private static CoderResult xflow(Buffer src, int mark, int nb) {
- CoderResult cr = (nb == 0 || src.remaining() < (nb - 1))
- ?CoderResult.UNDERFLOW:CoderResult.OVERFLOW;
src.position(mark);
- return cr;
+ return (nb == 0 || src.remaining() < nb)
+ ? CoderResult.UNDERFLOW : CoderResult.OVERFLOW;
}
private CoderResult decodeArrayLoop(ByteBuffer src,
@@ -210,7 +226,6 @@
// ASCII only loop
while (dp < dlASCII && sa[sp] >= 0)
da[dp++] = (char) sa[sp++];
-
while (sp < sl) {
int b1 = sa[sp];
if (b1 >= 0) {
@@ -219,13 +234,20 @@
return xflow(src, sp, sl, dst, dp, 1);
da[dp++] = (char) b1;
sp++;
- } else if ((b1 >> 5) == -2) {
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
// 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+ // [C2..DF] [80..BF]
if (sl - sp < 2 || dp >= dl)
return xflow(src, sp, sl, dst, dp, 2);
int b2 = sa[sp + 1];
- if (isMalformed2(b1, b2))
- return malformed(src, sp, dst, dp, 2);
+ // Now we check the first byte of 2-byte sequence as
+ // if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0)
+ // no longer need to check b1 against c1 & c0 for
+ // malformed as we did in previous version
+ // (b1 & 0x1e) == 0x0 || (b2 & 0xc0) != 0x80;
+ // only need to check the second byte b2.
+ if (isNotContinuation(b2))
+ return malformedForLength(src, sp, dst, dp, 1);
da[dp++] = (char) (((b1 << 6) ^ b2)
^
(((byte) 0xC0 << 6) ^
@@ -233,24 +255,37 @@
sp += 2;
} else if ((b1 >> 4) == -2) {
// 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
- if (sl - sp < 3 || dp >= dl)
+ int srcRemaining = sl - sp;
+ if (srcRemaining < 3 || dp >= dl) {
+ if (srcRemaining > 1 && isMalformed3_2(b1, sa[sp + 1]))
+ return malformedForLength(src, sp, dst, dp, 1);
return xflow(src, sp, sl, dst, dp, 3);
+ }
int b2 = sa[sp + 1];
int b3 = sa[sp + 2];
if (isMalformed3(b1, b2, b3))
return malformed(src, sp, dst, dp, 3);
- da[dp++] = (char)
+ char c = (char)
((b1 << 12) ^
(b2 << 6) ^
(b3 ^
(((byte) 0xE0 << 12) ^
((byte) 0x80 << 6) ^
((byte) 0x80 << 0))));
+ if (Character.isSurrogate(c))
+ return malformedForLength(src, sp, dst, dp, 3);
+ da[dp++] = c;
sp += 3;
} else if ((b1 >> 3) == -2) {
// 4 bytes, 21 bits: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
- if (sl - sp < 4 || dl - dp < 2)
+ int srcRemaining = sl - sp;
+ if (srcRemaining < 4 || dl - dp < 2) {
+ if (srcRemaining > 1 && isMalformed4_2(b1, sa[sp + 1]))
+ return malformedForLength(src, sp, dst, dp, 1);
+ if (srcRemaining > 2 && isMalformed4_3(sa[sp + 2]))
+ return malformedForLength(src, sp, dst, dp, 2);
return xflow(src, sp, sl, dst, dp, 4);
+ }
int b2 = sa[sp + 1];
int b3 = sa[sp + 2];
int b4 = sa[sp + 3];
@@ -289,38 +324,51 @@
return xflow(src, mark, 1); // overflow
dst.put((char) b1);
mark++;
- } else if ((b1 >> 5) == -2) {
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
// 2 bytes, 11 bits: 110xxxxx 10xxxxxx
if (limit - mark < 2|| dst.remaining() < 1)
return xflow(src, mark, 2);
int b2 = src.get();
- if (isMalformed2(b1, b2))
- return malformed(src, mark, 2);
- dst.put((char) (((b1 << 6) ^ b2)
+ if (isNotContinuation(b2))
+ return malformedForLength(src, mark, 1);
+ dst.put((char) (((b1 << 6) ^ b2)
^
(((byte) 0xC0 << 6) ^
((byte) 0x80 << 0))));
mark += 2;
} else if ((b1 >> 4) == -2) {
// 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
- if (limit - mark < 3 || dst.remaining() < 1)
+ int srcRemaining = limit - mark;
+ if (srcRemaining < 3 || dst.remaining() < 1) {
+ if (srcRemaining > 1 && isMalformed3_2(b1, src.get()))
+ return malformedForLength(src, mark, 1);
return xflow(src, mark, 3);
+ }
int b2 = src.get();
int b3 = src.get();
if (isMalformed3(b1, b2, b3))
return malformed(src, mark, 3);
- dst.put((char)
- ((b1 << 12) ^
- (b2 << 6) ^
- (b3 ^
- (((byte) 0xE0 << 12) ^
- ((byte) 0x80 << 6) ^
- ((byte) 0x80 << 0)))));
+ char c = (char)
+ ((b1 << 12) ^
+ (b2 << 6) ^
+ (b3 ^
+ (((byte) 0xE0 << 12) ^
+ ((byte) 0x80 << 6) ^
+ ((byte) 0x80 << 0))));
+ if (Character.isSurrogate(c))
+ return malformedForLength(src, mark, 3);
+ dst.put(c);
mark += 3;
} else if ((b1 >> 3) == -2) {
// 4 bytes, 21 bits: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
- if (limit - mark < 4 || dst.remaining() < 2)
+ int srcRemaining = limit - mark;
+ if (srcRemaining < 4 || dst.remaining() < 2) {
+ if (srcRemaining > 1 && isMalformed4_2(b1, src.get()))
+ return malformedForLength(src, mark, 1);
+ if (srcRemaining > 2 && isMalformed4_3(src.get()))
+ return malformedForLength(src, mark, 2);
return xflow(src, mark, 4);
+ }
int b2 = src.get();
int b3 = src.get();
int b4 = src.get();
@@ -364,7 +412,7 @@
return bb;
}
- // returns -1 if there is malformed byte(s) and the
+ // returns -1 if there is/are malformed byte(s) and the
// "action" for malformed input is not REPLACE.
public int decode(byte[] sa, int sp, int len, char[] da) {
final int sl = sp + len;
@@ -381,11 +429,11 @@
if (b1 >= 0) {
// 1 byte, 7 bits: 0xxxxxxx
da[dp++] = (char) b1;
- } else if ((b1 >> 5) == -2) {
+ } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) {
// 2 bytes, 11 bits: 110xxxxx 10xxxxxx
if (sp < sl) {
int b2 = sa[sp++];
- if (isMalformed2(b1, b2)) {
+ if (isNotContinuation(b2)) {
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
da[dp++] = replacement().charAt(0);
@@ -410,21 +458,33 @@
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
da[dp++] = replacement().charAt(0);
- sp -=3;
+ sp -= 3;
bb = getByteBuffer(bb, sa, sp);
sp += malformedN(bb, 3).length();
} else {
- da[dp++] = (char)((b1 << 12) ^
+ char c = (char)((b1 << 12) ^
(b2 << 6) ^
(b3 ^
(((byte) 0xE0 << 12) ^
((byte) 0x80 << 6) ^
((byte) 0x80 << 0))));
+ if (Character.isSurrogate(c)) {
+ if (malformedInputAction() != CodingErrorAction.REPLACE)
+ return -1;
+ da[dp++] = replacement().charAt(0);
+ } else {
+ da[dp++] = c;
+ }
}
continue;
}
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
+ if (sp < sl && isMalformed3_2(b1, sa[sp])) {
+ da[dp++] = replacement().charAt(0);
+ continue;
+
+ }
da[dp++] = replacement().charAt(0);
return dp;
} else if ((b1 >> 3) == -2) {
@@ -458,28 +518,29 @@
}
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
+
+ if (sp < sl && isMalformed4_2(b1, sa[sp])) {
+ da[dp++] = replacement().charAt(0);
+ continue;
+ }
+ sp++;
+ if (sp < sl && isMalformed4_3(sa[sp])) {
+ da[dp++] = replacement().charAt(0);
+ continue;
+ }
da[dp++] = replacement().charAt(0);
return dp;
} else {
if (malformedInputAction() != CodingErrorAction.REPLACE)
return -1;
da[dp++] = replacement().charAt(0);
- sp--;
- bb = getByteBuffer(bb, sa, sp);
- CoderResult cr = malformedN(bb, 1);
- if (!cr.isError()) {
- // leading byte for 5 or 6-byte, but don't have enough
- // bytes in buffer to check. Consumed rest as malformed.
- return dp;
- }
- sp += cr.length();
}
}
return dp;
}
}
- private static class Encoder extends CharsetEncoder
+ private static final class Encoder extends CharsetEncoder
implements ArrayEncoder {
private Encoder(Charset cs) {
--- a/jdk/src/share/classes/sun/nio/cs/standard-charsets Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/nio/cs/standard-charsets Tue Dec 06 05:28:17 2011 -0800
@@ -63,6 +63,10 @@
alias UTF8 # JDK historical
alias unicode-1-1-utf-8
+charset CESU-8 CESU_8
+ alias CESU8
+ alias csCESU-8
+
charset UTF-16 UTF_16
alias UTF_16 # JDK historical
alias utf16
--- a/jdk/src/share/classes/sun/print/PSPrinterJob.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/print/PSPrinterJob.java Tue Dec 06 05:28:17 2011 -0800
@@ -68,14 +68,18 @@
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
import java.io.CharConversionException;
import java.io.File;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.IOException;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -673,15 +677,38 @@
private class PrinterSpooler implements java.security.PrivilegedAction {
PrinterException pex;
+ private void handleProcessFailure(final Process failedProcess,
+ final String[] execCmd, final int result) throws IOException {
+ try (StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw)) {
+ pw.append("error=").append(Integer.toString(result));
+ pw.append(" running:");
+ for (String arg: execCmd) {
+ pw.append(" '").append(arg).append("'");
+ }
+ try (InputStream is = failedProcess.getErrorStream();
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr)) {
+ while (br.ready()) {
+ pw.println();
+ pw.append("\t\t").append(br.readLine());
+ }
+ } finally {
+ pw.flush();
+ throw new IOException(sw.toString());
+ }
+ }
+ }
+
public Object run() {
+ if (spoolFile == null || !spoolFile.exists()) {
+ pex = new PrinterException("No spool file");
+ return null;
+ }
try {
/**
* Spool to the printer.
*/
- if (spoolFile == null || !spoolFile.exists()) {
- pex = new PrinterException("No spool file");
- return null;
- }
String fileName = spoolFile.getAbsolutePath();
String execCmd[] = printExecCmd(mDestination, mOptions,
mNoJobSheet, getJobNameInt(),
@@ -689,12 +716,16 @@
Process process = Runtime.getRuntime().exec(execCmd);
process.waitFor();
- spoolFile.delete();
-
+ final int result = process.exitValue();
+ if (0 != result) {
+ handleProcessFailure(process, execCmd, result);
+ }
} catch (IOException ex) {
pex = new PrinterIOException(ex);
} catch (InterruptedException ie) {
pex = new PrinterException(ie.toString());
+ } finally {
+ spoolFile.delete();
}
return null;
}
--- a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. 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
@@ -29,6 +29,7 @@
import java.util.Hashtable;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.io.FilePermission;
import java.io.IOException;
import java.net.*;
import java.rmi.*;
@@ -38,8 +39,17 @@
import java.rmi.registry.Registry;
import java.rmi.server.RMIClientSocketFactory;
import java.rmi.server.RMIServerSocketFactory;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.Policy;
import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.ProtectionDomain;
import java.text.MessageFormat;
+import sun.rmi.server.LoaderHandler;
import sun.rmi.server.UnicastServerRef;
import sun.rmi.server.UnicastServerRef2;
import sun.rmi.transport.LiveRef;
@@ -334,11 +344,19 @@
Thread.currentThread().setContextClassLoader(cl);
- int regPort = Registry.REGISTRY_PORT;
- if (args.length >= 1) {
- regPort = Integer.parseInt(args[0]);
+ final int regPort = (args.length >= 1) ? Integer.parseInt(args[0])
+ : Registry.REGISTRY_PORT;
+ try {
+ registry = AccessController.doPrivileged(
+ new PrivilegedExceptionAction<RegistryImpl>() {
+ public RegistryImpl run() throws RemoteException {
+ return new RegistryImpl(regPort);
+ }
+ }, getAccessControlContext());
+ } catch (PrivilegedActionException ex) {
+ throw (RemoteException) ex.getException();
}
- registry = new RegistryImpl(regPort);
+
// prevent registry from exiting
while (true) {
try {
@@ -358,4 +376,46 @@
}
System.exit(1);
}
+
+ /**
+ * Generates an AccessControlContext with minimal permissions.
+ * The approach used here is taken from the similar method
+ * getAccessControlContext() in the sun.applet.AppletPanel class.
+ */
+ private static AccessControlContext getAccessControlContext() {
+ // begin with permissions granted to all code in current policy
+ PermissionCollection perms = AccessController.doPrivileged(
+ new java.security.PrivilegedAction<PermissionCollection>() {
+ public PermissionCollection run() {
+ CodeSource codesource = new CodeSource(null,
+ (java.security.cert.Certificate[]) null);
+ Policy p = java.security.Policy.getPolicy();
+ if (p != null) {
+ return p.getPermissions(codesource);
+ } else {
+ return new Permissions();
+ }
+ }
+ });
+
+ /*
+ * Anyone can connect to the registry and the registry can connect
+ * to and possibly download stubs from anywhere. Downloaded stubs and
+ * related classes themselves are more tightly limited by RMI.
+ */
+ perms.add(new SocketPermission("*", "connect,accept"));
+
+ perms.add(new RuntimePermission("accessClassInPackage.sun.*"));
+
+ perms.add(new FilePermission("<<ALL FILES>>", "read"));
+
+ /*
+ * Create an AccessControlContext that consists of a single
+ * protection domain with only the permissions calculated above.
+ */
+ ProtectionDomain pd = new ProtectionDomain(
+ new CodeSource(null,
+ (java.security.cert.Certificate[]) null), perms);
+ return new AccessControlContext(new ProtectionDomain[] { pd });
+ }
}
--- a/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. 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
@@ -1032,8 +1032,8 @@
* it is not already implied by the collection.
*/
private static void addPermissionsForURLs(URL[] urls,
- PermissionCollection perms,
- boolean forLoader)
+ PermissionCollection perms,
+ boolean forLoader)
{
for (int i = 0; i < urls.length; i++) {
URL url = urls[i];
--- a/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java Tue Dec 06 05:28:17 2011 -0800
@@ -390,6 +390,12 @@
ObjectInput in;
try {
in = call.getInputStream();
+ try {
+ Class<?> clazz = Class.forName("sun.rmi.transport.DGCImpl_Skel");
+ if (clazz.isAssignableFrom(skel.getClass())) {
+ ((MarshalInputStream)in).useCodebaseOnly();
+ }
+ } catch (ClassNotFoundException ignore) { }
hash = in.readLong();
} catch (Exception readEx) {
throw new UnmarshalException("error unmarshalling call header",
--- a/jdk/src/share/classes/sun/security/krb5/internal/KerberosTime.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/krb5/internal/KerberosTime.java Tue Dec 06 05:28:17 2011 -0800
@@ -68,8 +68,8 @@
private int microSeconds; // the last three digits of the microsecond value
// The time when this class is loaded. Used in setNow()
- private static final long initMilli = System.currentTimeMillis();
- private static final long initMicro = System.nanoTime() / 1000;
+ private static long initMilli = System.currentTimeMillis();
+ private static long initMicro = System.nanoTime() / 1000;
private static long syncTime;
private static boolean DEBUG = Krb5.DEBUG;
@@ -212,9 +212,22 @@
}
public void setNow() {
- long microElapsed = System.nanoTime() / 1000 - initMicro;
- setTime(initMilli + microElapsed/1000);
- microSeconds = (int)(microElapsed % 1000);
+ long newMilli = System.currentTimeMillis();
+ long newMicro = System.nanoTime() / 1000;
+ long microElapsed = newMicro - initMicro;
+ long calcMilli = initMilli + microElapsed/1000;
+ if (calcMilli - newMilli > 100 || newMilli - calcMilli > 100) {
+ if (DEBUG) {
+ System.out.println("System time adjusted");
+ }
+ initMilli = newMilli;
+ initMicro = newMicro;
+ setTime(newMilli);
+ microSeconds = 0;
+ } else {
+ setTime(calcMilli);
+ microSeconds = (int)(microElapsed % 1000);
+ }
}
public int getMicroSeconds() {
--- a/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -375,7 +375,7 @@
}
AuthorizationDataEntry[] auDataEntry = readAuth();
AuthorizationData auData = null;
- if (auData != null) {
+ if (auDataEntry != null) {
auData = new AuthorizationData(auDataEntry);
}
byte[] ticketData = readData();
--- a/jdk/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java Tue Dec 06 05:28:17 2011 -0800
@@ -209,10 +209,24 @@
}
public sun.security.krb5.Credentials setKrbCreds() {
+ // Note: We will not pass authorizationData to s.s.k.Credentials. The
+ // field in that class will be passed to Krb5Context as the return
+ // value of ExtendedGSSContext.inquireSecContext(KRB5_GET_AUTHZ_DATA),
+ // which is documented as the authData in the service ticket. That
+ // is on the acceptor side.
+ //
+ // This class is for the initiator side. Also, authdata inside a ccache
+ // is most likely to be the one in Authenticator in PA-TGS-REQ encoded
+ // in TGS-REQ, therefore only stored with a service ticket. Currently
+ // in Java, we only reads TGTs.
return new sun.security.krb5.Credentials(ticket,
cname, sname, key, flags, authtime, starttime, endtime, renewTill, caddr);
}
+ public KerberosTime getStartTime() {
+ return starttime;
+ }
+
public KerberosTime getAuthTime() {
return authtime;
}
@@ -221,6 +235,10 @@
return endtime;
}
+ public KerberosTime getRenewTill() {
+ return renewTill;
+ }
+
public TicketFlags getTicketFlags() {
return flags;
}
@@ -228,4 +246,8 @@
public int getEType() {
return key.getEType();
}
+
+ public int getTktEType() {
+ return ticket.encPart.getEType();
+ }
}
--- a/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. 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
@@ -69,12 +69,38 @@
// check if the Socket is invalid (error or closed)
c.checkWrite();
+ /*
+ * By default, we counter chosen plaintext issues on CBC mode
+ * ciphersuites in SSLv3/TLS1.0 by sending one byte of application
+ * data in the first record of every payload, and the rest in
+ * subsequent record(s). Note that the issues have been solved in
+ * TLS 1.1 or later.
+ *
+ * It is not necessary to split the very first application record of
+ * a freshly negotiated TLS session, as there is no previous
+ * application data to guess. To improve compatibility, we will not
+ * split such records.
+ *
+ * This avoids issues in the outbound direction. For a full fix,
+ * the peer must have similar protections.
+ */
+ boolean isFirstRecordOfThePayload = true;
+
// Always flush at the end of each application level record.
// This lets application synchronize read and write streams
// however they like; if we buffered here, they couldn't.
try {
do {
- int howmuch = Math.min(len, r.availableDataBytes());
+ int howmuch;
+ if (isFirstRecordOfThePayload && c.needToSplitPayload()) {
+ howmuch = Math.min(0x01, r.availableDataBytes());
+ } else {
+ howmuch = Math.min(len, r.availableDataBytes());
+ }
+
+ if (isFirstRecordOfThePayload && howmuch != 0) {
+ isFirstRecordOfThePayload = false;
+ }
// NOTE: *must* call c.writeRecord() even for howmuch == 0
if (howmuch > 0) {
--- a/jdk/src/share/classes/sun/security/ssl/CipherBox.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/CipherBox.java Tue Dec 06 05:28:17 2011 -0800
@@ -113,6 +113,11 @@
private SecureRandom random;
/**
+ * Is the cipher of CBC mode?
+ */
+ private final boolean isCBCMode;
+
+ /**
* Fixed masks of various block size, as the initial decryption IVs
* for TLS 1.1 or later.
*
@@ -128,6 +133,7 @@
private CipherBox() {
this.protocolVersion = ProtocolVersion.DEFAULT;
this.cipher = null;
+ this.isCBCMode = false;
}
/**
@@ -148,6 +154,7 @@
random = JsseJce.getSecureRandom();
}
this.random = random;
+ this.isCBCMode = bulkCipher.isCBCMode;
/*
* RFC 4346 recommends two algorithms used to generated the
@@ -694,4 +701,12 @@
}
}
+ /*
+ * Does the cipher use CBC mode?
+ *
+ * @return true if the cipher use CBC mode, false otherwise.
+ */
+ boolean isCBCMode() {
+ return isCBCMode;
+ }
}
--- a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java Tue Dec 06 05:28:17 2011 -0800
@@ -420,10 +420,16 @@
// exportable under 512/40 bit rules
final boolean exportable;
+ // Is the cipher algorithm of Cipher Block Chaining (CBC) mode?
+ final boolean isCBCMode;
+
BulkCipher(String transformation, int keySize,
int expandedKeySize, int ivSize, boolean allowed) {
this.transformation = transformation;
- this.algorithm = transformation.split("/")[0];
+ String[] splits = transformation.split("/");
+ this.algorithm = splits[0];
+ this.isCBCMode =
+ splits.length <= 1 ? false : "CBC".equalsIgnoreCase(splits[1]);
this.description = this.algorithm + "/" + (keySize << 3);
this.keySize = keySize;
this.ivSize = ivSize;
@@ -436,7 +442,10 @@
BulkCipher(String transformation, int keySize,
int ivSize, boolean allowed) {
this.transformation = transformation;
- this.algorithm = transformation.split("/")[0];
+ String[] splits = transformation.split("/");
+ this.algorithm = splits[0];
+ this.isCBCMode =
+ splits.length <= 1 ? false : "CBC".equalsIgnoreCase(splits[1]);
this.description = this.algorithm + "/" + (keySize << 3);
this.keySize = keySize;
this.ivSize = ivSize;
--- a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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
@@ -46,6 +46,7 @@
*/
final class EngineOutputRecord extends OutputRecord {
+ private SSLEngineImpl engine;
private EngineWriter writer;
private boolean finishedMsg = false;
@@ -62,6 +63,7 @@
*/
EngineOutputRecord(byte type, SSLEngineImpl engine) {
super(type, recordSize(type));
+ this.engine = engine;
writer = engine.writer;
}
@@ -227,12 +229,51 @@
* implementations are fragile and don't like to see empty
* records, so this increases robustness.
*/
- int length = Math.min(ea.getAppRemaining(), maxDataSize);
- if (length == 0) {
+ if (ea.getAppRemaining() == 0) {
return;
}
/*
+ * By default, we counter chosen plaintext issues on CBC mode
+ * ciphersuites in SSLv3/TLS1.0 by sending one byte of application
+ * data in the first record of every payload, and the rest in
+ * subsequent record(s). Note that the issues have been solved in
+ * TLS 1.1 or later.
+ *
+ * It is not necessary to split the very first application record of
+ * a freshly negotiated TLS session, as there is no previous
+ * application data to guess. To improve compatibility, we will not
+ * split such records.
+ *
+ * Because of the compatibility, we'd better produce no more than
+ * SSLSession.getPacketBufferSize() net data for each wrap. As we
+ * need a one-byte record at first, the 2nd record size should be
+ * equal to or less than Record.maxDataSizeMinusOneByteRecord.
+ *
+ * This avoids issues in the outbound direction. For a full fix,
+ * the peer must have similar protections.
+ */
+ int length;
+ if (engine.needToSplitPayload(writeCipher, protocolVersion)) {
+ write(ea, writeMAC, writeCipher, 0x01);
+ ea.resetLim(); // reset application data buffer limit
+ length = Math.min(ea.getAppRemaining(),
+ maxDataSizeMinusOneByteRecord);
+ } else {
+ length = Math.min(ea.getAppRemaining(), maxDataSize);
+ }
+
+ // Don't bother to really write empty records.
+ if (length > 0) {
+ write(ea, writeMAC, writeCipher, length);
+ }
+
+ return;
+ }
+
+ void write(EngineArgs ea, MAC writeMAC, CipherBox writeCipher,
+ int length) throws IOException {
+ /*
* Copy out existing buffer values.
*/
ByteBuffer dstBB = ea.netData;
--- a/jdk/src/share/classes/sun/security/ssl/MAC.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/MAC.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. 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
@@ -172,10 +172,10 @@
* when there are only 2^8 sequence numbers left.
*/
return (block != null && mac != null &&
- block[0] == 0xFF && block[1] == 0xFF &&
- block[2] == 0xFF && block[3] == 0xFF &&
- block[4] == 0xFF && block[5] == 0xFF &&
- block[6] == 0xFF);
+ block[0] == (byte)0xFF && block[1] == (byte)0xFF &&
+ block[2] == (byte)0xFF && block[3] == (byte)0xFF &&
+ block[4] == (byte)0xFF && block[5] == (byte)0xFF &&
+ block[6] == (byte)0xFF);
}
/*
@@ -192,7 +192,7 @@
* only 2^48 sequence numbers left.
*/
return (block != null && mac != null &&
- block[0] == 0xFF && block[1] == 0xFF);
+ block[0] == (byte)0xFF && block[1] == (byte)0xFF);
}
// increment the sequence number in the block array
--- a/jdk/src/share/classes/sun/security/ssl/Record.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/Record.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. 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
@@ -67,6 +67,23 @@
+ maxPadding // padding
+ trailerSize; // MAC
+ static final boolean enableCBCProtection =
+ Debug.getBooleanProperty("jsse.enableCBCProtection", true);
+
+ /*
+ * For CBC protection in SSL3/TLS1, we break some plaintext into two
+ * packets. Max application data size for the second packet.
+ */
+ static final int maxDataSizeMinusOneByteRecord =
+ maxDataSize // max data size
+ - ( // max one byte record size
+ headerSize // header
+ + maxIVLength // iv
+ + 1 // one byte data
+ + maxPadding // padding
+ + trailerSize // MAC
+ );
+
/*
* The maximum large record size.
*
--- a/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -771,10 +771,15 @@
final class AbstractTrustManagerWrapper extends X509ExtendedTrustManager
implements X509TrustManager {
+ // the delegated trust manager
private final X509TrustManager tm;
+ // Cache the trusted certificate to optimize the performance.
+ private final Collection<X509Certificate> trustedCerts = new HashSet<>();
+
AbstractTrustManagerWrapper(X509TrustManager tm) {
this.tm = tm;
+ Collections.addAll(trustedCerts, tm.getAcceptedIssuers());
}
@Override
@@ -863,20 +868,7 @@
constraints = new SSLAlgorithmConstraints(sslSocket, true);
}
- AlgorithmChecker checker = new AlgorithmChecker(constraints);
- try {
- checker.init(false);
-
- // a forward checker, need to check from trust to target
- for (int i = chain.length - 1; i >= 0; i--) {
- Certificate cert = chain[i];
- // We don't care about the unresolved critical extensions.
- checker.check(cert, Collections.<String>emptySet());
- }
- } catch (CertPathValidatorException cpve) {
- throw new CertificateException(
- "Certificates does not conform to algorithm constraints");
- }
+ checkAlgorithmConstraints(chain, constraints);
}
}
@@ -918,20 +910,33 @@
constraints = new SSLAlgorithmConstraints(engine, true);
}
- AlgorithmChecker checker = new AlgorithmChecker(constraints);
- try {
+ checkAlgorithmConstraints(chain, constraints);
+ }
+ }
+
+ private void checkAlgorithmConstraints(X509Certificate[] chain,
+ AlgorithmConstraints constraints) throws CertificateException {
+
+ try {
+ // Does the certificate chain end with a trusted certificate?
+ int checkedLength = chain.length - 1;
+ if (trustedCerts.contains(chain[checkedLength])) {
+ checkedLength--;
+ }
+
+ // A forward checker, need to check from trust to target
+ if (checkedLength >= 0) {
+ AlgorithmChecker checker = new AlgorithmChecker(constraints);
checker.init(false);
-
- // A forward checker, need to check from trust to target
- for (int i = chain.length - 1; i >= 0; i--) {
+ for (int i = checkedLength; i >= 0; i--) {
Certificate cert = chain[i];
// We don't care about the unresolved critical extensions.
checker.check(cert, Collections.<String>emptySet());
}
- } catch (CertPathValidatorException cpve) {
- throw new CertificateException(
- "Certificates does not conform to algorithm constraints");
}
+ } catch (CertPathValidatorException cpve) {
+ throw new CertificateException(
+ "Certificates does not conform to algorithm constraints");
}
}
}
--- a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -309,6 +309,11 @@
Object writeLock;
/*
+ * Is it the first application record to write?
+ */
+ private boolean isFirstAppOutputRecord = true;
+
+ /*
* Class and subclass dynamic debugging support
*/
private static final Debug debug = Debug.getInstance("ssl");
@@ -612,6 +617,9 @@
// See comment above.
oldCipher.dispose();
+
+ // reset the flag of the first application record
+ isFirstAppOutputRecord = true;
}
/*
@@ -1286,10 +1294,36 @@
}
}
+ /*
+ * turn off the flag of the first application record if we really
+ * consumed at least byte.
+ */
+ if (isFirstAppOutputRecord && ea.deltaApp() > 0) {
+ isFirstAppOutputRecord = false;
+ }
+
return hsStatus;
}
/*
+ * Need to split the payload except the following cases:
+ *
+ * 1. protocol version is TLS 1.1 or later;
+ * 2. bulk cipher does not use CBC mode, including null bulk cipher suites.
+ * 3. the payload is the first application record of a freshly
+ * negotiated TLS session.
+ * 4. the CBC protection is disabled;
+ *
+ * More details, please refer to
+ * EngineOutputRecord.write(EngineArgs, MAC, CipherBox).
+ */
+ boolean needToSplitPayload(CipherBox cipher, ProtocolVersion protocol) {
+ return (protocol.v <= ProtocolVersion.TLS10.v) &&
+ cipher.isCBCMode() && !isFirstAppOutputRecord &&
+ Record.enableCBCProtection;
+ }
+
+ /*
* Non-application OutputRecords go through here.
*/
void writeRecord(EngineOutputRecord eor) throws IOException {
--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -369,6 +369,11 @@
/* Class and subclass dynamic debugging support */
private static final Debug debug = Debug.getInstance("ssl");
+ /*
+ * Is it the first application record to write?
+ */
+ private boolean isFirstAppOutputRecord = true;
+
//
// CONSTRUCTORS AND INITIALIZATION CODE
//
@@ -802,8 +807,35 @@
if (connectionState < cs_ERROR) {
checkSequenceNumber(writeMAC, r.contentType());
}
+
+ // turn off the flag of the first application record
+ if (isFirstAppOutputRecord &&
+ r.contentType() == Record.ct_application_data) {
+ isFirstAppOutputRecord = false;
+ }
}
+ /*
+ * Need to split the payload except the following cases:
+ *
+ * 1. protocol version is TLS 1.1 or later;
+ * 2. bulk cipher does not use CBC mode, including null bulk cipher suites.
+ * 3. the payload is the first application record of a freshly
+ * negotiated TLS session.
+ * 4. the CBC protection is disabled;
+ *
+ * More details, please refer to AppOutputStream.write(byte[], int, int).
+ */
+ boolean needToSplitPayload() {
+ writeLock.lock();
+ try {
+ return (protocolVersion.v <= ProtocolVersion.TLS10.v) &&
+ writeCipher.isCBCMode() && !isFirstAppOutputRecord &&
+ Record.enableCBCProtection;
+ } finally {
+ writeLock.unlock();
+ }
+ }
/*
* Read an application data record. Alerts and handshake
@@ -1453,7 +1485,8 @@
private void closeSocket(boolean selfInitiated) throws IOException {
if ((debug != null) && Debug.isOn("ssl")) {
- System.out.println(threadName() + ", called closeSocket(selfInitiated)");
+ System.out.println(threadName() +
+ ", called closeSocket(" + selfInitiated + ")");
}
if (self == this) {
super.close();
@@ -2030,6 +2063,9 @@
// See comment above.
oldCipher.dispose();
+
+ // reset the flag of the first application record
+ isFirstAppOutputRecord = true;
}
/*
--- a/jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java Tue Dec 06 05:28:17 2011 -0800
@@ -33,18 +33,7 @@
import java.util.Date;
import sun.security.pkcs10.PKCS10;
-import sun.security.x509.AlgorithmId;
-import sun.security.x509.CertificateAlgorithmId;
-import sun.security.x509.CertificateIssuerName;
-import sun.security.x509.CertificateSerialNumber;
-import sun.security.x509.CertificateSubjectName;
-import sun.security.x509.CertificateValidity;
-import sun.security.x509.CertificateVersion;
-import sun.security.x509.CertificateX509Key;
-import sun.security.x509.X500Name;
-import sun.security.x509.X509CertImpl;
-import sun.security.x509.X509CertInfo;
-import sun.security.x509.X509Key;
+import sun.security.x509.*;
/**
@@ -165,6 +154,13 @@
publicKey = pair.getPublic();
privateKey = pair.getPrivate();
+
+ // publicKey's format must be X.509 otherwise
+ // the whole CertGen part of this class is broken.
+ if (!"X.509".equalsIgnoreCase(publicKey.getFormat())) {
+ throw new IllegalArgumentException("publicKey's is not X.509, but "
+ + publicKey.getFormat());
+ }
}
@@ -186,6 +182,16 @@
return (X509Key)publicKey;
}
+ /**
+ * Always returns the public key of the generated key pair. Used
+ * by KeyTool only.
+ *
+ * The publicKey is not necessarily to be an instance of
+ * X509Key in some JCA/JCE providers, for example SunPKCS11.
+ */
+ public PublicKey getPublicKeyAnyway() {
+ return publicKey;
+ }
/**
* Returns the private key of the generated key pair.
@@ -200,7 +206,6 @@
return privateKey;
}
-
/**
* Returns a self-signed X.509v3 certificate for the public key.
* The certificate is immediately valid. No extensions.
@@ -225,6 +230,15 @@
throws CertificateException, InvalidKeyException, SignatureException,
NoSuchAlgorithmException, NoSuchProviderException
{
+ return getSelfCertificate(myname, firstDate, validity, null);
+ }
+
+ // Like above, plus a CertificateExtensions argument, which can be null.
+ public X509Certificate getSelfCertificate (X500Name myname, Date firstDate,
+ long validity, CertificateExtensions ext)
+ throws CertificateException, InvalidKeyException, SignatureException,
+ NoSuchAlgorithmException, NoSuchProviderException
+ {
X509CertImpl cert;
Date lastDate;
@@ -248,6 +262,7 @@
info.set(X509CertInfo.KEY, new CertificateX509Key(publicKey));
info.set(X509CertInfo.VALIDITY, interval);
info.set(X509CertInfo.ISSUER, new CertificateIssuerName(myname));
+ if (ext != null) info.set(X509CertInfo.EXTENSIONS, ext);
cert = new X509CertImpl(info);
cert.sign(privateKey, this.sigAlg);
--- a/jdk/src/share/classes/sun/security/tools/KeyTool.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/security/tools/KeyTool.java Tue Dec 06 05:28:17 2011 -0800
@@ -1518,9 +1518,16 @@
keypair.generate(keysize);
PrivateKey privKey = keypair.getPrivateKey();
+ CertificateExtensions ext = createV3Extensions(
+ null,
+ null,
+ v3ext,
+ keypair.getPublicKeyAnyway(),
+ null);
+
X509Certificate[] chain = new X509Certificate[1];
chain[0] = keypair.getSelfCertificate(
- x500Name, getStartDate(startDate), validity*24L*60L*60L);
+ x500Name, getStartDate(startDate), validity*24L*60L*60L, ext);
if (verbose) {
MessageFormat form = new MessageFormat(rb.getString
@@ -1537,9 +1544,6 @@
keyPass = promptForKeyPass(alias, null, storePass);
}
keyStore.setKeyEntry(alias, privKey, keyPass, chain);
-
- // resign so that -ext are applied.
- doSelfCert(alias, null, sigAlgName);
}
/**
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java Tue Dec 06 05:28:17 2011 -0800
@@ -524,56 +524,67 @@
}
// If we get here we're not printing
- AATextInfo info = drawTextAntialiased(c);
- if (info != null && (g instanceof Graphics2D)) {
+ if (g instanceof Graphics2D) {
+ AATextInfo info = drawTextAntialiased(c);
Graphics2D g2 = (Graphics2D)g;
- Object oldContrast = null;
- Object oldAAValue = g2.getRenderingHint(KEY_TEXT_ANTIALIASING);
- if (info.aaHint != oldAAValue) {
- g2.setRenderingHint(KEY_TEXT_ANTIALIASING, info.aaHint);
- } else {
- oldAAValue = null;
- }
- if (info.lcdContrastHint != null) {
- oldContrast = g2.getRenderingHint(KEY_TEXT_LCD_CONTRAST);
- if (info.lcdContrastHint.equals(oldContrast)) {
- oldContrast = null;
- } else {
- g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST,
- info.lcdContrastHint);
- }
- }
-
boolean needsTextLayout = ((c != null) &&
(c.getClientProperty(TextAttribute.NUMERIC_SHAPING) != null));
+
if (needsTextLayout) {
synchronized(charsBufferLock) {
int length = syncCharsBuffer(text);
needsTextLayout = isComplexLayout(charsBuffer, 0, length);
}
}
- if (needsTextLayout) {
+
+ if (info != null) {
+ Object oldContrast = null;
+ Object oldAAValue = g2.getRenderingHint(KEY_TEXT_ANTIALIASING);
+ if (info.aaHint != oldAAValue) {
+ g2.setRenderingHint(KEY_TEXT_ANTIALIASING, info.aaHint);
+ } else {
+ oldAAValue = null;
+ }
+ if (info.lcdContrastHint != null) {
+ oldContrast = g2.getRenderingHint(KEY_TEXT_LCD_CONTRAST);
+ if (info.lcdContrastHint.equals(oldContrast)) {
+ oldContrast = null;
+ } else {
+ g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST,
+ info.lcdContrastHint);
+ }
+ }
+
+ if (needsTextLayout) {
+ TextLayout layout = createTextLayout(c, text, g2.getFont(),
+ g2.getFontRenderContext());
+ layout.draw(g2, x, y);
+ } else {
+ g.drawString(text, x, y);
+ }
+
+ if (oldAAValue != null) {
+ g2.setRenderingHint(KEY_TEXT_ANTIALIASING, oldAAValue);
+ }
+ if (oldContrast != null) {
+ g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST, oldContrast);
+ }
+
+ return;
+ }
+
+ if (needsTextLayout){
TextLayout layout = createTextLayout(c, text, g2.getFont(),
g2.getFontRenderContext());
layout.draw(g2, x, y);
- } else {
- g.drawString(text, x, y);
- }
-
- if (oldAAValue != null) {
- g2.setRenderingHint(KEY_TEXT_ANTIALIASING, oldAAValue);
- }
- if (oldContrast != null) {
- g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST, oldContrast);
+ return;
}
}
- else {
- g.drawString(text, x, y);
- }
+
+ g.drawString(text, x, y);
}
-
/**
* Draws the string at the specified location underlining the specified
* character.
--- a/jdk/src/share/classes/sun/util/xml/XMLUtils.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/classes/sun/util/xml/XMLUtils.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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
@@ -76,7 +76,7 @@
} catch (SAXException saxe) {
throw new InvalidPropertiesFormatException(saxe);
}
- Element propertiesElement = (Element)doc.getChildNodes().item(1);
+ Element propertiesElement = doc.getDocumentElement();
String xmlVersion = propertiesElement.getAttribute("version");
if (xmlVersion.compareTo(EXTERNAL_XML_VERSION) > 0)
throw new InvalidPropertiesFormatException(
--- a/jdk/src/share/demo/jfc/TransparentRuler/README.txt Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/demo/jfc/TransparentRuler/README.txt Tue Dec 06 05:28:17 2011 -0800
@@ -1,14 +1,10 @@
To run the Ruler demo:
- java -jar Ruler.jar
+ java -jar TransparentRuler.jar
These instructions assume that this installation's version of the java
command is in your path. If it isn't, then you should either
specify the complete path to the java command or update your
PATH environment variable as described in the installation
instructions for the Java(TM) SE Development Kit.
-
-KNOWN ISSUES:
-Context menu is clipped with the window shape. The issues are:
-CR 7027486 JPopupMenu doesn't take window shape into account
--- a/jdk/src/share/javavm/export/jvm.h Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/javavm/export/jvm.h Tue Dec 06 05:28:17 2011 -0800
@@ -1424,7 +1424,8 @@
*/
unsigned int thread_park_blocker : 1;
unsigned int post_vm_init_hook_enabled : 1;
- unsigned int : 30;
+ unsigned int pending_list_uses_discovered_field : 1;
+ unsigned int : 29;
unsigned int : 32;
unsigned int : 32;
} jdk_version_info;
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp Tue Dec 06 05:28:17 2011 -0800
@@ -1112,11 +1112,14 @@
uint size3 = suffix * 3;
if (suffix == 0) continue; // done with empty string
chars.malloc(size3);
+ CHECK;
byte* chp = chars.ptr;
band saved_band = cp_Utf8_big_chars;
cp_Utf8_big_chars.readData(suffix);
+ CHECK;
for (int j = 0; j < suffix; j++) {
unsigned short ch = cp_Utf8_big_chars.getInt();
+ CHECK;
chp = store_Utf8_char(chp, ch);
}
chars.realloc(chp - chars.ptr);
@@ -1134,10 +1137,12 @@
CHECK;
int prevlen = 0; // previous string length (in chars)
tmallocs.add(bigbuf.ptr); // free after this block
+ CHECK;
cp_Utf8_prefix.rewind();
for (i = 0; i < len; i++) {
bytes& chars = allsuffixes[i];
int prefix = (i < PREFIX_SKIP_2)? 0: cp_Utf8_prefix.getInt();
+ CHECK;
int suffix = (int)chars.len;
byte* fillp;
// by induction, the buffer is already filled with the prefix
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, Oracle and/or its affiliates. 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
@@ -52,7 +52,7 @@
if (msize >= 0 && msize < sizeof(int))
msize = sizeof(int); // see 0xbaadf00d below
#endif
- void* ptr = (msize > PSIZE_MAX) ? null : malloc(msize);
+ void* ptr = (msize > PSIZE_MAX || msize <= 0) ? null : malloc(msize);
if (ptr != null) {
memset(ptr, 0, size);
} else {
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, Oracle and/or its affiliates. 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
@@ -33,7 +33,7 @@
#endif
// overflow management
-#define OVERFLOW ((size_t)-1)
+#define OVERFLOW ((uint)-1)
#define PSIZE_MAX (OVERFLOW/2) /* normal size limit */
inline size_t scale_size(size_t size, size_t scale) {
--- a/jdk/src/share/native/common/jdk_util.c Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/native/common/jdk_util.c Tue Dec 06 05:28:17 2011 -0800
@@ -101,5 +101,5 @@
// Advertise presence of sun.misc.PostVMInitHook:
// future optimization: detect if this is enabled.
info->post_vm_init_hook_enabled = 1;
-
+ info->pending_list_uses_discovered_field = 1;
}
--- a/jdk/src/share/native/sun/awt/medialib/mlib_types.h Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_types.h Tue Dec 06 05:28:17 2011 -0800
@@ -59,13 +59,8 @@
#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
-#if defined(__linux__)
-#include <stdint.h> /* for uintptr_t */
-#include <malloc.h> /* for ptrdiff_t */
-#else
-#include <link.h> /* for uintptr_t */
-#include <stddef.h> /* for ptrdiff_t */
-#endif /* __linux__ */
+#include <stdint.h>
+#include <stddef.h>
#ifdef MLIB_OS64BIT
--- a/jdk/src/share/native/sun/java2d/loops/TransformHelper.c Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/share/native/sun/java2d/loops/TransformHelper.c Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. 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
@@ -284,7 +284,7 @@
TransformHelperFunc *pHelperFunc;
TransformInterpFunc *pInterpFunc;
jdouble xorig, yorig;
- jint numedges;
+ jlong numedges;
jint *pEdges;
jint edgebuf[2 + MAXEDGES * 2];
union {
@@ -379,19 +379,44 @@
}
Region_IntersectBounds(&clipInfo, &dstInfo.bounds);
- numedges = (dstInfo.bounds.y2 - dstInfo.bounds.y1);
- if (numedges > MAXEDGES) {
- pEdges = malloc((2 + 2 * numedges) * sizeof (*pEdges));
- if (pEdges == NULL) {
- SurfaceData_InvokeUnlock(env, dstOps, &dstInfo);
- SurfaceData_InvokeUnlock(env, srcOps, &srcInfo);
- /* edgeArray should already contain zeros for min/maxy */
- return;
- }
+ numedges = (((jlong) dstInfo.bounds.y2) - ((jlong) dstInfo.bounds.y1));
+ if (numedges <= 0) {
+ pEdges = NULL;
+ } else if (!JNU_IsNull(env, edgeArray)) {
+ /*
+ * Ideally Java should allocate an array large enough, but if
+ * we ever have a miscommunication about the number of edge
+ * lines, or if the Java array calculation should overflow to
+ * a positive number and succeed in allocating an array that
+ * is too small, we need to verify that it can still hold the
+ * number of integers that we plan to store to be safe.
+ */
+ jsize edgesize = (*env)->GetArrayLength(env, edgeArray);
+ /* (edgesize/2 - 1) should avoid any overflow or underflow. */
+ pEdges = (((edgesize / 2) - 1) >= numedges)
+ ? (*env)->GetPrimitiveArrayCritical(env, edgeArray, NULL)
+ : NULL;
+ } else if (numedges > MAXEDGES) {
+ /* numedges variable (jlong) can be at most ((1<<32)-1) */
+ /* memsize can overflow a jint, but not a jlong */
+ jlong memsize = ((numedges * 2) + 2) * sizeof(*pEdges);
+ pEdges = (memsize == ((size_t) memsize))
+ ? malloc((size_t) memsize)
+ : NULL;
} else {
pEdges = edgebuf;
}
+ if (pEdges == NULL) {
+ if (numedges > 0) {
+ JNU_ThrowInternalError(env, "Unable to allocate edge list");
+ }
+ SurfaceData_InvokeUnlock(env, dstOps, &dstInfo);
+ SurfaceData_InvokeUnlock(env, srcOps, &srcInfo);
+ /* edgeArray should already contain zeros for min/maxy */
+ return;
+ }
+
Transform_GetInfo(env, itxform, &itxInfo);
if (!Region_IsEmpty(&clipInfo)) {
@@ -500,14 +525,14 @@
} else {
pEdges[0] = pEdges[1] = 0;
}
+
+ if (!JNU_IsNull(env, edgeArray)) {
+ (*env)->ReleasePrimitiveArrayCritical(env, edgeArray, pEdges, 0);
+ } else if (pEdges != edgebuf) {
+ free(pEdges);
+ }
SurfaceData_InvokeUnlock(env, dstOps, &dstInfo);
SurfaceData_InvokeUnlock(env, srcOps, &srcInfo);
- if (!JNU_IsNull(env, edgeArray)) {
- (*env)->SetIntArrayRegion(env, edgeArray, 0, 2+numedges*2, pEdges);
- }
- if (pEdges != edgebuf) {
- free(pEdges);
- }
}
static void
--- a/jdk/src/solaris/classes/java/io/FileDescriptor.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/classes/java/io/FileDescriptor.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2011, Oracle and/or its affiliates. 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
@@ -25,7 +25,8 @@
package java.io;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.ArrayList;
+import java.util.List;
/**
* Instances of the file descriptor class serve as an opaque handle
@@ -46,12 +47,9 @@
private int fd;
- /**
- * A counter for tracking the FIS/FOS/RAF instances that
- * use this FileDescriptor. The FIS/FOS.finalize() will not release
- * the FileDescriptor if it is still under user by a stream.
- */
- private AtomicInteger useCount;
+ private Closeable parent;
+ private List<Closeable> otherParents;
+ private boolean closed;
/**
* Constructs an (invalid) FileDescriptor
@@ -59,12 +57,10 @@
*/
public /**/ FileDescriptor() {
fd = -1;
- useCount = new AtomicInteger();
}
private /* */ FileDescriptor(int fd) {
this.fd = fd;
- useCount = new AtomicInteger();
}
/**
@@ -164,13 +160,67 @@
);
}
- // package private methods used by FIS, FOS and RAF
+ /*
+ * Package private methods to track referents.
+ * If multiple streams point to the same FileDescriptor, we cycle
+ * through the list of all referents and call close()
+ */
- int incrementAndGetUseCount() {
- return useCount.incrementAndGet();
+ /**
+ * Attach a Closeable to this FD for tracking.
+ * parent reference is added to otherParents when
+ * needed to make closeAll simpler.
+ */
+ synchronized void attach(Closeable c) {
+ if (parent == null) {
+ // first caller gets to do this
+ parent = c;
+ } else if (otherParents == null) {
+ otherParents = new ArrayList<>();
+ otherParents.add(parent);
+ otherParents.add(c);
+ } else {
+ otherParents.add(c);
+ }
}
- int decrementAndGetUseCount() {
- return useCount.decrementAndGet();
+ /**
+ * Cycle through all Closeables sharing this FD and call
+ * close() on each one.
+ *
+ * The caller closeable gets to call close0().
+ */
+ @SuppressWarnings("try")
+ synchronized void closeAll(Closeable releaser) throws IOException {
+ if (!closed) {
+ closed = true;
+ IOException ioe = null;
+ try (Closeable c = releaser) {
+ if (otherParents != null) {
+ for (Closeable referent : otherParents) {
+ try {
+ referent.close();
+ } catch(IOException x) {
+ if (ioe == null) {
+ ioe = x;
+ } else {
+ ioe.addSuppressed(x);
+ }
+ }
+ }
+ }
+ } catch(IOException ex) {
+ /*
+ * If releaser close() throws IOException
+ * add other exceptions as suppressed.
+ */
+ if (ioe != null)
+ ex.addSuppressed(ioe);
+ ioe = ex;
+ } finally {
+ if (ioe != null)
+ throw ioe;
+ }
+ }
}
}
--- a/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Tue Dec 06 05:28:17 2011 -0800
@@ -466,12 +466,16 @@
if (true) {
switch(e.getID()) {
case PaintEvent.UPDATE:
- log.finer("XCP coalescePaintEvent : UPDATE : add : x = " +
+ if (log.isLoggable(PlatformLogger.FINER)) {
+ log.finer("XCP coalescePaintEvent : UPDATE : add : x = " +
r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height);
+ }
return;
case PaintEvent.PAINT:
- log.finer("XCP coalescePaintEvent : PAINT : add : x = " +
+ if (log.isLoggable(PlatformLogger.FINER)) {
+ log.finer("XCP coalescePaintEvent : PAINT : add : x = " +
r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height);
+ }
return;
}
}
@@ -1248,7 +1252,9 @@
* ButtonPress, ButtonRelease, KeyPress, KeyRelease, EnterNotify, LeaveNotify, MotionNotify
*/
protected boolean isEventDisabled(XEvent e) {
- enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable"));
+ if (enableLog.isLoggable(PlatformLogger.FINEST)) {
+ enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable"));
+ }
if (!isEnabled()) {
switch (e.get_type()) {
case XConstants.ButtonPress:
@@ -1258,7 +1264,9 @@
case XConstants.EnterNotify:
case XConstants.LeaveNotify:
case XConstants.MotionNotify:
- enableLog.finer("Event {0} is disable", e);
+ if (enableLog.isLoggable(PlatformLogger.FINER)) {
+ enableLog.finer("Event {0} is disable", e);
+ }
return true;
}
}
--- a/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java Tue Dec 06 05:28:17 2011 -0800
@@ -678,7 +678,7 @@
public void writeToString(StructType stp, PrintWriter pw) {
int type;
pw.println("\n\n\tString getName() {\n\t\treturn \"" + stp.getName()+ "\"; \n\t}");
- pw.println("\n\n\tString getFieldsAsString() {\n\t\tString ret=\"\";\n");
+ pw.println("\n\n\tString getFieldsAsString() {\n\t\tStringBuilder ret = new StringBuilder(" + stp.getNumFields() * 40 + ");\n");
for (Enumeration e = stp.getMembers() ; e.hasMoreElements() ;) {
AtomicType tp = (AtomicType) e.nextElement();
@@ -688,24 +688,24 @@
if ((name != null) && (name.length() > 0))
{
if (type == AtomicType.TYPE_ATOM) {
- pw.println("\t\tret += \"\"+\"" + name + " = \" + XAtom.get(get_" + name + "()) +\", \";");
+ pw.println("\t\tret.append(\"" + name + " = \" ).append( XAtom.get(get_" + name + "()) ).append(\", \");");
} else if (name.equals("type")) {
- pw.println("\t\tret += \"\"+\"type = \" + XlibWrapper.eventToString[get_type()] +\", \";");
+ pw.println("\t\tret.append(\"type = \").append( XlibWrapper.eventToString[get_type()] ).append(\", \");");
} else if (name.equals("window")){
- pw.println("\t\tret += \"\"+\"window = \" + getWindow(get_window()) + \", \";");
+ pw.println("\t\tret.append(\"window = \" ).append( getWindow(get_window()) ).append(\", \");");
} else if (type == AtomicType.TYPE_ARRAY) {
- pw.print("\t\tret += \"{\"");
+ pw.print("\t\tret.append(\"{\")");
for (int i = 0; i < tp.getArrayLength(); i++) {
- pw.print(" + get_" + name + "(" + i + ") + \" \"");
+ pw.print("\n\t\t.append( get_" + name + "(" + i + ") ).append(\" \")");
}
- pw.println(" + \"}\";");
+ pw.println(".append( \"}\");");
} else {
- pw.println("\t\tret += \"\"+\"" + name +" = \" + get_"+ name+"() +\", \";");
+ pw.println("\t\tret.append(\"" + name +" = \").append( get_"+ name+"() ).append(\", \");");
}
}
}
- pw.println("\t\treturn ret;\n\t}\n\n");
+ pw.println("\t\treturn ret.toString();\n\t}\n\n");
}
public void writeStubs(StructType stp, PrintWriter pw) {
--- a/jdk/src/solaris/classes/sun/print/UnixPrintJob.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/classes/sun/print/UnixPrintJob.java Tue Dec 06 05:28:17 2011 -0800
@@ -38,7 +38,9 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.IOException;
+import java.io.PrintWriter;
import java.io.Reader;
+import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.util.Vector;
@@ -955,23 +957,49 @@
private class PrinterSpooler implements java.security.PrivilegedAction {
PrintException pex;
+ private void handleProcessFailure(final Process failedProcess,
+ final String[] execCmd, final int result) throws IOException {
+ try (StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw)) {
+ pw.append("error=").append(Integer.toString(result));
+ pw.append(" running:");
+ for (String arg: execCmd) {
+ pw.append(" '").append(arg).append("'");
+ }
+ try (InputStream is = failedProcess.getErrorStream();
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr)) {
+ while (br.ready()) {
+ pw.println();
+ pw.append("\t\t").append(br.readLine());
+ }
+ } finally {
+ pw.flush();
+ throw new IOException(sw.toString());
+ }
+ }
+ }
+
public Object run() {
+ if (spoolFile == null || !spoolFile.exists()) {
+ pex = new PrintException("No spool file");
+ notifyEvent(PrintJobEvent.JOB_FAILED);
+ return null;
+ }
try {
/**
* Spool to the printer.
*/
- if (spoolFile == null || !spoolFile.exists()) {
- pex = new PrintException("No spool file");
- notifyEvent(PrintJobEvent.JOB_FAILED);
- return null;
- }
String fileName = spoolFile.getAbsolutePath();
String execCmd[] = printExecCmd(mDestination, mOptions,
mNoJobSheet, jobName, copies, fileName);
Process process = Runtime.getRuntime().exec(execCmd);
process.waitFor();
- spoolFile.delete();
+ final int result = process.exitValue();
+ if (0 != result) {
+ handleProcessFailure(process, execCmd, result);
+ }
notifyEvent(PrintJobEvent.DATA_TRANSFER_COMPLETE);
} catch (IOException ex) {
notifyEvent(PrintJobEvent.JOB_FAILED);
@@ -981,6 +1009,7 @@
notifyEvent(PrintJobEvent.JOB_FAILED);
pex = new PrintException(ie);
} finally {
+ spoolFile.delete();
notifyEvent(PrintJobEvent.NO_MORE_EVENTS);
}
return null;
--- a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c Tue Dec 06 05:28:17 2011 -0800
@@ -43,8 +43,9 @@
#include "java_net_Inet4AddressImpl.h"
/* the initial size of our hostent buffers */
-#define HENT_BUF_SIZE 1024
-#define BIG_HENT_BUF_SIZE 10240 /* a jumbo-sized one */
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
/************************************************************************
* Inet4AddressImpl
@@ -57,60 +58,36 @@
*/
JNIEXPORT jstring JNICALL
Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
- char hostname[MAXHOSTNAMELEN+1];
+ char hostname[NI_MAXHOST+1];
hostname[0] = '\0';
if (JVM_GetHostName(hostname, sizeof(hostname))) {
/* Something went wrong, maybe networking is not setup? */
strcpy(hostname, "localhost");
} else {
-#ifdef __linux__
- /* On Linux gethostname() says "host.domain.sun.com". On
- * Solaris gethostname() says "host", so extra work is needed.
- */
-#else
- /* Solaris doesn't want to give us a fully qualified domain name.
- * We do a reverse lookup to try and get one. This works
- * if DNS occurs before NIS in /etc/resolv.conf, but fails
- * if NIS comes first (it still gets only a partial name).
- * We use thread-safe system calls.
- */
-#endif /* __linux__ */
- struct hostent res, res2, *hp;
- // these buffers must be pointer-aligned so they are declared
- // with pointer type
- char *buf[HENT_BUF_SIZE/(sizeof (char *))];
- char *buf2[HENT_BUF_SIZE/(sizeof (char *))];
- int h_error=0;
+ struct addrinfo hints, *res;
+ int error;
- // ensure null-terminated
- hostname[MAXHOSTNAMELEN] = '\0';
+ hostname[NI_MAXHOST] = '\0';
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_CANONNAME;
+ hints.ai_family = AF_INET;
+
+ error = getaddrinfo(hostname, NULL, &hints, &res);
-#ifdef __GLIBC__
- gethostbyname_r(hostname, &res, (char*)buf, sizeof(buf), &hp, &h_error);
-#else
- hp = gethostbyname_r(hostname, &res, (char*)buf, sizeof(buf), &h_error);
-#endif
- if (hp) {
-#ifdef __GLIBC__
- gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- &res2, (char*)buf2, sizeof(buf2), &hp, &h_error);
-#else
- hp = gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- &res2, (char*)buf2, sizeof(buf2), &h_error);
-#endif
- if (hp) {
- /*
- * If gethostbyaddr_r() found a fully qualified host name,
- * returns that name. Otherwise, returns the hostname
- * found by gethostname().
- */
- char *p = hp->h_name;
- if ((strlen(hp->h_name) > strlen(hostname))
- && (strncmp(hostname, hp->h_name, strlen(hostname)) == 0)
- && (*(p + strlen(hostname)) == '.'))
- strcpy(hostname, hp->h_name);
- }
+ if (error == 0) {/* host is known to name service */
+ getnameinfo(res->ai_addr,
+ res->ai_addrlen,
+ hostname,
+ NI_MAXHOST,
+ NULL,
+ 0,
+ NI_NAMEREQD);
+
+ /* if getnameinfo fails hostname is still the value
+ from gethostname */
+
+ freeaddrinfo(res);
}
}
return (*env)->NewStringUTF(env, hostname);
@@ -140,14 +117,9 @@
jstring host) {
const char *hostname;
jobjectArray ret = 0;
- struct hostent res, *hp = 0;
- // this buffer must be pointer-aligned so is declared
- // with pointer type
- char *buf[HENT_BUF_SIZE/(sizeof (char *))];
-
- /* temporary buffer, on the off chance we need to expand */
- char *tmp = NULL;
- int h_error=0;
+ int retLen = 0;
+ int error = 0;
+ struct addrinfo hints, *res, *resNew = NULL;
if (!initialized) {
ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
@@ -168,6 +140,11 @@
hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
CHECK_NULL_RETURN(hostname, NULL);
+ /* Try once, with our static buffer. */
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_CANONNAME;
+ hints.ai_family = AF_INET;
+
#ifdef __solaris__
/*
* Workaround for Solaris bug 4160367 - if a hostname contains a
@@ -181,69 +158,93 @@
}
#endif
- /* Try once, with our static buffer. */
-#ifdef __GLIBC__
- gethostbyname_r(hostname, &res, (char*)buf, sizeof(buf), &hp, &h_error);
-#else
- hp = gethostbyname_r(hostname, &res, (char*)buf, sizeof(buf), &h_error);
-#endif
+ error = getaddrinfo(hostname, NULL, &hints, &res);
+
+ if (error) {
+ /* report error */
+ ThrowUnknownHostExceptionWithGaiError(env, hostname, error);
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ return NULL;
+ } else {
+ int i = 0;
+ struct addrinfo *itr, *last = NULL, *iterator = res;
- /* With the re-entrant system calls, it's possible that the buffer
- * we pass to it is not large enough to hold an exceptionally
- * large DNS entry. This is signaled by errno->ERANGE. We try once
- * more, with a very big size.
- */
- if (hp == NULL && errno == ERANGE) {
- if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
-#ifdef __GLIBC__
- gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- &hp, &h_error);
-#else
- hp = gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- &h_error);
-#endif
- }
- }
- if (hp != NULL) {
- struct in_addr **addrp = (struct in_addr **) hp->h_addr_list;
- int i = 0;
+ while (iterator != NULL) {
+ // remove the duplicate one
+ int skip = 0;
+ itr = resNew;
+ while (itr != NULL) {
+ struct sockaddr_in *addr1, *addr2;
+ addr1 = (struct sockaddr_in *)iterator->ai_addr;
+ addr2 = (struct sockaddr_in *)itr->ai_addr;
+ if (addr1->sin_addr.s_addr ==
+ addr2->sin_addr.s_addr) {
+ skip = 1;
+ break;
+ }
+ itr = itr->ai_next;
+ }
- while (*addrp != (struct in_addr *) 0) {
- i++;
- addrp++;
+ if (!skip) {
+ struct addrinfo *next
+ = (struct addrinfo*) malloc(sizeof(struct addrinfo));
+ if (!next) {
+ JNU_ThrowOutOfMemoryError(env, "heap allocation failed");
+ ret = NULL;
+ goto cleanupAndReturn;
+ }
+ memcpy(next, iterator, sizeof(struct addrinfo));
+ next->ai_next = NULL;
+ if (resNew == NULL) {
+ resNew = next;
+ } else {
+ last->ai_next = next;
+ }
+ last = next;
+ i++;
+ }
+ iterator = iterator->ai_next;
}
- ret = (*env)->NewObjectArray(env, i, ni_iacls, NULL);
+ retLen = i;
+ iterator = resNew;
+
+ ret = (*env)->NewObjectArray(env, retLen, ni_iacls, NULL);
+
if (IS_NULL(ret)) {
/* we may have memory to free at the end of this */
goto cleanupAndReturn;
}
- addrp = (struct in_addr **) hp->h_addr_list;
+
i = 0;
- while (*addrp) {
- jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
- if (IS_NULL(iaObj)) {
- ret = NULL;
- goto cleanupAndReturn;
- }
- (*env)->SetIntField(env, iaObj, ni_iaaddressID,
- ntohl((*addrp)->s_addr));
- (*env)->SetObjectField(env, iaObj, ni_iahostID, host);
- (*env)->SetObjectArrayElement(env, ret, i, iaObj);
- addrp++;
- i++;
+ while (iterator != NULL) {
+ jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
+ if (IS_NULL(iaObj)) {
+ ret = NULL;
+ goto cleanupAndReturn;
+ }
+ (*env)->SetIntField(env, iaObj, ni_iaaddressID,
+ ntohl(((struct sockaddr_in*)iterator->ai_addr)->sin_addr.s_addr));
+ (*env)->SetObjectField(env, iaObj, ni_iahostID, host);
+ (*env)->SetObjectArrayElement(env, ret, i++, iaObj);
+ iterator = iterator->ai_next;
}
- } else {
- JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
- (char *)hostname);
- ret = NULL;
}
-cleanupAndReturn:
- JNU_ReleaseStringPlatformChars(env, host, hostname);
- if (tmp != NULL) {
- free(tmp);
+ cleanupAndReturn:
+ {
+ struct addrinfo *iterator, *tmp;
+ iterator = resNew;
+ while (iterator != NULL) {
+ tmp = iterator;
+ iterator = iterator->ai_next;
+ free(tmp);
+ }
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
}
+
+ freeaddrinfo(res);
+
return ret;
}
@@ -256,63 +257,38 @@
Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this,
jbyteArray addrArray) {
jstring ret = NULL;
- jint addr;
- struct hostent hent, *hp = 0;
- // this buffer must be pointer-aligned so is declared
- // with pointer type
- char *buf[HENT_BUF_SIZE/(sizeof (char *))];
- int h_error = 0;
- char *tmp = NULL;
- /*
- * We are careful here to use the reentrant version of
- * gethostbyname because at the Java level this routine is not
- * protected by any synchronization.
- *
- * Still keeping the reentrant platform dependent calls temporarily
- * We should probably conform to one interface later.
- *
- */
+ char host[NI_MAXHOST+1];
+ int error = 0;
+ int len = 0;
jbyte caddr[4];
+
+ struct sockaddr_in him4;
+ struct sockaddr *sa;
+
+ jint addr;
(*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr);
addr = ((caddr[0]<<24) & 0xff000000);
addr |= ((caddr[1] <<16) & 0xff0000);
addr |= ((caddr[2] <<8) & 0xff00);
addr |= (caddr[3] & 0xff);
- addr = htonl(addr);
-#ifdef __GLIBC__
- gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- (char*)buf, sizeof(buf), &hp, &h_error);
-#else
- hp = gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- (char*)buf, sizeof(buf), &h_error);
-#endif
- /* With the re-entrant system calls, it's possible that the buffer
- * we pass to it is not large enough to hold an exceptionally
- * large DNS entry. This is signaled by errno->ERANGE. We try once
- * more, with a very big size.
- */
- if (hp == NULL && errno == ERANGE) {
- if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
-#ifdef __GLIBC__
- gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error);
-#else
- hp = gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- &hent, tmp, BIG_HENT_BUF_SIZE, &h_error);
-#endif
- } else {
- JNU_ThrowOutOfMemoryError(env, "getHostByAddr");
- }
+ memset((void *) &him4, 0, sizeof(him4));
+ him4.sin_addr.s_addr = (uint32_t) htonl(addr);
+ him4.sin_family = AF_INET;
+ sa = (struct sockaddr *) &him4;
+ len = sizeof(him4);
+
+ error = getnameinfo(sa, len, host, NI_MAXHOST, NULL, 0,
+ NI_NAMEREQD);
+
+ if (!error) {
+ ret = (*env)->NewStringUTF(env, host);
}
- if (hp == NULL) {
+
+ if (ret == NULL) {
JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", NULL);
- } else {
- ret = (*env)->NewStringUTF(env, hp->h_name);
}
- if (tmp) {
- free(tmp);
- }
+
return ret;
}
--- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c Tue Dec 06 05:28:17 2011 -0800
@@ -82,31 +82,29 @@
* We use thread-safe system calls.
*/
#ifdef AF_INET6
- if (NET_addrtransAvailable()) {
- struct addrinfo hints, *res;
- int error;
+ struct addrinfo hints, *res;
+ int error;
- bzero(&hints, sizeof(hints));
- hints.ai_flags = AI_CANONNAME;
- hints.ai_family = AF_UNSPEC;
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_CANONNAME;
+ hints.ai_family = AF_UNSPEC;
- error = (*getaddrinfo_ptr)(hostname, NULL, &hints, &res);
+ error = getaddrinfo(hostname, NULL, &hints, &res);
- if (error == 0) {
- /* host is known to name service */
- error = (*getnameinfo_ptr)(res->ai_addr,
- res->ai_addrlen,
- hostname,
- NI_MAXHOST,
- NULL,
- 0,
- NI_NAMEREQD);
+ if (error == 0) {
+ /* host is known to name service */
+ error = getnameinfo(res->ai_addr,
+ res->ai_addrlen,
+ hostname,
+ NI_MAXHOST,
+ NULL,
+ 0,
+ NI_NAMEREQD);
- /* if getnameinfo fails hostname is still the value
- from gethostname */
+ /* if getnameinfo fails hostname is still the value
+ from gethostname */
- (*freeaddrinfo_ptr)(res);
- }
+ freeaddrinfo(res);
}
#endif /* AF_INET6 */
#endif /* __linux__ */
@@ -173,193 +171,191 @@
CHECK_NULL_RETURN(hostname, NULL);
#ifdef AF_INET6
- if (NET_addrtransAvailable()) {
- static jfieldID ia_preferIPv6AddressID;
- if (ia_preferIPv6AddressID == NULL) {
- jclass c = (*env)->FindClass(env,"java/net/InetAddress");
- if (c) {
- ia_preferIPv6AddressID =
- (*env)->GetStaticFieldID(env, c, "preferIPv6Address", "Z");
- }
- if (ia_preferIPv6AddressID == NULL) {
- JNU_ReleaseStringPlatformChars(env, host, hostname);
- return NULL;
- }
+ static jfieldID ia_preferIPv6AddressID;
+ if (ia_preferIPv6AddressID == NULL) {
+ jclass c = (*env)->FindClass(env,"java/net/InetAddress");
+ if (c) {
+ ia_preferIPv6AddressID =
+ (*env)->GetStaticFieldID(env, c, "preferIPv6Address", "Z");
}
- /* get the address preference */
- preferIPv6Address
- = (*env)->GetStaticBooleanField(env, ia_class, ia_preferIPv6AddressID);
-
- /* Try once, with our static buffer. */
- bzero(&hints, sizeof(hints));
- hints.ai_flags = AI_CANONNAME;
- hints.ai_family = AF_UNSPEC;
-
-#ifdef __solaris__
- /*
- * Workaround for Solaris bug 4160367 - if a hostname contains a
- * white space then 0.0.0.0 is returned
- */
- if (isspace((unsigned char)hostname[0])) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
- hostname);
+ if (ia_preferIPv6AddressID == NULL) {
JNU_ReleaseStringPlatformChars(env, host, hostname);
return NULL;
}
+ }
+ /* get the address preference */
+ preferIPv6Address
+ = (*env)->GetStaticBooleanField(env, ia_class, ia_preferIPv6AddressID);
+
+ /* Try once, with our static buffer. */
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_CANONNAME;
+ hints.ai_family = AF_UNSPEC;
+
+#ifdef __solaris__
+ /*
+ * Workaround for Solaris bug 4160367 - if a hostname contains a
+ * white space then 0.0.0.0 is returned
+ */
+ if (isspace((unsigned char)hostname[0])) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
+ hostname);
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ return NULL;
+ }
#endif
- error = (*getaddrinfo_ptr)(hostname, NULL, &hints, &res);
+ error = getaddrinfo(hostname, NULL, &hints, &res);
- if (error) {
- /* report error */
- ThrowUnknownHostExceptionWithGaiError(env, hostname, error);
- JNU_ReleaseStringPlatformChars(env, host, hostname);
- return NULL;
- } else {
- int i = 0;
- int inetCount = 0, inet6Count = 0, inetIndex, inet6Index;
- struct addrinfo *itr, *last = NULL, *iterator = res;
- while (iterator != NULL) {
- int skip = 0;
- itr = resNew;
- while (itr != NULL) {
- if (iterator->ai_family == itr->ai_family &&
- iterator->ai_addrlen == itr->ai_addrlen) {
- if (itr->ai_family == AF_INET) { /* AF_INET */
- struct sockaddr_in *addr1, *addr2;
- addr1 = (struct sockaddr_in *)iterator->ai_addr;
- addr2 = (struct sockaddr_in *)itr->ai_addr;
- if (addr1->sin_addr.s_addr ==
- addr2->sin_addr.s_addr) {
- skip = 1;
- break;
- }
- } else {
- int t;
- struct sockaddr_in6 *addr1, *addr2;
- addr1 = (struct sockaddr_in6 *)iterator->ai_addr;
- addr2 = (struct sockaddr_in6 *)itr->ai_addr;
+ if (error) {
+ /* report error */
+ ThrowUnknownHostExceptionWithGaiError(env, hostname, error);
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ return NULL;
+ } else {
+ int i = 0;
+ int inetCount = 0, inet6Count = 0, inetIndex, inet6Index;
+ struct addrinfo *itr, *last = NULL, *iterator = res;
+ while (iterator != NULL) {
+ int skip = 0;
+ itr = resNew;
+ while (itr != NULL) {
+ if (iterator->ai_family == itr->ai_family &&
+ iterator->ai_addrlen == itr->ai_addrlen) {
+ if (itr->ai_family == AF_INET) { /* AF_INET */
+ struct sockaddr_in *addr1, *addr2;
+ addr1 = (struct sockaddr_in *)iterator->ai_addr;
+ addr2 = (struct sockaddr_in *)itr->ai_addr;
+ if (addr1->sin_addr.s_addr ==
+ addr2->sin_addr.s_addr) {
+ skip = 1;
+ break;
+ }
+ } else {
+ int t;
+ struct sockaddr_in6 *addr1, *addr2;
+ addr1 = (struct sockaddr_in6 *)iterator->ai_addr;
+ addr2 = (struct sockaddr_in6 *)itr->ai_addr;
- for (t = 0; t < 16; t++) {
- if (addr1->sin6_addr.s6_addr[t] !=
- addr2->sin6_addr.s6_addr[t]) {
- break;
- }
- }
- if (t < 16) {
- itr = itr->ai_next;
- continue;
- } else {
- skip = 1;
+ for (t = 0; t < 16; t++) {
+ if (addr1->sin6_addr.s6_addr[t] !=
+ addr2->sin6_addr.s6_addr[t]) {
break;
}
}
- } else if (iterator->ai_family != AF_INET &&
- iterator->ai_family != AF_INET6) {
- /* we can't handle other family types */
- skip = 1;
- break;
- }
- itr = itr->ai_next;
- }
-
- if (!skip) {
- struct addrinfo *next
- = (struct addrinfo*) malloc(sizeof(struct addrinfo));
- if (!next) {
- JNU_ThrowOutOfMemoryError(env, "heap allocation failed");
- ret = NULL;
- goto cleanupAndReturn;
+ if (t < 16) {
+ itr = itr->ai_next;
+ continue;
+ } else {
+ skip = 1;
+ break;
+ }
}
- memcpy(next, iterator, sizeof(struct addrinfo));
- next->ai_next = NULL;
- if (resNew == NULL) {
- resNew = next;
- } else {
- last->ai_next = next;
- }
- last = next;
- i++;
- if (iterator->ai_family == AF_INET) {
- inetCount ++;
- } else if (iterator->ai_family == AF_INET6) {
- inet6Count ++;
- }
+ } else if (iterator->ai_family != AF_INET &&
+ iterator->ai_family != AF_INET6) {
+ /* we can't handle other family types */
+ skip = 1;
+ break;
}
- iterator = iterator->ai_next;
- }
- retLen = i;
- iterator = resNew;
-
- ret = (*env)->NewObjectArray(env, retLen, ni_iacls, NULL);
-
- if (IS_NULL(ret)) {
- /* we may have memory to free at the end of this */
- goto cleanupAndReturn;
+ itr = itr->ai_next;
}
- if (preferIPv6Address) {
- /* AF_INET addresses will be offset by inet6Count */
- inetIndex = inet6Count;
- inet6Index = 0;
- } else {
- /* AF_INET6 addresses will be offset by inetCount */
- inetIndex = 0;
- inet6Index = inetCount;
+ if (!skip) {
+ struct addrinfo *next
+ = (struct addrinfo*) malloc(sizeof(struct addrinfo));
+ if (!next) {
+ JNU_ThrowOutOfMemoryError(env, "heap allocation failed");
+ ret = NULL;
+ goto cleanupAndReturn;
+ }
+ memcpy(next, iterator, sizeof(struct addrinfo));
+ next->ai_next = NULL;
+ if (resNew == NULL) {
+ resNew = next;
+ } else {
+ last->ai_next = next;
+ }
+ last = next;
+ i++;
+ if (iterator->ai_family == AF_INET) {
+ inetCount ++;
+ } else if (iterator->ai_family == AF_INET6) {
+ inet6Count ++;
+ }
}
+ iterator = iterator->ai_next;
+ }
+ retLen = i;
+ iterator = resNew;
- while (iterator != NULL) {
- if (iterator->ai_family == AF_INET) {
+ ret = (*env)->NewObjectArray(env, retLen, ni_iacls, NULL);
+
+ if (IS_NULL(ret)) {
+ /* we may have memory to free at the end of this */
+ goto cleanupAndReturn;
+ }
+
+ if (preferIPv6Address) {
+ /* AF_INET addresses will be offset by inet6Count */
+ inetIndex = inet6Count;
+ inet6Index = 0;
+ } else {
+ /* AF_INET6 addresses will be offset by inetCount */
+ inetIndex = 0;
+ inet6Index = inetCount;
+ }
+
+ while (iterator != NULL) {
+ if (iterator->ai_family == AF_INET) {
jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
if (IS_NULL(iaObj)) {
- ret = NULL;
- goto cleanupAndReturn;
+ ret = NULL;
+ goto cleanupAndReturn;
}
(*env)->SetIntField(env, iaObj, ni_iaaddressID,
ntohl(((struct sockaddr_in*)iterator->ai_addr)->sin_addr.s_addr));
(*env)->SetObjectField(env, iaObj, ni_iahostID, host);
(*env)->SetObjectArrayElement(env, ret, inetIndex, iaObj);
inetIndex++;
- } else if (iterator->ai_family == AF_INET6) {
+ } else if (iterator->ai_family == AF_INET6) {
jint scope = 0;
jbyteArray ipaddress;
jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
if (IS_NULL(iaObj)) {
- ret = NULL;
- goto cleanupAndReturn;
+ ret = NULL;
+ goto cleanupAndReturn;
}
ipaddress = (*env)->NewByteArray(env, 16);
if (IS_NULL(ipaddress)) {
- ret = NULL;
- goto cleanupAndReturn;
+ ret = NULL;
+ goto cleanupAndReturn;
}
(*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
(jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
#ifdef __linux__
if (!kernelIsV22()) {
- scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
+ scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
}
#else
scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
#endif
if (scope != 0) { /* zero is default value, no need to set */
- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
+ (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
+ (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
}
(*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
(*env)->SetObjectField(env, iaObj, ni_iahostID, host);
(*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
inet6Index++;
- }
- iterator = iterator->ai_next;
}
+ iterator = iterator->ai_next;
}
}
-cleanupAndReturn:
+ cleanupAndReturn:
{
- struct addrinfo *iterator, *tmp;
+ struct addrinfo *iterator, *tmp;
iterator = resNew;
while (iterator != NULL) {
tmp = iterator;
@@ -369,8 +365,7 @@
JNU_ReleaseStringPlatformChars(env, host, hostname);
}
- if (NET_addrtransAvailable())
- (*freeaddrinfo_ptr)(res);
+ freeaddrinfo(res);
#endif /* AF_INET6 */
return ret;
@@ -393,44 +388,42 @@
int len = 0;
jbyte caddr[16];
- if (NET_addrtransAvailable()) {
- struct sockaddr_in him4;
- struct sockaddr_in6 him6;
- struct sockaddr *sa;
+ struct sockaddr_in him4;
+ struct sockaddr_in6 him6;
+ struct sockaddr *sa;
+ /*
+ * For IPv4 addresses construct a sockaddr_in structure.
+ */
+ if ((*env)->GetArrayLength(env, addrArray) == 4) {
+ jint addr;
+ (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr);
+ addr = ((caddr[0]<<24) & 0xff000000);
+ addr |= ((caddr[1] <<16) & 0xff0000);
+ addr |= ((caddr[2] <<8) & 0xff00);
+ addr |= (caddr[3] & 0xff);
+ memset((void *) &him4, 0, sizeof(him4));
+ him4.sin_addr.s_addr = (uint32_t) htonl(addr);
+ him4.sin_family = AF_INET;
+ sa = (struct sockaddr *) &him4;
+ len = sizeof(him4);
+ } else {
/*
- * For IPv4 addresses construct a sockaddr_in structure.
+ * For IPv6 address construct a sockaddr_in6 structure.
*/
- if ((*env)->GetArrayLength(env, addrArray) == 4) {
- jint addr;
- (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr);
- addr = ((caddr[0]<<24) & 0xff000000);
- addr |= ((caddr[1] <<16) & 0xff0000);
- addr |= ((caddr[2] <<8) & 0xff00);
- addr |= (caddr[3] & 0xff);
- memset((void *) &him4, 0, sizeof(him4));
- him4.sin_addr.s_addr = (uint32_t) htonl(addr);
- him4.sin_family = AF_INET;
- sa = (struct sockaddr *) &him4;
- len = sizeof(him4);
- } else {
- /*
- * For IPv6 address construct a sockaddr_in6 structure.
- */
- (*env)->GetByteArrayRegion(env, addrArray, 0, 16, caddr);
- memset((void *) &him6, 0, sizeof(him6));
- memcpy((void *)&(him6.sin6_addr), caddr, sizeof(struct in6_addr) );
- him6.sin6_family = AF_INET6;
- sa = (struct sockaddr *) &him6 ;
- len = sizeof(him6) ;
- }
+ (*env)->GetByteArrayRegion(env, addrArray, 0, 16, caddr);
+ memset((void *) &him6, 0, sizeof(him6));
+ memcpy((void *)&(him6.sin6_addr), caddr, sizeof(struct in6_addr) );
+ him6.sin6_family = AF_INET6;
+ sa = (struct sockaddr *) &him6 ;
+ len = sizeof(him6) ;
+ }
- error = (*getnameinfo_ptr)(sa, len, host, NI_MAXHOST, NULL, 0,
- NI_NAMEREQD);
+ error = getnameinfo(sa, len, host, NI_MAXHOST, NULL, 0,
+ NI_NAMEREQD);
- if (!error) {
- ret = (*env)->NewStringUTF(env, host);
- }
+ if (!error) {
+ ret = (*env)->NewStringUTF(env, host);
}
#endif /* AF_INET6 */
--- a/jdk/src/solaris/native/java/net/net_util_md.c Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/native/java/net/net_util_md.c Tue Dec 06 05:28:17 2011 -0800
@@ -377,37 +377,12 @@
* we should also check if the APIs are available.
*/
ipv6_fn = JVM_FindLibraryEntry(RTLD_DEFAULT, "inet_pton");
+ close(fd);
if (ipv6_fn == NULL ) {
- close(fd);
return JNI_FALSE;
+ } else {
+ return JNI_TRUE;
}
-
- /*
- * We've got the library, let's get the pointers to some
- * IPV6 specific functions. We have to do that because, at least
- * on Solaris we may build on a system without IPV6 networking
- * libraries, therefore we can't have a hard link to these
- * functions.
- */
- getaddrinfo_ptr = (getaddrinfo_f)
- JVM_FindLibraryEntry(RTLD_DEFAULT, "getaddrinfo");
-
- freeaddrinfo_ptr = (freeaddrinfo_f)
- JVM_FindLibraryEntry(RTLD_DEFAULT, "freeaddrinfo");
-
- gai_strerror_ptr = (gai_strerror_f)
- JVM_FindLibraryEntry(RTLD_DEFAULT, "gai_strerror");
-
- getnameinfo_ptr = (getnameinfo_f)
- JVM_FindLibraryEntry(RTLD_DEFAULT, "getnameinfo");
-
- if (freeaddrinfo_ptr == NULL || getnameinfo_ptr == NULL) {
- /* We need all 3 of them */
- getaddrinfo_ptr = NULL;
- }
-
- close(fd);
- return JNI_TRUE;
#endif /* AF_INET6 */
}
@@ -920,10 +895,6 @@
return 1;
}
-jboolean NET_addrtransAvailable() {
- return (jboolean)(getaddrinfo_ptr != NULL);
-}
-
/*
* Map the Java level socket option to the platform specific
* level and option name.
--- a/jdk/src/solaris/native/java/net/net_util_md.h Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/native/java/net/net_util_md.h Tue Dec 06 05:28:17 2011 -0800
@@ -102,10 +102,6 @@
const char* hostname,
int gai_error);
-/* do we have address translation support */
-
-extern jboolean NET_addrtransAvailable();
-
#define NET_WAIT_READ 0x01
#define NET_WAIT_WRITE 0x02
#define NET_WAIT_CONNECT 0x04
--- a/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_config.h Tue Dec 06 05:28:17 2011 -0800
@@ -32,7 +32,7 @@
#include <X11/Xutil.h>
#include <X11/extensions/shape.h>
#include <sys/types.h>
-#include <sys/unistd.h>
+#include <unistd.h>
#include <pthread.h>
#include <signal.h>
#include <inttypes.h>
--- a/jdk/src/windows/classes/java/io/FileDescriptor.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/windows/classes/java/io/FileDescriptor.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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
@@ -25,7 +25,8 @@
package java.io;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.ArrayList;
+import java.util.List;
/**
* Instances of the file descriptor class serve as an opaque handle
@@ -45,13 +46,9 @@
private long handle;
- /**
- * A use counter for tracking the FIS/FOS/RAF instances that
- * use this FileDescriptor. The FIS/FOS.finalize() will not release
- * the FileDescriptor if it is still under use by any stream.
- */
- private AtomicInteger useCount;
-
+ private Closeable parent;
+ private List<Closeable> otherParents;
+ private boolean closed;
/**
* Constructs an (invalid) FileDescriptor
@@ -60,7 +57,6 @@
public /**/ FileDescriptor() {
fd = -1;
handle = -1;
- useCount = new AtomicInteger();
}
static {
@@ -168,13 +164,67 @@
return desc;
}
- // package private methods used by FIS, FOS and RAF.
+ /*
+ * Package private methods to track referents.
+ * If multiple streams point to the same FileDescriptor, we cycle
+ * through the list of all referents and call close()
+ */
- int incrementAndGetUseCount() {
- return useCount.incrementAndGet();
+ /**
+ * Attach a Closeable to this FD for tracking.
+ * parent reference is added to otherParents when
+ * needed to make closeAll simpler.
+ */
+ synchronized void attach(Closeable c) {
+ if (parent == null) {
+ // first caller gets to do this
+ parent = c;
+ } else if (otherParents == null) {
+ otherParents = new ArrayList<>();
+ otherParents.add(parent);
+ otherParents.add(c);
+ } else {
+ otherParents.add(c);
+ }
}
- int decrementAndGetUseCount() {
- return useCount.decrementAndGet();
+ /**
+ * Cycle through all Closeables sharing this FD and call
+ * close() on each one.
+ *
+ * The caller closeable gets to call close0().
+ */
+ @SuppressWarnings("try")
+ synchronized void closeAll(Closeable releaser) throws IOException {
+ if (!closed) {
+ closed = true;
+ IOException ioe = null;
+ try (Closeable c = releaser) {
+ if (otherParents != null) {
+ for (Closeable referent : otherParents) {
+ try {
+ referent.close();
+ } catch(IOException x) {
+ if (ioe == null) {
+ ioe = x;
+ } else {
+ ioe.addSuppressed(x);
+ }
+ }
+ }
+ }
+ } catch(IOException ex) {
+ /*
+ * If releaser close() throws IOException
+ * add other exceptions as suppressed.
+ */
+ if (ioe != null)
+ ex.addSuppressed(ioe);
+ ioe = ex;
+ } finally {
+ if (ioe != null)
+ throw ioe;
+ }
+ }
}
}
--- a/jdk/src/windows/classes/java/lang/ProcessImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/windows/classes/java/lang/ProcessImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -60,10 +60,11 @@
throws IOException
{
if (append) {
+ String path = f.getPath();
SecurityManager sm = System.getSecurityManager();
if (sm != null)
- sm.checkWrite(f.getPath());
- long handle = openForAtomicAppend(f.getPath());
+ sm.checkWrite(path);
+ long handle = openForAtomicAppend(path);
final FileDescriptor fd = new FileDescriptor();
fdAccess.setHandle(fd, handle);
return AccessController.doPrivileged(
--- a/jdk/src/windows/classes/java/net/PlainSocketImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/windows/classes/java/net/PlainSocketImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -314,7 +314,7 @@
void socketSetOption(int cmd, boolean on, Object value)
throws SocketException {
- socketSetOption(cmd, on, value);
+ impl.socketSetOption(cmd, on, value);
}
int socketGetOption(int opt, Object iaContainerObj) throws SocketException {
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java Tue Dec 06 05:28:17 2011 -0800
@@ -124,26 +124,27 @@
private boolean atEof;
private String first;
private Path nextEntry;
+ private String prefix;
WindowsDirectoryIterator(String first) {
atEof = false;
this.first = first;
+ if (dir.needsSlashWhenResolving()) {
+ prefix = dir.toString() + "\\";
+ } else {
+ prefix = dir.toString();
+ }
+ }
+
+ // links to self and parent directories are ignored
+ private boolean isSelfOrParent(String name) {
+ return name.equals(".") || name.equals("..");
}
// applies filter and also ignores "." and ".."
private Path acceptEntry(String s, BasicFileAttributes attrs) {
- if (s.equals(".") || s.equals(".."))
- return null;
- if (dir.needsSlashWhenResolving()) {
- StringBuilder sb = new StringBuilder(dir.toString());
- sb.append('\\');
- sb.append(s);
- s = sb.toString();
- } else {
- s = dir + s;
- }
Path entry = WindowsPath
- .createFromNormalizedPath(dir.getFileSystem(), s, attrs);
+ .createFromNormalizedPath(dir.getFileSystem(), prefix + s, attrs);
try {
if (filter.accept(entry))
return entry;
@@ -157,7 +158,7 @@
private Path readNextEntry() {
// handle first element returned by search
if (first != null) {
- nextEntry = acceptEntry(first, null);
+ nextEntry = isSelfOrParent(first) ? null : acceptEntry(first, null);
first = null;
if (nextEntry != null)
return nextEntry;
@@ -184,6 +185,10 @@
return null;
}
+ // ignore link to self and parent directories
+ if (isSelfOrParent(name))
+ continue;
+
// grab the attributes from the WIN32_FIND_DATA structure
// (needs to be done while holding closeLock because close
// will release the buffer)
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java Tue Dec 06 05:28:17 2011 -0800
@@ -120,12 +120,18 @@
off = next;
} else {
if (isLetter(c0) && c1 == ':') {
- root = input.substring(0, 2);
- if (len > 2 && isSlash(input.charAt(2))) {
+ char c2;
+ if (len > 2 && isSlash(c2 = input.charAt(2))) {
+ // avoid concatenation when root is "D:\"
+ if (c2 == '\\') {
+ root = input.substring(0, 3);
+ } else {
+ root = input.substring(0, 2) + '\\';
+ }
off = 3;
- root += "\\";
type = WindowsPathType.ABSOLUTE;
} else {
+ root = input.substring(0, 2);
off = 2;
type = WindowsPathType.DRIVE_RELATIVE;
}
--- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java Tue Dec 06 05:28:17 2011 -0800
@@ -207,7 +207,7 @@
}
if (options[2] == 't') {
System.out.println("\t Time stamp: " +
- reformat(entries[i].getTimeStamp().toDate().toString()));
+ format(entries[i].getTimeStamp()));
}
}
}
@@ -234,30 +234,39 @@
System.out.println("\nDefault principal: " +
defaultPrincipal + ", " +
creds.length + " entries found.\n");
- String starttime = null;
- String endtime = null;
- String servicePrincipal = null;
- String etype = null;
if (creds != null) {
for (int i = 0; i < creds.length; i++) {
try {
- starttime =
- reformat(creds[i].getAuthTime().toDate().toString());
- endtime =
- reformat(creds[i].getEndTime().toDate().toString());
+ String starttime;
+ String endtime;
+ String renewTill;
+ String servicePrincipal;
+ if (creds[i].getStartTime() != null) {
+ starttime = format(creds[i].getStartTime());
+ } else {
+ starttime = format(creds[i].getAuthTime());
+ }
+ endtime = format(creds[i].getEndTime());
servicePrincipal =
creds[i].getServicePrincipal().toString();
System.out.println("[" + (i + 1) + "] " +
" Service Principal: " +
servicePrincipal);
- System.out.println(" Valid starting: " + starttime);
- System.out.println(" Expires: " + endtime);
+ System.out.println(" Valid starting: " + starttime);
+ System.out.println(" Expires: " + endtime);
+ if (creds[i].getRenewTill() != null) {
+ renewTill = format(creds[i].getRenewTill());
+ System.out.println(
+ " Renew until: " + renewTill);
+ }
if (options[0] == 'e') {
- etype = EType.toString(creds[i].getEType());
- System.out.println(" Encryption type: " + etype);
+ String eskey = EType.toString(creds[i].getEType());
+ String etkt = EType.toString(creds[i].getTktEType());
+ System.out.println(" EType (skey, tkt): "
+ + eskey + ", " + etkt);
}
if (options[1] == 'f') {
- System.out.println(" Flags: " +
+ System.out.println(" Flags: " +
creds[i].getTicketFlags().toString());
}
if (options[2] == 'a') {
@@ -312,13 +321,14 @@
* and yyyy is the year.
* @param date the string form of Date object.
*/
- String reformat(String date) {
+ private String format(KerberosTime kt) {
+ String date = kt.toDate().toString();
return (date.substring(4, 7) + " " + date.substring(8, 10) +
", " + date.substring(24)
- + " " + date.substring(11, 16));
+ + " " + date.substring(11, 19));
}
/**
- * Printes out the help information.
+ * Prints out the help information.
*/
void printHelp() {
System.out.println("\nUsage: klist " +
--- a/jdk/src/windows/lib/tzmappings Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/windows/lib/tzmappings Tue Dec 06 05:28:17 2011 -0800
@@ -167,7 +167,7 @@
Argentina Standard Time:900,900::America/Buenos_Aires:
Azerbaijan Standard Time:901,901:AZ:Asia/Baku:
Bangladesh Standard Time:902,902::Asia/Dhaka:
-Central Brazilian Standard Time:903,903:BR:America/Manaus:
+Central Brazilian Standard Time:903,903:BR:America/Cuiaba:
Central Standard Time (Mexico):904,904::America/Mexico_City:
Georgian Standard Time:905,905:GE:Asia/Tbilisi:
Jordan Standard Time:906,906:JO:Asia/Amman:
@@ -189,5 +189,7 @@
Ulaanbaatar Standard Time:922,922::Asia/Ulaanbaatar:
Venezuela Standard Time:923,923::America/Caracas:
Magadan Standard Time:924,924::Asia/Magadan:
-Western Brazilian Standard Time:925,925:BR:America/Rio_Branco:
-Armenian Standard Time:926,926:AM:Asia/Yerevan:
+Kaliningrad Standard Time:925,925:RU:Europe/Kaliningrad:
+Turkey Standard Time:926,926::Asia/Istanbul:
+Western Brazilian Standard Time:927,927:BR:America/Rio_Branco:
+Armenian Standard Time:928,928:AM:Asia/Yerevan:
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp Tue Dec 06 05:28:17 2011 -0800
@@ -355,7 +355,7 @@
RECT rect;
CalculateWarningWindowBounds(env, &rect);
- ::SetWindowPos(warningWindow, IsAlwaysOnTop() ? HWND_TOPMOST : GetHWnd(),
+ ::SetWindowPos(warningWindow, IsAlwaysOnTop() ? HWND_TOPMOST : HWND_NOTOPMOST,
rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top,
SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE |
@@ -835,7 +835,7 @@
if (securityAnimationKind == akShow) {
::SetWindowPos(warningWindow,
- IsAlwaysOnTop() ? HWND_TOPMOST : GetHWnd(),
+ IsAlwaysOnTop() ? HWND_TOPMOST : HWND_NOTOPMOST,
0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE |
SWP_SHOWWINDOW | SWP_NOOWNERZORDER);
--- a/jdk/test/ProblemList.txt Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/ProblemList.txt Tue Dec 06 05:28:17 2011 -0800
@@ -195,9 +195,6 @@
# jdk_lang
-# requires junit
-java/lang/invoke/InvokeDynamicPrintArgs.java generic-all
-
# 7079093
java/lang/instrument/ManifestTest.sh windows-all
@@ -490,9 +487,6 @@
#sun/security/pkcs11/ec/TestKeyFactory.java solaris-i586
sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java solaris-i586
-# Directly references PKCS11 class
-sun/security/pkcs11/Provider/Absolute.java windows-x64
-
# Fails on Fedora 9/Ubuntu 10.04 64bit, PKCS11Exception: CKR_DEVICE_ERROR
sun/security/pkcs11/KeyAgreement/TestDH.java generic-all
--- a/jdk/test/java/io/FileDescriptor/FileChannelFDTest.java Mon Dec 05 12:50:00 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2006, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- *
- * @test
- * @bug 6322678
- * @summary Test for making sure that fd is closed during
- * finalization of a stream, when an associated
- * file channel is not available
- */
-
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-
-public class FileChannelFDTest {
-
- static byte data[] = new byte[] {48, 49, 50, 51, 52, 53, 54, 55, 56, 57,};
- static String inFileName = "fd-in-test.txt";
- static String outFileName = "fd-out-test.txt";
- static File inFile;
- static File outFile;
-
- private static void writeToInFile() throws IOException {
- FileOutputStream out = new FileOutputStream(inFile);
- out.write(data);
- out.close();
- }
-
- public static void main(String[] args)
- throws Exception {
-
- inFile= new File(System.getProperty("test.dir", "."),
- inFileName);
- inFile.createNewFile();
- inFile.deleteOnExit();
- writeToInFile();
-
- outFile = new File(System.getProperty("test.dir", "."),
- outFileName);
- outFile.createNewFile();
- outFile.deleteOnExit();
-
- doFileChannel();
- }
-
- private static void doFileChannel() throws Exception {
-
- FileInputStream fis = new FileInputStream(inFile);
- FileDescriptor fd = fis.getFD();
- FileChannel fc = fis.getChannel();
- System.out.println("Created fis:" + fis);
-
- /**
- * Encourage the GC
- */
- fis = null;
- fc = null;
- System.gc();
- Thread.sleep(500);
-
- if (fd.valid()) {
- throw new Exception("Finalizer either didn't run --" +
- "try increasing the Thread's sleep time after System.gc();" +
- "or the finalizer didn't close the file");
- }
-
- System.out.println("File Closed successfully");
- System.out.println();
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/io/FileDescriptor/Sharing.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,408 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7105952 6322678 7082769
+ * @summary Improve finalisation for FileInputStream/FileOutputStream/RandomAccessFile
+ * @run main/othervm Sharing
+ */
+
+import java.io.*;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.util.concurrent.CountDownLatch;
+
+public class Sharing {
+
+ final static int numFiles = 10;
+ volatile static boolean fail;
+
+ public static void main(String[] args) throws Exception {
+ TestFinalizer();
+ TestMultipleFD();
+ TestIsValid();
+ MultiThreadedFD();
+ TestCloseAll();
+ }
+
+ /**
+ * Finalizer shouldn't discard a file descriptor until all streams have
+ * finished with it.
+ */
+ private static void TestFinalizer() throws Exception {
+ FileDescriptor fd = null;
+ File tempFile = new File("TestFinalizer1.txt");
+ tempFile.deleteOnExit();
+ try (Writer writer = new FileWriter(tempFile)) {
+ for (int i=0; i<5; i++) {
+ writer.write("test file content test file content");
+ }
+ }
+
+ FileInputStream fis1 = new FileInputStream(tempFile);
+ fd = fis1.getFD();
+ // Create a new FIS based on the existing FD (so the two FIS's share the same native fd)
+ try (FileInputStream fis2 = new FileInputStream(fd)) {
+ // allow fis1 to be gc'ed
+ fis1 = null;
+ int ret = 0;
+ while(ret >= 0) {
+ // encourage gc
+ System.gc();
+ // read from fis2 - when fis1 is gc'ed and finalizer is run, read will fail
+ System.out.print(".");
+ ret = fis2.read();
+ }
+ }
+
+ // variation of above. Use RandomAccessFile to obtain a filedescriptor
+ File testFinalizerFile = new File("TestFinalizer");
+ RandomAccessFile raf = new RandomAccessFile(testFinalizerFile, "rw");
+ raf.writeBytes("test file content test file content");
+ raf.seek(0L);
+ fd = raf.getFD();
+ try (FileInputStream fis3 = new FileInputStream(fd)) {
+ // allow raf to be gc'ed
+ raf = null;
+ int ret = 0;
+ while (ret >= 0) {
+ // encourage gc
+ System.gc();
+ /*
+ * read from fis3 - when raf is gc'ed and finalizer is run,
+ * fd should still be valid.
+ */
+ System.out.print(".");
+ ret = fis3.read();
+ }
+ } finally {
+ testFinalizerFile.delete();
+ }
+ }
+
+ /**
+ * Exercise FileDispatcher close()/preClose()
+ */
+ private static void TestMultipleFD() throws Exception {
+ RandomAccessFile raf = null;
+ FileOutputStream fos = null;
+ FileInputStream fis = null;
+ FileChannel fc = null;
+ FileLock fileLock = null;
+
+ File test1 = new File("test1");
+ try {
+ raf = new RandomAccessFile(test1, "rw");
+ fos = new FileOutputStream(raf.getFD());
+ fis = new FileInputStream(raf.getFD());
+ fc = raf.getChannel();
+ fileLock = fc.lock();
+ raf.setLength(0L);
+ fos.flush();
+ fos.write("TEST".getBytes());
+ } finally {
+ if (fileLock != null) fileLock.release();
+ if (fis != null) fis.close();
+ if (fos != null) fos.close();
+ if (raf != null) raf.close();
+ test1.delete();
+ }
+
+ /*
+ * Close out in different order to ensure FD is not
+ * closed out too early
+ */
+ File test2 = new File("test2");
+ try {
+ raf = new RandomAccessFile(test2, "rw");
+ fos = new FileOutputStream(raf.getFD());
+ fis = new FileInputStream(raf.getFD());
+ fc = raf.getChannel();
+ fileLock = fc.lock();
+ raf.setLength(0L);
+ fos.flush();
+ fos.write("TEST".getBytes());
+ } finally {
+ if (fileLock != null) fileLock.release();
+ if (raf != null) raf.close();
+ if (fos != null) fos.close();
+ if (fis != null) fis.close();
+ test2.delete();
+ }
+
+ // one more time, fos first this time
+ File test3 = new File("test3");
+ try {
+ raf = new RandomAccessFile(test3, "rw");
+ fos = new FileOutputStream(raf.getFD());
+ fis = new FileInputStream(raf.getFD());
+ fc = raf.getChannel();
+ fileLock = fc.lock();
+ raf.setLength(0L);
+ fos.flush();
+ fos.write("TEST".getBytes());
+ } finally {
+ if (fileLock != null) fileLock.release();
+ if (fos != null) fos.close();
+ if (raf != null) raf.close();
+ if (fis != null) fis.close();
+ test3.delete();
+ }
+ }
+
+ /**
+ * Similar to TestMultipleFD() but this time we
+ * just get and use FileDescriptor.valid() for testing.
+ */
+ private static void TestIsValid() throws Exception {
+ FileDescriptor fd = null;
+ RandomAccessFile raf = null;
+ FileOutputStream fos = null;
+ FileInputStream fis = null;
+ FileChannel fc = null;
+
+ File test1 = new File("test1");
+ try {
+ raf = new RandomAccessFile(test1, "rw");
+ fd = raf.getFD();
+ fos = new FileOutputStream(fd);
+ fis = new FileInputStream(fd);
+ } finally {
+ try {
+ if (fis != null) fis.close();
+ if (fd.valid()) {
+ throw new RuntimeException("[FIS close()] FileDescriptor shouldn't be valid");
+ }
+ if (fos != null) fos.close();
+ if (raf != null) raf.close();
+ } finally {
+ test1.delete();
+ }
+ }
+
+ /*
+ * Close out in different order to ensure FD is
+ * closed correctly.
+ */
+ File test2 = new File("test2");
+ try {
+ raf = new RandomAccessFile(test2, "rw");
+ fd = raf.getFD();
+ fos = new FileOutputStream(fd);
+ fis = new FileInputStream(fd);
+ } finally {
+ try {
+ if (raf != null) raf.close();
+ if (fd.valid()) {
+ throw new RuntimeException("[RAF close()] FileDescriptor shouldn't be valid");
+ }
+ if (fos != null) fos.close();
+ if (fis != null) fis.close();
+ } finally {
+ test2.delete();
+ }
+ }
+
+ // one more time, fos first this time
+ File test3 = new File("test3");
+ try {
+ raf = new RandomAccessFile(test3, "rw");
+ fd = raf.getFD();
+ fos = new FileOutputStream(fd);
+ fis = new FileInputStream(fd);
+ } finally {
+ try {
+ if (fos != null) fos.close();
+ if (fd.valid()) {
+ throw new RuntimeException("[FOS close()] FileDescriptor shouldn't be valid");
+ }
+ if (raf != null) raf.close();
+ if (fis != null) fis.close();
+ } finally {
+ test3.delete();
+ }
+ }
+ }
+
+ /**
+ * Test concurrent access to the same FileDescriptor
+ */
+ private static void MultiThreadedFD() throws Exception {
+ RandomAccessFile raf = null;
+ FileDescriptor fd = null;
+ int numThreads = 2;
+ CountDownLatch done = new CountDownLatch(numThreads);
+ OpenClose[] fileOpenClose = new OpenClose[numThreads];
+ File MultipleThreadedFD = new File("MultipleThreadedFD");
+ try {
+ raf = new RandomAccessFile(MultipleThreadedFD, "rw");
+ fd = raf.getFD();
+ for(int count=0;count<numThreads;count++) {
+ fileOpenClose[count] = new OpenClose(fd, done);
+ fileOpenClose[count].start();
+ }
+ done.await();
+ } finally {
+ try {
+ if(raf != null) raf.close();
+ // fd should now no longer be valid
+ if(fd.valid()) {
+ throw new RuntimeException("FileDescriptor should not be valid");
+ }
+ // OpenClose thread tests failed
+ if(fail) {
+ throw new RuntimeException("OpenClose thread tests failed.");
+ }
+ } finally {
+ MultipleThreadedFD.delete();
+ }
+ }
+ }
+
+ /**
+ * Test closeAll handling in FileDescriptor
+ */
+ private static void TestCloseAll() throws Exception {
+ File testFile = new File("test");
+ testFile.deleteOnExit();
+ RandomAccessFile raf = new RandomAccessFile(testFile, "rw");
+ FileInputStream fis = new FileInputStream(raf.getFD());
+ fis.close();
+ if (raf.getFD().valid()) {
+ throw new RuntimeException("FD should not be valid.");
+ }
+
+ // Test the suppressed exception handling - FileInputStream
+
+ raf = new RandomAccessFile(testFile, "rw");
+ fis = new FileInputStream(raf.getFD());
+ BadFileInputStream bfis1 = new BadFileInputStream(raf.getFD());
+ BadFileInputStream bfis2 = new BadFileInputStream(raf.getFD());
+ BadFileInputStream bfis3 = new BadFileInputStream(raf.getFD());
+ // extra test - set bfis3 to null
+ bfis3 = null;
+ try {
+ fis.close();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ if (ioe.getSuppressed().length != 2) {
+ throw new RuntimeException("[FIS]Incorrect number of suppressed " +
+ "exceptions received : " + ioe.getSuppressed().length);
+ }
+ }
+ if (raf.getFD().valid()) {
+ // we should still have closed the FD
+ // even with the exception.
+ throw new RuntimeException("[FIS]TestCloseAll : FD still valid.");
+ }
+
+ // Now test with FileOutputStream
+
+ raf = new RandomAccessFile(testFile, "rw");
+ FileOutputStream fos = new FileOutputStream(raf.getFD());
+ BadFileOutputStream bfos1 = new BadFileOutputStream(raf.getFD());
+ BadFileOutputStream bfos2 = new BadFileOutputStream(raf.getFD());
+ BadFileOutputStream bfos3 = new BadFileOutputStream(raf.getFD());
+ // extra test - set bfos3 to null
+ bfos3 = null;
+ try {
+ fos.close();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ if (ioe.getSuppressed().length != 2) {
+ throw new RuntimeException("[FOS]Incorrect number of suppressed " +
+ "exceptions received : " + ioe.getSuppressed().length);
+ }
+ }
+ if (raf.getFD().valid()) {
+ // we should still have closed the FD
+ // even with the exception.
+ throw new RuntimeException("[FOS]TestCloseAll : FD still valid.");
+ }
+ }
+
+ /**
+ * A thread which will open and close a number of FileInputStreams and
+ * FileOutputStreams referencing the same native file descriptor.
+ */
+ private static class OpenClose extends Thread {
+ private FileDescriptor fd = null;
+ private CountDownLatch done;
+ FileInputStream[] fisArray = new FileInputStream[numFiles];
+ FileOutputStream[] fosArray = new FileOutputStream[numFiles];
+
+ OpenClose(FileDescriptor filedescriptor, CountDownLatch done) {
+ this.fd = filedescriptor;
+ this.done = done;
+ }
+
+ public void run() {
+ try {
+ for(int i=0;i<numFiles;i++) {
+ fisArray[i] = new FileInputStream(fd);
+ fosArray[i] = new FileOutputStream(fd);
+ }
+
+ // Now close out
+ for(int i=0;i<numFiles;i++) {
+ if(fisArray[i] != null) fisArray[i].close();
+ if(fosArray[i] != null) fosArray[i].close();
+ }
+
+ } catch(IOException ioe) {
+ System.out.println("OpenClose encountered IO issue :" + ioe);
+ fail = true;
+ } finally {
+ if (fd.valid()) { // fd should not be valid after first close() call
+ System.out.println("OpenClose: FileDescriptor shouldn't be valid");
+ fail = true;
+ }
+ done.countDown();
+ }
+ }
+ }
+
+ private static class BadFileInputStream extends FileInputStream {
+
+ BadFileInputStream(FileDescriptor fd) {
+ super(fd);
+ }
+
+ public void close() throws IOException {
+ throw new IOException("Bad close operation");
+ }
+ }
+
+ private static class BadFileOutputStream extends FileOutputStream {
+
+ BadFileOutputStream(FileDescriptor fd) {
+ super(fd);
+ }
+
+ public void close() throws IOException {
+ throw new IOException("Bad close operation");
+ }
+ }
+
+}
--- a/jdk/test/java/io/etc/FileDescriptorSharing.java Mon Dec 05 12:50:00 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6322678 7082769
- * @summary FileInputStream/FileOutputStream/RandomAccessFile allow file descriptor
- * to be closed while still in use.
- * @run main/othervm FileDescriptorSharing
- */
-
-import java.io.*;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.util.concurrent.CountDownLatch;
-
-public class FileDescriptorSharing {
-
- final static int numFiles = 10;
- volatile static boolean fail;
-
- public static void main(String[] args) throws Exception {
- TestFinalizer();
- TestMultipleFD();
- TestIsValid();
- MultiThreadedFD();
- }
-
- /**
- * We shouldn't discard a file descriptor until all streams have
- * finished with it
- */
- private static void TestFinalizer() throws Exception {
- FileDescriptor fd = null;
- File tempFile = new File("TestFinalizer1.txt");
- tempFile.deleteOnExit();
- try (Writer writer = new FileWriter(tempFile)) {
- for (int i=0; i<5; i++) {
- writer.write("test file content test file content");
- }
- }
-
- FileInputStream fis1 = new FileInputStream(tempFile);
- fd = fis1.getFD();
- // Create a new FIS based on the existing FD (so the two FIS's share the same native fd)
- try (FileInputStream fis2 = new FileInputStream(fd)) {
- // allow fis1 to be gc'ed
- fis1 = null;
- int ret = 0;
- while(ret >= 0) {
- // encourage gc
- System.gc();
- // read from fis2 - when fis1 is gc'ed and finalizer is run, read will fail
- System.out.print(".");
- ret = fis2.read();
- }
- }
-
- // variation of above. Use RandomAccessFile to obtain a filedescriptor
- File testFinalizerFile = new File("TestFinalizer");
- RandomAccessFile raf = new RandomAccessFile(testFinalizerFile, "rw");
- raf.writeBytes("test file content test file content");
- raf.seek(0L);
- fd = raf.getFD();
- try (FileInputStream fis3 = new FileInputStream(fd)) {
- // allow raf to be gc'ed
- raf = null;
- int ret = 0;
- while (ret >= 0) {
- // encourage gc
- System.gc();
- /*
- * read from fis3 - when raf is gc'ed and finalizer is run,
- * fd should still be valid.
- */
- System.out.print(".");
- ret = fis3.read();
- }
- if(!fd.valid()) {
- throw new RuntimeException("TestFinalizer() : FileDescriptor should be valid");
- }
- } finally {
- testFinalizerFile.delete();
- }
- }
-
- /**
- * Exercise FileDispatcher close()/preClose()
- */
- private static void TestMultipleFD() throws Exception {
- RandomAccessFile raf = null;
- FileOutputStream fos = null;
- FileInputStream fis = null;
- FileChannel fc = null;
- FileLock fileLock = null;
-
- File test1 = new File("test1");
- try {
- raf = new RandomAccessFile(test1, "rw");
- fos = new FileOutputStream(raf.getFD());
- fis = new FileInputStream(raf.getFD());
- fc = raf.getChannel();
- fileLock = fc.lock();
- raf.setLength(0L);
- fos.flush();
- fos.write("TEST".getBytes());
- } finally {
- if (fileLock != null) fileLock.release();
- if (fis != null) fis.close();
- if (fos != null) fos.close();
- if (raf != null) raf.close();
- test1.delete();
- }
-
- /*
- * Close out in different order to ensure FD is not
- * closed out too early
- */
- File test2 = new File("test2");
- try {
- raf = new RandomAccessFile(test2, "rw");
- fos = new FileOutputStream(raf.getFD());
- fis = new FileInputStream(raf.getFD());
- fc = raf.getChannel();
- fileLock = fc.lock();
- raf.setLength(0L);
- fos.flush();
- fos.write("TEST".getBytes());
- } finally {
- if (fileLock != null) fileLock.release();
- if (raf != null) raf.close();
- if (fos != null) fos.close();
- if (fis != null) fis.close();
- test2.delete();
- }
-
- // one more time, fos first this time
- File test3 = new File("test3");
- try {
- raf = new RandomAccessFile(test3, "rw");
- fos = new FileOutputStream(raf.getFD());
- fis = new FileInputStream(raf.getFD());
- fc = raf.getChannel();
- fileLock = fc.lock();
- raf.setLength(0L);
- fos.flush();
- fos.write("TEST".getBytes());
- } finally {
- if (fileLock != null) fileLock.release();
- if (fos != null) fos.close();
- if (raf != null) raf.close();
- if (fis != null) fis.close();
- test3.delete();
- }
- }
-
- /**
- * Similar to TestMultipleFD() but this time we
- * just get and use FileDescriptor.valid() for testing.
- */
- private static void TestIsValid() throws Exception {
- FileDescriptor fd = null;
- RandomAccessFile raf = null;
- FileOutputStream fos = null;
- FileInputStream fis = null;
- FileChannel fc = null;
-
- File test1 = new File("test1");
- try {
- raf = new RandomAccessFile(test1, "rw");
- fd = raf.getFD();
- fos = new FileOutputStream(fd);
- fis = new FileInputStream(fd);
- } finally {
- try {
- if (fis != null) fis.close();
- if (fos != null) fos.close();
- if (!fd.valid()) {
- throw new RuntimeException("FileDescriptor should be valid");
- }
- if (raf != null) raf.close();
- if (fd.valid()) {
- throw new RuntimeException("close() called and FileDescriptor still valid");
- }
- } finally {
- if (raf != null) raf.close();
- test1.delete();
- }
- }
-
- /*
- * Close out in different order to ensure FD is not
- * closed out too early
- */
- File test2 = new File("test2");
- try {
- raf = new RandomAccessFile(test2, "rw");
- fd = raf.getFD();
- fos = new FileOutputStream(fd);
- fis = new FileInputStream(fd);
- } finally {
- try {
- if (raf != null) raf.close();
- if (fos != null) fos.close();
- if (!fd.valid()) {
- throw new RuntimeException("FileDescriptor should be valid");
- }
- if (fis != null) fis.close();
- if (fd.valid()) {
- throw new RuntimeException("close() called and FileDescriptor still valid");
- }
- } finally {
- test2.delete();
- }
- }
-
- // one more time, fos first this time
- File test3 = new File("test3");
- try {
- raf = new RandomAccessFile(test3, "rw");
- fd = raf.getFD();
- fos = new FileOutputStream(fd);
- fis = new FileInputStream(fd);
- } finally {
- try {
- if (fos != null) fos.close();
- if (raf != null) raf.close();
- if (!fd.valid()) {
- throw new RuntimeException("FileDescriptor should be valid");
- }
- if (fis != null) fis.close();
- if (fd.valid()) {
- throw new RuntimeException("close() called and FileDescriptor still valid");
- }
- } finally {
- test3.delete();
- }
- }
- }
-
- /**
- * Test concurrent access to the same fd.useCount field
- */
- private static void MultiThreadedFD() throws Exception {
- RandomAccessFile raf = null;
- FileDescriptor fd = null;
- int numThreads = 2;
- CountDownLatch done = new CountDownLatch(numThreads);
- OpenClose[] fileOpenClose = new OpenClose[numThreads];
- File MultipleThreadedFD = new File("MultipleThreadedFD");
- try {
- raf = new RandomAccessFile(MultipleThreadedFD, "rw");
- fd = raf.getFD();
- for(int count=0;count<numThreads;count++) {
- fileOpenClose[count] = new OpenClose(fd, done);
- fileOpenClose[count].start();
- }
- done.await();
- } finally {
- try {
- if(raf != null) raf.close();
- // fd should now no longer be valid
- if(fd.valid()) {
- throw new RuntimeException("FileDescriptor should not be valid");
- }
- // OpenClose thread tests failed
- if(fail) {
- throw new RuntimeException("OpenClose thread tests failed.");
- }
- } finally {
- MultipleThreadedFD.delete();
- }
- }
- }
-
- /**
- * A thread which will open and close a number of FileInputStreams and
- * FileOutputStreams referencing the same native file descriptor.
- */
- private static class OpenClose extends Thread {
- private FileDescriptor fd = null;
- private CountDownLatch done;
- FileInputStream[] fisArray = new FileInputStream[numFiles];
- FileOutputStream[] fosArray = new FileOutputStream[numFiles];
-
- OpenClose(FileDescriptor filedescriptor, CountDownLatch done) {
- this.fd = filedescriptor;
- this.done = done;
- }
-
- public void run() {
- try {
- for(int i=0;i<numFiles;i++) {
- fisArray[i] = new FileInputStream(fd);
- fosArray[i] = new FileOutputStream(fd);
- }
-
- // Now close out
- for(int i=0;i<numFiles;i++) {
- if(fisArray[i] != null) fisArray[i].close();
- if(fosArray[i] != null) fosArray[i].close();
- }
-
- } catch(IOException ioe) {
- System.out.println("OpenClose encountered IO issue :" + ioe);
- fail = true;
- } finally {
- if (!fd.valid()) { // fd should still be valid given RAF reference
- System.out.println("OpenClose: FileDescriptor should be valid");
- fail = true;
- }
- done.countDown();
- }
- }
- }
-}
--- a/jdk/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java Tue Dec 06 05:28:17 2011 -0800
@@ -28,6 +28,7 @@
*/
import java.io.*;
+import java.util.concurrent.*;
public class StreamsSurviveDestroy {
@@ -40,15 +41,17 @@
boolean wantInterrupt;
boolean acceptException;
Exception exc = null;
+ CountDownLatch latch;
Copier(String name, InputStream in, OutputStream out,
- boolean ae, boolean wi)
+ boolean ae, boolean wi, CountDownLatch l)
{
this.name = name;
this.in = in;
this.out = out;
this.acceptException = ae;
this.wantInterrupt = wi;
+ this.latch = l;
setName(name);
start();
}
@@ -59,6 +62,7 @@
public void run() {
byte[] buf = new byte[4242];
+ latch.countDown();
for (;;) {
try {
int n = in.read(buf);
@@ -95,13 +99,17 @@
}
static void test() throws Exception {
+ CountDownLatch latch = new CountDownLatch(2);
+
System.err.println("test");
Process p = Runtime.getRuntime().exec("/bin/cat");
Copier cp1 = new Copier("out", p.getInputStream(), System.err,
- false, false);
+ false, false, latch);
Copier cp2 = new Copier("err", p.getErrorStream(), System.err,
- false, false);
- Thread.sleep(100);
+ false, false, latch);
+ latch.await(); // Wait till both Copiers about to read
+ Thread.sleep(100);// Give both Copiers a chance to start read
+
p.destroy();
System.err.println(" exit: " + p.waitFor());
cp1.join();
@@ -111,13 +119,17 @@
}
static void testCloseBeforeDestroy() throws Exception {
+ CountDownLatch latch = new CountDownLatch(2);
+
System.err.println("testCloseBeforeDestroy");
Process p = Runtime.getRuntime().exec("/bin/cat");
Copier cp1 = new Copier("out", p.getInputStream(), System.err,
- true, false);
+ true, false, latch);
Copier cp2 = new Copier("err", p.getErrorStream(), System.err,
- true, false);
- Thread.sleep(100);
+ true, false, latch);
+ latch.await(); // Wait till both Copiers about to read
+ Thread.sleep(100);// Give both Copiers a chance to start read
+
p.getInputStream().close();
p.getErrorStream().close();
p.destroy();
@@ -129,13 +141,17 @@
}
static void testCloseAfterDestroy() throws Exception {
+ CountDownLatch latch = new CountDownLatch(2);
System.err.println("testCloseAfterDestroy");
Process p = Runtime.getRuntime().exec("/bin/cat");
Copier cp1 = new Copier("out", p.getInputStream(), System.err,
- true, false);
+ true, false,latch);
Copier cp2 = new Copier("err", p.getErrorStream(), System.err,
- true, false);
- Thread.sleep(100);
+ true, false, latch);
+
+ latch.await(); // Wait till both Copiers about to read
+ Thread.sleep(100);// Give both Copiers a chance to start read
+
p.destroy();
p.getInputStream().close();
p.getErrorStream().close();
@@ -147,13 +163,16 @@
}
static void testInterrupt() throws Exception {
+ CountDownLatch latch = new CountDownLatch(2);
System.err.println("testInterrupt");
Process p = Runtime.getRuntime().exec("/bin/cat");
Copier cp1 = new Copier("out", p.getInputStream(), System.err,
- false, true);
+ false, true, latch);
Copier cp2 = new Copier("err", p.getErrorStream(), System.err,
- false, true);
- Thread.sleep(100);
+ false, true, latch);
+ latch.await(); // Wait till both Copiers about to read
+ Thread.sleep(100);// Give both Copiers a chance to start read
+
cp1.interrupt();
cp2.interrupt();
Thread.sleep(100);
@@ -176,7 +195,5 @@
testCloseBeforeDestroy();
testCloseAfterDestroy();
testInterrupt();
-
}
-
}
--- a/jdk/test/java/lang/ThreadGroup/NullThreadName.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/lang/ThreadGroup/NullThreadName.java Tue Dec 06 05:28:17 2011 -0800
@@ -24,7 +24,6 @@
/*
* @test
* @bug 6576763
- * @ignore until hotspot 6776144 bug is resolved
* @summary (thread) Thread constructors throw undocumented NPE for null name
*/
@@ -64,8 +63,8 @@
try { Thread.sleep(2000); }
catch (InterruptedException unused) {}
- /* do not wait forever */
- if (count++ > 5)
+ /* do not wait forever - allow 120 seconds same as jtreg default timeout. */
+ if (count++ > 60)
throw new AssertionError("GoodThread is still alive!");
}
--- a/jdk/test/java/lang/ThreadGroup/Stop.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/lang/ThreadGroup/Stop.java Tue Dec 06 05:28:17 2011 -0800
@@ -29,37 +29,58 @@
*/
public class Stop implements Runnable {
- private static Thread first=null;
- private static Thread second=null;
- private static ThreadGroup group = new ThreadGroup("");
+ private static boolean groupStopped = false ;
+ private static final Object lock = new Object();
- Stop() {
- Thread thread = new Thread(group, this);
- if (first == null)
- first = thread;
- else
- second = thread;
-
- thread.start();
- }
+ private static final ThreadGroup group = new ThreadGroup("");
+ private static final Thread first = new Thread(group, new Stop());
+ private static final Thread second = new Thread(group, new Stop());
public void run() {
while (true) {
+ // Give the other thread a chance to start
try {
- Thread.sleep(1000); // Give other thread a chance to start
- if (Thread.currentThread() == first)
- group.stop();
- } catch(InterruptedException e){
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+
+ // When the first thread runs, it will stop the group.
+ if (Thread.currentThread() == first) {
+ synchronized (lock) {
+ try {
+ group.stop();
+ } finally {
+ // Signal the main thread it is time to check
+ // that the stopped thread group was successful
+ groupStopped = true;
+ lock.notifyAll();
+ }
+ }
}
}
}
public static void main(String[] args) throws Exception {
- for (int i=0; i<2; i++)
- new Stop();
- Thread.sleep(3000);
+ // Launch two threads as part of the same thread group
+ first.start();
+ second.start();
+
+ // Wait for the thread group stop to be issued
+ synchronized(lock){
+ while (!groupStopped) {
+ lock.wait();
+ // Give the other thread a chance to stop
+ Thread.sleep(1000);
+ }
+ }
+
+ // Check that the second thread is terminated when the
+ // first thread terminates the thread group.
boolean failed = second.isAlive();
- first.stop(); second.stop();
+
+ // Clean up any threads that may have not been terminated
+ first.stop();
+ second.stop();
if (failed)
throw new RuntimeException("Failure.");
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/CallSiteTest.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @summary smoke tests for CallSite
+ *
+ * @build indify.Indify
+ * @compile CallSiteTest.java
+ * @run main/othervm
+ * indify.Indify
+ * --expand-properties --classpath ${test.classes}
+ * --java test.java.lang.invoke.CallSiteTest
+ */
+
+package test.java.lang.invoke;
+
+import java.io.*;
+
+import java.lang.invoke.*;
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class CallSiteTest {
+ private final static Class CLASS = CallSiteTest.class;
+
+ private static CallSite mcs;
+ private static CallSite vcs;
+ private static MethodHandle mh_foo;
+ private static MethodHandle mh_bar;
+
+ static {
+ try {
+ mh_foo = lookup().findStatic(CLASS, "foo", methodType(int.class, int.class, int.class));
+ mh_bar = lookup().findStatic(CLASS, "bar", methodType(int.class, int.class, int.class));
+ mcs = new MutableCallSite(mh_foo);
+ vcs = new VolatileCallSite(mh_foo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String... av) throws Throwable {
+ testMutableCallSite();
+ testVolatileCallSite();
+ }
+
+ private final static int N = Integer.MAX_VALUE / 100;
+ private final static int RESULT1 = 762786192;
+ private final static int RESULT2 = -21474836;
+
+ private static void assertEquals(int expected, int actual) {
+ if (expected != actual)
+ throw new AssertionError("expected: " + expected + ", actual: " + actual);
+ }
+
+ private static void testMutableCallSite() throws Throwable {
+ // warm-up
+ for (int i = 0; i < 20000; i++) {
+ mcs.setTarget(mh_foo);
+ }
+ // run
+ for (int n = 0; n < 2; n++) {
+ mcs.setTarget(mh_foo);
+ for (int i = 0; i < 5; i++) {
+ assertEquals(RESULT1, runMutableCallSite());
+ }
+ mcs.setTarget(mh_bar);
+ for (int i = 0; i < 5; i++) {
+ assertEquals(RESULT2, runMutableCallSite());
+ }
+ }
+ }
+ private static void testVolatileCallSite() throws Throwable {
+ // warm-up
+ for (int i = 0; i < 20000; i++) {
+ vcs.setTarget(mh_foo);
+ }
+ // run
+ for (int n = 0; n < 2; n++) {
+ vcs.setTarget(mh_foo);
+ for (int i = 0; i < 5; i++) {
+ assertEquals(RESULT1, runVolatileCallSite());
+ }
+ vcs.setTarget(mh_bar);
+ for (int i = 0; i < 5; i++) {
+ assertEquals(RESULT2, runVolatileCallSite());
+ }
+ }
+ }
+
+ private static int runMutableCallSite() throws Throwable {
+ int sum = 0;
+ for (int i = 0; i < N; i++) {
+ sum += (int) INDY_mcs().invokeExact(i, i+1);
+ }
+ return sum;
+ }
+ private static int runVolatileCallSite() throws Throwable {
+ int sum = 0;
+ for (int i = 0; i < N; i++) {
+ sum += (int) INDY_vcs().invokeExact(i, i+1);
+ }
+ return sum;
+ }
+
+ static int foo(int a, int b) { return a + b; }
+ static int bar(int a, int b) { return a - b; }
+
+ private static MethodType MT_bsm() {
+ shouldNotCallThis();
+ return methodType(CallSite.class, Lookup.class, String.class, MethodType.class);
+ }
+
+ private static CallSite bsm_mcs(Lookup caller, String name, MethodType type) throws ReflectiveOperationException {
+ return mcs;
+ }
+ private static MethodHandle MH_bsm_mcs() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findStatic(lookup().lookupClass(), "bsm_mcs", MT_bsm());
+ }
+ private static MethodHandle INDY_mcs() throws Throwable {
+ shouldNotCallThis();
+ return ((CallSite) MH_bsm_mcs().invoke(lookup(), "foo", methodType(int.class, int.class, int.class))).dynamicInvoker();
+ }
+
+ private static CallSite bsm_vcs(Lookup caller, String name, MethodType type) throws ReflectiveOperationException {
+ return vcs;
+ }
+ private static MethodHandle MH_bsm_vcs() throws ReflectiveOperationException {
+ shouldNotCallThis();
+ return lookup().findStatic(lookup().lookupClass(), "bsm_vcs", MT_bsm());
+ }
+ private static MethodHandle INDY_vcs() throws Throwable {
+ shouldNotCallThis();
+ return ((CallSite) MH_bsm_vcs().invoke(lookup(), "foo", methodType(int.class, int.class, int.class))).dynamicInvoker();
+ }
+
+ private static void shouldNotCallThis() {
+ // if this gets called, the transformation has not taken place
+ throw new AssertionError("this code should be statically transformed away by Indify");
+ }
+}
--- a/jdk/test/java/lang/invoke/InvokeDynamicPrintArgs.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/lang/invoke/InvokeDynamicPrintArgs.java Tue Dec 06 05:28:17 2011 -0800
@@ -38,8 +38,6 @@
package test.java.lang.invoke;
-import org.junit.Test;
-
import java.util.*;
import java.io.*;
@@ -99,21 +97,6 @@
System.setSecurityManager(new SM());
}
- @Test
- public void testInvokeDynamicPrintArgs() throws IOException {
- System.err.println(System.getProperties());
- String testClassPath = System.getProperty("build.test.classes.dir");
- if (testClassPath == null) throw new RuntimeException();
- String[] args = new String[]{
- "--verify-specifier-count=3",
- "--verbose",
- "--expand-properties", "--classpath", testClassPath,
- "--java", "test.java.lang.invoke.InvokeDynamicPrintArgs", "--check-output"
- };
- System.err.println("Indify: "+Arrays.toString(args));
- indify.Indify.main(args);
- }
-
private static PrintStream oldOut;
private static ByteArrayOutputStream buf;
private static void openBuf() {
--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java Tue Dec 06 05:28:17 2011 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7024172
+ * @bug 7024172 7067691
* @summary Test if proxy for PlatformLoggingMXBean is equivalent
* to proxy for LoggingMXBean
*
@@ -43,6 +43,13 @@
static String LOGGER_NAME_2 = "com.sun.management.Logger.Logger2";
static String UNKNOWN_LOGGER_NAME = "com.sun.management.Unknown";
+ // These instance variables prevent premature logger garbage collection
+ // See getLogger() weak reference warnings.
+ Logger logger1;
+ Logger logger2;
+
+ static LoggingMXBeanTest test;
+
public static void main(String[] argv) throws Exception {
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
LoggingMXBean proxy =
@@ -51,7 +58,7 @@
LoggingMXBean.class);
// test LoggingMXBean proxy
- LoggingMXBeanTest p = new LoggingMXBeanTest(proxy);
+ test = new LoggingMXBeanTest(proxy);
// check if the attributes implemented by PlatformLoggingMXBean
// and LoggingMXBean return the same value
@@ -64,9 +71,9 @@
// same verification as in java/util/logging/LoggingMXBeanTest2
public LoggingMXBeanTest(LoggingMXBean mbean) throws Exception {
- Logger logger1 = Logger.getLogger( LOGGER_NAME_1 );
+ logger1 = Logger.getLogger( LOGGER_NAME_1 );
logger1.setLevel(Level.FINE);
- Logger logger2 = Logger.getLogger( LOGGER_NAME_2 );
+ logger2 = Logger.getLogger( LOGGER_NAME_2 );
logger2.setLevel(null);
/*
@@ -207,6 +214,7 @@
// verify logger names
List<String> loggers1 = mxbean1.getLoggerNames();
List<String> loggers2 = mxbean2.getLoggerNames();
+
if (loggers1.size() != loggers2.size())
throw new RuntimeException("LoggerNames: unmatched number of entries");
List<String> loggers3 = new ArrayList<>(loggers1);
@@ -219,7 +227,10 @@
if (!mxbean1.getLoggerLevel(logger)
.equals(mxbean2.getLoggerLevel(logger)))
throw new RuntimeException(
- "LoggerLevel: unmatched level for " + logger);
+ "LoggerLevel: unmatched level for " + logger
+ + ", " + mxbean1.getLoggerLevel(logger)
+ + ", " + mxbean2.getLoggerLevel(logger));
+
if (!mxbean1.getParentLoggerName(logger)
.equals(mxbean2.getParentLoggerName(logger)))
throw new RuntimeException(
--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java Tue Dec 06 05:28:17 2011 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 6876135 7024172
+ * @bug 6876135 7024172 7067691
*
* @summary Test PlatformLoggingMXBean
* This test performs similar testing as
@@ -41,11 +41,15 @@
public class PlatformLoggingMXBeanTest
{
-
ObjectName objectName = null;
static String LOGGER_NAME_1 = "com.sun.management.Logger1";
static String LOGGER_NAME_2 = "com.sun.management.Logger2";
+ // Use Logger instance variables to prevent premature garbage collection
+ // of weak references.
+ Logger logger1;
+ Logger logger2;
+
public PlatformLoggingMXBeanTest() throws Exception {
}
@@ -135,8 +139,8 @@
System.out.println( "*********** Phase 3 ***********" );
System.out.println( "*******************************" );
System.out.println( " Create and test new Loggers" );
- Logger logger1 = Logger.getLogger( LOGGER_NAME_1 );
- Logger logger2 = Logger.getLogger( LOGGER_NAME_2 );
+ logger1 = Logger.getLogger( LOGGER_NAME_1 );
+ logger2 = Logger.getLogger( LOGGER_NAME_2 );
// check that Level object are returned properly
try {
@@ -187,6 +191,7 @@
System.out.println( " Set and Check the Logger Level" );
log1 = false;
log2 = false;
+
try {
// Set the level of logger1 to ALL
params = new Object[2];
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/ref/ReferenceEnqueue.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4268317
+ * @summary Test if Reference.enqueue() works properly with GC
+ */
+
+import java.lang.ref.*;
+
+public class ReferenceEnqueue {
+
+ public static void main(String args[]) throws Exception {
+ for (int i=0; i < 5; i++)
+ new WeakRef().run();
+ System.out.println("Test passed.");
+ }
+
+ static class WeakRef {
+ final ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
+ final Reference<Object> ref;
+ final int iterations = 1000;
+
+ WeakRef() {
+ this.ref = new WeakReference<Object>(new Object(), queue);
+ }
+
+ void run() throws InterruptedException {
+ System.gc();
+ for (int i = 0; i < iterations; i++) {
+ System.gc();
+ if (ref.isEnqueued()) {
+ break;
+ }
+
+ Thread.sleep(100);
+ }
+
+ if (ref.isEnqueued() == false) {
+ // GC have not enqueued refWeak for the timeout period
+ System.out.println("Reference not enqueued yet");
+ return;
+ }
+
+ if (ref.enqueue() == true) {
+ // enqueue() should return false since
+ // ref is already enqueued by the GC
+ throw new RuntimeException("Error: enqueue() returned true;"
+ + " expected false");
+ }
+
+ if (queue.poll() == null) {
+ // poll() should return ref enqueued by the GC
+ throw new RuntimeException("Error: poll() returned null;"
+ + " expected ref object");
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/ref/ReferenceEnqueuePending.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,201 @@
+/* Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4243978
+ * @summary Test if Reference.enqueue() works properly with pending references
+ */
+import java.lang.ref.*;
+
+public class ReferenceEnqueuePending {
+ static class NumberedWeakReference extends WeakReference<Integer> {
+ // Add an integer to identify the weak reference object.
+ int number;
+
+ NumberedWeakReference(Integer referent, ReferenceQueue<Integer> q, int i) {
+ super(referent, q);
+ number = i;
+ }
+ }
+
+ final static boolean debug = System.getProperty("test.debug") != null;
+ final static int iterations = 1000;
+ final static int gc_trigger = 99;
+ static int[] a = new int[2 * iterations];
+ // Keep all weak references alive with the following array.
+ static NumberedWeakReference[] b = new NumberedWeakReference[iterations];
+
+ public static void main(String[] argv) throws Exception {
+ if (debug) {
+ System.out.println("Starting the test.");
+ }
+ // Raise thread priority to match the referenceHandler
+ // priority, so that they can race also on a uniprocessor.
+ raisePriority();
+
+ ReferenceQueue<Integer> refQueue = new ReferenceQueue<>();
+
+ // Our objective is to let the mutator enqueue
+ // a Reference object that may already be in the
+ // pending state because of having been identified
+ // as weakly reachable at a previous garbage collection.
+ // To this end, we create many Reference objects, each with a
+ // a unique integer object as its referant.
+ // We let the referents become eligible for collection,
+ // while racing with the garbage collector which may
+ // have pended some of these Reference objects.
+ // Finally we check that all of the Reference objects
+ // end up on the their queue. The test was originally
+ // submitted to show that such races could break the
+ // pending list and/or the reference queue, because of sharing
+ // the same link ("next") for maintaining both lists, thus
+ // losing some of the Reference objects on either queue.
+
+ Integer obj = new Integer(0);
+ NumberedWeakReference weaky = new NumberedWeakReference(obj, refQueue, 0);
+ for (int i = 1; i < iterations; i++) {
+ // Create a new object, dropping the onlY strong reference to
+ // the previous Integer object.
+ obj = new Integer(i);
+ // Trigger gc each gc_trigger iterations.
+ if ((i % gc_trigger) == 0) {
+ forceGc(0);
+ }
+ // Enqueue every other weaky.
+ if ((i % 2) == 0) {
+ weaky.enqueue();
+ }
+ // Remember the Reference objects, for testing later.
+ b[i - 1] = weaky;
+ // Get a new weaky for the Integer object just
+ // created, which may be explicitly enqueued in
+ // our next trip around the loop.
+ weaky = new NumberedWeakReference(obj, refQueue, i);
+ }
+
+ // Do a final collection to discover and process all
+ // Reference objects created above, allowing enough time
+ // for the ReferenceHandler thread to queue the References.
+ forceGc(100);
+ forceGc(100);
+
+ // Verify that all WeakReference objects ended up queued.
+ checkResult(refQueue, obj, iterations-1);
+ System.out.println("Test passed.");
+ }
+
+ private static void checkResult(ReferenceQueue<Integer> queue,
+ Integer obj,
+ int expected) {
+ if (debug) {
+ System.out.println("Reading the queue");
+ }
+
+ // Empty the queue and record numbers into a[];
+ NumberedWeakReference weakRead = (NumberedWeakReference) queue.poll();
+ int length = 0;
+ while (weakRead != null) {
+ a[length++] = weakRead.number;
+ weakRead = (NumberedWeakReference) queue.poll();
+ }
+ if (debug) {
+ System.out.println("Reference Queue had " + length + " elements");
+ }
+ // Use the last Reference object of those created above, so as to keep it "alive".
+ System.out.println("I must write " + obj + " to prevent compiler optimizations.");
+
+
+ // verify the queued references: all but the last Reference object
+ // should have been in the queue.
+ if (debug) {
+ System.out.println("Start of final check");
+ }
+
+ // Sort the first "length" elements in array "a[]".
+ sort(length);
+
+ boolean fail = (length != expected);
+ for (int i = 0; i < length; i++) {
+ if (a[i] != i) {
+ if (debug) {
+ System.out.println("a[" + i + "] is not " + i + " but " + a[i]);
+ }
+ fail = true;
+ }
+ }
+ if (fail) {
+ printMissingElements(length, expected);
+ throw new RuntimeException("TEST FAILED: only " + length
+ + " reference objects have been queued out of "
+ + expected);
+ }
+ }
+
+ private static void printMissingElements(int length, int expected) {
+ System.out.println("The following numbers were not found in the reference queue: ");
+ int missing = 0;
+ int element = 0;
+ for (int i = 0; i < length; i++) {
+ while ((a[i] != element) & (element < expected)) {
+ System.out.print(element + " ");
+ if (missing % 20 == 19) {
+ System.out.println(" ");
+ }
+ missing++;
+ element++;
+ }
+ element++;
+ }
+ System.out.print("\n");
+ }
+
+ private static void forceGc(long millis) throws InterruptedException {
+ Runtime.getRuntime().gc();
+ Thread.sleep(millis);
+ }
+
+ // Bubble sort the first "length" elements in array "a".
+ private static void sort(int length) {
+ int hold;
+ if (debug) {
+ System.out.println("Sorting. Length=" + length);
+ }
+ for (int pass = 1; pass < length; pass++) { // passes over the array
+ for (int i = 0; i < length - pass; i++) { // a single pass
+ if (a[i] > a[i + 1]) { // then swap
+ hold = a[i];
+ a[i] = a[i + 1];
+ a[i + 1] = hold;
+ }
+ } // End of i loop
+ } // End of pass loop
+ }
+
+ // Raise thread priority so as to increase the
+ // probability of the mutator succeeding in enqueueing
+ // an object that is still in the pending state.
+ // This is (probably) only required for a uniprocessor.
+ static void raisePriority() {
+ Thread tr = Thread.currentThread();
+ tr.setPriority(Thread.MAX_PRIORITY);
+ }
+} // End of class ReferenceEnqueuePending
--- a/jdk/test/java/nio/charset/coders/Errors.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/nio/charset/coders/Errors.java Tue Dec 06 05:28:17 2011 -0800
@@ -23,7 +23,7 @@
/* @test
* @summary Check that error cases are replaced correctly in String/ISR/OSW
- * @bug 4457851
+ * @bug 4457851 7096080
*
* @build Errors Util
* @run main Errors
@@ -193,11 +193,9 @@
t.test("\uFFFF", new byte[] { (byte)0xEF, (byte)0xBF, (byte)0xBF });
t.test(new byte[] { X, (byte)0x7f, Y }, "x\u007Fy");
t.test(new byte[] { X, (byte)0x80, Y }, "x\uFFFDy");
- t.test(new byte[] { (byte)0xf0, (byte)0xf0 }, "\uFFFD");
}
public static void main(String[] args) throws Exception {
-
test_US_ASCII(new TestString("US-ASCII"));
test_US_ASCII(new TestStream("US-ASCII"));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/readTest/readTest.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.rmi.registry.Registry;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
+
+public class readTest {
+
+ public static void main(String args[]) throws Exception {
+ int port = 7491;
+ try {
+ testPkg.Server obj = new testPkg.Server();
+ testPkg.Hello stub = (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0);
+ // Bind the remote object's stub in the registry
+ Registry registry = LocateRegistry.getRegistry(port);
+ registry.bind("Hello", stub);
+
+ System.err.println("Server ready");
+
+ // now, let's test client
+ testPkg.Client client = new testPkg.Client(port);
+ String testStubReturn = client.testStub();
+ if(!testStubReturn.equals(obj.hello)) {
+ throw new RuntimeException("Test Fails : unexpected string from stub call");
+ } else {
+ System.out.println("Test passed");
+ }
+ registry.unbind("Hello");
+
+ } catch (Exception e) {
+ System.err.println("Server exception: " + e.toString());
+ e.printStackTrace();
+ }
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/readTest/readTest.sh Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,95 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# @test
+# @bug 7102369 7094468 7100592
+# @summary remove java.rmi.server.codebase property parsing from registyimpl
+# @run shell readTest.sh
+
+OS=`uname -s`
+case "$OS" in
+ SunOS | Linux )
+ PS=":"
+ FS="/"
+ FILEURL="file:"
+ ;;
+ Windows* | CYGWIN* )
+ PS=";"
+ FS="\\"
+ FILEURL="file:/"
+ ;;
+ * )
+ echo "Unrecognized system!"
+ exit 1;
+ ;;
+esac
+
+cp -r ${TESTSRC}${FS}* .
+${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java
+${TESTJAVA}${FS}bin${FS}javac readTest.java
+
+mkdir rmi_tmp
+RMIREG_OUT=rmi.out
+#start rmiregistry without any local classes on classpath
+cd rmi_tmp
+${TESTJAVA}${FS}bin${FS}rmiregistry 7491 > ..${FS}${RMIREG_OUT} 2>&1 &
+RMIREG_PID=$!
+# allow some time to start
+sleep 3
+cd ..
+
+# trailing / after code base is important for rmi codebase property.
+${TESTJAVA}${FS}bin${FS}java -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 &
+TEST_PID=$!
+#bulk of testcase - let it run for a while
+sleep 5
+
+#we're done, kill processes first
+kill -9 ${RMIREG_PID} ${TEST_PID}
+sleep 3
+
+echo "Test output : "
+
+cat OUT.TXT
+echo "=============="
+echo "rmiregistry output : "
+cat ${RMIREG_OUT}
+echo "=============="
+
+grep "Server ready" OUT.TXT
+result1=$?
+grep "Test passed" OUT.TXT
+result2=$?
+
+if [ $result1 -eq 0 -a $result2 -eq 0 ]
+then
+ echo "Passed"
+ exitCode=0;
+else
+ echo "Failed"
+ exitCode=1
+fi
+rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp
+exit ${exitCode}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/readTest/testPkg/Client.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package testPkg;
+
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+
+public class Client {
+ int port;
+
+ public Client(int p) {
+ port = p;
+ }
+
+ public String testStub() throws Exception {
+ try {
+ Registry registry = LocateRegistry.getRegistry(port);
+ Hello stub = (Hello) registry.lookup("Hello");
+ String response = stub.sayHello();
+ return response;
+ } catch (Exception e) {
+ System.err.println("Client exception: " + e.toString());
+ throw e;
+ }
+ }
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/readTest/testPkg/Hello.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package testPkg;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface Hello extends Remote {
+ String sayHello() throws RemoteException;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/registry/readTest/testPkg/Server.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package testPkg;
+
+public class Server implements Hello {
+
+ public String hello = "Hello, world!";
+
+ public Server() {}
+
+ public String sayHello() {
+ return hello;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Collections/EmptySortedSet.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4533691
+ * @summary Unit test for Collections.emptySortedSet
+ */
+
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+public class EmptySortedSet {
+ static int status = 0;
+ private static final String FAILED = " failed. ";
+ private static final String PERIOD = ".";
+ private final String thisClassName = this.getClass().getName();
+
+ public static void main(String[] args) throws Exception {
+ new EmptySortedSet();
+ }
+
+ public EmptySortedSet() throws Exception {
+ run();
+ }
+
+ /**
+ * Returns {@code true} if the {@link Object} passed in is an empty
+ * {@link SortedSet}.
+ *
+ * @param obj the object to test
+ * @return {@code true} if the {@link Object} is an empty {@link SortedSet}
+ * otherwise {@code false}.
+ */
+ private boolean isEmptySortedSet(Object obj) {
+ boolean isEmptySortedSet = false;
+
+ // We determine if the object is an empty sorted set by testing if it's
+ // an instance of SortedSet, and if so, if it's empty. Currently the
+ // testing doesn't include checks of the other methods.
+ if (obj instanceof SortedSet) {
+ SortedSet ss = (SortedSet) obj;
+
+ if ((ss.isEmpty()) && (ss.size() == 0)) {
+ isEmptySortedSet = true;
+ }
+ }
+
+ return isEmptySortedSet;
+ }
+
+ private void run() throws Exception {
+ Method[] methods = this.getClass().getDeclaredMethods();
+
+ for (int i = 0; i < methods.length; i++) {
+ Method method = methods[i];
+ String methodName = method.getName();
+
+ if (methodName.startsWith("test")) {
+ try {
+ Object obj = method.invoke(this, new Object[0]);
+ } catch(Exception e) {
+ throw new Exception(this.getClass().getName() + "." +
+ methodName + " test failed, test exception "
+ + "follows\n" + e.getCause());
+ }
+ }
+ }
+ }
+
+ private void throwException(String methodName, String reason)
+ throws Exception
+ {
+ StringBuilder sb = new StringBuilder(thisClassName);
+ sb.append(PERIOD);
+ sb.append(methodName);
+ sb.append(FAILED);
+ sb.append(reason);
+ throw new Exception(sb.toString());
+ }
+
+ /**
+ *
+ */
+ private void test00() throws Exception {
+ //throwException("test00", "This test has not been implemented yet.");
+ }
+
+ /**
+ * Tests that the comparator is {@code null}.
+ */
+ private void testComparatorIsNull() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ Comparator comparator = sortedSet.comparator();
+
+ if (comparator != null) {
+ throwException("testComparatorIsNull", "Comparator is not null.");
+ }
+ }
+
+ /**
+ * Tests that the contains method returns {@code false}.
+ */
+ private void testContains() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+
+ if (sortedSet.contains(new Object())) {
+ throwException("testContains", "Should not contain any elements.");
+ }
+ }
+
+ /**
+ * Tests that the containsAll method returns {@code false}.
+ */
+ private void testContainsAll() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ TreeSet treeSet = new TreeSet();
+ treeSet.add("1");
+ treeSet.add("2");
+ treeSet.add("3");
+
+ if (sortedSet.containsAll(treeSet)) {
+ throwException("testContainsAll",
+ "Should not contain any elements.");
+ }
+ }
+
+ /**
+ * Tests that the iterator is empty.
+ */
+ private void testEmptyIterator() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ Iterator emptyIterator = sortedSet.iterator();
+
+ if ((emptyIterator != null) && (emptyIterator.hasNext())) {
+ throwException("testEmptyIterator", "The iterator is not empty.");
+ }
+ }
+
+ /**
+ * Tests that the set is empty.
+ */
+ private void testIsEmpty() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+
+ if ((sortedSet != null) && (!sortedSet.isEmpty())) {
+ throwException("testSizeIsZero", "The set is not empty.");
+ }
+ }
+
+ /**
+ * Tests that the first() method throws NoSuchElementException
+ */
+ private void testFirst() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+
+ try {
+ sortedSet.first();
+ throwException("testFirst",
+ "NoSuchElemenException was not thrown.");
+ } catch(NoSuchElementException nsee) {
+ // Do nothing
+ }
+ }
+
+ /**
+ * Tests the headSet() method.
+ */
+ private void testHeadSet() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ SortedSet ss;
+
+ try {
+ ss = sortedSet.headSet(null);
+ throwException("testHeadSet",
+ "Must throw NullPointerException for null element");
+ } catch(NullPointerException npe) {
+ // Do nothing
+ }
+
+ try {
+ ss = sortedSet.headSet(new Object());
+ throwException("testHeadSet",
+ "Must throw ClassCastException for non-Comparable element");
+ } catch(ClassCastException cce) {
+ // Do nothing.
+ }
+
+ ss = sortedSet.headSet("1");
+
+ if ((ss == null) || !isEmptySortedSet(ss)) {
+ throwException("testHeadSet",
+ "Returned value is null or not an EmptySortedSet.");
+ }
+ }
+
+ /**
+ * Tests that the last() method throws NoSuchElementException
+ */
+ private void testLast() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+
+ try {
+ sortedSet.last();
+ throwException("testLast",
+ "NoSuchElemenException was not thrown.");
+ } catch(NoSuchElementException nsee) {
+ // Do nothing
+ }
+ }
+
+ /**
+ * Tests that the size is 0.
+ */
+ private void testSizeIsZero() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ int size = sortedSet.size();
+
+ if (size > 0) {
+ throwException("testSizeIsZero",
+ "The size of the set is greater then 0.");
+ }
+ }
+
+ /**
+ * Tests the subSet() method.
+ */
+ private void testSubSet() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ SortedSet ss = sortedSet.headSet("1");
+
+ try {
+ ss = sortedSet.subSet(null, BigInteger.TEN);
+ ss = sortedSet.subSet(BigInteger.ZERO, null);
+ ss = sortedSet.subSet(null, null);
+ throwException("testSubSet",
+ "Must throw NullPointerException for null element");
+ } catch(NullPointerException npe) {
+ // Do nothing
+ }
+
+ try {
+ Object obj1 = new Object();
+ Object obj2 = new Object();
+ ss = sortedSet.subSet(obj1, BigInteger.TEN);
+ ss = sortedSet.subSet(BigInteger.ZERO, obj2);
+ ss = sortedSet.subSet(obj1, obj2);
+ throwException("testSubSet",
+ "Must throw ClassCastException for parameter which is "
+ + "not Comparable.");
+ } catch(ClassCastException cce) {
+ // Do nothing.
+ }
+
+ try {
+ ss = sortedSet.subSet(BigInteger.ZERO, BigInteger.ZERO);
+ ss = sortedSet.subSet(BigInteger.TEN, BigInteger.ZERO);
+ throwException("testSubSet",
+ "Must throw IllegalArgumentException when fromElement is "
+ + "not less then then toElement.");
+ } catch(IllegalArgumentException iae) {
+ // Do nothing.
+ }
+
+ ss = sortedSet.subSet(BigInteger.ZERO, BigInteger.TEN);
+
+ if (!isEmptySortedSet(ss)) {
+ throw new Exception("Returned value is not empty sorted set.");
+ }
+ }
+
+ /**
+ * Tests the tailSet() method.
+ */
+ private void testTailSet() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ SortedSet ss;
+
+ try {
+ ss = sortedSet.tailSet(null);
+ throwException("testTailSet",
+ "Must throw NullPointerException for null element");
+ } catch(NullPointerException npe) {
+ // Do nothing
+ }
+
+ try {
+ SortedSet ss2 = sortedSet.tailSet(new Object());
+ throwException("testTailSet",
+ "Must throw ClassCastException for non-Comparable element");
+ } catch(ClassCastException cce) {
+ // Do nothing.
+ }
+
+ ss = sortedSet.tailSet("1");
+
+ if ((ss == null) || !isEmptySortedSet(ss)) {
+ throwException("testTailSet",
+ "Returned value is null or not an EmptySortedSet.");
+ }
+ }
+
+ /**
+ * Tests that the array has a size of 0.
+ */
+ private void testToArray() throws Exception {
+ SortedSet sortedSet = Collections.emptySortedSet();
+ Object[] emptySortedSetArray = sortedSet.toArray();
+
+ if ((emptySortedSetArray == null) || (emptySortedSetArray.length > 0)) {
+ throwException("testToArray",
+ "Returned null array or array with length > 0.");
+ }
+
+ String[] strings = new String[2];
+ strings[0] = "1";
+ strings[1] = "2";
+ emptySortedSetArray = sortedSet.toArray(strings);
+
+ if ((emptySortedSetArray == null) || (emptySortedSetArray[0] != null)) {
+ throwException("testToArray",
+ "Returned null array or array with length > 0.");
+ }
+ }
+}
--- a/jdk/test/java/util/Timer/Args.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/util/Timer/Args.java Tue Dec 06 05:28:17 2011 -0800
@@ -92,19 +92,22 @@
new F(){void f(){ t.scheduleAtFixedRate(x, (Date)null, 42); }}
);
- final long start = System.currentTimeMillis();
- final Date past = new Date(start - 10500);
final CountDownLatch y1 = new CountDownLatch(1);
final CountDownLatch y2 = new CountDownLatch(1);
final CountDownLatch y3 = new CountDownLatch(11);
+ final long start = System.currentTimeMillis();
+ final Date past = new Date(start - 10500);
+
schedule( t, counter(y1), past);
schedule( t, counter(y2), past, 1000);
scheduleAtFixedRate(t, counter(y3), past, 1000);
y3.await();
y1.await();
y2.await();
- System.out.printf("elapsed=%d%n", System.currentTimeMillis() - start);
- check(System.currentTimeMillis() - start < 500);
+
+ final long elapsed = System.currentTimeMillis() - start;
+ System.out.printf("elapsed=%d%n", elapsed);
+ check(elapsed < 500);
t.cancel();
--- a/jdk/test/java/util/Timer/KillThread.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/java/util/Timer/KillThread.java Tue Dec 06 05:28:17 2011 -0800
@@ -31,21 +31,26 @@
import java.util.*;
public class KillThread {
+ static volatile Thread tdThread;
public static void main (String[] args) throws Exception {
Timer t = new Timer();
// Start a mean event that kills the timer thread
t.schedule(new TimerTask() {
public void run() {
+ tdThread = Thread.currentThread();
throw new ThreadDeath();
}
}, 0);
// Wait for mean event to do the deed and thread to die.
try {
- Thread.sleep(100);
+ do {
+ Thread.sleep(100);
+ } while(tdThread == null);
} catch(InterruptedException e) {
}
+ tdThread.join();
// Try to start another event
try {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2007, 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 4492274
+ * @summary Tests if JEditorPane.getPage() correctly returns anchor reference.
+ * @author Denis Sharypov
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import javax.swing.text.html.HTMLEditorKit;
+import java.awt.*;
+import java.io.File;
+import java.net.URL;
+
+public class bug4492274 {
+
+ private static URL page;
+
+ private static JEditorPane jep;
+
+ public static void main(String args[]) throws Exception {
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ createAndShowGUI();
+ }
+ });
+
+ toolkit.realSync();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ page = new URL(page, "#linkname");
+ jep.setPage(page);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+
+ toolkit.realSync();
+
+ if (getPageAnchor() == null) {
+ throw new RuntimeException("JEditorPane.getPage() returns null anchor reference");
+ }
+
+ }
+
+ private static String getPageAnchor() throws Exception {
+ final String[] result = new String[1];
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ result[0] = jep.getPage().getRef();
+ }
+ });
+
+ return result[0];
+ }
+
+ private static void createAndShowGUI() {
+ try {
+ File file = new File(System.getProperty("test.src", "."), "test.html");
+ page = file.toURI().toURL();
+
+ JFrame f = new JFrame();
+
+ jep = new JEditorPane();
+ jep.setEditorKit(new HTMLEditorKit());
+ jep.setEditable(false);
+ jep.setPage(page);
+
+ JScrollPane sp = new JScrollPane(jep);
+
+ f.getContentPane().add(sp);
+ f.setSize(500, 500);
+ f.setVisible(true);
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JEditorPane/4492274/test.html Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,7 @@
+<html>
+<body>
+<a name="top">top</a>
+<img src=a.jpg width=500 height=1000>
+<a name="linkname">bottom</a>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6348946/bug6348946.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2007, 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6348946
+ * @summary Tests that JSlider's thumb moves in the right direction
+ * when it is used as a JTable cell editor.
+ * @author Mikhail Lapshin
+*/
+
+import sun.awt.SunToolkit;
+
+import java.awt.*;
+import java.awt.event.InputEvent;
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.table.*;
+
+public class bug6348946 {
+
+ private static JFrame frame;
+
+ private static JPanel panel;
+
+ private static volatile boolean passed = false;
+
+ public static void main(String[] args) throws Exception {
+ String lf = "javax.swing.plaf.metal.MetalLookAndFeel";
+ UIManager.setLookAndFeel(lf);
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ setupUI();
+ }
+ });
+ toolkit.realSync();
+ clickOnSlider();
+ toolkit.realSync();
+ checkResult();
+ } finally {
+ stopEDT();
+ }
+ }
+
+ private static void setupUI() {
+ frame = new JFrame();
+
+ panel = new JPanel();
+ panel.setLayout(new BorderLayout());
+ panel.add(new ParameterTable(), BorderLayout.CENTER);
+ frame.getContentPane().add(panel);
+
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ private static void clickOnSlider() throws Exception {
+ Robot robot = new Robot();
+ robot.setAutoDelay(10);
+
+ Rectangle rect = getPanelRectangle();
+
+ double clickX = rect.getX() + rect.getWidth() / 4;
+ double clickY = rect.getY() + rect.getHeight() / 2;
+ robot.mouseMove((int) clickX, (int) clickY);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ }
+
+ private static void checkResult(){
+ if (passed) {
+ System.out.println("Test passed");
+ } else {
+ throw new RuntimeException("The thumb moved " +
+ "to the right instead of the left!");
+ }
+ }
+
+ private static void stopEDT() {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ frame.dispose();
+ }
+ });
+ }
+
+ private static class ParameterTable extends JTable {
+ public ParameterTable() {
+ super(new Object[][]{{5}}, new String[]{"Value"});
+ getColumnModel().getColumn(0).setCellRenderer(new Renderer());
+ getColumnModel().getColumn(0).setCellEditor(new Editor());
+ }
+ }
+
+ private static class Renderer implements TableCellRenderer {
+ private JSlider slider = new JSlider(0, 10);
+
+ public Component getTableCellRendererComponent(JTable table,
+ Object value,
+ boolean isSelected,
+ boolean hasFocus,
+ int row, int col) {
+ int val = (Integer) value;
+ slider.setValue(val);
+ return slider;
+ }
+ }
+
+ private static class Editor extends AbstractCellEditor implements TableCellEditor {
+ private JSlider slider = new JSlider(0, 10);
+
+ public Component getTableCellEditorComponent(JTable table, Object value,
+ boolean isSelected,
+ int row, int col) {
+ int val = (Integer) value;
+ slider.setValue(val);
+ return slider;
+ }
+
+ public Editor() {
+ slider.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent e) {
+ if (!slider.getValueIsAdjusting()) {
+ passed = slider.getValue() <= 5;
+ }
+ }
+ });
+ }
+
+ public Object getCellEditorValue() {
+ return slider.getValue();
+ }
+ }
+
+ private static Rectangle getPanelRectangle() throws Exception{
+ final Rectangle[] result = new Rectangle[1];
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ result[0] = new Rectangle(panel.getLocationOnScreen(), panel.getSize());
+ }
+ });
+
+ return result[0];
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2011 Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Portions Copyright (c) 2011 IBM Corporation
+ */
+
+/* @test
+ * @bug 7049024
+ * @summary DnD fails with JTextArea and JTextField
+ * @author Sean Chou
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import javax.swing.text.DefaultCaret;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+
+public class bug7049024 {
+ public static Clipboard clipboard = null;
+
+ public static JTextField textField = null;
+
+ // This button is used to move focus away from textField.
+ public static JButton button = null;
+
+ public static JFrame frame = null;
+
+ public static DefaultCaret caret = null;
+
+ public static void main(String[] args) throws Exception {
+
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ frame = new JFrame("Test");
+ textField = new JTextField("test selection for textfield");
+ button = new JButton("To compete the focus");
+
+ frame.setLayout(new FlowLayout());
+ frame.getContentPane().add(textField);
+ frame.getContentPane().add(button);
+
+ frame.pack();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setVisible(true);
+ }
+ });
+ toolkit.realSync();
+
+ clipboard = textField.getToolkit().getSystemSelection();
+ if (null == clipboard) {
+ return;
+ }
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ textField.requestFocusInWindow();
+ }
+ });
+ toolkit.realSync();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ caret = (DefaultCaret) textField.getCaret();
+ caret.setDot(2);
+ caret.moveDot(4);
+ }
+ });
+ toolkit.realSync();
+
+ String oldSelection = (String) clipboard.getData(DataFlavor.stringFlavor);
+ System.out.println("oldSelection is " + oldSelection);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ button.requestFocusInWindow();
+ }
+ });
+ toolkit.realSync(); // So JTextField loses the focus.
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ caret.setDot(4);
+ caret.moveDot(6);
+ }
+ });
+ toolkit.realSync();
+
+ String newSelection = (String) clipboard.getData(DataFlavor.stringFlavor);
+ System.out.println("newSelection is " + newSelection);
+
+ boolean passed = newSelection.equals(oldSelection);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ frame.dispose();
+ }
+ });
+
+ if (!passed) {
+ throw new RuntimeException("The test for bug 7049024 failed");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/ToolTipManager/Test6256140.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2007, 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6256140
+ * @summary Esc key doesn't restore old value in JFormattedtextField when ToolTip is set
+ * @author Alexander Potochkin
+ * @run main Test6256140
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+
+public class Test6256140 {
+
+ private static volatile JFormattedTextField ft;
+
+ private final static String initialText = "value";
+ private final static JLabel toolTipLabel = new JLabel("tip");
+
+ public static void main(String[] args) throws Exception {
+
+ Robot robot = new Robot();
+ robot.setAutoDelay(10);
+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ createAndShowGUI();
+ }
+ });
+ toolkit.realSync();
+
+ Point point = ft.getLocationOnScreen();
+ robot.mouseMove(point.x, point.y);
+ robot.mouseMove(point.x + 3, point.y + 3);
+
+ robot.keyPress(KeyEvent.VK_A);
+ robot.keyRelease(KeyEvent.VK_A);
+ toolkit.realSync();
+
+ if (!isTooltipShowning()) {
+ throw new RuntimeException("Tooltip is not shown");
+ }
+
+ robot.keyPress(KeyEvent.VK_ESCAPE);
+ robot.keyRelease(KeyEvent.VK_ESCAPE);
+ toolkit.realSync();
+
+ if (isTooltipShowning()) {
+ throw new RuntimeException("Tooltip must be hidden now");
+ }
+
+ if (isTextEqual()) {
+ throw new RuntimeException("FormattedTextField must *not* cancel the updated value this time");
+ }
+
+ robot.keyPress(KeyEvent.VK_ESCAPE);
+ robot.keyRelease(KeyEvent.VK_ESCAPE);
+ toolkit.realSync();
+
+ if (!isTextEqual()) {
+ throw new RuntimeException("FormattedTextField must cancel the updated value");
+ }
+ }
+
+ private static boolean isTooltipShowning() throws Exception {
+ final boolean[] result = new boolean[1];
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ result[0] = toolTipLabel.isShowing();
+ }
+ });
+
+ return result[0];
+ }
+
+ private static boolean isTextEqual() throws Exception {
+ final boolean[] result = new boolean[1];
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ result[0] = initialText.equals(ft.getText());
+ }
+ });
+
+ return result[0];
+ }
+
+ private static void createAndShowGUI() {
+ ToolTipManager.sharedInstance().setDismissDelay(Integer.MAX_VALUE);
+ ToolTipManager.sharedInstance().setInitialDelay(0);
+
+ final JFrame frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setLayout(new FlowLayout());
+
+ ft = new JFormattedTextField() {
+
+ public JToolTip createToolTip() {
+ JToolTip toolTip = super.createToolTip();
+ toolTip.setLayout(new BorderLayout());
+ toolTip.add(toolTipLabel);
+ return toolTip;
+ }
+ };
+ ft.setToolTipText(" ");
+ ft.setValue(initialText);
+ frame.add(ft);
+
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ ft.requestFocus();
+ }
+}
--- a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 4635230 6283345 6303830 6824440 6867348
+ * @bug 4635230 6283345 6303830 6824440 6867348 7094155
* @summary Basic unit tests for generating XML Signatures with JSR 105
* @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java
* X509KeySelector.java GenerationTests.java
@@ -134,6 +134,7 @@
test_create_signature_enveloping_sha512_rsa_sha384();
test_create_signature_enveloping_sha512_rsa_sha512();
test_create_signature_reference_dependency();
+ test_create_signature_with_attr_in_no_namespace();
}
private static void setup() throws Exception {
@@ -460,6 +461,52 @@
System.out.println();
}
+ static void test_create_signature_with_attr_in_no_namespace()
+ throws Exception
+ {
+ System.out.println
+ ("* Generating signature-with-attr-in-no-namespace.xml");
+
+ // create references
+ List<Reference> refs = Collections.singletonList
+ (fac.newReference("#unknown", sha1));
+
+ // create SignedInfo
+ SignedInfo si = fac.newSignedInfo(withoutComments, rsaSha1, refs);
+
+ // create object-1
+ Document doc = db.newDocument();
+ Element nc = doc.createElementNS(null, "NonCommentandus");
+ // add attribute with no namespace
+ nc.setAttribute("Id", "unknown");
+ XMLObject obj = fac.newXMLObject(Collections.singletonList
+ (new DOMStructure(nc)), "object-1", null, null);
+
+ // create XMLSignature
+ XMLSignature sig = fac.newXMLSignature(si, rsa,
+ Collections.singletonList(obj),
+ "signature", null);
+ DOMSignContext dsc = new DOMSignContext(getPrivateKey("RSA"), doc);
+
+ sig.sign(dsc);
+
+// dumpDocument(doc, new PrintWriter(System.out));
+
+ DOMValidateContext dvc = new DOMValidateContext
+ (kvks, doc.getDocumentElement());
+ XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
+
+ if (sig.equals(sig2) == false) {
+ throw new Exception
+ ("Unmarshalled signature is not equal to generated signature");
+ }
+ if (sig2.validate(dvc) == false) {
+ throw new Exception("Validation of generated signature failed");
+ }
+
+ System.out.println();
+ }
+
static void test_create_signature() throws Exception {
System.out.println("* Generating signature.xml");
--- a/jdk/test/sun/nio/cs/TestStringCoding.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/nio/cs/TestStringCoding.java Tue Dec 06 05:28:17 2011 -0800
@@ -24,7 +24,7 @@
*/
/* @test
- @bug 6636323 6636319 7040220
+ @bug 6636323 6636319 7040220 7096080
@summary Test if StringCoding and NIO result have the same de/encoding result
* @run main/othervm/timeout=2000 TestStringCoding
*/
@@ -111,7 +111,8 @@
//encode unmappable surrogates
if (enc instanceof sun.nio.cs.ArrayEncoder &&
cs.contains(Charset.forName("ASCII"))) {
- if (cs.name().equals("UTF-8")) // utf8 handles surrogates
+ if (cs.name().equals("UTF-8") || // utf8 handles surrogates
+ cs.name().equals("CESU-8")) // utf8 handles surrogates
return;
enc.replaceWith(new byte[] { (byte)'A'});
sun.nio.cs.ArrayEncoder cae = (sun.nio.cs.ArrayEncoder)enc;
@@ -136,7 +137,6 @@
cs.name())))
throw new RuntimeException("encode3(surrogates) failed -> "
+ cs.name());
-
ba = new byte[str.length() - 1];
n = cae.encode(str.toCharArray(), 0, str.length(), ba);
if (n != 7 || !"abABABc".equals(new String(ba, 0, n,
--- a/jdk/test/sun/nio/cs/TestStringCodingUTF8.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/nio/cs/TestStringCodingUTF8.java Tue Dec 06 05:28:17 2011 -0800
@@ -33,14 +33,16 @@
public class TestStringCodingUTF8 {
public static void main(String[] args) throws Throwable {
- test();
+ test("UTF-8");
+ test("CESU-8");
// security manager on
System.setSecurityManager(new PermissiveSecurityManger());
- test();
+ test("UTF-8");
+ test("CESU-8");
}
- static void test() throws Throwable {
- Charset cs = Charset.forName("UTF-8");
+ static void test(String csn) throws Throwable {
+ Charset cs = Charset.forName(csn);
char[] bmp = new char[0x10000];
for (int i = 0; i < 0x10000; i++) {
bmp[i] = (char)i;
--- a/jdk/test/sun/nio/cs/TestUTF8.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/nio/cs/TestUTF8.java Tue Dec 06 05:28:17 2011 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4486841 7040220
+ * @bug 4486841 7040220 7096080
* @summary Test UTF-8 charset
*/
@@ -156,15 +156,22 @@
return 3;
}
+ static int to4ByteUTF8(int uc, byte[] bb, int pos) {
+ bb[pos++] = (byte)(0xf0 | ((uc >> 18)));
+ bb[pos++] = (byte)(0x80 | ((uc >> 12) & 0x3f));
+ bb[pos++] = (byte)(0x80 | ((uc >> 6) & 0x3f));
+ bb[pos++] = (byte)(0x80 | (uc & 0x3f));
+ return 4;
+ }
+
static void checkRoundtrip(String csn) throws Exception {
System.out.printf(" Check roundtrip <%s>...", csn);
char[] cc = getUTFChars();
byte[] bb = encode(cc, csn, false);
char[] ccO = decode(bb, csn, false);
- if (!Arrays.equals(cc, ccO)) {
+ if (!Arrays.equals(cc, ccO))
System.out.printf(" non-direct failed");
- }
bb = encode(cc, csn, true);
ccO = decode(bb, csn, true);
if (!Arrays.equals(cc, ccO)) {
@@ -180,6 +187,40 @@
System.out.println();
}
+ static void check4ByteSurrs(String csn) throws Exception {
+ System.out.printf(" Check 4-byte Surrogates <%s>...%n", csn);
+ byte[] bb = new byte[(0x110000 - 0x10000) * 4];
+ char[] cc = new char[(0x110000 - 0x10000) * 2];
+ int bpos = 0;
+ int cpos = 0;
+ for (int i = 0x10000; i < 0x110000; i++) {
+ Character.toChars(i, cc, cpos);
+ bpos += to4ByteUTF8(i, bb, bpos);
+ cpos += 2;
+ }
+ checkSurrs(csn, bb, cc);
+ }
+
+
+ static void checkSurrs(String csn, byte[] bb, char[] cc)
+ throws Exception
+ {
+ char[] ccO = decode(bb, csn, false);
+ if (!Arrays.equals(cc, ccO)) {
+ System.out.printf(" decoding failed%n");
+ }
+ ccO = decode(bb, csn, true);
+ if (!Arrays.equals(cc, ccO)) {
+ System.out.printf(" decoding(direct) failed%n");
+ }
+ if (!Arrays.equals(cc, new String(bb, csn).toCharArray())) {
+ System.out.printf(" String.toCharArray() failed");
+ }
+ if (!Arrays.equals(bb, new String(cc).getBytes(csn))) {
+ System.out.printf(" String.getBytes() failed");
+ }
+ }
+
static void check6ByteSurrs(String csn) throws Exception {
System.out.printf(" Check 6-byte Surrogates <%s>...%n", csn);
byte[] bb = new byte[(0x110000 - 0x10000) * 6];
@@ -192,22 +233,9 @@
bpos += to3ByteUTF8(cc[cpos + 1], bb, bpos);
cpos += 2;
}
+ checkSurrs(csn, bb, cc);
+ }
- char[] ccO = decode(bb, csn, false);
- if (!Arrays.equals(cc, ccO)) {
- System.out.printf(" decoding failed%n");
- }
- ccO = decode(bb, csn, true);
- if (!Arrays.equals(cc, ccO)) {
- System.out.printf(" decoding(direct) failed%n");
- }
- // new String(bb, csn).getBytes(csn) will not return
- // the 6 bytes surrogates as in bb, so only test
- // toCharArray() here.
- if (!Arrays.equals(cc, new String(bb, csn).toCharArray())) {
- System.out.printf(" String.toCharArray() failed");
- }
- }
static void compare(String csn1, String csn2) throws Exception {
System.out.printf(" Diff <%s> <%s>...%n", csn1, csn2);
@@ -266,6 +294,10 @@
{1, (byte)0xFF, (byte)0xFF, (byte)0xFF }, // all ones
{1, (byte)0xE0, (byte)0xC0, (byte)0x80 }, // invalid second byte
{1, (byte)0xE0, (byte)0x80, (byte)0xC0 }, // invalid first byte
+ {1, (byte)0xE0, (byte)0x41,}, // invalid second byte & 2 bytes
+ {3, (byte)0xED, (byte)0xAE, (byte)0x80 }, // 3 bytes surrogate
+ {3, (byte)0xED, (byte)0xB0, (byte)0x80 }, // 3 bytes surrogate
+
// Four-byte sequences
{1, (byte)0xF0, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
@@ -276,8 +308,13 @@
{1, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF }, // all ones
{1, (byte)0xF0, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid second byte
{1, (byte)0xF0, (byte)0xC0, (byte)0x80, (byte)0x80 }, // invalid second byte
+ {1, (byte)0xF0, (byte)41 }, // invalid second byte
+ // & only 2 bytes
+
{2, (byte)0xF0, (byte)0x90, (byte)0xC0, (byte)0x80 }, // invalid third byte
- {3, (byte)0xF0, (byte)0x90, (byte)0x80, (byte)0xC0 }, // invalid third byte
+ {3, (byte)0xF0, (byte)0x90, (byte)0x80, (byte)0xC0 }, // invalid forth byte
+ {2, (byte)0xF0, (byte)0x90, (byte)0x41 }, // invalid third byte
+ // & 3 bytes input
{1, (byte)0xF1, (byte)0xC0, (byte)0x80, (byte)0x80 }, // invalid second byte
{2, (byte)0xF1, (byte)0x80, (byte)0xC0, (byte)0x80 }, // invalid third byte
@@ -287,30 +324,113 @@
{1, (byte)0xF5, (byte)0x80, (byte)0x80, (byte)0xC0 }, // out-range 4-byte
// Five-byte sequences
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid first byte
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
- {5, (byte)0xF8, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid first byte
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
{1, (byte)0xF8, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80},
- {2, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80 },
- {3, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF },
- {4, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0 },
// Six-byte sequences
- {6, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
- {6, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
- {6, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
- {6, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
{1, (byte)0xF8, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 },
- {2, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80 },
- {3, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF, (byte)0x80 },
- {4, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0, (byte)0x80 },
- {5, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0x80, (byte)0xC0 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0x80, (byte)0xC0 },
};
- static void checkMalformed(String csn) throws Exception {
+ // The first byte is the length of malformed bytes
+ static byte[][] malformed_cesu8 = {
+ // One-byte sequences:
+ {1, (byte)0xFF },
+ {1, (byte)0xC0 },
+ {1, (byte)0x80 },
+
+ {1, (byte)0xFF, (byte)0xFF}, // all ones
+ {1, (byte)0xA0, (byte)0x80}, // 101x first byte first nibble
+
+ // Two-byte sequences:
+ {1, (byte)0xC0, (byte)0x80}, // invalid first byte
+ {1, (byte)0xC1, (byte)0xBF}, // invalid first byte
+ {1, (byte)0xC2, (byte)0x00}, // invalid second byte
+ {1, (byte)0xC2, (byte)0xC0}, // invalid second byte
+ {1, (byte)0xD0, (byte)0x00}, // invalid second byte
+ {1, (byte)0xD0, (byte)0xC0}, // invalid second byte
+ {1, (byte)0xDF, (byte)0x00}, // invalid second byte
+ {1, (byte)0xDF, (byte)0xC0}, // invalid second byte
+
+ // Three-byte sequences
+ {1, (byte)0xE0, (byte)0x80, (byte)0x80}, // 111x first byte first nibble
+ {1, (byte)0xE0, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xE0, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xE0, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+
+ {1, (byte)0xE0, (byte)0xC0, (byte)0xBF }, // invalid second byte
+ {2, (byte)0xE0, (byte)0xA0, (byte)0x7F }, // invalid third byte
+ {2, (byte)0xE0, (byte)0xA0, (byte)0xC0 }, // invalid third byte
+ {1, (byte)0xFF, (byte)0xFF, (byte)0xFF }, // all ones
+ {1, (byte)0xE0, (byte)0xC0, (byte)0x80 }, // invalid second byte
+ {1, (byte)0xE0, (byte)0x80, (byte)0xC0 }, // invalid first byte
+ {1, (byte)0xE0, (byte)0x41,}, // invalid second byte & 2 bytes
+
+ // CESU-8 does not have 4, 5, 6 bytes sequenc
+ // Four-byte sequences
+ {1, (byte)0xF0, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xF0, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xF0, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xF0, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+07FF zero-padded
+
+ {1, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF }, // all ones
+ {1, (byte)0xF0, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid second byte
+ {1, (byte)0xF0, (byte)0xC0, (byte)0x80, (byte)0x80 }, // invalid second byte
+ {1, (byte)0xF0, (byte)41 }, // invalid second byte
+ // & only 2 bytes
+ {1, (byte)0xF0, (byte)0x90, (byte)0xC0, (byte)0x80 }, // invalid third byte
+ {1, (byte)0xF0, (byte)0x90, (byte)0x80, (byte)0xC0 }, // invalid forth byte
+ {1, (byte)0xF0, (byte)0x90, (byte)0x41 }, // invalid third byte
+ // & 3 bytes input
+
+ {1, (byte)0xF1, (byte)0xC0, (byte)0x80, (byte)0x80 }, // invalid second byte
+ {1, (byte)0xF1, (byte)0x80, (byte)0xC0, (byte)0x80 }, // invalid third byte
+ {1, (byte)0xF1, (byte)0x80, (byte)0x80, (byte)0xC0 }, // invalid forth byte
+ {1, (byte)0xF4, (byte)0x90, (byte)0x80, (byte)0xC0 }, // out-range 4-byte
+ {1, (byte)0xF4, (byte)0xC0, (byte)0x80, (byte)0xC0 }, // out-range 4-byte
+ {1, (byte)0xF5, (byte)0x80, (byte)0x80, (byte)0xC0 }, // out-range 4-byte
+
+ // Five-byte sequences
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80}, // invalid first byte
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+ {1, (byte)0xF8, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
+
+ {1, (byte)0xF8, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80},
+ {1, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0 },
+
+ // Six-byte sequences
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 }, // U+0000 zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x81, (byte)0xBF }, // U+007F zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xBF }, // U+07FF zero-padded
+ {1, (byte)0xFC, (byte)0x80, (byte)0x80, (byte)0x8F, (byte)0xBF, (byte)0xBF }, // U+FFFF zero-padded
+ {1, (byte)0xF8, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0xC0, (byte)0x80, (byte)0x80, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0xC1, (byte)0xBF, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0xC0, (byte)0x80 },
+ {1, (byte)0xF8, (byte)0x80, (byte)0x80, (byte)0x9F, (byte)0x80, (byte)0xC0 },
+ };
+
+
+ static void checkMalformed(String csn, byte[][] malformed) throws Exception {
boolean failed = false;
System.out.printf(" Check malformed <%s>...%n", csn);
Charset cs = Charset.forName(csn);
@@ -430,9 +550,12 @@
public static void main(String[] args) throws Exception {
checkRoundtrip("UTF-8");
- check6ByteSurrs("UTF-8");
- //compare("UTF-8", "UTF-8-OLD");
- checkMalformed("UTF-8");
+ check4ByteSurrs("UTF-8");
+ checkMalformed("UTF-8", malformed);
checkUnderOverflow("UTF-8");
+
+ checkRoundtrip("CESU-8");
+ check6ByteSurrs("CESU-8");
+ checkMalformed("CESU-8", malformed_cesu8);
}
}
--- a/jdk/test/sun/security/pkcs11/Provider/Absolute.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/security/pkcs11/Provider/Absolute.java Tue Dec 06 05:28:17 2011 -0800
@@ -27,7 +27,6 @@
*/
import java.security.*;
import java.lang.reflect.*;
-import sun.security.pkcs11.*;
public class Absolute {
--- a/jdk/test/sun/security/pkcs11/fips/CipherTest.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/security/pkcs11/fips/CipherTest.java Tue Dec 06 05:28:17 2011 -0800
@@ -394,52 +394,47 @@
public static void main(PeerFactory peerFactory, KeyStore keyStore,
String[] args) throws Exception {
- SSLContext reservedSSLContext = SSLContext.getDefault();
- try {
- long time = System.currentTimeMillis();
- String relPath;
- if ((args != null) && (args.length > 0) && args[0].equals("sh")) {
- relPath = pathToStoresSH;
- } else {
- relPath = pathToStores;
- }
- PATH = new File(System.getProperty("test.src", "."), relPath);
- CipherTest.peerFactory = peerFactory;
- System.out.print(
- "Initializing test '" + peerFactory.getName() + "'...");
-// secureRandom = new SecureRandom();
-// secureRandom.nextInt();
-// trustStore = readKeyStore(trustStoreFile);
- CipherTest.keyStore = keyStore;
-// keyStore = readKeyStore(keyStoreFile);
- KeyManagerFactory keyFactory =
- KeyManagerFactory.getInstance(
- KeyManagerFactory.getDefaultAlgorithm());
- keyFactory.init(keyStore, "test12".toCharArray());
- keyManager = (X509ExtendedKeyManager)keyFactory.getKeyManagers()[0];
+ long time = System.currentTimeMillis();
+ String relPath;
+ if ((args != null) && (args.length > 0) && args[0].equals("sh")) {
+ relPath = pathToStoresSH;
+ } else {
+ relPath = pathToStores;
+ }
+ PATH = new File(System.getProperty("test.src", "."), relPath);
+ CipherTest.peerFactory = peerFactory;
+ System.out.print(
+ "Initializing test '" + peerFactory.getName() + "'...");
+// secureRandom = new SecureRandom();
+// secureRandom.nextInt();
+// trustStore = readKeyStore(trustStoreFile);
+ CipherTest.keyStore = keyStore;
+// keyStore = readKeyStore(keyStoreFile);
+ KeyManagerFactory keyFactory =
+ KeyManagerFactory.getInstance(
+ KeyManagerFactory.getDefaultAlgorithm());
+ keyFactory.init(keyStore, "test12".toCharArray());
+ keyManager = (X509ExtendedKeyManager)keyFactory.getKeyManagers()[0];
- TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- tmf.init(keyStore);
- trustManager = (X509TrustManager)tmf.getTrustManagers()[0];
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ tmf.init(keyStore);
+ trustManager = (X509TrustManager)tmf.getTrustManagers()[0];
-// trustManager = new AlwaysTrustManager();
- SSLContext context = SSLContext.getInstance("TLS");
- context.init(new KeyManager[] {keyManager},
- new TrustManager[] {trustManager}, null);
- SSLContext.setDefault(context);
+// trustManager = new AlwaysTrustManager();
+ SSLContext context = SSLContext.getInstance("TLS");
+ context.init(new KeyManager[] {keyManager},
+ new TrustManager[] {trustManager}, null);
+ SSLContext.setDefault(context);
- CipherTest cipherTest = new CipherTest(peerFactory);
- Thread serverThread = new Thread(peerFactory.newServer(cipherTest),
- "Server");
- serverThread.setDaemon(true);
- serverThread.start();
- System.out.println("Done");
- cipherTest.run();
- time = System.currentTimeMillis() - time;
- System.out.println("Done. (" + time + " ms)");
- } finally {
- SSLContext.setDefault(reservedSSLContext);
- }
+ CipherTest cipherTest = new CipherTest(peerFactory);
+ Thread serverThread = new Thread(peerFactory.newServer(cipherTest),
+ "Server");
+ serverThread.setDaemon(true);
+ serverThread.start();
+ System.out.println("Done");
+ cipherTest.run();
+ time = System.currentTimeMillis() - time;
+ System.out.println("Done. (" + time + " ms)");
}
static abstract class PeerFactory {
--- a/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java Tue Dec 06 05:28:17 2011 -0800
@@ -26,9 +26,9 @@
* @bug 6313675 6323647
* @summary Verify that all ciphersuites work in FIPS mode
* @library ..
- * @run main/othervm ClientJSSEServerJSSE
* @ignore JSSE supported cipher suites are changed with CR 6916074,
* need to update this test case in JDK 7 soon
+ * @run main/othervm ClientJSSEServerJSSE
* @author Andreas Sterbenz
*/
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,10 +1,7 @@
/*
* @test
* @build TestThread Traffic Handler ServerHandler ServerThread ClientThread
- * @run main/othervm/timeout=140 main
- *
- * SunJSSE does not support dynamic system properties, no way to re-use
- * system properties in samevm/agentvm mode.
+ * @run main/othervm/timeout=140 -Djsse.enableCBCProtection=false main
* @summary Make sure that different configurations of SSL sockets work
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,423 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7113275
+ * @summary compatibility issue with MD2 trust anchor and old X509TrustManager
+ *
+ * SunJSSE does not support dynamic system properties, no way to re-use
+ * system properties in samevm/agentvm mode.
+ * @run main/othervm MD2InTrustAnchor PKIX TLSv1.1
+ * @run main/othervm MD2InTrustAnchor SunX509 TLSv1.1
+ * @run main/othervm MD2InTrustAnchor PKIX TLSv1.2
+ * @run main/othervm MD2InTrustAnchor SunX509 TLSv1.2
+ */
+
+import java.net.*;
+import java.util.*;
+import java.io.*;
+import javax.net.ssl.*;
+import java.security.KeyStore;
+import java.security.KeyFactory;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.spec.*;
+import java.security.interfaces.*;
+import sun.misc.BASE64Decoder;
+
+
+public class MD2InTrustAnchor {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = false;
+
+ /*
+ * Certificates and key used in the test.
+ */
+
+ // It's a trust anchor signed with MD2 hash function.
+ static String trustedCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICkjCCAfugAwIBAgIBADANBgkqhkiG9w0BAQIFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTExMTE4MTExNDA0WhcNMzIxMDI4MTExNDA0WjA7MQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwgZ8wDQYJ\n" +
+ "KoZIhvcNAQEBBQADgY0AMIGJAoGBAPGyB9tugUGgxtdeqe0qJEwf9x1Gy4BOi1yR\n" +
+ "wzDZY4H5LquvIfQ2V3J9X1MQENVsFvkvp65ZcFcy+ObOucXUUPFcd/iw2DVb5QXA\n" +
+ "ffyeVqWD56GPi8Qe37wrJO3L6fBhN9oxp/BbdRLgjU81zx8qLEyPODhPMxV4OkcA\n" +
+ "SDwZTSxxAgMBAAGjgaUwgaIwHQYDVR0OBBYEFLOAtr/YrYj9H04EDLA0fd14jisF\n" +
+ "MGMGA1UdIwRcMFqAFLOAtr/YrYj9H04EDLA0fd14jisFoT+kPTA7MQswCQYDVQQG\n" +
+ "EwJVUzENMAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2\n" +
+ "Y2WCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEC\n" +
+ "BQADgYEAr8ExpXu/FTIRiMzPm0ubqwME4lniilwQUiEOD/4DbksNjEIcUyS2hIk1\n" +
+ "qsmjJz3SHBnwhxl9dhJVwk2tZLkPGW86Zn0TPVRsttK4inTgCC9GFGeqQBdrU/uf\n" +
+ "lipBzXWljrfbg4N/kK8m2LabtKUMMnGysM8rN0Fx2PYm5xxGvtM=\n" +
+ "-----END CERTIFICATE-----";
+
+ // The certificate issued by above trust anchor, signed with MD5
+ static String targetCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICeDCCAeGgAwIBAgIBAjANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTExMTE4MTExNDA2WhcNMzEwODA1MTExNDA2WjBPMQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UxEjAQBgNV\n" +
+ "BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwDnm96mw\n" +
+ "fXCH4bgXk1US0VcJsQVxUtGMyncAveMuzBzNzOmKZPeqyYX1Fuh4q+cuza03WTJd\n" +
+ "G9nOkNr364e3Rn1aaHjCMcBmFflObnGnhhufNmIGYogJ9dJPmhUVPEVAXrMG+Ces\n" +
+ "NKy2E8woGnLMrqu6yiuTClbLBPK8fWzTXrECAwEAAaN4MHYwCwYDVR0PBAQDAgPo\n" +
+ "MB0GA1UdDgQWBBSdRrpocLPJXyGfDmMWJrcEf29WGDAfBgNVHSMEGDAWgBSzgLa/\n" +
+ "2K2I/R9OBAywNH3deI4rBTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIG\n" +
+ "CCsGAQUFBwMDMA0GCSqGSIb3DQEBBAUAA4GBAKJ71ZiCUykkJrCLYUxlFlhvUcr9\n" +
+ "sTcOc67QdroW5f412NI15SXWDiley/JOasIiuIFPjaJBjOKoHOvTjG/snVu9wEgq\n" +
+ "YNR8dPsO+NM8r79C6jO+Jx5fYAC7os2XxS75h3NX0ElJcbwIXGBJ6xRrsFh/BGYH\n" +
+ "yvudOlX4BkVR0l1K\n" +
+ "-----END CERTIFICATE-----";
+
+ // Private key in the format of PKCS#8.
+ static String targetPrivateKey =
+ "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMA55vepsH1wh+G4\n" +
+ "F5NVEtFXCbEFcVLRjMp3AL3jLswczczpimT3qsmF9RboeKvnLs2tN1kyXRvZzpDa\n" +
+ "9+uHt0Z9Wmh4wjHAZhX5Tm5xp4YbnzZiBmKICfXST5oVFTxFQF6zBvgnrDSsthPM\n" +
+ "KBpyzK6rusorkwpWywTyvH1s016xAgMBAAECgYEAn9bF3oRkdDoBU0i/mcww5I+K\n" +
+ "SH9tFt+WQbiojjz9ac49trkvUfu7MO1Jui2+QbrvaSkyj+HYGFOJd1wMsPXeB7ck\n" +
+ "5mOIYV4uZK8jfNMSQ8v0tFEeIPp5lKdw1XnrQfSe+abo2eL5Lwso437Y4s3w37+H\n" +
+ "aY3d76hR5qly+Ys+Ww0CQQDjeOoX89d/xhRqGXKjCx8ImE/dPmsI8O27cwtKrDYJ\n" +
+ "6t0v/xryVIdvOYcRBvKnqEogOH7T1kI+LnWKUTJ2ehJ7AkEA2FVloPVqCehXcc7e\n" +
+ "z3TDpU9w1B0JXklcV5HddYsRqp9RukN/VK4szKE7F1yoarIUtfE9Lr9082Jwyp3M\n" +
+ "L11xwwJBAKsZ+Hur3x0tUY29No2Nf/pnFyvEF57SGwA0uPmiL8Ol9lpz+UDudDEl\n" +
+ "hIM6Rqv12kwCMuQE9i7vo1o3WU3k5KECQEqhg1L49yD935TqiiFFpe0Ur9btQXse\n" +
+ "kdXAA4d2d5zGI7q/aGD9SYU6phkUJSHR16VA2RuUfzMrpb+wmm1IrmMCQFtLoKRT\n" +
+ "A5kokFb+E3Gplu29tJvCUpfwgBFRS+wmkvtiaU/tiyDcVgDO+An5DwedxxdVzqiE\n" +
+ "njWHoKY3axDQ8OU=\n";
+
+
+ static char passphrase[] = "passphrase".toCharArray();
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+ SSLContext context = generateSSLContext(trustedCertStr, targetCertStr,
+ targetPrivateKey);
+ SSLServerSocketFactory sslssf = context.getServerSocketFactory();
+ SSLServerSocket sslServerSocket =
+ (SSLServerSocket)sslssf.createServerSocket(serverPort);
+ sslServerSocket.setNeedClientAuth(true);
+ serverPort = sslServerSocket.getLocalPort();
+
+ /*
+ * Signal Client, we're ready for his connect.
+ */
+ serverReady = true;
+
+ SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept();
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write('A');
+ sslOS.flush();
+
+ sslSocket.close();
+ }
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLContext context = generateSSLContext(trustedCertStr, targetCertStr,
+ targetPrivateKey);
+ SSLSocketFactory sslsf = context.getSocketFactory();
+
+ SSLSocket sslSocket =
+ (SSLSocket)sslsf.createSocket("localhost", serverPort);
+
+ // enable the specified TLS protocol
+ sslSocket.setEnabledProtocols(new String[] {tlsProtocol});
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write('B');
+ sslOS.flush();
+ sslIS.read();
+
+ sslSocket.close();
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+ private static String tmAlgorithm; // trust manager
+ private static String tlsProtocol; // trust manager
+
+ private static void parseArguments(String[] args) {
+ tmAlgorithm = args[0];
+ tlsProtocol = args[1];
+ }
+
+ private static SSLContext generateSSLContext(String trustedCertStr,
+ String keyCertStr, String keySpecStr) throws Exception {
+
+ // generate certificate from cert string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ // create a key store
+ KeyStore ks = KeyStore.getInstance("JKS");
+ ks.load(null, null);
+
+ // import the trused cert
+ Certificate trusedCert = null;
+ ByteArrayInputStream is = null;
+ if (trustedCertStr != null) {
+ is = new ByteArrayInputStream(trustedCertStr.getBytes());
+ trusedCert = cf.generateCertificate(is);
+ is.close();
+
+ ks.setCertificateEntry("RSA Export Signer", trusedCert);
+ }
+
+ if (keyCertStr != null) {
+ // generate the private key.
+ PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
+ new BASE64Decoder().decodeBuffer(keySpecStr));
+ KeyFactory kf = KeyFactory.getInstance("RSA");
+ RSAPrivateKey priKey =
+ (RSAPrivateKey)kf.generatePrivate(priKeySpec);
+
+ // generate certificate chain
+ is = new ByteArrayInputStream(keyCertStr.getBytes());
+ Certificate keyCert = cf.generateCertificate(is);
+ is.close();
+
+ // It's not allowed to send MD2 signed certificate to peer,
+ // even it may be a trusted certificate. Then we will not
+ // place the trusted certficate in the chain.
+ Certificate[] chain = new Certificate[1];
+ chain[0] = keyCert;
+
+ // import the key entry.
+ ks.setKeyEntry("Whatever", priKey, passphrase, chain);
+ }
+
+ // create SSL context
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmAlgorithm);
+ tmf.init(ks);
+
+ SSLContext ctx = SSLContext.getInstance(tlsProtocol);
+ if (keyCertStr != null && !keyCertStr.isEmpty()) {
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance("NewSunX509");
+ kmf.init(ks, passphrase);
+
+ ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+ ks = null;
+ } else {
+ ctx.init(null, tmf.getTrustManagers(), null);
+ }
+
+ return ctx;
+ }
+
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ /*
+ * Start the tests.
+ */
+ new MD2InTrustAnchor();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ MD2InTrustAnchor() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,475 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7113275
+ * @summary compatibility issue with MD2 trust anchor and old X509TrustManager
+ *
+ * SunJSSE does not support dynamic system properties, no way to re-use
+ * system properties in samevm/agentvm mode.
+ * @run main/othervm TrustTrustedCert PKIX TLSv1.1
+ * @run main/othervm TrustTrustedCert SunX509 TLSv1.1
+ * @run main/othervm TrustTrustedCert PKIX TLSv1.2
+ * @run main/othervm TrustTrustedCert SunX509 TLSv1.2
+ */
+
+import java.net.*;
+import java.util.*;
+import java.io.*;
+import javax.net.ssl.*;
+import java.security.*;
+import java.security.cert.*;
+import java.security.spec.*;
+import java.security.interfaces.*;
+import sun.misc.BASE64Decoder;
+
+
+public class TrustTrustedCert {
+
+ /*
+ * =============================================================
+ * Set the various variables needed for the tests, then
+ * specify what tests to run on each side.
+ */
+
+ /*
+ * Should we run the client or server in a separate thread?
+ * Both sides can throw exceptions, but do you have a preference
+ * as to which side should be the main thread.
+ */
+ static boolean separateServerThread = false;
+
+ /*
+ * Certificates and key used in the test.
+ */
+
+ // It's a trust anchor signed with MD2 hash function.
+ static String trustedCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICkjCCAfugAwIBAgIBADANBgkqhkiG9w0BAQIFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTExMTE4MTExNDA0WhcNMzIxMDI4MTExNDA0WjA7MQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwgZ8wDQYJ\n" +
+ "KoZIhvcNAQEBBQADgY0AMIGJAoGBAPGyB9tugUGgxtdeqe0qJEwf9x1Gy4BOi1yR\n" +
+ "wzDZY4H5LquvIfQ2V3J9X1MQENVsFvkvp65ZcFcy+ObOucXUUPFcd/iw2DVb5QXA\n" +
+ "ffyeVqWD56GPi8Qe37wrJO3L6fBhN9oxp/BbdRLgjU81zx8qLEyPODhPMxV4OkcA\n" +
+ "SDwZTSxxAgMBAAGjgaUwgaIwHQYDVR0OBBYEFLOAtr/YrYj9H04EDLA0fd14jisF\n" +
+ "MGMGA1UdIwRcMFqAFLOAtr/YrYj9H04EDLA0fd14jisFoT+kPTA7MQswCQYDVQQG\n" +
+ "EwJVUzENMAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2\n" +
+ "Y2WCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEC\n" +
+ "BQADgYEAr8ExpXu/FTIRiMzPm0ubqwME4lniilwQUiEOD/4DbksNjEIcUyS2hIk1\n" +
+ "qsmjJz3SHBnwhxl9dhJVwk2tZLkPGW86Zn0TPVRsttK4inTgCC9GFGeqQBdrU/uf\n" +
+ "lipBzXWljrfbg4N/kK8m2LabtKUMMnGysM8rN0Fx2PYm5xxGvtM=\n" +
+ "-----END CERTIFICATE-----";
+
+ // The certificate issued by above trust anchor, signed with MD5
+ static String targetCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICeDCCAeGgAwIBAgIBAjANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+ "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+ "MTExMTE4MTExNDA2WhcNMzEwODA1MTExNDA2WjBPMQswCQYDVQQGEwJVUzENMAsG\n" +
+ "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UxEjAQBgNV\n" +
+ "BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwDnm96mw\n" +
+ "fXCH4bgXk1US0VcJsQVxUtGMyncAveMuzBzNzOmKZPeqyYX1Fuh4q+cuza03WTJd\n" +
+ "G9nOkNr364e3Rn1aaHjCMcBmFflObnGnhhufNmIGYogJ9dJPmhUVPEVAXrMG+Ces\n" +
+ "NKy2E8woGnLMrqu6yiuTClbLBPK8fWzTXrECAwEAAaN4MHYwCwYDVR0PBAQDAgPo\n" +
+ "MB0GA1UdDgQWBBSdRrpocLPJXyGfDmMWJrcEf29WGDAfBgNVHSMEGDAWgBSzgLa/\n" +
+ "2K2I/R9OBAywNH3deI4rBTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIG\n" +
+ "CCsGAQUFBwMDMA0GCSqGSIb3DQEBBAUAA4GBAKJ71ZiCUykkJrCLYUxlFlhvUcr9\n" +
+ "sTcOc67QdroW5f412NI15SXWDiley/JOasIiuIFPjaJBjOKoHOvTjG/snVu9wEgq\n" +
+ "YNR8dPsO+NM8r79C6jO+Jx5fYAC7os2XxS75h3NX0ElJcbwIXGBJ6xRrsFh/BGYH\n" +
+ "yvudOlX4BkVR0l1K\n" +
+ "-----END CERTIFICATE-----";
+
+ // Private key in the format of PKCS#8.
+ static String targetPrivateKey =
+ "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMA55vepsH1wh+G4\n" +
+ "F5NVEtFXCbEFcVLRjMp3AL3jLswczczpimT3qsmF9RboeKvnLs2tN1kyXRvZzpDa\n" +
+ "9+uHt0Z9Wmh4wjHAZhX5Tm5xp4YbnzZiBmKICfXST5oVFTxFQF6zBvgnrDSsthPM\n" +
+ "KBpyzK6rusorkwpWywTyvH1s016xAgMBAAECgYEAn9bF3oRkdDoBU0i/mcww5I+K\n" +
+ "SH9tFt+WQbiojjz9ac49trkvUfu7MO1Jui2+QbrvaSkyj+HYGFOJd1wMsPXeB7ck\n" +
+ "5mOIYV4uZK8jfNMSQ8v0tFEeIPp5lKdw1XnrQfSe+abo2eL5Lwso437Y4s3w37+H\n" +
+ "aY3d76hR5qly+Ys+Ww0CQQDjeOoX89d/xhRqGXKjCx8ImE/dPmsI8O27cwtKrDYJ\n" +
+ "6t0v/xryVIdvOYcRBvKnqEogOH7T1kI+LnWKUTJ2ehJ7AkEA2FVloPVqCehXcc7e\n" +
+ "z3TDpU9w1B0JXklcV5HddYsRqp9RukN/VK4szKE7F1yoarIUtfE9Lr9082Jwyp3M\n" +
+ "L11xwwJBAKsZ+Hur3x0tUY29No2Nf/pnFyvEF57SGwA0uPmiL8Ol9lpz+UDudDEl\n" +
+ "hIM6Rqv12kwCMuQE9i7vo1o3WU3k5KECQEqhg1L49yD935TqiiFFpe0Ur9btQXse\n" +
+ "kdXAA4d2d5zGI7q/aGD9SYU6phkUJSHR16VA2RuUfzMrpb+wmm1IrmMCQFtLoKRT\n" +
+ "A5kokFb+E3Gplu29tJvCUpfwgBFRS+wmkvtiaU/tiyDcVgDO+An5DwedxxdVzqiE\n" +
+ "njWHoKY3axDQ8OU=\n";
+
+
+ static char passphrase[] = "passphrase".toCharArray();
+
+ /*
+ * Is the server ready to serve?
+ */
+ volatile static boolean serverReady = false;
+
+ /*
+ * Turn on SSL debugging?
+ */
+ static boolean debug = false;
+
+ /*
+ * Define the server side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doServerSide() throws Exception {
+ SSLContext context = generateSSLContext();
+ SSLServerSocketFactory sslssf = context.getServerSocketFactory();
+ SSLServerSocket sslServerSocket =
+ (SSLServerSocket)sslssf.createServerSocket(serverPort);
+ sslServerSocket.setNeedClientAuth(true);
+ serverPort = sslServerSocket.getLocalPort();
+
+ /*
+ * Signal Client, we're ready for his connect.
+ */
+ serverReady = true;
+
+ SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept();
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslIS.read();
+ sslOS.write('A');
+ sslOS.flush();
+
+ sslSocket.close();
+ }
+
+ /*
+ * Define the client side of the test.
+ *
+ * If the server prematurely exits, serverReady will be set to true
+ * to avoid infinite hangs.
+ */
+ void doClientSide() throws Exception {
+
+ /*
+ * Wait for server to get started.
+ */
+ while (!serverReady) {
+ Thread.sleep(50);
+ }
+
+ SSLContext context = generateSSLContext();
+ SSLSocketFactory sslsf = context.getSocketFactory();
+
+ SSLSocket sslSocket =
+ (SSLSocket)sslsf.createSocket("localhost", serverPort);
+
+ // enable the specified TLS protocol
+ sslSocket.setEnabledProtocols(new String[] {tlsProtocol});
+
+ InputStream sslIS = sslSocket.getInputStream();
+ OutputStream sslOS = sslSocket.getOutputStream();
+
+ sslOS.write('B');
+ sslOS.flush();
+ sslIS.read();
+
+ sslSocket.close();
+ }
+
+ /*
+ * =============================================================
+ * The remainder is just support stuff
+ */
+ private static String tmAlgorithm; // trust manager
+ private static String tlsProtocol; // trust manager
+
+ private static void parseArguments(String[] args) {
+ tmAlgorithm = args[0];
+ tlsProtocol = args[1];
+ }
+
+ private static SSLContext generateSSLContext() throws Exception {
+
+ // generate certificate from cert string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ // create a key store
+ KeyStore ks = KeyStore.getInstance("JKS");
+ ks.load(null, null);
+
+ // import the trused cert
+ X509Certificate trusedCert = null;
+ ByteArrayInputStream is =
+ new ByteArrayInputStream(trustedCertStr.getBytes());
+ trusedCert = (X509Certificate)cf.generateCertificate(is);
+ is.close();
+
+ ks.setCertificateEntry("Trusted RSA Signer", trusedCert);
+
+ // generate the private key.
+ PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
+ new BASE64Decoder().decodeBuffer(targetPrivateKey));
+ KeyFactory kf = KeyFactory.getInstance("RSA");
+ RSAPrivateKey priKey =
+ (RSAPrivateKey)kf.generatePrivate(priKeySpec);
+
+ // generate certificate chain
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ X509Certificate keyCert = (X509Certificate)cf.generateCertificate(is);
+ is.close();
+
+ X509Certificate[] chain = new X509Certificate[2];
+ chain[0] = keyCert;
+ chain[1] = trusedCert;
+
+ // import the key entry and the chain
+ ks.setKeyEntry("TheKey", priKey, passphrase, chain);
+
+ // create SSL context
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmAlgorithm);
+ tmf.init(ks);
+
+ // create the customized KM and TM
+ NoneExtendedX509TM myTM =
+ new NoneExtendedX509TM(tmf.getTrustManagers()[0]);
+ NoneExtendedX509KM myKM =
+ new NoneExtendedX509KM("TheKey", chain, priKey);
+
+ SSLContext ctx = SSLContext.getInstance(tlsProtocol);
+ // KeyManagerFactory kmf = KeyManagerFactory.getInstance("NewSunX509");
+ // kmf.init(ks, passphrase);
+ // ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+ ctx.init(new KeyManager[]{myKM}, new TrustManager[]{myTM}, null);
+ ks = null;
+
+ return ctx;
+ }
+
+ static class NoneExtendedX509TM implements X509TrustManager {
+ X509TrustManager tm;
+
+ NoneExtendedX509TM(TrustManager tm) {
+ this.tm = (X509TrustManager)tm;
+ }
+
+ public void checkClientTrusted(X509Certificate chain[], String authType)
+ throws CertificateException {
+ tm.checkClientTrusted(chain, authType);
+ }
+
+ public void checkServerTrusted(X509Certificate chain[], String authType)
+ throws CertificateException {
+ tm.checkServerTrusted(chain, authType);
+ }
+
+ public X509Certificate[] getAcceptedIssuers() {
+ return tm.getAcceptedIssuers();
+ }
+ }
+
+ static class NoneExtendedX509KM implements X509KeyManager {
+ private String keyAlias;
+ private X509Certificate[] chain;
+ private PrivateKey privateKey;
+
+ NoneExtendedX509KM(String keyAlias, X509Certificate[] chain,
+ PrivateKey privateKey) {
+ this.keyAlias = keyAlias;
+ this.chain = chain;
+ this.privateKey = privateKey;
+ }
+
+ public String[] getClientAliases(String keyType, Principal[] issuers) {
+ return new String[] {keyAlias};
+ }
+
+ public String chooseClientAlias(String[] keyType, Principal[] issuers,
+ Socket socket) {
+ return keyAlias;
+ }
+
+ public String[] getServerAliases(String keyType, Principal[] issuers) {
+ return new String[] {keyAlias};
+ }
+
+ public String chooseServerAlias(String keyType, Principal[] issuers,
+ Socket socket) {
+ return keyAlias;
+ }
+
+ public X509Certificate[] getCertificateChain(String alias) {
+ return chain;
+ }
+
+ public PrivateKey getPrivateKey(String alias) {
+ return privateKey;
+ }
+ }
+
+
+ // use any free port by default
+ volatile int serverPort = 0;
+
+ volatile Exception serverException = null;
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
+ if (debug)
+ System.setProperty("javax.net.debug", "all");
+
+ /*
+ * Get the customized arguments.
+ */
+ parseArguments(args);
+
+ /*
+ * Start the tests.
+ */
+ new TrustTrustedCert();
+ }
+
+ Thread clientThread = null;
+ Thread serverThread = null;
+
+ /*
+ * Primary constructor, used to drive remainder of the test.
+ *
+ * Fork off the other side, then do your work.
+ */
+ TrustTrustedCert() throws Exception {
+ try {
+ if (separateServerThread) {
+ startServer(true);
+ startClient(false);
+ } else {
+ startClient(true);
+ startServer(false);
+ }
+ } catch (Exception e) {
+ // swallow for now. Show later
+ }
+
+ /*
+ * Wait for other side to close down.
+ */
+ if (separateServerThread) {
+ serverThread.join();
+ } else {
+ clientThread.join();
+ }
+
+ /*
+ * When we get here, the test is pretty much over.
+ * Which side threw the error?
+ */
+ Exception local;
+ Exception remote;
+ String whichRemote;
+
+ if (separateServerThread) {
+ remote = serverException;
+ local = clientException;
+ whichRemote = "server";
+ } else {
+ remote = clientException;
+ local = serverException;
+ whichRemote = "client";
+ }
+
+ /*
+ * If both failed, return the curthread's exception, but also
+ * print the remote side Exception
+ */
+ if ((local != null) && (remote != null)) {
+ System.out.println(whichRemote + " also threw:");
+ remote.printStackTrace();
+ System.out.println();
+ throw local;
+ }
+
+ if (remote != null) {
+ throw remote;
+ }
+
+ if (local != null) {
+ throw local;
+ }
+ }
+
+ void startServer(boolean newThread) throws Exception {
+ if (newThread) {
+ serverThread = new Thread() {
+ public void run() {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ /*
+ * Our server thread just died.
+ *
+ * Release the client, if not active already...
+ */
+ System.err.println("Server died...");
+ serverReady = true;
+ serverException = e;
+ }
+ }
+ };
+ serverThread.start();
+ } else {
+ try {
+ doServerSide();
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ serverReady = true;
+ }
+ }
+ }
+
+ void startClient(boolean newThread) throws Exception {
+ if (newThread) {
+ clientThread = new Thread() {
+ public void run() {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ /*
+ * Our client thread just died.
+ */
+ System.err.println("Client died...");
+ clientException = e;
+ }
+ }
+ };
+ clientThread.start();
+ } else {
+ try {
+ doClientSide();
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ }
+}
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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
@@ -29,6 +29,8 @@
* This is a simple hack to test a bunch of conditions and check
* their return codes.
*
+ * @run main/othervm -Djsse.enableCBCProtection=false CheckStatus
+ *
* @author Brad Wetmore
*/
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. 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
@@ -30,6 +30,8 @@
* This is to test larger buffer arrays, and make sure the maximum
* is being passed.
*
+ * @run main/othervm -Djsse.enableCBCProtection=false LargeBufs
+ *
* @author Brad R. Wetmore
*/
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2011, Oracle and/or its affiliates. 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
@@ -27,10 +27,7 @@
* @bug 6388456
* @summary Need adjustable TLS max record size for interoperability
* with non-compliant
- * @run main/othervm LargePacket
- *
- * SunJSSE does not support dynamic system properties, no way to re-use
- * system properties in samevm/agentvm mode.
+ * @run main/othervm -Djsse.enableCBCProtection=false LargePacket
*
* @author Xuelei Fan
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7105780
+ * @summary Add SSLSocket client/SSLEngine server to templates directory.
+ *
+ * SunJSSE does not support dynamic system properties, no way to re-use
+ * system properties in samevm/agentvm mode.
+ *
+ * @run main/othervm SSLSocketSSLEngineTemplate
+ */
+
+/**
+ * A SSLSocket/SSLEngine interop test case. This is not the way to
+ * code SSLEngine-based servers, but works for what we need to do here,
+ * which is to make sure that SSLEngine/SSLSockets can talk to each other.
+ * SSLEngines can use direct or indirect buffers, and different code
+ * is used to get at the buffer contents internally, so we test that here.
+ *
+ * The test creates one SSLSocket (client) and one SSLEngine (server).
+ * The SSLSocket talks to a raw ServerSocket, and the server code
+ * does the translation between byte [] and ByteBuffers that the SSLEngine
+ * can use. The "transport" layer consists of a Socket Input/OutputStream
+ * and two byte buffers for the SSLEngines: think of them
+ * as directly connected pipes.
+ *
+ * Again, this is a *very* simple example: real code will be much more
+ * involved. For example, different threading and I/O models could be
+ * used, transport mechanisms could close unexpectedly, and so on.
+ *
+ * When this application runs, notice that several messages
+ * (wrap/unwrap) pass before any application data is consumed or
+ * produced. (For more information, please see the SSL/TLS
+ * specifications.) There may several steps for a successful handshake,
+ * so it's typical to see the following series of operations:
+ *
+ * client server message
+ * ====== ====== =======
+ * write() ... ClientHello
+ * ... unwrap() ClientHello
+ * ... wrap() ServerHello/Certificate
+ * read() ... ServerHello/Certificate
+ * write() ... ClientKeyExchange
+ * write() ... ChangeCipherSpec
+ * write() ... Finished
+ * ... unwrap() ClientKeyExchange
+ * ... unwrap() ChangeCipherSpec
+ * ... unwrap() Finished
+ * ... wrap() ChangeCipherSpec
+ * ... wrap() Finished
+ * read() ... ChangeCipherSpec
+ * read() ... Finished
+ */
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.*;
+import java.io.*;
+import java.net.*;
+import java.security.*;
+import java.nio.*;
+
+public class SSLSocketSSLEngineTemplate {
+
+ /*
+ * Enables logging of the SSL/TLS operations.
+ */
+ private static boolean logging = true;
+
+ /*
+ * Enables the JSSE system debugging system property:
+ *
+ * -Djavax.net.debug=all
+ *
+ * This gives a lot of low-level information about operations underway,
+ * including specific handshake messages, and might be best examined
+ * after gaining some familiarity with this application.
+ */
+ private static boolean debug = false;
+ private SSLContext sslc;
+ private SSLEngine serverEngine; // server-side SSLEngine
+ private SSLSocket sslSocket; // client-side socket
+ private ServerSocket serverSocket; // server-side Socket, generates the...
+ private Socket socket; // server-side socket that will read
+
+ private final byte[] serverMsg =
+ "Hi there Client, I'm a Server.".getBytes();
+ private final byte[] clientMsg =
+ "Hello Server, I'm a Client! Pleased to meet you!".getBytes();
+
+ private ByteBuffer serverOut; // write side of serverEngine
+ private ByteBuffer serverIn; // read side of serverEngine
+
+ private volatile Exception clientException;
+ private volatile Exception serverException;
+
+ /*
+ * For data transport, this example uses local ByteBuffers.
+ */
+ private ByteBuffer cTOs; // "reliable" transport client->server
+ private ByteBuffer sTOc; // "reliable" transport server->client
+
+ /*
+ * The following is to set up the keystores/trust material.
+ */
+ private static final String pathToStores = "../etc/";
+ private static final String keyStoreFile = "keystore";
+ private static final String trustStoreFile = "truststore";
+ private static final String passwd = "passphrase";
+ private static String keyFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores
+ + "/" + keyStoreFile;
+ private static String trustFilename =
+ System.getProperty("test.src", ".") + "/" + pathToStores
+ + "/" + trustStoreFile;
+
+ /*
+ * Main entry point for this test.
+ */
+ public static void main(String args[]) throws Exception {
+ if (debug) {
+ System.setProperty("javax.net.debug", "all");
+ }
+
+ String [] protocols = new String [] {
+ "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" };
+
+ for (String protocol : protocols) {
+ log("Testing " + protocol);
+ /*
+ * Run the tests with direct and indirect buffers.
+ */
+ SSLSocketSSLEngineTemplate test =
+ new SSLSocketSSLEngineTemplate(protocol);
+ test.runTest(true);
+ test.runTest(false);
+ }
+
+ System.out.println("Test Passed.");
+ }
+
+ /*
+ * Create an initialized SSLContext to use for these tests.
+ */
+ public SSLSocketSSLEngineTemplate(String protocol) throws Exception {
+
+ KeyStore ks = KeyStore.getInstance("JKS");
+ KeyStore ts = KeyStore.getInstance("JKS");
+
+ char[] passphrase = "passphrase".toCharArray();
+
+ ks.load(new FileInputStream(keyFilename), passphrase);
+ ts.load(new FileInputStream(trustFilename), passphrase);
+
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+ kmf.init(ks, passphrase);
+
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+ tmf.init(ts);
+
+ SSLContext sslCtx = SSLContext.getInstance(protocol);
+
+ sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+ sslc = sslCtx;
+ }
+
+ /*
+ * Run the test.
+ *
+ * Sit in a tight loop, with the server engine calling wrap/unwrap
+ * regardless of whether data is available or not. We do this until
+ * we get the application data. Then we shutdown and go to the next one.
+ *
+ * The main loop handles all of the I/O phases of the SSLEngine's
+ * lifetime:
+ *
+ * initial handshaking
+ * application data transfer
+ * engine closing
+ *
+ * One could easily separate these phases into separate
+ * sections of code.
+ */
+ private void runTest(boolean direct) throws Exception {
+ boolean serverClose = direct;
+
+ serverSocket = new ServerSocket(0);
+ int port = serverSocket.getLocalPort();
+ Thread thread = createClientThread(port, serverClose);
+
+ socket = serverSocket.accept();
+ socket.setSoTimeout(500);
+ serverSocket.close();
+
+ createSSLEngine();
+ createBuffers(direct);
+
+ try {
+ boolean closed = false;
+
+ InputStream is = socket.getInputStream();
+ OutputStream os = socket.getOutputStream();
+
+ SSLEngineResult serverResult; // results from last operation
+
+ /*
+ * Examining the SSLEngineResults could be much more involved,
+ * and may alter the overall flow of the application.
+ *
+ * For example, if we received a BUFFER_OVERFLOW when trying
+ * to write to the output pipe, we could reallocate a larger
+ * pipe, but instead we wait for the peer to drain it.
+ */
+ byte[] inbound = new byte[8192];
+ byte[] outbound = new byte[8192];
+
+ while (!isEngineClosed(serverEngine)) {
+ int len = 0;
+
+ // Inbound data
+ log("================");
+
+ // Read from the Client side.
+ try {
+ len = is.read(inbound);
+ if (len == -1) {
+ throw new Exception("Unexpected EOF");
+ }
+ cTOs.put(inbound, 0, len);
+ } catch (SocketTimeoutException ste) {
+ // swallow. Nothing yet, probably waiting on us.
+ }
+
+ cTOs.flip();
+
+ serverResult = serverEngine.unwrap(cTOs, serverIn);
+ log("server unwrap: ", serverResult);
+ runDelegatedTasks(serverResult, serverEngine);
+ cTOs.compact();
+
+ // Outbound data
+ log("----");
+
+ serverResult = serverEngine.wrap(serverOut, sTOc);
+ log("server wrap: ", serverResult);
+ runDelegatedTasks(serverResult, serverEngine);
+
+ sTOc.flip();
+
+ if ((len = sTOc.remaining()) != 0) {
+ sTOc.get(outbound, 0, len);
+ os.write(outbound, 0, len);
+ // Give the other side a chance to process
+ }
+
+ sTOc.compact();
+
+ if (!closed && (serverOut.remaining() == 0)) {
+ closed = true;
+
+ /*
+ * We'll alternate initiatating the shutdown.
+ * When the server initiates, it will take one more
+ * loop, but tests the orderly shutdown.
+ */
+ if (serverClose) {
+ serverEngine.closeOutbound();
+ }
+ serverIn.flip();
+
+ /*
+ * A sanity check to ensure we got what was sent.
+ */
+ if (serverIn.remaining() != clientMsg.length) {
+ throw new Exception("Client: Data length error");
+ }
+
+ for (int i = 0; i < clientMsg.length; i++) {
+ if (clientMsg[i] != serverIn.get()) {
+ throw new Exception("Client: Data content error");
+ }
+ }
+ serverIn.compact();
+ }
+ }
+ return;
+ } catch (Exception e) {
+ serverException = e;
+ } finally {
+ socket.close();
+
+ // Wait for the client to join up with us.
+ thread.join();
+ if (serverException != null) {
+ throw serverException;
+ }
+ if (clientException != null) {
+ throw clientException;
+ }
+ }
+ }
+
+ /*
+ * Create a client thread which does simple SSLSocket operations.
+ * We'll write and read one data packet.
+ */
+ private Thread createClientThread(final int port,
+ final boolean serverClose) throws Exception {
+
+ Thread t = new Thread("ClientThread") {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(1000); // Give server time to finish setup.
+
+ sslSocket = (SSLSocket) sslc.getSocketFactory().
+ createSocket("localhost", port);
+ OutputStream os = sslSocket.getOutputStream();
+ InputStream is = sslSocket.getInputStream();
+
+ // write(byte[]) goes in one shot.
+ os.write(clientMsg);
+
+ byte[] inbound = new byte[2048];
+ int pos = 0;
+
+ int len;
+done:
+ while ((len = is.read(inbound, pos, 2048 - pos)) != -1) {
+ pos += len;
+ // Let the client do the closing.
+ if ((pos == serverMsg.length) && !serverClose) {
+ sslSocket.close();
+ break done;
+ }
+ }
+
+ if (pos != serverMsg.length) {
+ throw new Exception("Client: Data length error");
+ }
+
+ for (int i = 0; i < serverMsg.length; i++) {
+ if (inbound[i] != serverMsg[i]) {
+ throw new Exception("Client: Data content error");
+ }
+ }
+ } catch (Exception e) {
+ clientException = e;
+ }
+ }
+ };
+ t.start();
+ return t;
+ }
+
+ /*
+ * Using the SSLContext created during object creation,
+ * create/configure the SSLEngines we'll use for this test.
+ */
+ private void createSSLEngine() throws Exception {
+ /*
+ * Configure the serverEngine to act as a server in the SSL/TLS
+ * handshake.
+ */
+ serverEngine = sslc.createSSLEngine();
+ serverEngine.setUseClientMode(false);
+ serverEngine.getNeedClientAuth();
+ }
+
+ /*
+ * Create and size the buffers appropriately.
+ */
+ private void createBuffers(boolean direct) {
+
+ SSLSession session = serverEngine.getSession();
+ int appBufferMax = session.getApplicationBufferSize();
+ int netBufferMax = session.getPacketBufferSize();
+
+ /*
+ * We'll make the input buffers a bit bigger than the max needed
+ * size, so that unwrap()s following a successful data transfer
+ * won't generate BUFFER_OVERFLOWS.
+ *
+ * We'll use a mix of direct and indirect ByteBuffers for
+ * tutorial purposes only. In reality, only use direct
+ * ByteBuffers when they give a clear performance enhancement.
+ */
+ if (direct) {
+ serverIn = ByteBuffer.allocateDirect(appBufferMax + 50);
+ cTOs = ByteBuffer.allocateDirect(netBufferMax);
+ sTOc = ByteBuffer.allocateDirect(netBufferMax);
+ } else {
+ serverIn = ByteBuffer.allocate(appBufferMax + 50);
+ cTOs = ByteBuffer.allocate(netBufferMax);
+ sTOc = ByteBuffer.allocate(netBufferMax);
+ }
+
+ serverOut = ByteBuffer.wrap(serverMsg);
+ }
+
+ /*
+ * If the result indicates that we have outstanding tasks to do,
+ * go ahead and run them in this thread.
+ */
+ private static void runDelegatedTasks(SSLEngineResult result,
+ SSLEngine engine) throws Exception {
+
+ if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+ Runnable runnable;
+ while ((runnable = engine.getDelegatedTask()) != null) {
+ log("\trunning delegated task...");
+ runnable.run();
+ }
+ HandshakeStatus hsStatus = engine.getHandshakeStatus();
+ if (hsStatus == HandshakeStatus.NEED_TASK) {
+ throw new Exception(
+ "handshake shouldn't need additional tasks");
+ }
+ log("\tnew HandshakeStatus: " + hsStatus);
+ }
+ }
+
+ private static boolean isEngineClosed(SSLEngine engine) {
+ return (engine.isOutboundDone() && engine.isInboundDone());
+ }
+
+ /*
+ * Logging code
+ */
+ private static boolean resultOnce = true;
+
+ private static void log(String str, SSLEngineResult result) {
+ if (!logging) {
+ return;
+ }
+ if (resultOnce) {
+ resultOnce = false;
+ System.out.println("The format of the SSLEngineResult is: \n"
+ + "\t\"getStatus() / getHandshakeStatus()\" +\n"
+ + "\t\"bytesConsumed() / bytesProduced()\"\n");
+ }
+ HandshakeStatus hsStatus = result.getHandshakeStatus();
+ log(str
+ + result.getStatus() + "/" + hsStatus + ", "
+ + result.bytesConsumed() + "/" + result.bytesProduced()
+ + " bytes");
+ if (hsStatus == HandshakeStatus.FINISHED) {
+ log("\t...ready for application data");
+ }
+ }
+
+ private static void log(String str) {
+ if (logging) {
+ System.out.println(str);
+ }
+ }
+}
--- a/jdk/test/sun/tools/jinfo/Basic.sh Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/tools/jinfo/Basic.sh Tue Dec 06 05:28:17 2011 -0800
@@ -44,7 +44,19 @@
failed=0
-if [ $isWindows = false ]; then
+runSA=true
+
+if [ $isLinux = true ]; then
+ # Some Linux systems disable non-child ptrace (see 7050524)
+ ptrace_scope=`/sbin/sysctl -n kernel.yama.ptrace_scope`
+ if [ $? = 0 ]; then
+ if [ $ptrace_scope = 1 ]; then
+ runSA=false
+ fi
+ fi
+fi
+
+if [ $runSA = true ]; then
# -sysprops option
${JINFO} -J-XX:+UsePerfData -sysprops $appJavaPid
if [ $? != 0 ]; then failed=1; fi
--- a/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh Mon Dec 05 12:50:00 2011 -0500
+++ b/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh Tue Dec 06 05:28:17 2011 -0800
@@ -22,7 +22,7 @@
#
# @test
-# @bug 4990825
+# @bug 4990825 7092186
# @run shell/timeout=90 jstatdExternalRegistry.sh
# @summary Test functionality of 'jstatd -p<port>&' with an external RMI registry
--- a/langtools/.hgtags Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/.hgtags Tue Dec 06 05:28:17 2011 -0800
@@ -134,3 +134,5 @@
f6c783e18bdf4d46a0ab273868afebbf32600ff7 jdk8-b10
4bf01f1c4e3464f378959d10f3983a0469181d94 jdk8-b11
f2d6ed25857dfa7f269ac66e13666d648cb988c6 jdk8-b12
+ae25163501bc7477cd907e26a006a6f1b05fdb6d jdk8-b13
+58f1325d72b2bacc901f5189ee5e4e81e81ea657 jdk8-b14
--- a/langtools/make/build.properties Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/make/build.properties Tue Dec 06 05:28:17 2011 -0800
@@ -196,3 +196,7 @@
# An empty value means all tests
# Override as desired to run a specific set of tests
jtreg.tests =
+
+# Check style configuration
+# overridable name and version
+checkstyle.name.version = checkstyle-5.4
--- a/langtools/make/build.xml Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/make/build.xml Tue Dec 06 05:28:17 2011 -0800
@@ -131,8 +131,10 @@
<property name="dist.bin.dir" location="${dist.dir}/bin"/>
<property name="dist.coverage.dir" location="${dist.dir}/coverage"/>
<property name="dist.findbugs.dir" location="${dist.dir}/findbugs"/>
+ <property name="dist.checkstyle.dir" location="${dist.dir}/checkstyle"/>
<property name="dist.lib.dir" location="${dist.dir}/lib"/>
<property name="make.dir" location="make"/>
+ <property name="make.conf.dir" location="${make.dir}/conf"/>
<property name="make.tools.dir" location="${make.dir}/tools"/>
<property name="src.dir" location="src"/>
<property name="src.bin.dir" location="${src.dir}/share/bin"/>
@@ -263,6 +265,41 @@
<jtreg-tool name="all" tests="${jtreg.tests}"/>
</target>
+ <target name="checkstyle" depends="-def-checkstyle"
+ description="Generates reports for code convention violations.">
+ <mkdir dir="${dist.checkstyle.dir}"/>
+ <checkstyle config="${make.conf.dir}/checkstyle-langtools.xml"
+ failureProperty="checkstyle.failure"
+ failOnViolation="false">
+ <formatter type="xml" tofile="${dist.checkstyle.dir}/checkstyle_report.xml"/>
+ <fileset dir="src" includes="**/*.java, **/*.properties"/>
+ </checkstyle>
+ <!-- transform the output to a simple html -->
+ <xslt in="${dist.checkstyle.dir}/checkstyle_report.xml"
+ out="${dist.checkstyle.dir}/checkstyle_report.html"
+ style="${checkstyle.home}/contrib/checkstyle-simple.xsl"/>
+ <!-- transform the output to a very simple emacs friendly text file -->
+ <xslt in="${dist.checkstyle.dir}/checkstyle_report.xml"
+ out="${dist.checkstyle.dir}/checkstyle_report.tmp"
+ style="${make.conf.dir}/checkstyle-emacs.xsl"/>
+ <!-- beautify remove extra lines -->
+ <move file="${dist.checkstyle.dir}/checkstyle_report.tmp"
+ toFile="${dist.checkstyle.dir}/checkstyle_report.emacs.txt">
+ <filterchain>
+ <ignoreblank/>
+ <replaceregex byline="true" pattern="^File:" replace="${line.separator}File:"/>
+ </filterchain>
+ </move>
+ </target>
+ <!-- target can be invoked from an ide, the output of which can be used
+ to access and fix the errors directly.
+ -->
+ <target name="checkstyle-ide" depends="checkstyle">
+ <concat>
+ <fileset file="${dist.checkstyle.dir}/checkstyle_report.emacs.txt"/>
+ </concat>
+ </target>
+
<target name="findbugs" depends="-def-findbugs,build-all-tools">
<property name="findbugs.reportLevel" value="medium"/>
<mkdir dir="${dist.findbugs.dir}"/>
@@ -406,6 +443,7 @@
<echo level="info">target.java.home = ${target.java.home}</echo>
<echo level="info">jtreg.home = ${jtreg.home}</echo>
<echo level="info">findbugs.home = ${findbugs.home}</echo>
+ <echo level="info">checkstyle.home = ${checkstyle.home}</echo>
</target>
<target name="post-sanity" depends="-def-jtreg,sanity,build"
@@ -690,6 +728,10 @@
<check name="findbugs" property="findbugs.home" marker="lib/findbugs.jar"/>
</target>
+ <target name="-check-checkstyle.home" depends="-def-check">
+ <check name="checkstyle" property="checkstyle.home" marker="${checkstyle.name.version}.jar"/>
+ </target>
+
<target name="-check-jtreg.home" depends="-def-check">
<check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/>
</target>
@@ -989,6 +1031,16 @@
<taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
</target>
+ <target name="-def-checkstyle" unless="checkstyle.defined"
+ depends="-check-checkstyle.home">
+ <taskdef resource="checkstyletask.properties">
+ <classpath>
+ <pathelement location="${checkstyle.home}/${checkstyle.name.version}-all.jar"/>
+ </classpath>
+ </taskdef>
+ <property name="checkstyle.defined" value="true"/>
+ </target>
+
<target name="-def-findbugs" unless="findbugs.defined"
depends="-check-findbugs.home,-check-target.java.home">
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/make/conf/checkstyle-emacs.xsl Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="text" omit-xml-declaration="yes"/>
+
+<xsl:template match="/">
+Coding Style Check Results
+--------------------------
+Total files checked: <xsl:number level="any" value="count(descendant::file)"/>
+ Files with errors: <xsl:number level="any" value="count(descendant::file[error])"/>
+ Total errors: <xsl:number level="any" value="count(descendant::error)"/>
+ Errors per file: <xsl:number level="any" value="count(descendant::error) div count(descendant::file)"/>
+<xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="file[error]">
+<xsl:apply-templates select="error"/>
+</xsl:template>
+
+<xsl:template match="error">
+<xsl:value-of select="../@name"/>:<xsl:value-of select="@line"/><xsl:text>: </xsl:text><xsl:value-of select="@message"/><xsl:text>
+</xsl:text>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/make/conf/checkstyle-langtools.xml Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+ Checks for initial langtools code conventions, we are starting with
+ imports and import orders and this will grow to encompass other
+ violations over time.
+-->
+
+<module name="Checker">
+
+ <!-- Checks for whitespace. -->
+ <module name="FileTabCharacter">
+ <property name="fileExtensions" value=".java"/>
+ </module>
+
+ <!-- Miscellaneous other checks. -->
+ <module name="RegexpSingleline">
+ <property name="format" value="\s+$"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ <property name="message" value="Line has trailing spaces."/>
+ <property name="fileExtensions" value=".java .html"/>
+ </module>
+
+ <module name="TreeWalker">
+ <!-- Checks for imports -->
+ <!--
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ -->
+ <module name="GenericWhitespace"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="ImportOrder">
+ <property name="groups" value="java, javax, org, com"/>
+ <property name="ordered" value="true"/>
+ <property name="separated" value="true"/>
+ </module>
+ <module name="EmptyForInitializerPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="WhitespaceAfter"/>
+ </module>
+</module>
\ No newline at end of file
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. 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
@@ -214,7 +214,7 @@
AnnotationProcessorFactory providedFactory,
java.util.Set<Class<? extends AnnotationProcessorFactory> > productiveFactories) {
Bark bark = Bark.instance(context);
- java.io.PrintWriter out = bark.warnWriter;
+ java.io.PrintWriter out = bark.getWriter(Log.WriterKind.WARNING);
Options options = Options.instance(context);
Collection<TypeDeclaration> spectypedecls = new LinkedHashSet<TypeDeclaration>();
--- a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/apt/main/Main.java Tue Dec 06 05:28:17 2011 -0800
@@ -205,7 +205,7 @@
String s = " " + helpSynopsis();
out.print(s);
for (int j = s.length(); j < 29; j++) out.print(" ");
- Bark.printLines(out, getLocalizedString(descrKey));
+ Bark.printRawLines(out, getLocalizedString(descrKey));
}
}
@@ -227,7 +227,7 @@
String s = " " + helpSynopsis();
out.print(s);
for (int j = s.length(); j < 29; j++) out.print(" ");
- Bark.printLines(out, getLocalizedString(descrKey));
+ Bark.printRawLines(out, getLocalizedString(descrKey));
}
}
@@ -259,7 +259,7 @@
String s = " " + helpSynopsis();
out.print(s);
for (int j = s.length(); j < 29; j++) out.print(" ");
- Log.printLines(out, getLocalizedString(descrKey));
+ Log.printRawLines(out, getLocalizedString(descrKey));
}
};
@@ -421,7 +421,7 @@
},
new AptOption("-version", "opt.version") {
boolean process(String option) {
- Bark.printLines(out, ownName + " " + AptJavaCompiler.version());
+ Bark.printRawLines(out, ownName + " " + AptJavaCompiler.version());
return super.process(option);
}
},
@@ -660,11 +660,11 @@
/** Print a string that explains usage.
*/
void help() {
- Bark.printLines(out, getLocalizedString("msg.usage.header", ownName));
+ Bark.printRawLines(out, getLocalizedString("msg.usage.header", ownName));
for (int i=0; i < recognizedOptions.length; i++) {
recognizedOptions[i].help();
}
- Bark.printLines(out, getLocalizedString("msg.usage.footer"));
+ Bark.printRawLines(out, getLocalizedString("msg.usage.footer"));
out.println();
}
@@ -675,7 +675,7 @@
recognizedOptions[i].xhelp();
}
out.println();
- Bark.printLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
+ Bark.printRawLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
}
/** Report a usage error.
@@ -688,7 +688,7 @@
/** Report a warning.
*/
void warning(String key, Object... args) {
- Bark.printLines(out, ownName + ": "
+ Bark.printRawLines(out, ownName + ": "
+ getLocalizedString(key, args));
}
@@ -796,7 +796,7 @@
origFilenames = processArgs((args=CommandLine.parse(args)));
if (options.get("suppress-tool-api-removal-message") == null) {
- Bark.printLines(out, getLocalizedString("misc.Deprecation"));
+ Bark.printRawLines(out, getLocalizedString("misc.Deprecation"));
}
if (origFilenames == null) {
@@ -808,7 +808,7 @@
return EXIT_OK;
}
} catch (java.io.FileNotFoundException e) {
- Bark.printLines(out, ownName + ": " +
+ Bark.printRawLines(out, ownName + ": " +
getLocalizedString("err.file.not.found",
e.getMessage()));
return EXIT_SYSERR;
@@ -1183,7 +1183,7 @@
/** Print a message reporting an internal error.
*/
void bugMessage(Throwable ex) {
- Bark.printLines(out, getLocalizedString("msg.bug",
+ Bark.printRawLines(out, getLocalizedString("msg.bug",
AptJavaCompiler.version()));
ex.printStackTrace(out);
}
@@ -1191,34 +1191,34 @@
/** Print a message reporting an fatal error.
*/
void apMessage(AnnotationProcessingError ex) {
- Bark.printLines(out, getLocalizedString("misc.Problem"));
+ Bark.printRawLines(out, getLocalizedString("misc.Problem"));
ex.getCause().printStackTrace(out);
}
/** Print a message about sun.misc.Service problem.
*/
void sceMessage(sun.misc.ServiceConfigurationError ex) {
- Bark.printLines(out, getLocalizedString("misc.SunMiscService"));
+ Bark.printRawLines(out, getLocalizedString("misc.SunMiscService"));
ex.printStackTrace(out);
}
/** Print a message reporting an fatal error.
*/
void feMessage(Throwable ex) {
- Bark.printLines(out, ex.toString());
+ Bark.printRawLines(out, ex.toString());
}
/** Print a message reporting an input/output error.
*/
void ioMessage(Throwable ex) {
- Bark.printLines(out, getLocalizedString("msg.io"));
+ Bark.printRawLines(out, getLocalizedString("msg.io"));
ex.printStackTrace(out);
}
/** Print a message reporting an out-of-resources error.
*/
void resourceMessage(Throwable ex) {
- Bark.printLines(out, getLocalizedString("msg.resource"));
+ Bark.printRawLines(out, getLocalizedString("msg.resource"));
ex.printStackTrace(out);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -325,7 +325,7 @@
ListBuffer<TypeElement> elements = new ListBuffer<TypeElement>();
for (JCCompilationUnit unit : units) {
for (JCTree node : unit.defs) {
- if (node.getTag() == JCTree.CLASSDEF) {
+ if (node.hasTag(JCTree.Tag.CLASSDEF)) {
JCClassDecl cdef = (JCClassDecl) node;
if (cdef.sym != null) // maybe null if errors in anno processing
elements.append(cdef.sym);
@@ -383,12 +383,12 @@
private void handleFlowResults(Queue<Env<AttrContext>> queue, ListBuffer<Element> elems) {
for (Env<AttrContext> env: queue) {
switch (env.tree.getTag()) {
- case JCTree.CLASSDEF:
+ case CLASSDEF:
JCClassDecl cdef = (JCClassDecl) env.tree;
if (cdef.sym != null)
elems.append(cdef.sym);
break;
- case JCTree.TOPLEVEL:
+ case TOPLEVEL:
JCCompilationUnit unit = (JCCompilationUnit) env.tree;
if (unit.packge != null)
elems.append(unit.packge);
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java Tue Dec 06 05:28:17 2011 -0800
@@ -52,6 +52,7 @@
import com.sun.tools.javac.util.ClientCodeException;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Log.PrefixKind;
import com.sun.tools.javac.util.Options;
import com.sun.tools.javac.util.Pair;
@@ -156,15 +157,28 @@
return new JavacFileManager(context, true, charset);
}
+ @Override
public JavacTask getTask(Writer out,
JavaFileManager fileManager,
DiagnosticListener<? super JavaFileObject> diagnosticListener,
Iterable<String> options,
Iterable<String> classes,
- Iterable<? extends JavaFileObject> compilationUnits)
+ Iterable<? extends JavaFileObject> compilationUnits) {
+ Context context = new Context();
+ return getTask(out, fileManager, diagnosticListener,
+ options, classes, compilationUnits,
+ context);
+ }
+
+ public JavacTask getTask(Writer out,
+ JavaFileManager fileManager,
+ DiagnosticListener<? super JavaFileObject> diagnosticListener,
+ Iterable<String> options,
+ Iterable<String> classes,
+ Iterable<? extends JavaFileObject> compilationUnits,
+ Context context)
{
try {
- Context context = new Context();
ClientCodeWrapper ccw = ClientCodeWrapper.instance(context);
final String kindMsg = "All compilation units must be of SOURCE kind";
@@ -212,9 +226,10 @@
return;
Options optionTable = Options.instance(context);
+ Log log = Log.instance(context);
JavacOption[] recognizedOptions =
- RecognizedOptions.getJavacToolOptions(new GrumpyHelper());
+ RecognizedOptions.getJavacToolOptions(new GrumpyHelper(log));
Iterator<String> flags = options.iterator();
while (flags.hasNext()) {
String flag = flags.next();
@@ -227,7 +242,7 @@
if (fileManager.handleOption(flag, flags)) {
continue;
} else {
- String msg = Main.getLocalizedString("err.invalid.flag", flag);
+ String msg = log.localize(PrefixKind.JAVAC, "err.invalid.flag", flag);
throw new IllegalArgumentException(msg);
}
}
@@ -235,7 +250,7 @@
JavacOption option = recognizedOptions[j];
if (option.hasArg()) {
if (!flags.hasNext()) {
- String msg = Main.getLocalizedString("err.req.arg", flag);
+ String msg = log.localize(PrefixKind.JAVAC, "err.req.arg", flag);
throw new IllegalArgumentException(msg);
}
String operand = flags.next();
@@ -250,6 +265,8 @@
throw new IllegalArgumentException(flag);
}
}
+
+ optionTable.notifyListeners();
}
public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) {
@@ -267,7 +284,7 @@
public int isSupportedOption(String option) {
JavacOption[] recognizedOptions =
- RecognizedOptions.getJavacToolOptions(new GrumpyHelper());
+ RecognizedOptions.getJavacToolOptions(new GrumpyHelper(null));
for (JavacOption o : recognizedOptions) {
if (o.matches(option))
return o.hasArg() ? 1 : 0;
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Tue Dec 06 05:28:17 2011 -0800
@@ -59,6 +59,7 @@
import com.sun.tools.javac.comp.MemberEnter;
import com.sun.tools.javac.comp.Resolve;
import com.sun.tools.javac.model.JavacElements;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.tree.JCTree;
@@ -140,8 +141,8 @@
}
public long getEndPosition(CompilationUnitTree file, Tree tree) {
- Map<JCTree,Integer> endPositions = ((JCCompilationUnit) file).endPositions;
- return TreeInfo.getEndPos((JCTree) tree, endPositions);
+ EndPosTable endPosTable = ((JCCompilationUnit) file).endPositions;
+ return TreeInfo.getEndPos((JCTree) tree, endPosTable);
}
};
}
@@ -207,7 +208,7 @@
if (sym == null && TreeInfo.isDeclaration(tree)) {
for (TreePath p = path; p != null; p = p.getParentPath()) {
JCTree t = (JCTree) p.getLeaf();
- if (t.getTag() == JCTree.CLASSDEF) {
+ if (t.hasTag(JCTree.Tag.CLASSDEF)) {
JCClassDecl ct = (JCClassDecl) t;
if (ct.sym != null) {
if ((ct.sym.flags_field & Flags.UNATTRIBUTED) != 0) {
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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
@@ -31,6 +31,8 @@
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+
/** Enter annotations on symbols. Annotations accumulate in a queue,
* which is processed at the top level of any set of recursive calls
* requesting it be processed.
@@ -148,7 +150,7 @@
return new Attribute.Compound(a.type, List.<Pair<MethodSymbol,Attribute>>nil());
}
List<JCExpression> args = a.args;
- if (args.length() == 1 && args.head.getTag() != JCTree.ASSIGN) {
+ if (args.length() == 1 && !args.head.hasTag(ASSIGN)) {
// special case: elided "value=" assumed
args.head = make.at(args.head.pos).
Assign(make.Ident(names.value), args.head);
@@ -157,12 +159,12 @@
new ListBuffer<Pair<MethodSymbol,Attribute>>();
for (List<JCExpression> tl = args; tl.nonEmpty(); tl = tl.tail) {
JCExpression t = tl.head;
- if (t.getTag() != JCTree.ASSIGN) {
+ if (!t.hasTag(ASSIGN)) {
log.error(t.pos(), "annotation.value.must.be.name.value");
continue;
}
JCAssign assign = (JCAssign)t;
- if (assign.lhs.getTag() != JCTree.IDENT) {
+ if (!assign.lhs.hasTag(IDENT)) {
log.error(t.pos(), "annotation.value.must.be.name.value");
continue;
}
@@ -222,14 +224,14 @@
(((JCFieldAccess) tree).selected).type);
}
if ((expected.tsym.flags() & Flags.ANNOTATION) != 0) {
- if (tree.getTag() != JCTree.ANNOTATION) {
+ if (!tree.hasTag(ANNOTATION)) {
log.error(tree.pos(), "annotation.value.must.be.annotation");
expected = syms.errorType;
}
return enterAnnotation((JCAnnotation)tree, expected, env);
}
if (expected.tag == TypeTags.ARRAY) { // should really be isArray()
- if (tree.getTag() != JCTree.NEWARRAY) {
+ if (!tree.hasTag(NEWARRAY)) {
tree = make.at(tree.pos).
NewArray(null, List.<JCExpression>nil(), List.of(tree));
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Tue Dec 06 05:28:17 2011 -0800
@@ -49,8 +49,13 @@
import com.sun.source.util.SimpleTreeVisitor;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.code.Kinds.ERRONEOUS;
import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.code.TypeTags.WILDCARD;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** This is the main context-dependent analysis phase in GJC. It
* encompasses name resolution, type checking and constant folding as
@@ -245,7 +250,7 @@
((v.flags() & HASINIT) != 0
||
!((base == null ||
- (base.getTag() == JCTree.IDENT && TreeInfo.name(base) == names._this)) &&
+ (base.hasTag(IDENT) && TreeInfo.name(base) == names._this)) &&
isAssignableAsBlankFinal(v, env)))) {
if (v.isResourceVariable()) { //TWR resource
log.error(pos, "try.resource.may.not.be.assigned", v);
@@ -263,7 +268,7 @@
* @param tree The candidate tree.
*/
boolean isStaticReference(JCTree tree) {
- if (tree.getTag() == JCTree.SELECT) {
+ if (tree.hasTag(SELECT)) {
Symbol lsym = TreeInfo.symbol(((JCFieldAccess) tree).selected);
if (lsym == null || lsym.kind != TYP) {
return false;
@@ -693,7 +698,7 @@
// disable implicit outer instance from being passed.
// (This would be an illegal access to "this before super").
if (env.info.isSelfCall &&
- env.tree.getTag() == JCTree.NEWCLASS &&
+ env.tree.hasTag(NEWCLASS) &&
((JCNewClass) env.tree).encl == null)
{
c.flags_field |= NOOUTERTHIS;
@@ -863,7 +868,7 @@
chk.checkDeprecatedAnnotation(tree.pos(), v);
if (tree.init != null) {
- if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
+ if ((v.flags_field & FINAL) != 0 && !tree.init.hasTag(NEWCLASS)) {
// In this case, `v' is final. Ensure that it's initializer is
// evaluated.
v.getConstValue(); // ensure initializer is evaluated
@@ -971,8 +976,8 @@
public void visitLabelled(JCLabeledStatement tree) {
// Check that label is not used in an enclosing statement
Env<AttrContext> env1 = env;
- while (env1 != null && env1.tree.getTag() != JCTree.CLASSDEF) {
- if (env1.tree.getTag() == JCTree.LABELLED &&
+ while (env1 != null && !env1.tree.hasTag(CLASSDEF)) {
+ if (env1.tree.hasTag(LABELLED) &&
((JCLabeledStatement) env1.tree).label == tree.label) {
log.error(tree.pos(), "label.already.in.use",
tree.label);
@@ -1052,14 +1057,14 @@
private static void addVars(List<JCStatement> stats, Scope switchScope) {
for (;stats.nonEmpty(); stats = stats.tail) {
JCTree stat = stats.head;
- if (stat.getTag() == JCTree.VARDEF)
+ if (stat.hasTag(VARDEF))
switchScope.enter(((JCVariableDecl) stat).sym);
}
}
// where
/** Return the selected enumeration constant symbol, or null. */
private Symbol enumConstant(JCTree tree, Type enumType) {
- if (tree.getTag() != JCTree.IDENT) {
+ if (!tree.hasTag(IDENT)) {
log.error(tree.pos(), "enum.label.must.be.unqualified.enum");
return syms.errSymbol;
}
@@ -1094,7 +1099,7 @@
localEnv;
// Attribute resource declarations
for (JCTree resource : tree.resources) {
- if (resource.getTag() == JCTree.VARDEF) {
+ if (resource.hasTag(VARDEF)) {
attribStat(resource, tryEnv);
chk.checkType(resource, resource.type, syms.autoCloseableType, "try.not.applicable.to.type");
@@ -1312,7 +1317,7 @@
* @param env The environment current at the jump statement.
*/
private JCTree findJumpTarget(DiagnosticPosition pos,
- int tag,
+ JCTree.Tag tag,
Name label,
Env<AttrContext> env) {
// Search environments outwards from the point of jump.
@@ -1320,15 +1325,15 @@
LOOP:
while (env1 != null) {
switch (env1.tree.getTag()) {
- case JCTree.LABELLED:
+ case LABELLED:
JCLabeledStatement labelled = (JCLabeledStatement)env1.tree;
if (label == labelled.label) {
// If jump is a continue, check that target is a loop.
- if (tag == JCTree.CONTINUE) {
- if (labelled.body.getTag() != JCTree.DOLOOP &&
- labelled.body.getTag() != JCTree.WHILELOOP &&
- labelled.body.getTag() != JCTree.FORLOOP &&
- labelled.body.getTag() != JCTree.FOREACHLOOP)
+ if (tag == CONTINUE) {
+ if (!labelled.body.hasTag(DOLOOP) &&
+ !labelled.body.hasTag(WHILELOOP) &&
+ !labelled.body.hasTag(FORLOOP) &&
+ !labelled.body.hasTag(FOREACHLOOP))
log.error(pos, "not.loop.label", label);
// Found labelled statement target, now go inwards
// to next non-labelled tree.
@@ -1338,17 +1343,17 @@
}
}
break;
- case JCTree.DOLOOP:
- case JCTree.WHILELOOP:
- case JCTree.FORLOOP:
- case JCTree.FOREACHLOOP:
+ case DOLOOP:
+ case WHILELOOP:
+ case FORLOOP:
+ case FOREACHLOOP:
if (label == null) return env1.tree;
break;
- case JCTree.SWITCH:
- if (label == null && tag == JCTree.BREAK) return env1.tree;
+ case SWITCH:
+ if (label == null && tag == BREAK) return env1.tree;
break;
- case JCTree.METHODDEF:
- case JCTree.CLASSDEF:
+ case METHODDEF:
+ case CLASSDEF:
break LOOP;
default:
}
@@ -1356,7 +1361,7 @@
}
if (label != null)
log.error(pos, "undef.label", label);
- else if (tag == JCTree.CONTINUE)
+ else if (tag == CONTINUE)
log.error(pos, "cont.outside.loop");
else
log.error(pos, "break.outside.switch.loop");
@@ -1452,7 +1457,7 @@
if (encl.tag == CLASS) {
// we are calling a nested class
- if (tree.meth.getTag() == JCTree.SELECT) {
+ if (tree.meth.hasTag(SELECT)) {
JCTree qualifier = ((JCFieldAccess) tree.meth).selected;
// We are seeing a prefixed call, of the form
@@ -1468,7 +1473,7 @@
rs.resolveImplicitThis(tree.meth.pos(),
localEnv, site, true);
}
- } else if (tree.meth.getTag() == JCTree.SELECT) {
+ } else if (tree.meth.hasTag(SELECT)) {
log.error(tree.meth.pos(), "illegal.qual.not.icls",
site.tsym);
}
@@ -1522,7 +1527,7 @@
// as a special case, array.clone() has a result that is
// the same as static type of the array being cloned
- if (tree.meth.getTag() == JCTree.SELECT &&
+ if (tree.meth.hasTag(SELECT) &&
allowCovariantReturns &&
methName == names.clone &&
types.isArray(((JCFieldAccess) tree.meth).selected.type))
@@ -1531,7 +1536,7 @@
// as a special case, x.getClass() has type Class<? extends |X|>
if (allowGenerics &&
methName == names.getClass && tree.args.isEmpty()) {
- Type qualifier = (tree.meth.getTag() == JCTree.SELECT)
+ Type qualifier = (tree.meth.hasTag(SELECT))
? ((JCFieldAccess) tree.meth).selected.type
: env.enclClass.sym.type;
restype = new
@@ -1560,7 +1565,7 @@
JCMethodDecl enclMethod = env.enclMethod;
if (enclMethod != null && enclMethod.name == names.init) {
JCBlock body = enclMethod.body;
- if (body.stats.head.getTag() == JCTree.EXEC &&
+ if (body.stats.head.hasTag(EXEC) &&
((JCExpressionStatement) body.stats.head).expr == tree)
return true;
}
@@ -1591,7 +1596,7 @@
// complete class name to be fully qualified
JCExpression clazz = tree.clazz; // Class field following new
JCExpression clazzid = // Identifier in class field
- (clazz.getTag() == JCTree.TYPEAPPLY)
+ (clazz.hasTag(TYPEAPPLY))
? ((JCTypeApply) clazz).clazz
: clazz;
@@ -1610,7 +1615,7 @@
attribExpr(tree.encl, env));
clazzid1 = make.at(clazz.pos).Select(make.Type(encltype),
((JCIdent) clazzid).name);
- if (clazz.getTag() == JCTree.TYPEAPPLY)
+ if (clazz.hasTag(TYPEAPPLY))
clazz = make.at(tree.pos).
TypeApply(clazzid1,
((JCTypeApply) clazz).arguments);
@@ -1689,7 +1694,7 @@
// Enums may not be instantiated except implicitly
if (allowEnums &&
(clazztype.tsym.flags_field&Flags.ENUM) != 0 &&
- (env.tree.getTag() != JCTree.VARDEF ||
+ (!env.tree.hasTag(VARDEF) ||
(((JCVariableDecl) env.tree).mods.flags&Flags.ENUM) == 0 ||
((JCVariableDecl) env.tree).init != tree))
log.error(tree.pos(), "enum.cant.be.instantiated");
@@ -1930,7 +1935,7 @@
Name name = TreeInfo.name(arg);
if (name == names._this || name == names._super) return arg;
- int optag = JCTree.NULLCHK;
+ JCTree.Tag optag = NULLCHK;
JCUnary tree = make.at(arg.pos).Unary(optag, arg);
tree.operator = syms.nullcheck;
tree.type = arg.type;
@@ -1991,7 +1996,7 @@
Type operand = attribExpr(tree.rhs, env);
// Find operator.
Symbol operator = tree.operator = rs.resolveBinaryOperator(
- tree.pos(), tree.getTag() - JCTree.ASGOffset, env,
+ tree.pos(), tree.getTag().noAssignOp(), env,
owntype, operand);
if (operator.kind == MTH &&
@@ -1999,7 +2004,7 @@
!operand.isErroneous()) {
chk.checkOperator(tree.pos(),
(OperatorSymbol)operator,
- tree.getTag() - JCTree.ASGOffset,
+ tree.getTag().noAssignOp(),
owntype,
operand);
chk.checkDivZero(tree.rhs.pos(), operator, operand);
@@ -2012,7 +2017,7 @@
public void visitUnary(JCUnary tree) {
// Attribute arguments.
- Type argtype = (JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC)
+ Type argtype = (tree.getTag().isIncOrDecUnaryOp())
? attribTree(tree.arg, env, VAR, Type.noType)
: chk.checkNonVoid(tree.arg.pos(), attribExpr(tree.arg, env));
@@ -2023,7 +2028,7 @@
Type owntype = types.createErrorType(tree.type);
if (operator.kind == MTH &&
!argtype.isErroneous()) {
- owntype = (JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC)
+ owntype = (tree.getTag().isIncOrDecUnaryOp())
? tree.arg.type
: operator.type.getReturnType();
int opc = ((OperatorSymbol)operator).opcode;
@@ -2621,7 +2626,7 @@
canOwnInitializer(env.info.scope.owner) &&
v.owner == env.info.scope.owner.enclClass() &&
((v.flags() & STATIC) != 0) == Resolve.isStatic(env) &&
- (env.tree.getTag() != JCTree.ASSIGN ||
+ (!env.tree.hasTag(ASSIGN) ||
TreeInfo.skipParens(((JCAssign) env.tree).lhs) != tree)) {
String suffix = (env.info.enclVar == v) ?
"self.ref" : "forward.ref";
@@ -2812,10 +2817,10 @@
}
Type elemtype = types.elemtype(argtype);
switch (tree.getTag()) {
- case JCTree.APPLY:
+ case APPLY:
((JCMethodInvocation) tree).varargsElement = elemtype;
break;
- case JCTree.NEWCLASS:
+ case NEWCLASS:
((JCNewClass) tree).varargsElement = elemtype;
break;
default:
@@ -2896,9 +2901,9 @@
if (clazzOuter.tag == CLASS) {
Type site;
JCExpression clazz = TreeInfo.typeIn(tree.clazz);
- if (clazz.getTag() == JCTree.IDENT) {
+ if (clazz.hasTag(IDENT)) {
site = env.enclClass.sym.type;
- } else if (clazz.getTag() == JCTree.SELECT) {
+ } else if (clazz.hasTag(SELECT)) {
site = ((JCFieldAccess) clazz).selected.type;
} else throw new AssertionError(""+tree);
if (clazzOuter.tag == CLASS && site != clazzOuter) {
@@ -3068,7 +3073,7 @@
* Attribute an env for either a top level tree or class declaration.
*/
public void attrib(Env<AttrContext> env) {
- if (env.tree.getTag() == JCTree.TOPLEVEL)
+ if (env.tree.hasTag(TOPLEVEL))
attribTopLevel(env);
else
attribClass(env.tree.pos(), env.enclClass.sym);
@@ -3245,7 +3250,7 @@
((c.flags() & STATIC) == 0 || c.name == names.empty) &&
(TreeInfo.flags(l.head) & (STATIC | INTERFACE)) != 0) {
Symbol sym = null;
- if (l.head.getTag() == JCTree.VARDEF) sym = ((JCVariableDecl) l.head).sym;
+ if (l.head.hasTag(VARDEF)) sym = ((JCVariableDecl) l.head).sym;
if (sym == null ||
sym.kind != VAR ||
((VarSymbol) sym).getConstValue() == null)
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Tue Dec 06 05:28:17 2011 -0800
@@ -42,10 +42,14 @@
import com.sun.tools.javac.code.Symbol.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.code.Flags.SYNCHRONIZED;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.code.TypeTags.WILDCARD;
import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** Type checking helper class for the attribution phase.
*
@@ -987,7 +991,7 @@
* <i>not</i> final.
*/
private long implicitEnumFinalFlag(JCTree tree) {
- if (tree.getTag() != JCTree.CLASSDEF) return 0;
+ if (!tree.hasTag(CLASSDEF)) return 0;
class SpecialTreeVisitor extends JCTree.Visitor {
boolean specialized;
SpecialTreeVisitor() {
@@ -1099,7 +1103,7 @@
// not parameterized at all.
if (tree.type.getEnclosingType().isRaw())
log.error(tree.pos(), "improperly.formed.type.inner.raw.param");
- if (tree.clazz.getTag() == JCTree.SELECT)
+ if (tree.clazz.hasTag(SELECT))
visitSelectInternal((JCFieldAccess)tree.clazz);
}
}
@@ -2413,7 +2417,7 @@
// count them off as they're annotated
for (JCTree arg : a.args) {
- if (arg.getTag() != JCTree.ASSIGN) continue; // recovery
+ if (!arg.hasTag(ASSIGN)) continue; // recovery
JCAssign assign = (JCAssign) arg;
Symbol m = TreeInfo.symbol(assign.lhs);
if (m == null || m.type.isErroneous()) continue;
@@ -2442,12 +2446,12 @@
a.args.tail == null)
return;
- if (a.args.head.getTag() != JCTree.ASSIGN) return; // error recovery
+ if (!a.args.head.hasTag(ASSIGN)) return; // error recovery
JCAssign assign = (JCAssign) a.args.head;
Symbol m = TreeInfo.symbol(assign.lhs);
if (m.name != names.value) return;
JCTree rhs = assign.rhs;
- if (rhs.getTag() != JCTree.NEWARRAY) return;
+ if (!rhs.hasTag(NEWARRAY)) return;
JCNewArray na = (JCNewArray) rhs;
Set<Symbol> targets = new HashSet<Symbol>();
for (JCTree elem : na.elems) {
@@ -2506,7 +2510,7 @@
try {
tree.sym.flags_field |= LOCKED;
for (JCTree def : tree.defs) {
- if (def.getTag() != JCTree.METHODDEF) continue;
+ if (!def.hasTag(METHODDEF)) continue;
JCMethodDecl meth = (JCMethodDecl)def;
checkAnnotationResType(meth.pos(), meth.restype.type);
}
@@ -2614,7 +2618,7 @@
*/
int checkOperator(DiagnosticPosition pos,
OperatorSymbol operator,
- int tag,
+ JCTree.Tag tag,
Type left,
Type right) {
if (operator.opcode == ByteCodes.error) {
@@ -2650,7 +2654,8 @@
* Check for empty statements after if
*/
void checkEmptyIf(JCIf tree) {
- if (tree.thenpart.getTag() == JCTree.SKIP && tree.elsepart == null && lint.isEnabled(LintCategory.EMPTY))
+ if (tree.thenpart.hasTag(SKIP) && tree.elsepart == null &&
+ lint.isEnabled(LintCategory.EMPTY))
log.warning(LintCategory.EMPTY, tree.thenpart.pos(), "empty.if");
}
@@ -2754,7 +2759,7 @@
}
// where
private boolean isCanonical(JCTree tree) {
- while (tree.getTag() == JCTree.SELECT) {
+ while (tree.hasTag(SELECT)) {
JCFieldAccess s = (JCFieldAccess) tree;
if (s.sym.owner != TreeInfo.symbol(s.selected))
return false;
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Tue Dec 06 05:28:17 2011 -0800
@@ -228,7 +228,7 @@
* only, and members go into the class member scope.
*/
Scope enterScope(Env<AttrContext> env) {
- return (env.tree.getTag() == JCTree.CLASSDEF)
+ return (env.tree.hasTag(JCTree.Tag.CLASSDEF))
? ((JCClassDecl) env.tree).sym.members_field
: env.info.scope;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. 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
@@ -116,9 +116,9 @@
/** Return closest enclosing environment which points to a tree with given tag.
*/
- public Env<A> enclosing(int tag) {
+ public Env<A> enclosing(JCTree.Tag tag) {
Env<A> env1 = this;
- while (env1 != null && env1.tree.getTag() != tag) env1 = env1.next;
+ while (env1 != null && !env1.tree.hasTag(tag)) env1 = env1.next;
return env1;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue Dec 06 05:28:17 2011 -0800
@@ -40,8 +40,10 @@
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** This pass implements dataflow analysis for Java programs.
* Liveness analysis checks that every statement is reachable.
@@ -321,7 +323,7 @@
log.error(exit.tree.pos(),
"unreported.exception.default.constructor",
exit.thrown);
- } else if (exit.tree.getTag() == JCTree.VARDEF &&
+ } else if (exit.tree.hasTag(VARDEF) &&
((JCVariableDecl)exit.tree).sym.isResourceVariable()) {
log.error(exit.tree.pos(),
"unreported.exception.implicit.close",
@@ -416,7 +418,7 @@
*/
void letInit(JCTree tree) {
tree = TreeInfo.skipParens(tree);
- if (tree.getTag() == JCTree.IDENT || tree.getTag() == JCTree.SELECT) {
+ if (tree.hasTag(IDENT) || tree.hasTag(SELECT)) {
Symbol sym = TreeInfo.symbol(tree);
if (sym.kind == VAR) {
letInit(tree.pos(), (VarSymbol)sym);
@@ -452,7 +454,7 @@
pendingExits = oldPendingExits;
for (; exits.nonEmpty(); exits = exits.tail) {
PendingExit exit = exits.head;
- if (exit.tree.getTag() == JCTree.BREAK &&
+ if (exit.tree.hasTag(BREAK) &&
((JCBreak) exit.tree).target == tree) {
inits.andSet(exit.inits);
uninits.andSet(exit.uninits);
@@ -471,7 +473,7 @@
pendingExits = new ListBuffer<PendingExit>();
for (; exits.nonEmpty(); exits = exits.tail) {
PendingExit exit = exits.head;
- if (exit.tree.getTag() == JCTree.CONTINUE &&
+ if (exit.tree.hasTag(CONTINUE) &&
((JCContinue) exit.tree).target == tree) {
inits.andSet(exit.inits);
uninits.andSet(exit.uninits);
@@ -517,7 +519,7 @@
*/
void scanDef(JCTree tree) {
scanStat(tree);
- if (tree != null && tree.getTag() == JCTree.BLOCK && !alive) {
+ if (tree != null && tree.hasTag(JCTree.Tag.BLOCK) && !alive) {
log.error(tree.pos(),
"initializer.must.be.able.to.complete.normally");
}
@@ -528,7 +530,7 @@
void scanStat(JCTree tree) {
if (!alive && tree != null) {
log.error(tree.pos(), "unreachable.stmt");
- if (tree.getTag() != JCTree.SKIP) alive = true;
+ if (!tree.hasTag(SKIP)) alive = true;
}
scan(tree);
}
@@ -614,7 +616,7 @@
try {
// define all the static fields
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() == JCTree.VARDEF) {
+ if (l.head.hasTag(VARDEF)) {
JCVariableDecl def = (JCVariableDecl)l.head;
if ((def.mods.flags & STATIC) != 0) {
VarSymbol sym = def.sym;
@@ -626,7 +628,7 @@
// process all the static initializers
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() != JCTree.METHODDEF &&
+ if (!l.head.hasTag(METHODDEF) &&
(TreeInfo.flags(l.head) & STATIC) != 0) {
scanDef(l.head);
errorUncaught();
@@ -653,7 +655,7 @@
// define all the instance fields
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() == JCTree.VARDEF) {
+ if (l.head.hasTag(VARDEF)) {
JCVariableDecl def = (JCVariableDecl)l.head;
if ((def.mods.flags & STATIC) == 0) {
VarSymbol sym = def.sym;
@@ -665,7 +667,7 @@
// process all the instance initializers
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() != JCTree.METHODDEF &&
+ if (!l.head.hasTag(METHODDEF) &&
(TreeInfo.flags(l.head) & STATIC) == 0) {
scanDef(l.head);
errorUncaught();
@@ -691,7 +693,7 @@
// process all the methods
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() == JCTree.METHODDEF) {
+ if (l.head.hasTag(METHODDEF)) {
scan(l.head);
errorUncaught();
}
@@ -760,7 +762,7 @@
PendingExit exit = exits.head;
exits = exits.tail;
if (exit.thrown == null) {
- Assert.check(exit.tree.getTag() == JCTree.RETURN);
+ Assert.check(exit.tree.hasTag(RETURN));
if (isInitialConstructor) {
inits = exit.inits;
for (int i = firstadr; i < nextadr; i++)
@@ -989,7 +991,7 @@
Bits uninits) {
for (;stats.nonEmpty(); stats = stats.tail) {
JCTree stat = stats.head;
- if (stat.getTag() == JCTree.VARDEF) {
+ if (stat.hasTag(VARDEF)) {
int adr = ((JCVariableDecl) stat).sym.adr;
inits.excl(adr);
uninits.incl(adr);
@@ -1346,7 +1348,7 @@
public void visitUnary(JCUnary tree) {
switch (tree.getTag()) {
- case JCTree.NOT:
+ case NOT:
scanCond(tree.arg);
Bits t = initsWhenFalse;
initsWhenFalse = initsWhenTrue;
@@ -1355,8 +1357,8 @@
uninitsWhenFalse = uninitsWhenTrue;
uninitsWhenTrue = t;
break;
- case JCTree.PREINC: case JCTree.POSTINC:
- case JCTree.PREDEC: case JCTree.POSTDEC:
+ case PREINC: case POSTINC:
+ case PREDEC: case POSTDEC:
scanExpr(tree.arg);
letInit(tree.arg);
break;
@@ -1367,7 +1369,7 @@
public void visitBinary(JCBinary tree) {
switch (tree.getTag()) {
- case JCTree.AND:
+ case AND:
scanCond(tree.lhs);
Bits initsWhenFalseLeft = initsWhenFalse;
Bits uninitsWhenFalseLeft = uninitsWhenFalse;
@@ -1377,7 +1379,7 @@
initsWhenFalse.andSet(initsWhenFalseLeft);
uninitsWhenFalse.andSet(uninitsWhenFalseLeft);
break;
- case JCTree.OR:
+ case OR:
scanCond(tree.lhs);
Bits initsWhenTrueLeft = initsWhenTrue;
Bits uninitsWhenTrueLeft = uninitsWhenTrue;
@@ -1418,7 +1420,7 @@
private boolean is292targetTypeCast(JCTypeCast tree) {
boolean is292targetTypeCast = false;
JCExpression expr = TreeInfo.skipParens(tree.expr);
- if (expr.getTag() == JCTree.APPLY) {
+ if (expr.hasTag(APPLY)) {
JCMethodInvocation apply = (JCMethodInvocation)expr;
Symbol sym = TreeInfo.symbol(apply.meth);
is292targetTypeCast = sym != null &&
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Tue Dec 06 05:28:17 2011 -0800
@@ -633,13 +633,13 @@
//the polymorphic signature call environment is nested.
switch (env.next.tree.getTag()) {
- case JCTree.TYPECAST:
+ case TYPECAST:
JCTypeCast castTree = (JCTypeCast)env.next.tree;
restype = (TreeInfo.skipParens(castTree.expr) == env.tree) ?
castTree.clazz.type :
syms.objectType;
break;
- case JCTree.EXEC:
+ case EXEC:
JCTree.JCExpressionStatement execTree =
(JCTree.JCExpressionStatement)env.next.tree;
restype = (TreeInfo.skipParens(execTree.expr) == env.tree) ?
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Tue Dec 06 05:28:17 2011 -0800
@@ -40,11 +40,14 @@
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.parser.EndPosTable;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.jvm.ByteCodes.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** This pass translates away some syntactic sugar: inner classes,
* class literals, assertions, foreach loops, etc.
@@ -125,7 +128,7 @@
/** A hash table mapping syntax trees to their ending source positions.
*/
- Map<JCTree, Integer> endPositions;
+ EndPosTable endPosTable;
/**************************************************************************
* Global mappings
@@ -303,7 +306,7 @@
Symbol constructor = TreeInfo.symbol(tree.meth);
ClassSymbol c = (ClassSymbol)constructor.owner;
if (c.hasOuterInstance() &&
- tree.meth.getTag() != JCTree.SELECT &&
+ !tree.meth.hasTag(SELECT) &&
outerThisStack.head != null)
visitSymbol(outerThisStack.head);
}
@@ -508,7 +511,7 @@
* @param optag The operators tree tag.
* @param arg The operator's argument.
*/
- JCUnary makeUnary(int optag, JCExpression arg) {
+ JCUnary makeUnary(JCTree.Tag optag, JCExpression arg) {
JCUnary tree = make.Unary(optag, arg);
tree.operator = rs.resolveUnaryOperator(
make_pos, optag, attrEnv, arg.type);
@@ -521,7 +524,7 @@
* @param lhs The operator's left argument.
* @param rhs The operator's right argument.
*/
- JCBinary makeBinary(int optag, JCExpression lhs, JCExpression rhs) {
+ JCBinary makeBinary(JCTree.Tag optag, JCExpression lhs, JCExpression rhs) {
JCBinary tree = make.Binary(optag, lhs, rhs);
tree.operator = rs.resolveBinaryOperator(
make_pos, optag, attrEnv, lhs.type, rhs.type);
@@ -534,10 +537,10 @@
* @param lhs The operator's left argument.
* @param rhs The operator's right argument.
*/
- JCAssignOp makeAssignop(int optag, JCTree lhs, JCTree rhs) {
+ JCAssignOp makeAssignop(JCTree.Tag optag, JCTree lhs, JCTree rhs) {
JCAssignOp tree = make.Assignop(optag, lhs, rhs);
tree.operator = rs.resolveBinaryOperator(
- make_pos, tree.getTag() - JCTree.ASGOffset, attrEnv, lhs.type, rhs.type);
+ make_pos, tree.getTag().noAssignOp(), attrEnv, lhs.type, rhs.type);
tree.type = lhs.type;
return tree;
}
@@ -720,7 +723,7 @@
// where
private boolean isTranslatedClassAvailable(ClassSymbol c) {
for (JCTree tree: translated) {
- if (tree.getTag() == JCTree.CLASSDEF
+ if (tree.hasTag(CLASSDEF)
&& ((JCClassDecl) tree).sym == c) {
return true;
}
@@ -802,13 +805,13 @@
private static int accessCode(JCTree tree, JCTree enclOp) {
if (enclOp == null)
return DEREFcode;
- else if (enclOp.getTag() == JCTree.ASSIGN &&
+ else if (enclOp.hasTag(ASSIGN) &&
tree == TreeInfo.skipParens(((JCAssign) enclOp).lhs))
return ASSIGNcode;
- else if (JCTree.PREINC <= enclOp.getTag() && enclOp.getTag() <= JCTree.POSTDEC &&
+ else if (enclOp.getTag().isIncOrDecUnaryOp() &&
tree == TreeInfo.skipParens(((JCUnary) enclOp).arg))
- return (enclOp.getTag() - JCTree.PREINC) * 2 + PREINCcode;
- else if (JCTree.BITOR_ASG <= enclOp.getTag() && enclOp.getTag() <= JCTree.MOD_ASG &&
+ return mapTagToUnaryOpCode(enclOp.getTag());
+ else if (enclOp.getTag().isAssignop() &&
tree == TreeInfo.skipParens(((JCAssignOp) enclOp).lhs))
return accessCode(((OperatorSymbol) ((JCAssignOp) enclOp).operator).opcode);
else
@@ -832,39 +835,39 @@
/** Return tree tag for assignment operation corresponding
* to given binary operator.
*/
- private static int treeTag(OperatorSymbol operator) {
+ private static JCTree.Tag treeTag(OperatorSymbol operator) {
switch (operator.opcode) {
case ByteCodes.ior: case ByteCodes.lor:
- return JCTree.BITOR_ASG;
+ return BITOR_ASG;
case ByteCodes.ixor: case ByteCodes.lxor:
- return JCTree.BITXOR_ASG;
+ return BITXOR_ASG;
case ByteCodes.iand: case ByteCodes.land:
- return JCTree.BITAND_ASG;
+ return BITAND_ASG;
case ByteCodes.ishl: case ByteCodes.lshl:
case ByteCodes.ishll: case ByteCodes.lshll:
- return JCTree.SL_ASG;
+ return SL_ASG;
case ByteCodes.ishr: case ByteCodes.lshr:
case ByteCodes.ishrl: case ByteCodes.lshrl:
- return JCTree.SR_ASG;
+ return SR_ASG;
case ByteCodes.iushr: case ByteCodes.lushr:
case ByteCodes.iushrl: case ByteCodes.lushrl:
- return JCTree.USR_ASG;
+ return USR_ASG;
case ByteCodes.iadd: case ByteCodes.ladd:
case ByteCodes.fadd: case ByteCodes.dadd:
case ByteCodes.string_add:
- return JCTree.PLUS_ASG;
+ return PLUS_ASG;
case ByteCodes.isub: case ByteCodes.lsub:
case ByteCodes.fsub: case ByteCodes.dsub:
- return JCTree.MINUS_ASG;
+ return MINUS_ASG;
case ByteCodes.imul: case ByteCodes.lmul:
case ByteCodes.fmul: case ByteCodes.dmul:
- return JCTree.MUL_ASG;
+ return MUL_ASG;
case ByteCodes.idiv: case ByteCodes.ldiv:
case ByteCodes.fdiv: case ByteCodes.ddiv:
- return JCTree.DIV_ASG;
+ return DIV_ASG;
case ByteCodes.imod: case ByteCodes.lmod:
case ByteCodes.fmod: case ByteCodes.dmod:
- return JCTree.MOD_ASG;
+ return MOD_ASG;
default:
throw new AssertionError();
}
@@ -1003,7 +1006,7 @@
if (!currentClass.isSubClass(sym.owner, types))
return true;
if ((sym.flags() & STATIC) != 0 ||
- tree.getTag() != JCTree.SELECT ||
+ !tree.hasTag(SELECT) ||
TreeInfo.name(((JCFieldAccess) tree).selected) == names._super)
return false;
return !((JCFieldAccess) tree).selected.type.tsym.isSubClass(currentClass, types);
@@ -1018,7 +1021,7 @@
if (protAccess) {
Symbol qualifier = null;
ClassSymbol c = currentClass;
- if (tree.getTag() == JCTree.SELECT && (sym.flags() & STATIC) == 0) {
+ if (tree.hasTag(SELECT) && (sym.flags() & STATIC) == 0) {
qualifier = ((JCFieldAccess) tree).selected.type.tsym;
while (!qualifier.isSubClass(c, types)) {
c = c.owner.enclClass();
@@ -1058,7 +1061,7 @@
Assert.check(sym != null && (sym.flags_field & FINAL) != 0);
tree = make.at(tree.pos).Ident(sym);
}
- JCExpression base = (tree.getTag() == JCTree.SELECT) ? ((JCFieldAccess) tree).selected : null;
+ JCExpression base = (tree.hasTag(SELECT)) ? ((JCFieldAccess) tree).selected : null;
switch (sym.kind) {
case TYP:
if (sym.owner.kind != PCK) {
@@ -1068,11 +1071,11 @@
while (base != null &&
TreeInfo.symbol(base) != null &&
TreeInfo.symbol(base).kind != PCK) {
- base = (base.getTag() == JCTree.SELECT)
+ base = (base.hasTag(SELECT))
? ((JCFieldAccess) base).selected
: null;
}
- if (tree.getTag() == JCTree.IDENT) {
+ if (tree.hasTag(IDENT)) {
((JCIdent) tree).name = flatname;
} else if (base == null) {
tree = make.at(tree.pos).Ident(sym);
@@ -1220,6 +1223,42 @@
}
}
+ /** Maps unary operator integer codes to JCTree.Tag objects
+ * @param unaryOpCode the unary operator code
+ */
+ private static Tag mapUnaryOpCodeToTag(int unaryOpCode){
+ switch (unaryOpCode){
+ case PREINCcode:
+ return PREINC;
+ case PREDECcode:
+ return PREDEC;
+ case POSTINCcode:
+ return POSTINC;
+ case POSTDECcode:
+ return POSTDEC;
+ default:
+ return NO_TAG;
+ }
+ }
+
+ /** Maps JCTree.Tag objects to unary operator integer codes
+ * @param tag the JCTree.Tag
+ */
+ private static int mapTagToUnaryOpCode(Tag tag){
+ switch (tag){
+ case PREINC:
+ return PREINCcode;
+ case PREDEC:
+ return PREDECcode;
+ case POSTINC:
+ return POSTINCcode;
+ case POSTDEC:
+ return POSTDECcode;
+ default:
+ return -1;
+ }
+ }
+
/** Construct definition of an access method.
* @param pos The source code position of the definition.
* @param vsym The private or protected symbol.
@@ -1259,8 +1298,7 @@
expr = make.Assign(ref, args.head);
break;
case PREINCcode: case POSTINCcode: case PREDECcode: case POSTDECcode:
- expr = makeUnary(
- ((acode1 - PREINCcode) >> 1) + JCTree.PREINC, ref);
+ expr = makeUnary(mapUnaryOpCodeToTag(acode1), ref);
break;
default:
expr = make.Assignop(
@@ -1576,7 +1614,7 @@
}
private JCExpression makeNonNullCheck(JCExpression expression) {
- return makeBinary(JCTree.NE, expression, makeNull());
+ return makeBinary(NE, expression, makeNull());
}
/** Construct a tree that represents the outer instance
@@ -1808,7 +1846,7 @@
// $newcache.getClass().getComponentType().getClassLoader() : cl$"
JCExpression clvalue =
make.Conditional(
- makeBinary(JCTree.EQ, make.Ident(clsym), makeNull()),
+ makeBinary(EQ, make.Ident(clsym), makeNull()),
make.Assign(
make.Ident(clsym),
makeCall(
@@ -1976,7 +2014,7 @@
writer.xClassName(type).toString().replace('/', '.');
Symbol cs = cacheSym(pos, sig);
return make_at(pos).Conditional(
- makeBinary(JCTree.EQ, make.Ident(cs), makeNull()),
+ makeBinary(EQ, make.Ident(cs), makeNull()),
make.Assign(
make.Ident(cs),
make.App(
@@ -2023,7 +2061,7 @@
List.<Type>nil());
JCClassDecl containerDef = classDef(container);
make_at(containerDef.pos());
- JCExpression notStatus = makeUnary(JCTree.NOT, make.App(make.Select(
+ JCExpression notStatus = makeUnary(NOT, make.App(make.Select(
classOfType(types.erasure(outermostClass.type),
containerDef.pos()),
desiredAssertionStatusSym)));
@@ -2032,7 +2070,7 @@
containerDef.defs = containerDef.defs.prepend(assertDisabledDef);
}
make_at(pos);
- return makeUnary(JCTree.NOT, make.Ident(assertDisabledSym));
+ return makeUnary(NOT, make.Ident(assertDisabledSym));
}
@@ -2062,9 +2100,9 @@
JCTree abstractRval(JCTree rval, Type type, TreeBuilder builder) {
rval = TreeInfo.skipParens(rval);
switch (rval.getTag()) {
- case JCTree.LITERAL:
+ case LITERAL:
return builder.build(rval);
- case JCTree.IDENT:
+ case IDENT:
JCIdent id = (JCIdent) rval;
if ((id.sym.flags() & FINAL) != 0 && id.sym.owner.kind == MTH)
return builder.build(rval);
@@ -2097,9 +2135,9 @@
JCTree abstractLval(JCTree lval, final TreeBuilder builder) {
lval = TreeInfo.skipParens(lval);
switch (lval.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
return builder.build(lval);
- case JCTree.SELECT: {
+ case SELECT: {
final JCFieldAccess s = (JCFieldAccess)lval;
JCTree selected = TreeInfo.skipParens(s.selected);
Symbol lid = TreeInfo.symbol(s.selected);
@@ -2110,7 +2148,7 @@
}
});
}
- case JCTree.INDEXED: {
+ case INDEXED: {
final JCArrayAccess i = (JCArrayAccess)lval;
return abstractRval(i.indexed, new TreeBuilder() {
public JCTree build(final JCTree indexed) {
@@ -2125,7 +2163,7 @@
}
});
}
- case JCTree.TYPECAST: {
+ case TYPECAST: {
return abstractLval(((JCTypeCast)lval).expr, builder);
}
}
@@ -2158,9 +2196,8 @@
} else {
make_at(tree.pos());
T result = super.translate(tree);
- if (endPositions != null && result != tree) {
- Integer endPos = endPositions.remove(tree);
- if (endPos != null) endPositions.put(result, endPos);
+ if (endPosTable != null && result != tree) {
+ endPosTable.replaceTree(tree, result);
}
return result;
}
@@ -2345,7 +2382,7 @@
for (List<JCTree> defs = tree.defs;
defs.nonEmpty();
defs=defs.tail) {
- if (defs.head.getTag() == JCTree.VARDEF && (((JCVariableDecl) defs.head).mods.flags & ENUM) != 0) {
+ if (defs.head.hasTag(VARDEF) && (((JCVariableDecl) defs.head).mods.flags & ENUM) != 0) {
JCVariableDecl var = (JCVariableDecl)defs.head;
visitEnumConstantDef(var, nextOrdinal++);
values.append(make.QualIdent(var.sym));
@@ -2757,9 +2794,9 @@
List.<JCExpression>nil() : List.of(translate(tree.detail));
if (!tree.cond.type.isFalse()) {
cond = makeBinary
- (JCTree.AND,
+ (AND,
cond,
- makeUnary(JCTree.NOT, tree.cond));
+ makeUnary(NOT, tree.cond));
}
result =
make.If(cond,
@@ -2816,7 +2853,7 @@
// first argument.
if (c.hasOuterInstance()) {
JCExpression thisArg;
- if (tree.meth.getTag() == JCTree.SELECT) {
+ if (tree.meth.hasTag(SELECT)) {
thisArg = attr.
makeNullCheck(translate(((JCFieldAccess) tree.meth).selected));
tree.meth = make.Ident(constructor);
@@ -2837,7 +2874,7 @@
// If the translated method itself is an Apply tree, we are
// seeing an access method invocation. In this case, append
// the method arguments to the arguments of the access method.
- if (tree.meth.getTag() == JCTree.APPLY) {
+ if (tree.meth.hasTag(APPLY)) {
JCMethodInvocation app = (JCMethodInvocation)tree.meth;
app.args = tree.args.prependList(app.args);
result = app;
@@ -2971,7 +3008,7 @@
// If translated left hand side is an Apply, we are
// seeing an access method invocation. In this case, append
// right hand side as last argument of the access method.
- if (tree.lhs.getTag() == JCTree.APPLY) {
+ if (tree.lhs.hasTag(APPLY)) {
JCMethodInvocation app = (JCMethodInvocation)tree.lhs;
app.args = List.of(tree.rhs).prependList(app.args);
result = app;
@@ -2988,7 +3025,7 @@
// (but without recomputing x)
JCTree newTree = abstractLval(tree.lhs, new TreeBuilder() {
public JCTree build(final JCTree lhs) {
- int newTag = tree.getTag() - JCTree.ASGOffset;
+ JCTree.Tag newTag = tree.getTag().noAssignOp();
// Erasure (TransTypes) can change the type of
// tree.lhs. However, we can still get the
// unerased type of tree.lhs as it is stored
@@ -3018,7 +3055,7 @@
// If translated left hand side is an Apply, we are
// seeing an access method invocation. In this case, append
// right hand side as last argument of the access method.
- if (tree.lhs.getTag() == JCTree.APPLY) {
+ if (tree.lhs.hasTag(APPLY)) {
JCMethodInvocation app = (JCMethodInvocation)tree.lhs;
// if operation is a += on strings,
// make sure to convert argument to string
@@ -3038,13 +3075,13 @@
// or
// translate to tmp1=lval(e); tmp2=tmp1; (typeof tree)tmp1 OP 1; tmp2
// where OP is += or -=
- final boolean cast = TreeInfo.skipParens(tree.arg).getTag() == JCTree.TYPECAST;
+ final boolean cast = TreeInfo.skipParens(tree.arg).hasTag(TYPECAST);
return abstractLval(tree.arg, new TreeBuilder() {
public JCTree build(final JCTree tmp1) {
return abstractRval(tmp1, tree.arg.type, new TreeBuilder() {
public JCTree build(final JCTree tmp2) {
- int opcode = (tree.getTag() == JCTree.POSTINC)
- ? JCTree.PLUS_ASG : JCTree.MINUS_ASG;
+ JCTree.Tag opcode = (tree.hasTag(POSTINC))
+ ? PLUS_ASG : MINUS_ASG;
JCTree lhs = cast
? make.TypeCast(tree.arg.type, (JCExpression)tmp1)
: tmp1;
@@ -3059,25 +3096,24 @@
}
public void visitUnary(JCUnary tree) {
- boolean isUpdateOperator =
- JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC;
+ boolean isUpdateOperator = tree.getTag().isIncOrDecUnaryOp();
if (isUpdateOperator && !tree.arg.type.isPrimitive()) {
switch(tree.getTag()) {
- case JCTree.PREINC: // ++ e
+ case PREINC: // ++ e
// translate to e += 1
- case JCTree.PREDEC: // -- e
+ case PREDEC: // -- e
// translate to e -= 1
{
- int opcode = (tree.getTag() == JCTree.PREINC)
- ? JCTree.PLUS_ASG : JCTree.MINUS_ASG;
+ JCTree.Tag opcode = (tree.hasTag(PREINC))
+ ? PLUS_ASG : MINUS_ASG;
JCAssignOp newTree = makeAssignop(opcode,
tree.arg,
make.Literal(1));
result = translate(newTree, tree.type);
return;
}
- case JCTree.POSTINC: // e ++
- case JCTree.POSTDEC: // e --
+ case POSTINC: // e ++
+ case POSTDEC: // e --
{
result = translate(lowerBoxedPostop(tree), tree.type);
return;
@@ -3088,14 +3124,14 @@
tree.arg = boxIfNeeded(translate(tree.arg, tree), tree.type);
- if (tree.getTag() == JCTree.NOT && tree.arg.type.constValue() != null) {
+ if (tree.hasTag(NOT) && tree.arg.type.constValue() != null) {
tree.type = cfolder.fold1(bool_not, tree.arg.type);
}
// If translated left hand side is an Apply, we are
// seeing an access method invocation. In this case, return
// that access method invocation as result.
- if (isUpdateOperator && tree.arg.getTag() == JCTree.APPLY) {
+ if (isUpdateOperator && tree.arg.hasTag(APPLY)) {
result = tree.arg;
} else {
result = tree;
@@ -3106,7 +3142,7 @@
List<Type> formals = tree.operator.type.getParameterTypes();
JCTree lhs = tree.lhs = translate(tree.lhs, formals.head);
switch (tree.getTag()) {
- case JCTree.OR:
+ case OR:
if (lhs.type.isTrue()) {
result = lhs;
return;
@@ -3116,7 +3152,7 @@
return;
}
break;
- case JCTree.AND:
+ case AND:
if (lhs.type.isFalse()) {
result = lhs;
return;
@@ -3186,9 +3222,9 @@
indexdef.init.type = indexdef.type = syms.intType.constType(0);
List<JCStatement> loopinit = List.of(arraycachedef, lencachedef, indexdef);
- JCBinary cond = makeBinary(JCTree.LT, make.Ident(index), make.Ident(lencache));
-
- JCExpressionStatement step = make.Exec(makeUnary(JCTree.PREINC, make.Ident(index)));
+ JCBinary cond = makeBinary(LT, make.Ident(index), make.Ident(lencache));
+
+ JCExpressionStatement step = make.Exec(makeUnary(PREINC, make.Ident(index)));
Type elemtype = types.elemtype(tree.expr.type);
JCExpression loopvarinit = make.Indexed(make.Ident(arraycache),
@@ -3592,7 +3628,7 @@
// need to special case-access of the form C.super.x
// these will always need an access method.
boolean qualifiedSuperAccess =
- tree.selected.getTag() == JCTree.SELECT &&
+ tree.selected.hasTag(SELECT) &&
TreeInfo.name(tree.selected) == names._super;
tree.selected = translate(tree.selected);
if (tree.name == names._class)
@@ -3639,10 +3675,10 @@
try {
attrEnv = env;
this.make = make;
- endPositions = env.toplevel.endPositions;
+ endPosTable = env.toplevel.endPositions;
currentClass = null;
currentMethodDef = null;
- outermostClassDef = (cdef.getTag() == JCTree.CLASSDEF) ? (JCClassDecl)cdef : null;
+ outermostClassDef = (cdef.hasTag(CLASSDEF)) ? (JCClassDecl)cdef : null;
outermostMemberDef = null;
this.translated = new ListBuffer<JCTree>();
classdefs = new HashMap<ClassSymbol,JCClassDecl>();
@@ -3668,7 +3704,7 @@
// note that recursive invocations of this method fail hard
attrEnv = null;
this.make = null;
- endPositions = null;
+ endPosTable = null;
currentClass = null;
currentMethodDef = null;
outermostClassDef = null;
@@ -3838,7 +3874,7 @@
JCIdent fLocUsageId = make.Ident(otherVarSym);
JCExpression sel = make.Select(fLocUsageId, ordinalSymbol);
- JCBinary bin = makeBinary(JCTree.MINUS, id1, sel);
+ JCBinary bin = makeBinary(MINUS, id1, sel);
JCReturn ret = make.Return(bin);
blockStatements.append(ret);
JCMethodDecl compareToMethod = make.MethodDef((MethodSymbol)compareToSym,
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Tue Dec 06 05:28:17 2011 -0800
@@ -40,8 +40,10 @@
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
/** This is the second phase of Enter, in which classes are completed
@@ -644,7 +646,7 @@
tree.sym = v;
if (tree.init != null) {
v.flags_field |= HASINIT;
- if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
+ if ((v.flags_field & FINAL) != 0 && !tree.init.hasTag(NEWCLASS)) {
Env<AttrContext> initEnv = getInitEnv(tree, env);
initEnv.info.enclVar = v;
v.setLazyConstValue(initEnv(tree, initEnv), attr, tree.init);
@@ -868,7 +870,7 @@
// If this is a toplevel-class, make sure any preceding import
// clauses have been seen.
if (c.owner.kind == PCK) {
- memberEnter(env.toplevel, env.enclosing(JCTree.TOPLEVEL));
+ memberEnter(env.toplevel, env.enclosing(TOPLEVEL));
todo.append(env);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Tue Dec 06 05:28:17 2011 -0800
@@ -49,9 +49,12 @@
import javax.lang.model.element.ElementVisitor;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.code.Kinds.ERRONEOUS;
import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** Helper class for name resolution, used mostly by the attribution phase.
*
@@ -1269,7 +1272,7 @@
staticOnly = true;
}
- if (env.tree.getTag() != JCTree.IMPORT) {
+ if (!env.tree.hasTag(IMPORT)) {
sym = findGlobalType(env, env.toplevel.namedImportScope, name);
if (sym.exists()) return sym;
else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
@@ -1796,7 +1799,7 @@
* @param env The environment current at the operation.
* @param argtypes The types of the operands.
*/
- Symbol resolveOperator(DiagnosticPosition pos, int optag,
+ Symbol resolveOperator(DiagnosticPosition pos, JCTree.Tag optag,
Env<AttrContext> env, List<Type> argtypes) {
startResolution();
Name name = treeinfo.operatorName(optag);
@@ -1815,7 +1818,7 @@
* @param env The environment current at the operation.
* @param arg The type of the operand.
*/
- Symbol resolveUnaryOperator(DiagnosticPosition pos, int optag, Env<AttrContext> env, Type arg) {
+ Symbol resolveUnaryOperator(DiagnosticPosition pos, JCTree.Tag optag, Env<AttrContext> env, Type arg) {
return resolveOperator(pos, optag, env, List.of(arg));
}
@@ -1827,7 +1830,7 @@
* @param right The types of the right operand.
*/
Symbol resolveBinaryOperator(DiagnosticPosition pos,
- int optag,
+ JCTree.Tag optag,
Env<AttrContext> env,
Type left,
Type right) {
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java Tue Dec 06 05:28:17 2011 -0800
@@ -31,6 +31,7 @@
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.parser.EndPosTable;
/** This class contains the CharacterRangeTable for some method
* and the hashtable for mapping trees or lists of trees to their
@@ -54,9 +55,9 @@
*/
private Map<Object,SourceRange> positions = new HashMap<Object,SourceRange>();
- /** The hashtable for ending positions stored in the parser.
+ /** The object for ending positions stored in the parser.
*/
- private Map<JCTree, Integer> endPositions;
+ private EndPosTable endPosTable;
/** The tree of the method this table is intended for.
* We should traverse this tree to get source ranges.
@@ -65,9 +66,9 @@
/** Constructor
*/
- public CRTable(JCTree.JCMethodDecl tree, Map<JCTree, Integer> endPositions) {
+ public CRTable(JCTree.JCMethodDecl tree, EndPosTable endPosTable) {
this.methodTree = tree;
- this.endPositions = endPositions;
+ this.endPosTable = endPosTable;
}
/** Create a new CRTEntry and add it to the entries.
@@ -532,12 +533,9 @@
*/
public int endPos(JCTree tree) {
if (tree == null) return Position.NOPOS;
- if (tree.getTag() == JCTree.BLOCK)
+ if (tree.hasTag(JCTree.Tag.BLOCK))
return ((JCBlock) tree).endpos;
- Integer endpos = endPositions.get(tree);
- if (endpos != null)
- return endpos.intValue();
- return Position.NOPOS;
+ return endPosTable.getEndPos(tree);
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue Dec 06 05:28:17 2011 -0800
@@ -2539,7 +2539,7 @@
* @param arg An argument for substitution into the output string.
*/
private void printCCF(String key, Object arg) {
- log.printNoteLines(key, arg);
+ log.printLines(key, arg);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Tue Dec 06 05:28:17 2011 -0800
@@ -892,8 +892,9 @@
if ((flags & INTERFACE) != 0) flags |= ABSTRACT; // Interfaces are always ABSTRACT
if (inner.name.isEmpty()) flags &= ~FINAL; // Anonymous class: unset FINAL flag
if (dumpInnerClassModifiers) {
- log.errWriter.println("INNERCLASS " + inner.name);
- log.errWriter.println("---" + flagNames(flags));
+ PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
+ pw.println("INNERCLASS " + inner.name);
+ pw.println("---" + flagNames(flags));
}
databuf.appendChar(pool.get(inner));
databuf.appendChar(
@@ -911,8 +912,9 @@
int flags = adjustFlags(v.flags());
databuf.appendChar(flags);
if (dumpFieldModifiers) {
- log.errWriter.println("FIELD " + fieldName(v));
- log.errWriter.println("---" + flagNames(v.flags()));
+ PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
+ pw.println("FIELD " + fieldName(v));
+ pw.println("---" + flagNames(v.flags()));
}
databuf.appendChar(pool.put(fieldName(v)));
databuf.appendChar(pool.put(typeSig(v.erasure(types))));
@@ -934,8 +936,9 @@
int flags = adjustFlags(m.flags());
databuf.appendChar(flags);
if (dumpMethodModifiers) {
- log.errWriter.println("METHOD " + fieldName(m));
- log.errWriter.println("---" + flagNames(m.flags()));
+ PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
+ pw.println("METHOD " + fieldName(m));
+ pw.println("---" + flagNames(m.flags()));
}
databuf.appendChar(pool.put(fieldName(m)));
databuf.appendChar(pool.put(typeSig(m.externalType(types))));
@@ -1483,9 +1486,10 @@
if ((flags & INTERFACE) == 0) flags |= ACC_SUPER;
if (c.isInner() && c.name.isEmpty()) flags &= ~FINAL;
if (dumpClassModifiers) {
- log.errWriter.println();
- log.errWriter.println("CLASSFILE " + c.getQualifiedName());
- log.errWriter.println("---" + flagNames(flags));
+ PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
+ pw.println();
+ pw.println("CLASSFILE " + c.getQualifiedName());
+ pw.println("---" + flagNames(flags));
}
databuf.appendChar(flags);
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Tue Dec 06 05:28:17 2011 -0800
@@ -26,8 +26,6 @@
package com.sun.tools.javac.jvm;
import java.util.*;
-import javax.lang.model.element.ElementKind;
-
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.List;
@@ -39,6 +37,7 @@
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.jvm.Code.*;
import com.sun.tools.javac.jvm.Items.*;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
@@ -47,6 +46,8 @@
import static com.sun.tools.javac.jvm.ByteCodes.*;
import static com.sun.tools.javac.jvm.CRTFlags.*;
import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK;
/** This pass maps flat Java (i.e. without inner classes) to bytecodes.
*
@@ -195,9 +196,10 @@
*/
private int nerrs = 0;
- /** A hash table mapping syntax trees to their ending source positions.
+ /** An object containing mappings of syntax trees to their
+ * ending source positions.
*/
- private Map<JCTree, Integer> endPositions;
+ EndPosTable endPosTable;
/** Generate code to load an integer constant.
* @param n The integer to be loaded.
@@ -433,7 +435,7 @@
*/
boolean hasFinally(JCTree target, Env<GenContext> env) {
while (env.tree != target) {
- if (env.tree.getTag() == JCTree.TRY && env.info.finalize.hasFinalizer())
+ if (env.tree.hasTag(TRY) && env.info.finalize.hasFinalizer())
return true;
env = env.next;
}
@@ -460,17 +462,17 @@
for (List<JCTree> l = defs; l.nonEmpty(); l = l.tail) {
JCTree def = l.head;
switch (def.getTag()) {
- case JCTree.BLOCK:
+ case BLOCK:
JCBlock block = (JCBlock)def;
if ((block.flags & STATIC) != 0)
clinitCode.append(block);
else
initCode.append(block);
break;
- case JCTree.METHODDEF:
+ case METHODDEF:
methodDefs.append(def);
break;
- case JCTree.VARDEF:
+ case VARDEF:
JCVariableDecl vdef = (JCVariableDecl) def;
VarSymbol sym = vdef.sym;
checkDimension(vdef.pos(), sym.type);
@@ -480,20 +482,14 @@
JCStatement init = make.at(vdef.pos()).
Assignment(sym, vdef.init);
initCode.append(init);
- if (endPositions != null) {
- Integer endPos = endPositions.remove(vdef);
- if (endPos != null) endPositions.put(init, endPos);
- }
+ endPosTable.replaceTree(vdef, init);
} else if (sym.getConstValue() == null) {
// Initialize class (static) variables only if
// they are not compile-time constants.
JCStatement init = make.at(vdef.pos).
Assignment(sym, vdef.init);
clinitCode.append(init);
- if (endPositions != null) {
- Integer endPos = endPositions.remove(vdef);
- if (endPos != null) endPositions.put(init, endPos);
- }
+ endPosTable.replaceTree(vdef, init);
} else {
checkStringConstant(vdef.init.pos(), sym.getConstValue());
}
@@ -707,7 +703,7 @@
}
int startpc = code.curPc();
genStat(tree, env);
- if (tree.getTag() == JCTree.BLOCK) crtFlags |= CRT_BLOCK;
+ if (tree.hasTag(BLOCK)) crtFlags |= CRT_BLOCK;
code.crt.put(tree, crtFlags, startpc, code.curPc());
}
@@ -717,7 +713,7 @@
if (code.isAlive()) {
code.statBegin(tree.pos);
genDef(tree, env);
- } else if (env.info.isSwitch && tree.getTag() == JCTree.VARDEF) {
+ } else if (env.info.isSwitch && tree.hasTag(VARDEF)) {
// variables whose declarations are in a switch
// can be used even if the decl is unreachable.
code.newLocal(((JCVariableDecl) tree).sym);
@@ -784,7 +780,7 @@
*/
public CondItem genCond(JCTree _tree, boolean markBranches) {
JCTree inner_tree = TreeInfo.skipParens(_tree);
- if (inner_tree.getTag() == JCTree.CONDEXPR) {
+ if (inner_tree.hasTag(CONDEXPR)) {
JCConditional tree = (JCConditional)inner_tree;
CondItem cond = genCond(tree.cond, CRT_FLOW_CONTROLLER);
if (cond.isTrue()) {
@@ -1033,7 +1029,7 @@
Env<GenContext> localEnv = env.dup(tree, new GenContext());
genStats(tree.stats, localEnv);
// End the scope of all block-local variables in variable info.
- if (env.tree.getTag() != JCTree.METHODDEF) {
+ if (!env.tree.hasTag(METHODDEF)) {
code.statBegin(tree.endpos);
code.endScopes(limit);
code.pendingStatPos = Position.NOPOS;
@@ -1628,11 +1624,11 @@
// Optimize x++ to ++x and x-- to --x.
JCExpression e = tree.expr;
switch (e.getTag()) {
- case JCTree.POSTINC:
- ((JCUnary) e).setTag(JCTree.PREINC);
+ case POSTINC:
+ ((JCUnary) e).setTag(PREINC);
break;
- case JCTree.POSTDEC:
- ((JCUnary) e).setTag(JCTree.PREDEC);
+ case POSTDEC:
+ ((JCUnary) e).setTag(PREDEC);
break;
}
genExpr(tree.expr, tree.expr.type).drop();
@@ -1819,13 +1815,13 @@
// If we have an increment of -32768 to +32767 of a local
// int variable we can use an incr instruction instead of
// proceeding further.
- if ((tree.getTag() == JCTree.PLUS_ASG || tree.getTag() == JCTree.MINUS_ASG) &&
+ if ((tree.hasTag(PLUS_ASG) || tree.hasTag(MINUS_ASG)) &&
l instanceof LocalItem &&
tree.lhs.type.tag <= INT &&
tree.rhs.type.tag <= INT &&
tree.rhs.type.constValue() != null) {
int ival = ((Number) tree.rhs.type.constValue()).intValue();
- if (tree.getTag() == JCTree.MINUS_ASG) ival = -ival;
+ if (tree.hasTag(MINUS_ASG)) ival = -ival;
((LocalItem)l).incr(ival);
result = l;
return;
@@ -1841,29 +1837,29 @@
public void visitUnary(JCUnary tree) {
OperatorSymbol operator = (OperatorSymbol)tree.operator;
- if (tree.getTag() == JCTree.NOT) {
+ if (tree.hasTag(NOT)) {
CondItem od = genCond(tree.arg, false);
result = od.negate();
} else {
Item od = genExpr(tree.arg, operator.type.getParameterTypes().head);
switch (tree.getTag()) {
- case JCTree.POS:
+ case POS:
result = od.load();
break;
- case JCTree.NEG:
+ case NEG:
result = od.load();
code.emitop0(operator.opcode);
break;
- case JCTree.COMPL:
+ case COMPL:
result = od.load();
emitMinusOne(od.typecode);
code.emitop0(operator.opcode);
break;
- case JCTree.PREINC: case JCTree.PREDEC:
+ case PREINC: case PREDEC:
od.duplicate();
if (od instanceof LocalItem &&
(operator.opcode == iadd || operator.opcode == isub)) {
- ((LocalItem)od).incr(tree.getTag() == JCTree.PREINC ? 1 : -1);
+ ((LocalItem)od).incr(tree.hasTag(PREINC) ? 1 : -1);
result = od;
} else {
od.load();
@@ -1877,12 +1873,12 @@
result = items.makeAssignItem(od);
}
break;
- case JCTree.POSTINC: case JCTree.POSTDEC:
+ case POSTINC: case POSTDEC:
od.duplicate();
if (od instanceof LocalItem &&
(operator.opcode == iadd || operator.opcode == isub)) {
Item res = od.load();
- ((LocalItem)od).incr(tree.getTag() == JCTree.POSTINC ? 1 : -1);
+ ((LocalItem)od).incr(tree.hasTag(POSTINC) ? 1 : -1);
result = res;
} else {
Item res = od.load();
@@ -1898,7 +1894,7 @@
result = res;
}
break;
- case JCTree.NULLCHK:
+ case NULLCHK:
result = od.load();
code.emitop0(dup);
genNullCheck(tree.pos());
@@ -1926,7 +1922,7 @@
// Convert buffer to string.
bufferToString(tree.pos());
result = items.makeStackItem(syms.stringType);
- } else if (tree.getTag() == JCTree.AND) {
+ } else if (tree.hasTag(AND)) {
CondItem lcond = genCond(tree.lhs, CRT_FLOW_CONTROLLER);
if (!lcond.isFalse()) {
Chain falseJumps = lcond.jumpFalse();
@@ -1940,7 +1936,7 @@
} else {
result = lcond;
}
- } else if (tree.getTag() == JCTree.OR) {
+ } else if (tree.hasTag(OR)) {
CondItem lcond = genCond(tree.lhs, CRT_FLOW_CONTROLLER);
if (!lcond.isTrue()) {
Chain trueJumps = lcond.jumpTrue();
@@ -1997,7 +1993,7 @@
*/
void appendStrings(JCTree tree) {
tree = TreeInfo.skipParens(tree);
- if (tree.getTag() == JCTree.PLUS && tree.type.constValue() == null) {
+ if (tree.hasTag(PLUS) && tree.type.constValue() == null) {
JCBinary op = (JCBinary) tree;
if (op.operator.kind == MTH &&
((OperatorSymbol) op.operator).opcode == string_add) {
@@ -2215,7 +2211,7 @@
attrEnv = env;
ClassSymbol c = cdef.sym;
this.toplevel = env.toplevel;
- this.endPositions = toplevel.endPositions;
+ this.endPosTable = toplevel.endPositions;
// If this is a class definition requiring Miranda methods,
// add them.
if (generateIproxies &&
@@ -2240,7 +2236,7 @@
if (nerrs != 0) {
// if errors, discard code
for (List<JCTree> l = cdef.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() == JCTree.METHODDEF)
+ if (l.head.hasTag(METHODDEF))
((JCMethodDecl) l.head).sym.code = null;
}
}
@@ -2251,7 +2247,7 @@
attrEnv = null;
this.env = null;
toplevel = null;
- endPositions = null;
+ endPosTable = null;
nerrs = 0;
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Tue Dec 06 05:28:17 2011 -0800
@@ -48,17 +48,18 @@
import com.sun.source.util.TaskEvent;
import com.sun.source.util.TaskListener;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.*;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.comp.*;
+import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.jvm.*;
+import com.sun.tools.javac.parser.*;
+import com.sun.tools.javac.processing.*;
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.parser.*;
-import com.sun.tools.javac.comp.*;
-import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.processing.*;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.Log.WriterKind;
import static javax.tools.StandardLocation.CLASS_OUTPUT;
import static com.sun.tools.javac.main.OptionName.*;
@@ -1506,20 +1507,20 @@
for (List<JCTree> it = tree.defs; it.tail != null; it = it.tail) {
JCTree t = it.head;
switch (t.getTag()) {
- case JCTree.CLASSDEF:
+ case CLASSDEF:
if (isInterface ||
(((JCClassDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
(((JCClassDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCClassDecl) t).sym.packge().getQualifiedName() == names.java_lang)
newdefs.append(t);
break;
- case JCTree.METHODDEF:
+ case METHODDEF:
if (isInterface ||
(((JCMethodDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
((JCMethodDecl) t).sym.name == names.init ||
(((JCMethodDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCMethodDecl) t).sym.packge().getQualifiedName() == names.java_lang)
newdefs.append(t);
break;
- case JCTree.VARDEF:
+ case VARDEF:
if (isInterface || (((JCVariableDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
(((JCVariableDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCVariableDecl) t).sym.packge().getQualifiedName() == names.java_lang)
newdefs.append(t);
@@ -1602,7 +1603,7 @@
}
protected void printNote(String lines) {
- Log.printLines(log.noticeWriter, lines);
+ log.printRawLines(Log.WriterKind.NOTICE, lines);
}
/** Print numbers of errors and warnings.
@@ -1614,8 +1615,8 @@
key = "count." + kind;
else
key = "count." + kind + ".plural";
- log.printErrLines(key, String.valueOf(count));
- log.errWriter.flush();
+ log.printLines(WriterKind.ERROR, key, String.valueOf(count));
+ log.flush(Log.WriterKind.ERROR);
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavacOption.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavacOption.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2011, Oracle and/or its affiliates. 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
@@ -25,10 +25,11 @@
package com.sun.tools.javac.main;
-import java.io.PrintWriter;
import java.util.LinkedHashMap;
import java.util.Map;
import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Log.PrefixKind;
+import com.sun.tools.javac.util.Log.WriterKind;
import com.sun.tools.javac.util.Options;
/**
@@ -177,14 +178,14 @@
/** Print a line of documentation describing this option, if standard.
* @param out the stream to which to write the documentation
*/
- void help(PrintWriter out) {
- String s = " " + helpSynopsis();
- out.print(s);
- for (int j = Math.min(s.length(), 28); j < 29; j++) out.print(" ");
- Log.printLines(out, Main.getLocalizedString(descrKey));
+ void help(Log log) {
+ log.printRawLines(WriterKind.NOTICE,
+ String.format(" %-26s %s",
+ helpSynopsis(log),
+ log.localize(PrefixKind.JAVAC, descrKey)));
}
- String helpSynopsis() {
+ String helpSynopsis(Log log) {
StringBuilder sb = new StringBuilder();
sb.append(name);
if (argsNameKey == null) {
@@ -202,7 +203,7 @@
} else {
if (!hasSuffix)
sb.append(" ");
- sb.append(Main.getLocalizedString(argsNameKey));
+ sb.append(log.localize(PrefixKind.JAVAC, argsNameKey));
}
return sb.toString();
@@ -211,7 +212,7 @@
/** Print a line of documentation describing this option, if non-standard.
* @param out the stream to which to write the documentation
*/
- void xhelp(PrintWriter out) {}
+ void xhelp(Log log) {}
/** Process the option (with arg). Return true if error detected.
*/
@@ -271,9 +272,9 @@
super(name, descrKey, kind, choices);
}
@Override
- void help(PrintWriter out) {}
+ void help(Log log) {}
@Override
- void xhelp(PrintWriter out) { super.help(out); }
+ void xhelp(Log log) { super.help(log); }
@Override
public OptionKind getKind() { return OptionKind.EXTENDED; }
};
@@ -288,9 +289,9 @@
super(name, argsNameKey, null);
}
@Override
- void help(PrintWriter out) {}
+ void help(Log log) {}
@Override
- void xhelp(PrintWriter out) {}
+ void xhelp(Log log) {}
@Override
public OptionKind getKind() { return OptionKind.HIDDEN; }
};
--- a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java Tue Dec 06 05:28:17 2011 -0800
@@ -33,7 +33,6 @@
import java.security.MessageDigest;
import java.util.Collection;
import java.util.LinkedHashSet;
-import java.util.MissingResourceException;
import java.util.Set;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
@@ -46,6 +45,8 @@
import com.sun.tools.javac.main.JavacOption.Option;
import com.sun.tools.javac.main.RecognizedOptions.OptionHelper;
import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.Log.WriterKind;
+import com.sun.tools.javac.util.Log.PrefixKind;
import com.sun.tools.javac.processing.AnnotationProcessingError;
import static com.sun.tools.javac.main.OptionName.*;
@@ -67,6 +68,10 @@
*/
PrintWriter out;
+ /** The log to use for diagnostic output.
+ */
+ Log log;
+
/**
* If true, certain errors will cause an exception, such as command line
* arg errors, or exceptions in user provided code.
@@ -98,6 +103,7 @@
public void setOut(PrintWriter out) {
Main.this.out = out;
+ Main.this.log.setWriters(out);
}
public void error(String key, Object... args) {
@@ -105,11 +111,11 @@
}
public void printVersion() {
- Log.printLines(out, getLocalizedString("version", ownName, JavaCompiler.version()));
+ log.printLines(PrefixKind.JAVAC, "version", ownName, JavaCompiler.version());
}
public void printFullVersion() {
- Log.printLines(out, getLocalizedString("fullVersion", ownName, JavaCompiler.fullVersion()));
+ log.printLines(PrefixKind.JAVAC, "fullVersion", ownName, JavaCompiler.fullVersion());
}
public void printHelp() {
@@ -158,39 +164,38 @@
/** Print a string that explains usage.
*/
void help() {
- Log.printLines(out, getLocalizedString("msg.usage.header", ownName));
+ log.printLines(PrefixKind.JAVAC, "msg.usage.header", ownName);
for (int i=0; i<recognizedOptions.length; i++) {
- recognizedOptions[i].help(out);
+ recognizedOptions[i].help(log);
}
- out.println();
+ log.printNewline();
}
/** Print a string that explains usage for X options.
*/
void xhelp() {
for (int i=0; i<recognizedOptions.length; i++) {
- recognizedOptions[i].xhelp(out);
+ recognizedOptions[i].xhelp(log);
}
- out.println();
- Log.printLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
+ log.printNewline();
+ log.printLines(PrefixKind.JAVAC, "msg.usage.nonstandard.footer");
}
/** Report a usage error.
*/
void error(String key, Object... args) {
if (apiMode) {
- String msg = getLocalizedString(key, args);
+ String msg = log.localize(PrefixKind.JAVAC, key, args);
throw new PropagatedException(new IllegalStateException(msg));
}
warning(key, args);
- Log.printLines(out, getLocalizedString("msg.usage", ownName));
+ log.printLines(PrefixKind.JAVAC, "msg.usage", ownName);
}
/** Report a warning.
*/
void warning(String key, Object... args) {
- Log.printLines(out, ownName + ": "
- + getLocalizedString(key, args));
+ log.printRawLines(ownName + ": " + log.localize(PrefixKind.JAVAC, key, args));
}
public Option getOption(String flag) {
@@ -307,6 +312,8 @@
showClass(showClass);
}
+ options.notifyListeners();
+
return filenames;
}
// where
@@ -352,6 +359,9 @@
List<JavaFileObject> fileObjects,
Iterable<? extends Processor> processors)
{
+ context.put(Log.outKey, out);
+ log = Log.instance(context);
+
if (options == null)
options = Options.instance(context); // creates a new one
@@ -390,20 +400,17 @@
return Result.CMDERR;
}
} catch (java.io.FileNotFoundException e) {
- Log.printLines(out, ownName + ": " +
- getLocalizedString("err.file.not.found",
- e.getMessage()));
+ warning("err.file.not.found", e.getMessage());
return Result.SYSERR;
}
boolean forceStdOut = options.isSet("stdout");
if (forceStdOut) {
- out.flush();
+ log.flush();
out = new PrintWriter(System.out, true);
+ log.setWriters(out);
}
- context.put(Log.outKey, out);
-
// allow System property in following line as a Mustang legacy
boolean batchMode = (options.isUnset("nonBatchMode")
&& System.getProperty("nonBatchMode") == null);
@@ -415,8 +422,6 @@
comp = JavaCompiler.instance(context);
if (comp == null) return Result.SYSERR;
- Log log = Log.instance(context);
-
if (!files.isEmpty()) {
// add filenames to fileObjects
comp = JavaCompiler.instance(context);
@@ -433,10 +438,10 @@
if (log.expectDiagKeys != null) {
if (log.expectDiagKeys.isEmpty()) {
- Log.printLines(log.noticeWriter, "all expected diagnostics found");
+ log.printRawLines("all expected diagnostics found");
return Result.OK;
} else {
- Log.printLines(log.noticeWriter, "expected diagnostic keys not found: " + log.expectDiagKeys);
+ log.printRawLines("expected diagnostic keys not found: " + log.expectDiagKeys);
return Result.ERROR;
}
}
@@ -491,52 +496,50 @@
/** Print a message reporting an internal error.
*/
void bugMessage(Throwable ex) {
- Log.printLines(out, getLocalizedString("msg.bug",
- JavaCompiler.version()));
- ex.printStackTrace(out);
+ log.printLines(PrefixKind.JAVAC, "msg.bug", JavaCompiler.version());
+ ex.printStackTrace(log.getWriter(WriterKind.NOTICE));
}
/** Print a message reporting a fatal error.
*/
void feMessage(Throwable ex) {
- Log.printLines(out, ex.getMessage());
+ log.printRawLines(ex.getMessage());
if (ex.getCause() != null && options.isSet("dev")) {
- ex.getCause().printStackTrace(out);
+ ex.getCause().printStackTrace(log.getWriter(WriterKind.NOTICE));
}
}
/** Print a message reporting an input/output error.
*/
void ioMessage(Throwable ex) {
- Log.printLines(out, getLocalizedString("msg.io"));
- ex.printStackTrace(out);
+ log.printLines(PrefixKind.JAVAC, "msg.io");
+ ex.printStackTrace(log.getWriter(WriterKind.NOTICE));
}
/** Print a message reporting an out-of-resources error.
*/
void resourceMessage(Throwable ex) {
- Log.printLines(out, getLocalizedString("msg.resource"));
-// System.out.println("(name buffer len = " + Name.names.length + " " + Name.nc);//DEBUG
- ex.printStackTrace(out);
+ log.printLines(PrefixKind.JAVAC, "msg.resource");
+ ex.printStackTrace(log.getWriter(WriterKind.NOTICE));
}
/** Print a message reporting an uncaught exception from an
* annotation processor.
*/
void apMessage(AnnotationProcessingError ex) {
- Log.printLines(out,
- getLocalizedString("msg.proc.annotation.uncaught.exception"));
- ex.getCause().printStackTrace(out);
+ log.printLines("msg.proc.annotation.uncaught.exception");
+ ex.getCause().printStackTrace(log.getWriter(WriterKind.NOTICE));
}
/** Display the location and checksum of a class. */
void showClass(String className) {
- out.println("javac: show class: " + className);
+ PrintWriter pw = log.getWriter(WriterKind.NOTICE);
+ pw.println("javac: show class: " + className);
URL url = getClass().getResource('/' + className.replace('.', '/') + ".class");
if (url == null)
- out.println(" class not found");
+ pw.println(" class not found");
else {
- out.println(" " + url);
+ pw.println(" " + url);
try {
final String algorithm = "MD5";
byte[] digest;
@@ -553,9 +556,9 @@
StringBuilder sb = new StringBuilder();
for (byte b: digest)
sb.append(String.format("%02x", b));
- out.println(" " + algorithm + " checksum: " + sb);
+ pw.println(" " + algorithm + " checksum: " + sb);
} catch (Exception e) {
- out.println(" cannot compute digest: " + e);
+ pw.println(" cannot compute digest: " + e);
}
}
}
@@ -566,35 +569,35 @@
* Internationalization
*************************************************************************/
- /** Find a localized string in the resource bundle.
- * @param key The key for the localized string.
- */
- public static String getLocalizedString(String key, Object... args) { // FIXME sb private
- try {
- if (messages == null)
- messages = new JavacMessages(javacBundleName);
- return messages.getLocalizedString("javac." + key, args);
- }
- catch (MissingResourceException e) {
- throw new Error("Fatal Error: Resource for javac is missing", e);
- }
- }
+// /** Find a localized string in the resource bundle.
+// * @param key The key for the localized string.
+// */
+// public static String getLocalizedString(String key, Object... args) { // FIXME sb private
+// try {
+// if (messages == null)
+// messages = new JavacMessages(javacBundleName);
+// return messages.getLocalizedString("javac." + key, args);
+// }
+// catch (MissingResourceException e) {
+// throw new Error("Fatal Error: Resource for javac is missing", e);
+// }
+// }
+//
+// public static void useRawMessages(boolean enable) {
+// if (enable) {
+// messages = new JavacMessages(javacBundleName) {
+// @Override
+// public String getLocalizedString(String key, Object... args) {
+// return key;
+// }
+// };
+// } else {
+// messages = new JavacMessages(javacBundleName);
+// }
+// }
- public static void useRawMessages(boolean enable) {
- if (enable) {
- messages = new JavacMessages(javacBundleName) {
- @Override
- public String getLocalizedString(String key, Object... args) {
- return key;
- }
- };
- } else {
- messages = new JavacMessages(javacBundleName);
- }
- }
-
- private static final String javacBundleName =
+ public static final String javacBundleName =
"com.sun.tools.javac.resources.javac";
-
- private static JavacMessages messages;
+//
+// private static JavacMessages messages;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java Tue Dec 06 05:28:17 2011 -0800
@@ -25,16 +25,6 @@
package com.sun.tools.javac.main;
-import com.sun.tools.javac.code.Lint;
-import com.sun.tools.javac.code.Source;
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.jvm.Target;
-import com.sun.tools.javac.main.JavacOption.HiddenOption;
-import com.sun.tools.javac.main.JavacOption.Option;
-import com.sun.tools.javac.main.JavacOption.XOption;
-import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javac.util.Options;
-import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
@@ -44,6 +34,19 @@
import java.util.Set;
import javax.lang.model.SourceVersion;
+import com.sun.tools.javac.code.Lint;
+import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.main.JavacOption.HiddenOption;
+import com.sun.tools.javac.main.JavacOption.Option;
+import com.sun.tools.javac.main.JavacOption.XOption;
+import com.sun.tools.javac.processing.JavacProcessingEnvironment;
+import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Log.PrefixKind;
+import com.sun.tools.javac.util.Options;
+
import static com.sun.tools.javac.main.OptionName.*;
/**
@@ -79,13 +82,18 @@
}
public static class GrumpyHelper implements OptionHelper {
+ private Log log;
+
+ public GrumpyHelper(Log log) {
+ this.log = log;
+ }
public void setOut(PrintWriter out) {
throw new IllegalArgumentException();
}
public void error(String key, Object... args) {
- throw new IllegalArgumentException(Main.getLocalizedString(key, args));
+ throw new IllegalArgumentException(log.localize(PrefixKind.JAVAC, key, args));
}
public void printVersion() {
@@ -400,9 +408,9 @@
},
new Option(A, "opt.arg.key.equals.value","opt.A") {
@Override
- String helpSynopsis() {
+ String helpSynopsis(Log log) {
hasSuffix = true;
- return super.helpSynopsis();
+ return super.helpSynopsis(log);
}
@Override
@@ -444,9 +452,9 @@
// It's actually implemented by the launcher.
new Option(J, "opt.arg.flag", "opt.J") {
@Override
- String helpSynopsis() {
+ String helpSynopsis(Log log) {
hasSuffix = true;
- return super.helpSynopsis();
+ return super.helpSynopsis(log);
}
@Override
public boolean process(Options options, String option) {
@@ -570,9 +578,9 @@
// It's actually implemented by the CommandLine class.
new Option(AT, "opt.arg.file", "opt.AT") {
@Override
- String helpSynopsis() {
+ String helpSynopsis(Log log) {
hasSuffix = true;
- return super.helpSynopsis();
+ return super.helpSynopsis(log);
}
@Override
public boolean process(Options options, String option) {
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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
@@ -48,6 +48,7 @@
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.Name;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
import static javax.lang.model.util.ElementFilter.methodsIn;
/**
@@ -288,7 +289,7 @@
}
}
public void visitArray(Attribute.Array array) {
- if (tree.getTag() == JCTree.NEWARRAY &&
+ if (tree.hasTag(NEWARRAY) &&
types.elemtype(array.type).tsym == findme.type.tsym) {
List<JCExpression> elems = ((JCNewArray) tree).elems;
for (Attribute value : array.values) {
@@ -327,7 +328,7 @@
scan(t.args);
}
public void visitAssign(JCAssign t) {
- if (t.lhs.getTag() == JCTree.IDENT) {
+ if (t.lhs.hasTag(IDENT)) {
JCIdent ident = (JCIdent) t.lhs;
if (ident.sym == sym)
result = t.rhs;
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java Mon Dec 05 12:50:00 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.javac.parser;
-
-import java.util.Map;
-import java.util.HashMap;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeInfo;
-
-import static com.sun.tools.javac.tree.JCTree.*;
-
-/**
- * This class is similar to Parser except that it stores ending
- * positions for the tree nodes.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b></p>
- */
-public class EndPosParser extends JavacParser {
-
- public EndPosParser(ParserFactory fac, Lexer S, boolean keepDocComments, boolean keepLineMap) {
- super(fac, S, keepDocComments, keepLineMap);
- this.S = S;
- endPositions = new HashMap<JCTree,Integer>();
- }
-
- private Lexer S;
-
- /** A hashtable to store ending positions
- * of source ranges indexed by the tree nodes.
- * Defined only if option flag genEndPos is set.
- */
- Map<JCTree, Integer> endPositions;
-
- /** {@inheritDoc} */
- @Override
- protected void storeEnd(JCTree tree, int endpos) {
- int errorEndPos = getErrorEndPos();
- endPositions.put(tree, errorEndPos > endpos ? errorEndPos : endpos);
- }
-
- /** {@inheritDoc} */
- @Override
- protected <T extends JCTree> T to(T t) {
- storeEnd(t, token.endPos);
- return t;
- }
-
- /** {@inheritDoc} */
- @Override
- protected <T extends JCTree> T toP(T t) {
- storeEnd(t, S.prevToken().endPos);
- return t;
- }
-
- @Override
- public JCCompilationUnit parseCompilationUnit() {
- JCCompilationUnit t = super.parseCompilationUnit();
- t.endPositions = endPositions;
- return t;
- }
-
- /** {@inheritDoc} */
- @Override
- JCExpression parExpression() {
- int pos = token.pos;
- JCExpression t = super.parExpression();
- return toP(F.at(pos).Parens(t));
- }
-
- /** {@inheritDoc} */
- @Override
- public int getEndPos(JCTree tree) {
- return TreeInfo.getEndPos(tree, endPositions);
- }
-
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/EndPosTable.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.javac.parser;
+
+import com.sun.tools.javac.tree.JCTree;
+
+/**
+ * Specifies the methods to access a mappings of syntax trees to end positions.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b></p>
+ */
+public interface EndPosTable {
+
+ /**
+ * This method will return the end position of a given tree, otherwise a
+ * Positions.NOPOS will be returned.
+ * @param tree JCTree
+ * @return position of the source tree or Positions.NOPOS for non-existent mapping
+ */
+ public int getEndPos(JCTree tree);
+
+ /**
+ * Give an old tree and a new tree, the old tree will be replaced with
+ * the new tree, the position of the new tree will be that of the old
+ * tree.
+ * not exist.
+ * @param oldtree a JCTree to be replaced
+ * @param newtree a JCTree to be replaced with
+ * @return position of the old tree or Positions.NOPOS for non-existent mapping
+ */
+ public int replaceTree(JCTree oldtree, JCTree newtree);
+}
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java Tue Dec 06 05:28:17 2011 -0800
@@ -25,10 +25,11 @@
package com.sun.tools.javac.parser;
-import java.nio.CharBuffer;
import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
import com.sun.tools.javac.util.*;
+import java.nio.CharBuffer;
import static com.sun.tools.javac.parser.Tokens.*;
import static com.sun.tools.javac.util.LayoutCharacters.*;
@@ -65,9 +66,6 @@
*/
private final Log log;
- /** The name table. */
- private final Names names;
-
/** The token factory. */
private final Tokens tokens;
@@ -87,17 +85,11 @@
*/
protected int errPos = Position.NOPOS;
- /** Has a @deprecated been encountered in last doc comment?
- * this needs to be reset by client.
+ /** The Unicode reader (low-level stream reader).
*/
- protected boolean deprecatedFlag = false;
+ protected UnicodeReader reader;
- /** A character buffer for saved chars.
- */
- protected char[] sbuf = new char[128];
- protected int sp;
-
- protected UnicodeReader reader;
+ protected ScannerFactory fac;
private static final boolean hexFloatsWork = hexFloatsWork();
private static boolean hexFloatsWork() {
@@ -129,14 +121,14 @@
}
protected JavaTokenizer(ScannerFactory fac, UnicodeReader reader) {
- log = fac.log;
- names = fac.names;
- tokens = fac.tokens;
- source = fac.source;
+ this.fac = fac;
+ this.log = fac.log;
+ this.tokens = fac.tokens;
+ this.source = fac.source;
this.reader = reader;
- allowBinaryLiterals = source.allowBinaryLiterals();
- allowHexFloats = source.allowHexFloats();
- allowUnderscoresInLiterals = source.allowUnderscoresInLiterals();
+ this.allowBinaryLiterals = source.allowBinaryLiterals();
+ this.allowHexFloats = source.allowHexFloats();
+ this.allowUnderscoresInLiterals = source.allowUnderscoresInLiterals();
}
/** Report an error at the given position using the provided arguments.
@@ -147,38 +139,13 @@
errPos = pos;
}
- /** Read next character in comment, skipping over double '\' characters.
- */
- protected void scanCommentChar() {
- reader.scanChar();
- if (reader.ch == '\\') {
- if (reader.peekChar() == '\\' && !reader.isUnicode()) {
- reader.skipChar();
- } else {
- reader.convertUnicode();
- }
- }
- }
-
- /** Append a character to sbuf.
- */
- private void putChar(char ch) {
- if (sp == sbuf.length) {
- char[] newsbuf = new char[sbuf.length * 2];
- System.arraycopy(sbuf, 0, newsbuf, 0, sbuf.length);
- sbuf = newsbuf;
- }
- sbuf[sp++] = ch;
- }
-
/** Read next character in character or string literal and copy into sbuf.
*/
private void scanLitChar(int pos) {
if (reader.ch == '\\') {
if (reader.peekChar() == '\\' && !reader.isUnicode()) {
reader.skipChar();
- putChar('\\');
- reader.scanChar();
+ reader.putChar('\\', true);
} else {
reader.scanChar();
switch (reader.ch) {
@@ -195,30 +162,30 @@
reader.scanChar();
}
}
- putChar((char)oct);
+ reader.putChar((char)oct);
break;
case 'b':
- putChar('\b'); reader.scanChar(); break;
+ reader.putChar('\b', true); break;
case 't':
- putChar('\t'); reader.scanChar(); break;
+ reader.putChar('\t', true); break;
case 'n':
- putChar('\n'); reader.scanChar(); break;
+ reader.putChar('\n', true); break;
case 'f':
- putChar('\f'); reader.scanChar(); break;
+ reader.putChar('\f', true); break;
case 'r':
- putChar('\r'); reader.scanChar(); break;
+ reader.putChar('\r', true); break;
case '\'':
- putChar('\''); reader.scanChar(); break;
+ reader.putChar('\'', true); break;
case '\"':
- putChar('\"'); reader.scanChar(); break;
+ reader.putChar('\"', true); break;
case '\\':
- putChar('\\'); reader.scanChar(); break;
+ reader.putChar('\\', true); break;
default:
lexError(reader.bp, "illegal.esc.char");
}
}
} else if (reader.bp != reader.buflen) {
- putChar(reader.ch); reader.scanChar();
+ reader.putChar(true);
}
}
@@ -227,7 +194,7 @@
int savePos;
do {
if (reader.ch != '_') {
- putChar(reader.ch);
+ reader.putChar(false);
} else {
if (!allowUnderscoresInLiterals) {
lexError(pos, "unsupported.underscore.lit", source.name);
@@ -246,12 +213,10 @@
*/
private void scanHexExponentAndSuffix(int pos) {
if (reader.ch == 'p' || reader.ch == 'P') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
skipIllegalUnderscores();
if (reader.ch == '+' || reader.ch == '-') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
}
skipIllegalUnderscores();
if ('0' <= reader.ch && reader.ch <= '9') {
@@ -268,14 +233,12 @@
lexError(pos, "malformed.fp.lit");
}
if (reader.ch == 'f' || reader.ch == 'F') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
tk = TokenKind.FLOATLITERAL;
radix = 16;
} else {
if (reader.ch == 'd' || reader.ch == 'D') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
}
tk = TokenKind.DOUBLELITERAL;
radix = 16;
@@ -289,14 +252,12 @@
if ('0' <= reader.ch && reader.ch <= '9') {
scanDigits(pos, 10);
}
- int sp1 = sp;
+ int sp1 = reader.sp;
if (reader.ch == 'e' || reader.ch == 'E') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
skipIllegalUnderscores();
if (reader.ch == '+' || reader.ch == '-') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
}
skipIllegalUnderscores();
if ('0' <= reader.ch && reader.ch <= '9') {
@@ -304,7 +265,7 @@
return;
}
lexError(pos, "malformed.fp.lit");
- sp = sp1;
+ reader.sp = sp1;
}
}
@@ -314,13 +275,11 @@
radix = 10;
scanFraction(pos);
if (reader.ch == 'f' || reader.ch == 'F') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
tk = TokenKind.FLOATLITERAL;
} else {
if (reader.ch == 'd' || reader.ch == 'D') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
}
tk = TokenKind.DOUBLELITERAL;
}
@@ -331,8 +290,7 @@
private void scanHexFractionAndSuffix(int pos, boolean seendigit) {
radix = 16;
Assert.check(reader.ch == '.');
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
skipIllegalUnderscores();
if (reader.digit(pos, 16) >= 0) {
seendigit = true;
@@ -369,8 +327,7 @@
} else if (seendigit && radix == 16 && (reader.ch == 'p' || reader.ch == 'P')) {
scanHexExponentAndSuffix(pos);
} else if (digitRadix == 10 && reader.ch == '.') {
- putChar(reader.ch);
- reader.scanChar();
+ reader.putChar(true);
scanFractionAndSuffix(pos);
} else if (digitRadix == 10 &&
(reader.ch == 'e' || reader.ch == 'E' ||
@@ -393,10 +350,7 @@
boolean isJavaIdentifierPart;
char high;
do {
- if (sp == sbuf.length) putChar(reader.ch); else sbuf[sp++] = reader.ch;
- // optimization, was: putChar(reader.ch);
-
- reader.scanChar();
+ reader.putChar(true);
switch (reader.ch) {
case 'A': case 'B': case 'C': case 'D': case 'E':
case 'F': case 'G': case 'H': case 'I': case 'J':
@@ -423,7 +377,7 @@
break;
case '\u001A': // EOI is also a legal identifier part
if (reader.bp >= reader.buflen) {
- name = names.fromChars(sbuf, 0, sp);
+ name = reader.name();
tk = tokens.lookupKind(name);
return;
}
@@ -435,11 +389,7 @@
} else {
high = reader.scanSurrogates();
if (high != 0) {
- if (sp == sbuf.length) {
- putChar(high);
- } else {
- sbuf[sp++] = high;
- }
+ reader.putChar(high);
isJavaIdentifierPart = Character.isJavaIdentifierPart(
Character.toCodePoint(high, reader.ch));
} else {
@@ -447,7 +397,7 @@
}
}
if (!isJavaIdentifierPart) {
- name = names.fromChars(sbuf, 0, sp);
+ name = reader.name();
tk = tokens.lookupKind(name);
return;
}
@@ -474,11 +424,11 @@
*/
private void scanOperator() {
while (true) {
- putChar(reader.ch);
- Name newname = names.fromChars(sbuf, 0, sp);
+ reader.putChar(false);
+ Name newname = reader.name();
TokenKind tk1 = tokens.lookupKind(newname);
if (tk1 == TokenKind.IDENTIFIER) {
- sp--;
+ reader.sp--;
break;
}
tk = tk1;
@@ -487,111 +437,17 @@
}
}
- /**
- * Scan a documentation comment; determine if a deprecated tag is present.
- * Called once the initial /, * have been skipped, positioned at the second *
- * (which is treated as the beginning of the first line).
- * Stops positioned at the closing '/'.
- */
- @SuppressWarnings("fallthrough")
- private void scanDocComment() {
- boolean deprecatedPrefix = false;
-
- forEachLine:
- while (reader.bp < reader.buflen) {
-
- // Skip optional WhiteSpace at beginning of line
- while (reader.bp < reader.buflen && (reader.ch == ' ' || reader.ch == '\t' || reader.ch == FF)) {
- scanCommentChar();
- }
-
- // Skip optional consecutive Stars
- while (reader.bp < reader.buflen && reader.ch == '*') {
- scanCommentChar();
- if (reader.ch == '/') {
- return;
- }
- }
-
- // Skip optional WhiteSpace after Stars
- while (reader.bp < reader.buflen && (reader.ch == ' ' || reader.ch == '\t' || reader.ch == FF)) {
- scanCommentChar();
- }
-
- deprecatedPrefix = false;
- // At beginning of line in the JavaDoc sense.
- if (reader.bp < reader.buflen && reader.ch == '@' && !deprecatedFlag) {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'd') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'e') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'p') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'r') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'e') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'c') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'a') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 't') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'e') {
- scanCommentChar();
- if (reader.bp < reader.buflen && reader.ch == 'd') {
- deprecatedPrefix = true;
- scanCommentChar();
- }}}}}}}}}}}
- if (deprecatedPrefix && reader.bp < reader.buflen) {
- if (Character.isWhitespace(reader.ch)) {
- deprecatedFlag = true;
- } else if (reader.ch == '*') {
- scanCommentChar();
- if (reader.ch == '/') {
- deprecatedFlag = true;
- return;
- }
- }
- }
-
- // Skip rest of line
- while (reader.bp < reader.buflen) {
- switch (reader.ch) {
- case '*':
- scanCommentChar();
- if (reader.ch == '/') {
- return;
- }
- break;
- case CR: // (Spec 3.4)
- scanCommentChar();
- if (reader.ch != LF) {
- continue forEachLine;
- }
- /* fall through to LF case */
- case LF: // (Spec 3.4)
- scanCommentChar();
- continue forEachLine;
- default:
- scanCommentChar();
- }
- } // rest of line
- } // forEachLine
- return;
- }
-
/** Read token.
*/
public Token readToken() {
- sp = 0;
+ reader.sp = 0;
name = null;
- deprecatedFlag = false;
radix = 0;
+
int pos = 0;
int endPos = 0;
+ List<Comment> comments = null;
try {
loop: while (true) {
@@ -656,7 +512,7 @@
scanNumber(pos, 2);
}
} else {
- putChar('0');
+ reader.putChar('0');
if (reader.ch == '_') {
int savePos = reader.bp;
do {
@@ -676,14 +532,13 @@
case '.':
reader.scanChar();
if ('0' <= reader.ch && reader.ch <= '9') {
- putChar('.');
+ reader.putChar('.');
scanFractionAndSuffix(pos);
} else if (reader.ch == '.') {
- putChar('.'); putChar('.');
- reader.scanChar();
+ reader.putChar('.'); reader.putChar('.', true);
if (reader.ch == '.') {
reader.scanChar();
- putChar('.');
+ reader.putChar('.');
tk = TokenKind.ELLIPSIS;
} else {
lexError(pos, "malformed.fp.lit");
@@ -712,32 +567,36 @@
reader.scanChar();
if (reader.ch == '/') {
do {
- scanCommentChar();
+ reader.scanCommentChar();
} while (reader.ch != CR && reader.ch != LF && reader.bp < reader.buflen);
if (reader.bp < reader.buflen) {
- processComment(pos, reader.bp, CommentStyle.LINE);
+ comments = addDocReader(comments, processComment(pos, reader.bp, CommentStyle.LINE));
}
break;
} else if (reader.ch == '*') {
+ boolean isEmpty = false;
reader.scanChar();
CommentStyle style;
if (reader.ch == '*') {
style = CommentStyle.JAVADOC;
- scanDocComment();
+ reader.scanCommentChar();
+ if (reader.ch == '/') {
+ isEmpty = true;
+ }
} else {
style = CommentStyle.BLOCK;
- while (reader.bp < reader.buflen) {
- if (reader.ch == '*') {
- reader.scanChar();
- if (reader.ch == '/') break;
- } else {
- scanCommentChar();
- }
+ }
+ while (!isEmpty && reader.bp < reader.buflen) {
+ if (reader.ch == '*') {
+ reader.scanChar();
+ if (reader.ch == '/') break;
+ } else {
+ reader.scanCommentChar();
}
}
if (reader.ch == '/') {
reader.scanChar();
- processComment(pos, reader.bp, style);
+ comments = addDocReader(comments, processComment(pos, reader.bp, style));
break;
} else {
lexError(pos, "unclosed.comment");
@@ -789,11 +648,7 @@
} else {
char high = reader.scanSurrogates();
if (high != 0) {
- if (sp == sbuf.length) {
- putChar(high);
- } else {
- sbuf[sp++] = high;
- }
+ reader.putChar(high);
isJavaIdentifierStart = Character.isJavaIdentifierStart(
Character.toCodePoint(high, reader.ch));
@@ -816,10 +671,10 @@
}
endPos = reader.bp;
switch (tk.tag) {
- case DEFAULT: return new Token(tk, pos, endPos, deprecatedFlag);
- case NAMED: return new NamedToken(tk, pos, endPos, name, deprecatedFlag);
- case STRING: return new StringToken(tk, pos, endPos, new String(sbuf, 0, sp), deprecatedFlag);
- case NUMERIC: return new NumericToken(tk, pos, endPos, new String(sbuf, 0, sp), radix, deprecatedFlag);
+ case DEFAULT: return new Token(tk, pos, endPos, comments);
+ case NAMED: return new NamedToken(tk, pos, endPos, name, comments);
+ case STRING: return new StringToken(tk, pos, endPos, reader.chars(), comments);
+ case NUMERIC: return new NumericToken(tk, pos, endPos, reader.chars(), radix, comments);
default: throw new AssertionError();
}
}
@@ -832,6 +687,12 @@
}
}
}
+ //where
+ List<Comment> addDocReader(List<Comment> docReaders, Comment docReader) {
+ return docReaders == null ?
+ List.of(docReader) :
+ docReaders.prepend(docReader);
+ }
/** Return the position where a lexical error occurred;
*/
@@ -845,22 +706,18 @@
errPos = pos;
}
- public enum CommentStyle {
- LINE,
- BLOCK,
- JAVADOC,
- }
-
/**
* Called when a complete comment has been scanned. pos and endPos
* will mark the comment boundary.
*/
- protected void processComment(int pos, int endPos, CommentStyle style) {
+ protected Tokens.Comment processComment(int pos, int endPos, CommentStyle style) {
if (scannerDebug)
System.out.println("processComment(" + pos
+ "," + endPos + "," + style + ")=|"
+ new String(reader.getRawCharacters(pos, endPos))
+ "|");
+ char[] buf = reader.getRawCharacters(pos, endPos);
+ return new BasicComment<UnicodeReader>(new UnicodeReader(fac, buf, buf.length), style);
}
/**
@@ -893,4 +750,125 @@
public Position.LineMap getLineMap() {
return Position.makeLineMap(reader.getRawCharacters(), reader.buflen, false);
}
+
+
+ /**
+ * Scan a documentation comment; determine if a deprecated tag is present.
+ * Called once the initial /, * have been skipped, positioned at the second *
+ * (which is treated as the beginning of the first line).
+ * Stops positioned at the closing '/'.
+ */
+ protected class BasicComment<U extends UnicodeReader> implements Comment {
+
+ CommentStyle cs;
+ U comment_reader;
+
+ protected boolean deprecatedFlag = false;
+ protected boolean scanned = false;
+
+ protected BasicComment(U comment_reader, CommentStyle cs) {
+ this.comment_reader = comment_reader;
+ this.cs = cs;
+ }
+
+ public String getText() {
+ return null;
+ }
+
+ public CommentStyle getStyle() {
+ return cs;
+ }
+
+ public boolean isDeprecated() {
+ if (!scanned && cs == CommentStyle.JAVADOC) {
+ scanDocComment();
+ }
+ return deprecatedFlag;
+ }
+
+ @SuppressWarnings("fallthrough")
+ protected void scanDocComment() {
+ try {
+ boolean deprecatedPrefix = false;
+
+ comment_reader.bp += 3; // '/**'
+ comment_reader.ch = comment_reader.buf[comment_reader.bp];
+
+ forEachLine:
+ while (comment_reader.bp < comment_reader.buflen) {
+
+ // Skip optional WhiteSpace at beginning of line
+ while (comment_reader.bp < comment_reader.buflen && (comment_reader.ch == ' ' || comment_reader.ch == '\t' || comment_reader.ch == FF)) {
+ comment_reader.scanCommentChar();
+ }
+
+ // Skip optional consecutive Stars
+ while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == '*') {
+ comment_reader.scanCommentChar();
+ if (comment_reader.ch == '/') {
+ return;
+ }
+ }
+
+ // Skip optional WhiteSpace after Stars
+ while (comment_reader.bp < comment_reader.buflen && (comment_reader.ch == ' ' || comment_reader.ch == '\t' || comment_reader.ch == FF)) {
+ comment_reader.scanCommentChar();
+ }
+
+ deprecatedPrefix = false;
+ // At beginning of line in the JavaDoc sense.
+ if (!deprecatedFlag) {
+ String deprecated = "@deprecated";
+ int i = 0;
+ while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == deprecated.charAt(i)) {
+ comment_reader.scanCommentChar();
+ i++;
+ if (i == deprecated.length()) {
+ deprecatedPrefix = true;
+ break;
+ }
+ }
+ }
+
+ if (deprecatedPrefix && comment_reader.bp < comment_reader.buflen) {
+ if (Character.isWhitespace(comment_reader.ch)) {
+ deprecatedFlag = true;
+ } else if (comment_reader.ch == '*') {
+ comment_reader.scanCommentChar();
+ if (comment_reader.ch == '/') {
+ deprecatedFlag = true;
+ return;
+ }
+ }
+ }
+
+ // Skip rest of line
+ while (comment_reader.bp < comment_reader.buflen) {
+ switch (comment_reader.ch) {
+ case '*':
+ comment_reader.scanCommentChar();
+ if (comment_reader.ch == '/') {
+ return;
+ }
+ break;
+ case CR: // (Spec 3.4)
+ comment_reader.scanCommentChar();
+ if (comment_reader.ch != LF) {
+ continue forEachLine;
+ }
+ /* fall through to LF case */
+ case LF: // (Spec 3.4)
+ comment_reader.scanCommentChar();
+ continue forEachLine;
+ default:
+ comment_reader.scanCommentChar();
+ }
+ } // rest of line
+ } // forEachLine
+ return;
+ } finally {
+ scanned = true;
+ }
+ }
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Tue Dec 06 05:28:17 2011 -0800
@@ -29,6 +29,7 @@
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.parser.Tokens.*;
+import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.*;
@@ -36,8 +37,16 @@
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.List;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.*;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.ASSERT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.CASE;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.CATCH;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.EQ;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.GT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.IMPORT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.LT;
import static com.sun.tools.javac.util.ListBuffer.lb;
-import static com.sun.tools.javac.parser.Tokens.TokenKind.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** The parser maps a token sequence into an abstract syntax
* tree. It operates by recursive descent, with code derived
@@ -74,12 +83,16 @@
/** The name table. */
private Names names;
+ /** End position mappings container */
+ private final AbstractEndPosTable endPosTable;
+
/** Construct a parser from a given scanner, tree factory and log.
*/
protected JavacParser(ParserFactory fac,
Lexer S,
boolean keepDocComments,
- boolean keepLineMap) {
+ boolean keepLineMap,
+ boolean keepEndPositions) {
this.S = S;
nextToken(); // prime the pump
this.F = fac.F;
@@ -101,8 +114,14 @@
docComments = keepDocComments ? new HashMap<JCTree,String>() : null;
this.keepLineMap = keepLineMap;
this.errorTree = F.Erroneous();
+ endPosTable = newEndPosTable(keepEndPositions);
}
+ protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) {
+ return keepEndPositions
+ ? new SimpleEndPosTable()
+ : new EmptyEndPosTable();
+ }
/** Switch: Should generics be recognized?
*/
boolean allowGenerics;
@@ -380,37 +399,21 @@
/* -------- source positions ------- */
- private int errorEndPos = -1;
-
private void setErrorEndPos(int errPos) {
- if (errPos > errorEndPos)
- errorEndPos = errPos;
+ endPosTable.setErrorEndPos(errPos);
}
- protected int getErrorEndPos() {
- return errorEndPos;
+ private void storeEnd(JCTree tree, int endpos) {
+ endPosTable.storeEnd(tree, endpos);
}
- /**
- * Store ending position for a tree.
- * @param tree The tree.
- * @param endpos The ending position to associate with the tree.
- */
- protected void storeEnd(JCTree tree, int endpos) {}
+ private <T extends JCTree> T to(T t) {
+ return endPosTable.to(t);
+ }
- /**
- * Store ending position for a tree. The ending position should
- * be the ending position of the current token.
- * @param t The tree.
- */
- protected <T extends JCTree> T to(T t) { return t; }
-
- /**
- * Store ending position for a tree. The ending position should
- * be greater of the ending position of the previous token and errorEndPos.
- * @param t The tree.
- */
- protected <T extends JCTree> T toP(T t) { return t; }
+ private <T extends JCTree> T toP(T t) {
+ return endPosTable.toP(t);
+ }
/** Get the start position for a tree node. The start position is
* defined to be the position of the first character of the first
@@ -430,7 +433,7 @@
* @param tree The tree node
*/
public int getEndPos(JCTree tree) {
- return Position.NOPOS;
+ return endPosTable.getEndPos(tree);
}
@@ -757,7 +760,7 @@
Assert.check(top == 0);
t = odStack[0];
- if (t.getTag() == JCTree.PLUS) {
+ if (t.hasTag(JCTree.Tag.PLUS)) {
StringBuffer buf = foldStrings(t);
if (buf != null) {
t = toP(F.at(startPos).Literal(TypeTags.CLASS, buf.toString()));
@@ -790,7 +793,7 @@
return null;
List<String> buf = List.nil();
while (true) {
- if (tree.getTag() == JCTree.LITERAL) {
+ if (tree.hasTag(LITERAL)) {
JCLiteral lit = (JCLiteral) tree;
if (lit.typetag == TypeTags.CLASS) {
StringBuffer sbuf =
@@ -801,9 +804,9 @@
}
return sbuf;
}
- } else if (tree.getTag() == JCTree.PLUS) {
+ } else if (tree.hasTag(JCTree.Tag.PLUS)) {
JCBinary op = (JCBinary)tree;
- if (op.rhs.getTag() == JCTree.LITERAL) {
+ if (op.rhs.hasTag(LITERAL)) {
JCLiteral lit = (JCLiteral) op.rhs;
if (lit.typetag == TypeTags.CLASS) {
buf = buf.prepend((String) lit.value);
@@ -899,7 +902,7 @@
t = term3();
if ((mode & TYPE) != 0 && token.kind == LT) {
// Could be a cast to a parameterized type
- int op = JCTree.LT;
+ JCTree.Tag op = JCTree.Tag.LT;
int pos1 = token.pos;
nextToken();
mode &= (EXPR | TYPE);
@@ -1153,7 +1156,7 @@
while ((token.kind == PLUSPLUS || token.kind == SUBSUB) && (mode & EXPR) != 0) {
mode = EXPR;
t = to(F.at(token.pos).Unary(
- token.kind == PLUSPLUS ? JCTree.POSTINC : JCTree.POSTDEC, t));
+ token.kind == PLUSPLUS ? POSTINC : POSTDEC, t));
nextToken();
}
return toP(t);
@@ -1353,7 +1356,7 @@
int pos = token.pos;
nextToken();
accept(CLASS);
- if (token.pos == errorEndPos) {
+ if (token.pos == endPosTable.errorEndPos) {
// error recovery
Name name = null;
if (token.kind == IDENTIFIER) {
@@ -1533,10 +1536,11 @@
/** ParExpression = "(" Expression ")"
*/
JCExpression parExpression() {
+ int pos = token.pos;
accept(LPAREN);
JCExpression t = parseExpression();
accept(RPAREN);
- return t;
+ return toP(F.at(pos).Parens(t));
}
/** Block = "{" BlockStatements "}"
@@ -1584,7 +1588,7 @@
break;
case MONKEYS_AT:
case FINAL: {
- String dc = token.docComment;
+ String dc = token.comment(CommentStyle.JAVADOC);
JCModifiers mods = modifiersOpt();
if (token.kind == INTERFACE ||
token.kind == CLASS ||
@@ -1601,21 +1605,21 @@
break;
}
case ABSTRACT: case STRICTFP: {
- String dc = token.docComment;
+ String dc = token.comment(CommentStyle.JAVADOC);
JCModifiers mods = modifiersOpt();
stats.append(classOrInterfaceOrEnumDeclaration(mods, dc));
break;
}
case INTERFACE:
case CLASS:
- String dc = token.docComment;
+ String dc = token.comment(CommentStyle.JAVADOC);
stats.append(classOrInterfaceOrEnumDeclaration(modifiersOpt(), dc));
break;
case ENUM:
case ASSERT:
if (allowEnums && token.kind == ENUM) {
error(token.pos, "local.enum");
- dc = token.docComment;
+ dc = token.comment(CommentStyle.JAVADOC);
stats.append(classOrInterfaceOrEnumDeclaration(modifiersOpt(), dc));
break;
} else if (allowAsserts && token.kind == ASSERT) {
@@ -1626,7 +1630,7 @@
default:
Token prevToken = token;
JCExpression t = term(EXPR | TYPE);
- if (token.kind == COLON && t.getTag() == JCTree.IDENT) {
+ if (token.kind == COLON && t.hasTag(IDENT)) {
nextToken();
JCStatement stat = parseStatement();
stats.append(F.at(pos).Labelled(prevToken.name(), stat));
@@ -1652,7 +1656,7 @@
// error recovery
if (token.pos == lastErrPos)
return stats.toList();
- if (token.pos <= errorEndPos) {
+ if (token.pos <= endPosTable.errorEndPos) {
skip(false, true, true, true);
lastErrPos = token.pos;
}
@@ -1701,7 +1705,7 @@
accept(LPAREN);
List<JCStatement> inits = token.kind == SEMI ? List.<JCStatement>nil() : forInit();
if (inits.length() == 1 &&
- inits.head.getTag() == JCTree.VARDEF &&
+ inits.head.hasTag(VARDEF) &&
((JCVariableDecl) inits.head).init == null &&
token.kind == COLON) {
checkForeach();
@@ -1834,7 +1838,7 @@
default:
Token prevToken = token;
JCExpression expr = parseExpression();
- if (token.kind == COLON && expr.getTag() == JCTree.IDENT) {
+ if (token.kind == COLON && expr.hasTag(IDENT)) {
nextToken();
JCStatement stat = parseStatement();
return F.at(pos).Labelled(prevToken.name(), stat);
@@ -1991,7 +1995,7 @@
annotations.appendList(partial.annotations);
pos = partial.pos;
}
- if (token.deprecatedFlag) {
+ if (token.deprecatedFlag()) {
flags |= Flags.DEPRECATED;
}
int lastPos = Position.NOPOS;
@@ -2087,7 +2091,7 @@
if (token.kind == IDENTIFIER) {
mode = EXPR;
JCExpression t1 = term1();
- if (t1.getTag() == JCTree.IDENT && token.kind == EQ) {
+ if (t1.hasTag(IDENT) && token.kind == EQ) {
int pos = token.pos;
accept(EQ);
JCExpression v = annotationValue();
@@ -2261,7 +2265,7 @@
boolean checkForImports = true;
boolean firstTypeDecl = true;
while (token.kind != EOF) {
- if (token.pos <= errorEndPos) {
+ if (token.pos <= endPosTable.errorEndPos) {
// error recovery
skip(checkForImports, false, false, false);
if (token.kind == EOF)
@@ -2271,9 +2275,9 @@
seenImport = true;
defs.append(importDeclaration());
} else {
- String docComment = token.docComment;
+ String docComment = token.comment(CommentStyle.JAVADOC);
if (firstTypeDecl && !seenImport && !seenPackage) {
- docComment = firstToken.docComment;
+ docComment = firstToken.comment(CommentStyle.JAVADOC);
consumedToplevelDoc = true;
}
JCTree def = typeDeclaration(mods, docComment);
@@ -2288,13 +2292,14 @@
}
JCTree.JCCompilationUnit toplevel = F.at(firstToken.pos).TopLevel(packageAnnotations, pid, defs.toList());
if (!consumedToplevelDoc)
- attach(toplevel, firstToken.docComment);
+ attach(toplevel, firstToken.comment(CommentStyle.JAVADOC));
if (defs.elems.isEmpty())
storeEnd(toplevel, S.prevToken().endPos);
if (keepDocComments)
toplevel.docComments = docComments;
if (keepLineMap)
toplevel.lineMap = S.getLineMap();
+ toplevel.endPositions = this.endPosTable;
return toplevel;
}
@@ -2485,7 +2490,7 @@
while (token.kind != RBRACE && token.kind != EOF) {
defs.appendList(classOrInterfaceBodyDeclaration(enumName,
false));
- if (token.pos <= errorEndPos) {
+ if (token.pos <= endPosTable.errorEndPos) {
// error recovery
skip(false, true, true, false);
}
@@ -2498,9 +2503,9 @@
/** EnumeratorDeclaration = AnnotationsOpt [TypeArguments] IDENTIFIER [ Arguments ] [ "{" ClassBody "}" ]
*/
JCTree enumeratorDeclaration(Name enumName) {
- String dc = token.docComment;
+ String dc = token.comment(CommentStyle.JAVADOC);
int flags = Flags.PUBLIC|Flags.STATIC|Flags.FINAL|Flags.ENUM;
- if (token.deprecatedFlag) {
+ if (token.deprecatedFlag()) {
flags |= Flags.DEPRECATED;
}
int pos = token.pos;
@@ -2547,7 +2552,7 @@
*/
List<JCTree> classOrInterfaceBody(Name className, boolean isInterface) {
accept(LBRACE);
- if (token.pos <= errorEndPos) {
+ if (token.pos <= endPosTable.errorEndPos) {
// error recovery
skip(false, true, false, false);
if (token.kind == LBRACE)
@@ -2556,7 +2561,7 @@
ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
while (token.kind != RBRACE && token.kind != EOF) {
defs.appendList(classOrInterfaceBodyDeclaration(className, isInterface));
- if (token.pos <= errorEndPos) {
+ if (token.pos <= endPosTable.errorEndPos) {
// error recovery
skip(false, true, true, false);
}
@@ -2587,7 +2592,7 @@
nextToken();
return List.<JCTree>nil();
} else {
- String dc = token.docComment;
+ String dc = token.comment(CommentStyle.JAVADOC);
int pos = token.pos;
JCModifiers mods = modifiersOpt();
if (token.kind == CLASS ||
@@ -2617,7 +2622,7 @@
} else {
type = parseType();
}
- if (token.kind == LPAREN && !isInterface && type.getTag() == JCTree.IDENT) {
+ if (token.kind == LPAREN && !isInterface && type.hasTag(IDENT)) {
if (isInterface || tk.name() != className)
error(pos, "invalid.meth.decl.ret.type.req");
return List.of(methodDeclaratorRest(
@@ -2688,7 +2693,7 @@
defaultValue = null;
}
accept(SEMI);
- if (token.pos <= errorEndPos) {
+ if (token.pos <= endPosTable.errorEndPos) {
// error recovery
skip(false, true, false, false);
if (token.kind == LBRACE) {
@@ -2814,15 +2819,15 @@
*/
protected JCExpression checkExprStat(JCExpression t) {
switch(t.getTag()) {
- case JCTree.PREINC: case JCTree.PREDEC:
- case JCTree.POSTINC: case JCTree.POSTDEC:
- case JCTree.ASSIGN:
- case JCTree.BITOR_ASG: case JCTree.BITXOR_ASG: case JCTree.BITAND_ASG:
- case JCTree.SL_ASG: case JCTree.SR_ASG: case JCTree.USR_ASG:
- case JCTree.PLUS_ASG: case JCTree.MINUS_ASG:
- case JCTree.MUL_ASG: case JCTree.DIV_ASG: case JCTree.MOD_ASG:
- case JCTree.APPLY: case JCTree.NEWCLASS:
- case JCTree.ERRONEOUS:
+ case PREINC: case PREDEC:
+ case POSTINC: case POSTDEC:
+ case ASSIGN:
+ case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+ case SL_ASG: case SR_ASG: case USR_ASG:
+ case PLUS_ASG: case MINUS_ASG:
+ case MUL_ASG: case DIV_ASG: case MOD_ASG:
+ case APPLY: case NEWCLASS:
+ case ERRONEOUS:
return t;
default:
JCExpression ret = F.at(t.pos).Erroneous(List.<JCTree>of(t));
@@ -2835,8 +2840,8 @@
* -1 if token is not a binary operator. @see TreeInfo.opPrec
*/
static int prec(TokenKind token) {
- int oc = optag(token);
- return (oc >= 0) ? TreeInfo.opPrec(oc) : -1;
+ JCTree.Tag oc = optag(token);
+ return (oc != NO_TAG) ? TreeInfo.opPrec(oc) : -1;
}
/**
@@ -2852,96 +2857,96 @@
}
/** Return operation tag of binary operator represented by token,
- * -1 if token is not a binary operator.
+ * No_TAG if token is not a binary operator.
*/
- static int optag(TokenKind token) {
+ static JCTree.Tag optag(TokenKind token) {
switch (token) {
case BARBAR:
- return JCTree.OR;
+ return OR;
case AMPAMP:
- return JCTree.AND;
+ return AND;
case BAR:
- return JCTree.BITOR;
+ return BITOR;
case BAREQ:
- return JCTree.BITOR_ASG;
+ return BITOR_ASG;
case CARET:
- return JCTree.BITXOR;
+ return BITXOR;
case CARETEQ:
- return JCTree.BITXOR_ASG;
+ return BITXOR_ASG;
case AMP:
- return JCTree.BITAND;
+ return BITAND;
case AMPEQ:
- return JCTree.BITAND_ASG;
+ return BITAND_ASG;
case EQEQ:
- return JCTree.EQ;
+ return JCTree.Tag.EQ;
case BANGEQ:
- return JCTree.NE;
+ return NE;
case LT:
- return JCTree.LT;
+ return JCTree.Tag.LT;
case GT:
- return JCTree.GT;
+ return JCTree.Tag.GT;
case LTEQ:
- return JCTree.LE;
+ return LE;
case GTEQ:
- return JCTree.GE;
+ return GE;
case LTLT:
- return JCTree.SL;
+ return SL;
case LTLTEQ:
- return JCTree.SL_ASG;
+ return SL_ASG;
case GTGT:
- return JCTree.SR;
+ return SR;
case GTGTEQ:
- return JCTree.SR_ASG;
+ return SR_ASG;
case GTGTGT:
- return JCTree.USR;
+ return USR;
case GTGTGTEQ:
- return JCTree.USR_ASG;
+ return USR_ASG;
case PLUS:
- return JCTree.PLUS;
+ return JCTree.Tag.PLUS;
case PLUSEQ:
- return JCTree.PLUS_ASG;
+ return PLUS_ASG;
case SUB:
- return JCTree.MINUS;
+ return MINUS;
case SUBEQ:
- return JCTree.MINUS_ASG;
+ return MINUS_ASG;
case STAR:
- return JCTree.MUL;
+ return MUL;
case STAREQ:
- return JCTree.MUL_ASG;
+ return MUL_ASG;
case SLASH:
- return JCTree.DIV;
+ return DIV;
case SLASHEQ:
- return JCTree.DIV_ASG;
+ return DIV_ASG;
case PERCENT:
- return JCTree.MOD;
+ return MOD;
case PERCENTEQ:
- return JCTree.MOD_ASG;
+ return MOD_ASG;
case INSTANCEOF:
- return JCTree.TYPETEST;
+ return TYPETEST;
default:
- return -1;
+ return NO_TAG;
}
}
/** Return operation tag of unary operator represented by token,
- * -1 if token is not a binary operator.
+ * No_TAG if token is not a binary operator.
*/
- static int unoptag(TokenKind token) {
+ static JCTree.Tag unoptag(TokenKind token) {
switch (token) {
case PLUS:
- return JCTree.POS;
+ return POS;
case SUB:
- return JCTree.NEG;
+ return NEG;
case BANG:
- return JCTree.NOT;
+ return NOT;
case TILDE:
- return JCTree.COMPL;
+ return COMPL;
case PLUSPLUS:
- return JCTree.PREINC;
+ return PREINC;
case SUBSUB:
- return JCTree.PREDEC;
+ return PREDEC;
default:
- return -1;
+ return NO_TAG;
}
}
@@ -3019,4 +3024,112 @@
allowTWR = true;
}
}
+
+ /*
+ * a functional source tree and end position mappings
+ */
+ protected class SimpleEndPosTable extends AbstractEndPosTable {
+
+ private final Map<JCTree, Integer> endPosMap;
+
+ SimpleEndPosTable() {
+ endPosMap = new HashMap<JCTree, Integer>();
+ }
+
+ protected void storeEnd(JCTree tree, int endpos) {
+ endPosMap.put(tree, errorEndPos > endpos ? errorEndPos : endpos);
+ }
+
+ protected <T extends JCTree> T to(T t) {
+ storeEnd(t, token.endPos);
+ return t;
+ }
+
+ protected <T extends JCTree> T toP(T t) {
+ storeEnd(t, S.prevToken().endPos);
+ return t;
+ }
+
+ public int getEndPos(JCTree tree) {
+ Integer value = endPosMap.get(tree);
+ return (value == null) ? Position.NOPOS : value;
+ }
+
+ public int replaceTree(JCTree oldTree, JCTree newTree) {
+ Integer pos = endPosMap.remove(oldTree);
+ if (pos != null) {
+ endPosMap.put(newTree, pos);
+ return pos;
+ }
+ return Position.NOPOS;
+ }
+ }
+
+ /*
+ * a default skeletal implementation without any mapping overhead.
+ */
+ protected class EmptyEndPosTable extends AbstractEndPosTable {
+
+ protected void storeEnd(JCTree tree, int endpos) { /* empty */ }
+
+ protected <T extends JCTree> T to(T t) {
+ return t;
+ }
+
+ protected <T extends JCTree> T toP(T t) {
+ return t;
+ }
+
+ public int getEndPos(JCTree tree) {
+ return Position.NOPOS;
+ }
+
+ public int replaceTree(JCTree oldTree, JCTree newTree) {
+ return Position.NOPOS;
+ }
+
+ }
+
+ protected abstract class AbstractEndPosTable implements EndPosTable {
+
+ /**
+ * Store the last error position.
+ */
+ protected int errorEndPos;
+
+ /**
+ * Store ending position for a tree, the value of which is the greater
+ * of last error position and the given ending position.
+ * @param tree The tree.
+ * @param endpos The ending position to associate with the tree.
+ */
+ protected abstract void storeEnd(JCTree tree, int endpos);
+
+ /**
+ * Store current token's ending position for a tree, the value of which
+ * will be the greater of last error position and the ending position of
+ * the current token.
+ * @param t The tree.
+ */
+ protected abstract <T extends JCTree> T to(T t);
+
+ /**
+ * Store current token's ending position for a tree, the value of which
+ * will be the greater of last error position and the ending position of
+ * the previous token.
+ * @param t The tree.
+ */
+ protected abstract <T extends JCTree> T toP(T t);
+
+ /**
+ * Set the error position during the parsing phases, the value of which
+ * will be set only if it is greater than the last stored error position.
+ * @param errPos The error position
+ */
+ protected void setErrorEndPos(int errPos) {
+ if (errPos > errorEndPos) {
+ errorEndPos = errPos;
+ }
+ }
+ }
}
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Tue Dec 06 05:28:17 2011 -0800
@@ -25,8 +25,8 @@
package com.sun.tools.javac.parser;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.parser.Tokens.Token;
+import com.sun.tools.javac.parser.Tokens.Comment;
+import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
import com.sun.tools.javac.util.*;
import java.nio.*;
@@ -59,352 +59,295 @@
super(fac, input, inputLength);
}
- /** The comment input buffer, index of next chacter to be read,
- * index of one past last character in buffer.
- */
- private char[] buf;
- private int bp;
- private int buflen;
-
- /** The current character.
- */
- private char ch;
-
- /** The column number position of the current character.
- */
- private int col;
-
- /** The buffer index of the last converted Unicode character
- */
- private int unicodeConversionBp = 0;
-
- /**
- * Buffer for doc comment.
- */
- private char[] docCommentBuffer = new char[1024];
-
- /**
- * Number of characters in doc comment buffer.
- */
- private int docCommentCount;
-
- /**
- * Translated and stripped contents of doc comment
- */
- private String docComment = null;
-
-
- /** Unconditionally expand the comment buffer.
- */
- private void expandCommentBuffer() {
- char[] newBuffer = new char[docCommentBuffer.length * 2];
- System.arraycopy(docCommentBuffer, 0, newBuffer,
- 0, docCommentBuffer.length);
- docCommentBuffer = newBuffer;
- }
-
- /** Convert an ASCII digit from its base (8, 10, or 16)
- * to its value.
- */
- private int digit(int base) {
- char c = ch;
- int result = Character.digit(c, base);
- if (result >= 0 && c > 0x7f) {
- ch = "0123456789abcdef".charAt(result);
- }
- return result;
- }
-
- /** Convert Unicode escape; bp points to initial '\' character
- * (Spec 3.3).
- */
- private void convertUnicode() {
- if (ch == '\\' && unicodeConversionBp != bp) {
- bp++; ch = buf[bp]; col++;
- if (ch == 'u') {
- do {
- bp++; ch = buf[bp]; col++;
- } while (ch == 'u');
- int limit = bp + 3;
- if (limit < buflen) {
- int d = digit(16);
- int code = d;
- while (bp < limit && d >= 0) {
- bp++; ch = buf[bp]; col++;
- d = digit(16);
- code = (code << 4) + d;
- }
- if (d >= 0) {
- ch = (char)code;
- unicodeConversionBp = bp;
- return;
- }
- }
- // "illegal.Unicode.esc", reported by base scanner
- } else {
- bp--;
- ch = '\\';
- col--;
- }
- }
- }
-
-
- /** Read next character.
- */
- private void scanChar() {
- bp++;
- ch = buf[bp];
- switch (ch) {
- case '\r': // return
- col = 0;
- break;
- case '\n': // newline
- if (bp == 0 || buf[bp-1] != '\r') {
- col = 0;
- }
- break;
- case '\t': // tab
- col = (col / TabInc * TabInc) + TabInc;
- break;
- case '\\': // possible Unicode
- col++;
- convertUnicode();
- break;
- default:
- col++;
- break;
- }
- }
-
@Override
- public Token readToken() {
- docComment = null;
- Token tk = super.readToken();
- tk.docComment = docComment;
- return tk;
+ protected Comment processComment(int pos, int endPos, CommentStyle style) {
+ char[] buf = reader.getRawCharacters(pos, endPos);
+ return new JavadocComment(new ColReader(fac, buf, buf.length), style);
}
/**
- * Read next character in doc comment, skipping over double '\' characters.
- * If a double '\' is skipped, put in the buffer and update buffer count.
+ * This is a specialized version of UnicodeReader that keeps track of the
+ * column position within a given character stream (used for Javadoc processing).
*/
- private void scanDocCommentChar() {
- scanChar();
- if (ch == '\\') {
- if (buf[bp+1] == '\\' && unicodeConversionBp != bp) {
- if (docCommentCount == docCommentBuffer.length)
- expandCommentBuffer();
- docCommentBuffer[docCommentCount++] = ch;
- bp++; col++;
- } else {
- convertUnicode();
+ static class ColReader extends UnicodeReader {
+
+ int col;
+
+ ColReader(ScannerFactory fac, char[] input, int inputLength) {
+ super(fac, input, inputLength);
+ }
+
+ @Override
+ protected void convertUnicode() {
+ if (ch == '\\' && unicodeConversionBp != bp) {
+ bp++; ch = buf[bp]; col++;
+ if (ch == 'u') {
+ do {
+ bp++; ch = buf[bp]; col++;
+ } while (ch == 'u');
+ int limit = bp + 3;
+ if (limit < buflen) {
+ int d = digit(bp, 16);
+ int code = d;
+ while (bp < limit && d >= 0) {
+ bp++; ch = buf[bp]; col++;
+ d = digit(bp, 16);
+ code = (code << 4) + d;
+ }
+ if (d >= 0) {
+ ch = (char)code;
+ unicodeConversionBp = bp;
+ return;
+ }
+ }
+ // "illegal.Unicode.esc", reported by base scanner
+ } else {
+ bp--;
+ ch = '\\';
+ col--;
+ }
+ }
+ }
+
+ @Override
+ protected void scanCommentChar() {
+ scanChar();
+ if (ch == '\\') {
+ if (peekChar() == '\\' && !isUnicode()) {
+ putChar(ch, false);
+ bp++; col++;
+ } else {
+ convertUnicode();
+ }
+ }
+ }
+
+ @Override
+ protected void scanChar() {
+ bp++;
+ ch = buf[bp];
+ switch (ch) {
+ case '\r': // return
+ col = 0;
+ break;
+ case '\n': // newline
+ if (bp == 0 || buf[bp-1] != '\r') {
+ col = 0;
+ }
+ break;
+ case '\t': // tab
+ col = (col / TabInc * TabInc) + TabInc;
+ break;
+ case '\\': // possible Unicode
+ col++;
+ convertUnicode();
+ break;
+ default:
+ col++;
+ break;
+ }
+ }
+ }
+
+ protected class JavadocComment extends JavaTokenizer.BasicComment<ColReader> {
+
+ /**
+ * Translated and stripped contents of doc comment
+ */
+ private String docComment = null;
+
+ JavadocComment(ColReader comment_reader, CommentStyle cs) {
+ super(comment_reader, cs);
+ }
+
+ public String getText() {
+ if (!scanned && cs == CommentStyle.JAVADOC) {
+ scanDocComment();
+ }
+ return docComment;
+ }
+
+ @Override
+ @SuppressWarnings("fallthrough")
+ protected void scanDocComment() {
+ try {
+ boolean firstLine = true;
+
+ // Skip over first slash
+ comment_reader.scanCommentChar();
+ // Skip over first star
+ comment_reader.scanCommentChar();
+
+ // consume any number of stars
+ while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == '*') {
+ comment_reader.scanCommentChar();
+ }
+ // is the comment in the form /**/, /***/, /****/, etc. ?
+ if (comment_reader.bp < comment_reader.buflen && comment_reader.ch == '/') {
+ docComment = "";
+ return;
+ }
+
+ // skip a newline on the first line of the comment.
+ if (comment_reader.bp < comment_reader.buflen) {
+ if (comment_reader.ch == LF) {
+ comment_reader.scanCommentChar();
+ firstLine = false;
+ } else if (comment_reader.ch == CR) {
+ comment_reader.scanCommentChar();
+ if (comment_reader.ch == LF) {
+ comment_reader.scanCommentChar();
+ firstLine = false;
+ }
+ }
+ }
+
+ outerLoop:
+
+ // The outerLoop processes the doc comment, looping once
+ // for each line. For each line, it first strips off
+ // whitespace, then it consumes any stars, then it
+ // puts the rest of the line into our buffer.
+ while (comment_reader.bp < comment_reader.buflen) {
+
+ // The wsLoop consumes whitespace from the beginning
+ // of each line.
+ wsLoop:
+
+ while (comment_reader.bp < comment_reader.buflen) {
+ switch(comment_reader.ch) {
+ case ' ':
+ comment_reader.scanCommentChar();
+ break;
+ case '\t':
+ comment_reader.col = ((comment_reader.col - 1) / TabInc * TabInc) + TabInc;
+ comment_reader.scanCommentChar();
+ break;
+ case FF:
+ comment_reader.col = 0;
+ comment_reader.scanCommentChar();
+ break;
+ // Treat newline at beginning of line (blank line, no star)
+ // as comment text. Old Javadoc compatibility requires this.
+ /*---------------------------------*
+ case CR: // (Spec 3.4)
+ doc_reader.scanCommentChar();
+ if (ch == LF) {
+ col = 0;
+ doc_reader.scanCommentChar();
+ }
+ break;
+ case LF: // (Spec 3.4)
+ doc_reader.scanCommentChar();
+ break;
+ *---------------------------------*/
+ default:
+ // we've seen something that isn't whitespace;
+ // jump out.
+ break wsLoop;
+ }
+ }
+
+ // Are there stars here? If so, consume them all
+ // and check for the end of comment.
+ if (comment_reader.ch == '*') {
+ // skip all of the stars
+ do {
+ comment_reader.scanCommentChar();
+ } while (comment_reader.ch == '*');
+
+ // check for the closing slash.
+ if (comment_reader.ch == '/') {
+ // We're done with the doc comment
+ // scanChar() and breakout.
+ break outerLoop;
+ }
+ } else if (! firstLine) {
+ //The current line does not begin with a '*' so we will indent it.
+ for (int i = 1; i < comment_reader.col; i++) {
+ comment_reader.putChar(' ', false);
+ }
+ }
+ // The textLoop processes the rest of the characters
+ // on the line, adding them to our buffer.
+ textLoop:
+ while (comment_reader.bp < comment_reader.buflen) {
+ switch (comment_reader.ch) {
+ case '*':
+ // Is this just a star? Or is this the
+ // end of a comment?
+ comment_reader.scanCommentChar();
+ if (comment_reader.ch == '/') {
+ // This is the end of the comment,
+ // set ch and return our buffer.
+ break outerLoop;
+ }
+ // This is just an ordinary star. Add it to
+ // the buffer.
+ comment_reader.putChar('*', false);
+ break;
+ case ' ':
+ case '\t':
+ comment_reader.putChar(comment_reader.ch, false);
+ comment_reader.scanCommentChar();
+ break;
+ case FF:
+ comment_reader.scanCommentChar();
+ break textLoop; // treat as end of line
+ case CR: // (Spec 3.4)
+ comment_reader.scanCommentChar();
+ if (comment_reader.ch != LF) {
+ // Canonicalize CR-only line terminator to LF
+ comment_reader.putChar((char)LF, false);
+ break textLoop;
+ }
+ /* fall through to LF case */
+ case LF: // (Spec 3.4)
+ // We've seen a newline. Add it to our
+ // buffer and break out of this loop,
+ // starting fresh on a new line.
+ comment_reader.putChar(comment_reader.ch, false);
+ comment_reader.scanCommentChar();
+ break textLoop;
+ default:
+ // Add the character to our buffer.
+ comment_reader.putChar(comment_reader.ch, false);
+ comment_reader.scanCommentChar();
+ }
+ } // end textLoop
+ firstLine = false;
+ } // end outerLoop
+
+ if (comment_reader.sp > 0) {
+ int i = comment_reader.sp - 1;
+ trailLoop:
+ while (i > -1) {
+ switch (comment_reader.sbuf[i]) {
+ case '*':
+ i--;
+ break;
+ default:
+ break trailLoop;
+ }
+ }
+ comment_reader.sp = i + 1;
+
+ // Store the text of the doc comment
+ docComment = comment_reader.chars();
+ } else {
+ docComment = "";
+ }
+ } finally {
+ scanned = true;
+ if (docComment != null &&
+ docComment.matches("(?sm).*^\\s*@deprecated( |$).*")) {
+ deprecatedFlag = true;
+ }
}
}
}
- /**
- * Process a doc comment and make the string content available.
- * Strips leading whitespace and stars.
- */
- @SuppressWarnings("fallthrough")
- protected void processComment(int pos, int endPos, CommentStyle style) {
- if (style != CommentStyle.JAVADOC) {
- return;
- }
-
- buf = reader.getRawCharacters(pos, endPos);
- buflen = buf.length;
- bp = 0;
- col = 0;
-
- docCommentCount = 0;
-
- boolean firstLine = true;
-
- // Skip over first slash
- scanDocCommentChar();
- // Skip over first star
- scanDocCommentChar();
-
- // consume any number of stars
- while (bp < buflen && ch == '*') {
- scanDocCommentChar();
- }
- // is the comment in the form /**/, /***/, /****/, etc. ?
- if (bp < buflen && ch == '/') {
- docComment = "";
- return;
- }
-
- // skip a newline on the first line of the comment.
- if (bp < buflen) {
- if (ch == LF) {
- scanDocCommentChar();
- firstLine = false;
- } else if (ch == CR) {
- scanDocCommentChar();
- if (ch == LF) {
- scanDocCommentChar();
- firstLine = false;
- }
- }
- }
-
- outerLoop:
-
- // The outerLoop processes the doc comment, looping once
- // for each line. For each line, it first strips off
- // whitespace, then it consumes any stars, then it
- // puts the rest of the line into our buffer.
- while (bp < buflen) {
-
- // The wsLoop consumes whitespace from the beginning
- // of each line.
- wsLoop:
-
- while (bp < buflen) {
- switch(ch) {
- case ' ':
- scanDocCommentChar();
- break;
- case '\t':
- col = ((col - 1) / TabInc * TabInc) + TabInc;
- scanDocCommentChar();
- break;
- case FF:
- col = 0;
- scanDocCommentChar();
- break;
-// Treat newline at beginning of line (blank line, no star)
-// as comment text. Old Javadoc compatibility requires this.
-/*---------------------------------*
- case CR: // (Spec 3.4)
- scanDocCommentChar();
- if (ch == LF) {
- col = 0;
- scanDocCommentChar();
- }
- break;
- case LF: // (Spec 3.4)
- scanDocCommentChar();
- break;
-*---------------------------------*/
- default:
- // we've seen something that isn't whitespace;
- // jump out.
- break wsLoop;
- }
- }
-
- // Are there stars here? If so, consume them all
- // and check for the end of comment.
- if (ch == '*') {
- // skip all of the stars
- do {
- scanDocCommentChar();
- } while (ch == '*');
-
- // check for the closing slash.
- if (ch == '/') {
- // We're done with the doc comment
- // scanChar() and breakout.
- break outerLoop;
- }
- } else if (! firstLine) {
- //The current line does not begin with a '*' so we will indent it.
- for (int i = 1; i < col; i++) {
- if (docCommentCount == docCommentBuffer.length)
- expandCommentBuffer();
- docCommentBuffer[docCommentCount++] = ' ';
- }
- }
-
- // The textLoop processes the rest of the characters
- // on the line, adding them to our buffer.
- textLoop:
- while (bp < buflen) {
- switch (ch) {
- case '*':
- // Is this just a star? Or is this the
- // end of a comment?
- scanDocCommentChar();
- if (ch == '/') {
- // This is the end of the comment,
- // set ch and return our buffer.
- break outerLoop;
- }
- // This is just an ordinary star. Add it to
- // the buffer.
- if (docCommentCount == docCommentBuffer.length)
- expandCommentBuffer();
- docCommentBuffer[docCommentCount++] = '*';
- break;
- case ' ':
- case '\t':
- if (docCommentCount == docCommentBuffer.length)
- expandCommentBuffer();
- docCommentBuffer[docCommentCount++] = ch;
- scanDocCommentChar();
- break;
- case FF:
- scanDocCommentChar();
- break textLoop; // treat as end of line
- case CR: // (Spec 3.4)
- scanDocCommentChar();
- if (ch != LF) {
- // Canonicalize CR-only line terminator to LF
- if (docCommentCount == docCommentBuffer.length)
- expandCommentBuffer();
- docCommentBuffer[docCommentCount++] = (char)LF;
- break textLoop;
- }
- /* fall through to LF case */
- case LF: // (Spec 3.4)
- // We've seen a newline. Add it to our
- // buffer and break out of this loop,
- // starting fresh on a new line.
- if (docCommentCount == docCommentBuffer.length)
- expandCommentBuffer();
- docCommentBuffer[docCommentCount++] = ch;
- scanDocCommentChar();
- break textLoop;
- default:
- // Add the character to our buffer.
- if (docCommentCount == docCommentBuffer.length)
- expandCommentBuffer();
- docCommentBuffer[docCommentCount++] = ch;
- scanDocCommentChar();
- }
- } // end textLoop
- firstLine = false;
- } // end outerLoop
-
- if (docCommentCount > 0) {
- int i = docCommentCount - 1;
- trailLoop:
- while (i > -1) {
- switch (docCommentBuffer[i]) {
- case '*':
- i--;
- break;
- default:
- break trailLoop;
- }
- }
- docCommentCount = i + 1;
-
- // Store the text of the doc comment
- docComment = new String(docCommentBuffer, 0 , docCommentCount);
- } else {
- docComment = "";
- }
- }
-
- /** Build a map for translating between line numbers and
- * positions in the input.
- *
- * @return a LineMap */
+ @Override
public Position.LineMap getLineMap() {
char[] buf = reader.getRawCharacters();
return Position.makeLineMap(buf, buf.length, true);
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. 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
@@ -75,10 +75,6 @@
public Parser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) {
Lexer lexer = scannerFactory.newScanner(input, keepDocComments);
- if (keepEndPos) {
- return new EndPosParser(this, lexer, keepDocComments, keepLineMap);
- } else {
- return new JavacParser(this, lexer, keepDocComments, keepLineMap);
- }
+ return new JavacParser(this, lexer, keepDocComments, keepLineMap, keepEndPos);
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java Tue Dec 06 05:28:17 2011 -0800
@@ -30,8 +30,10 @@
import com.sun.tools.javac.api.Formattable;
import com.sun.tools.javac.api.Messages;
import com.sun.tools.javac.parser.Tokens.Token.Tag;
+import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Names;
/** A class that defines codes/utilities for Java source tokens
@@ -281,6 +283,19 @@
}
}
+ public interface Comment {
+
+ enum CommentStyle {
+ LINE,
+ BLOCK,
+ JAVADOC,
+ }
+
+ String getText();
+ CommentStyle getStyle();
+ boolean isDeprecated();
+ }
+
/**
* This is the class representing a javac token. Each token has several fields
* that are set by the javac lexer (i.e. start/end position, string value, etc).
@@ -304,18 +319,14 @@
/** The end position of this token */
public final int endPos;
- /** Is this token preceeded by a deprecated comment? */
- public final boolean deprecatedFlag;
+ /** Comment reader associated with this token */
+ public final List<Comment> comments;
- /** Is this token preceeded by a deprecated comment? */
- public String docComment;
-
- Token(TokenKind kind, int pos, int endPos,
- boolean deprecatedFlag) {
+ Token(TokenKind kind, int pos, int endPos, List<Comment> comments) {
this.kind = kind;
this.pos = pos;
this.endPos = endPos;
- this.deprecatedFlag = deprecatedFlag;
+ this.comments = comments;
checkKind();
}
@@ -331,8 +342,8 @@
throw new AssertionError("Cant split - bad subtokens");
}
return new Token[] {
- new Token(t1, pos, pos + t1.name.length(), deprecatedFlag),
- new Token(t2, pos + t1.name.length(), endPos, false)
+ new Token(t1, pos, pos + t1.name.length(), comments),
+ new Token(t2, pos + t1.name.length(), endPos, null)
};
}
@@ -353,14 +364,52 @@
public int radix() {
throw new UnsupportedOperationException();
}
+
+ /**
+ * Preserve classic semantics - if multiple javadocs are found on the token
+ * the last one is returned
+ */
+ public String comment(Comment.CommentStyle style) {
+ List<Comment> readers = getReaders(Comment.CommentStyle.JAVADOC);
+ return readers.isEmpty() ?
+ null :
+ readers.head.getText();
+ }
+
+ /**
+ * Preserve classic semantics - deprecated should be set if at least one
+ * javadoc comment attached to this token contains the '@deprecated' string
+ */
+ public boolean deprecatedFlag() {
+ for (Comment r : getReaders(Comment.CommentStyle.JAVADOC)) {
+ if (r.isDeprecated()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private List<Comment> getReaders(Comment.CommentStyle style) {
+ if (comments == null) {
+ return List.nil();
+ } else {
+ ListBuffer<Comment> buf = ListBuffer.lb();
+ for (Comment r : comments) {
+ if (r.getStyle() == style) {
+ buf.add(r);
+ }
+ }
+ return buf.toList();
+ }
+ }
}
final static class NamedToken extends Token {
/** The name of this token */
public final Name name;
- public NamedToken(TokenKind kind, int pos, int endPos, Name name, boolean deprecatedFlag) {
- super(kind, pos, endPos, deprecatedFlag);
+ public NamedToken(TokenKind kind, int pos, int endPos, Name name, List<Comment> comments) {
+ super(kind, pos, endPos, comments);
this.name = name;
}
@@ -380,8 +429,8 @@
/** The string value of this token */
public final String stringVal;
- public StringToken(TokenKind kind, int pos, int endPos, String stringVal, boolean deprecatedFlag) {
- super(kind, pos, endPos, deprecatedFlag);
+ public StringToken(TokenKind kind, int pos, int endPos, String stringVal, List<Comment> comments) {
+ super(kind, pos, endPos, comments);
this.stringVal = stringVal;
}
@@ -401,8 +450,8 @@
/** The 'radix' value of this token */
public final int radix;
- public NumericToken(TokenKind kind, int pos, int endPos, String stringVal, int radix, boolean deprecatedFlag) {
- super(kind, pos, endPos, stringVal, deprecatedFlag);
+ public NumericToken(TokenKind kind, int pos, int endPos, String stringVal, int radix, List<Comment> comments) {
+ super(kind, pos, endPos, stringVal, comments);
this.radix = radix;
}
@@ -419,5 +468,5 @@
}
public static final Token DUMMY =
- new Token(TokenKind.ERROR, 0, 0, false);
+ new Token(TokenKind.ERROR, 0, 0, null);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java Tue Dec 06 05:28:17 2011 -0800
@@ -26,8 +26,12 @@
package com.sun.tools.javac.parser;
import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.util.Names;
+
import java.nio.CharBuffer;
-import com.sun.tools.javac.util.Log;
+
import static com.sun.tools.javac.util.LayoutCharacters.*;
/** The char reader used by the javac lexer/tokenizer. Returns the sequence of
@@ -58,6 +62,12 @@
protected int unicodeConversionBp = -1;
protected Log log;
+ protected Names names;
+
+ /** A character buffer for saved chars.
+ */
+ protected char[] sbuf = new char[128];
+ protected int sp;
/**
* Create a scanner from the input array. This method might
@@ -76,6 +86,7 @@
protected UnicodeReader(ScannerFactory sf, char[] input, int inputLength) {
log = sf.log;
+ names = sf.names;
if (inputLength == input.length) {
if (input.length > 0 && Character.isWhitespace(input[input.length - 1])) {
inputLength--;
@@ -103,6 +114,48 @@
}
}
+ /** Read next character in comment, skipping over double '\' characters.
+ */
+ protected void scanCommentChar() {
+ scanChar();
+ if (ch == '\\') {
+ if (peekChar() == '\\' && !isUnicode()) {
+ skipChar();
+ } else {
+ convertUnicode();
+ }
+ }
+ }
+
+ /** Append a character to sbuf.
+ */
+ protected void putChar(char ch, boolean scan) {
+ if (sp == sbuf.length) {
+ char[] newsbuf = new char[sbuf.length * 2];
+ System.arraycopy(sbuf, 0, newsbuf, 0, sbuf.length);
+ sbuf = newsbuf;
+ }
+ sbuf[sp++] = ch;
+ if (scan)
+ scanChar();
+ }
+
+ protected void putChar(char ch) {
+ putChar(ch, false);
+ }
+
+ protected void putChar(boolean scan) {
+ putChar(ch, scan);
+ }
+
+ Name name() {
+ return names.fromChars(sbuf, 0, sp);
+ }
+
+ String chars() {
+ return new String(sbuf, 0, sp);
+ }
+
/** Convert unicode escape; bp points to initial '\' character
* (Spec 3.3).
*/
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Tue Dec 06 05:28:17 2011 -0800
@@ -688,7 +688,7 @@
ps.removeSupportedOptions(unmatchedProcessorOptions);
if (printProcessorInfo || verbose) {
- log.printNoteLines("x.print.processor.info",
+ log.printLines("x.print.processor.info",
ps.processor.getClass().getName(),
matchedNames.toString(),
processingResult);
@@ -1014,7 +1014,7 @@
if (printRounds || verbose) {
List<ClassSymbol> tlc = lastRound ? List.<ClassSymbol>nil() : topLevelClasses;
Set<TypeElement> ap = lastRound ? Collections.<TypeElement>emptySet() : annotationsPresent;
- log.printNoteLines("x.print.rounds",
+ log.printLines("x.print.rounds",
number,
"{" + tlc.toString(", ") + "}",
ap,
@@ -1222,7 +1222,7 @@
List<ClassSymbol> classes = List.nil();
for (JCCompilationUnit unit : units) {
for (JCTree node : unit.defs) {
- if (node.getTag() == JCTree.CLASSDEF) {
+ if (node.hasTag(JCTree.Tag.CLASSDEF)) {
ClassSymbol sym = ((JCClassDecl) node).sym;
Assert.checkNonNull(sym);
classes = classes.prepend(sym);
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Dec 06 05:28:17 2011 -0800
@@ -792,7 +792,7 @@
compiler.err.cant.apply.diamond=\
cannot infer type arguments for {0}
-# 0: message segment, 1: message segment
+# 0: message segment or type, 1: message segment
compiler.err.cant.apply.diamond.1=\
cannot infer type arguments for {0};\n\
reason: {1}
@@ -854,7 +854,7 @@
compiler.misc.varargs.trustme.on.virtual.varargs=\
Instance method {0} is not final.
-# 0: type, 1: kind, 2: symbol
+# 0: type, 1: symbol kind, 2: symbol
compiler.misc.inaccessible.varargs.type=\
formal varargs element type {0} is not accessible from {1} {2}
@@ -1631,6 +1631,7 @@
compiler.misc.diamond.non.generic=\
cannot use ''<>'' with non-generic class {0}
+# 0: unused
compiler.misc.diamond.and.explicit.params=\
cannot use ''<>'' with explicit type parameters for constructor
@@ -1712,7 +1713,7 @@
## The second argument {1} is the location name
## The third argument {2} is the location type (only when {1} is a variable name)
-# 0: symbol kind, 1: symbol, 2: unused
+# 0: symbol kind, 1: type or symbol, 2: unused
compiler.misc.location=\
{0} {1}
@@ -1847,6 +1848,7 @@
compiler.misc.varargs.clash.with=\
{0} in {1} overrides {2} in {3}
+# 0: unused
compiler.misc.diamond.and.anon.class=\
cannot use ''<>'' with anonymous inner classes
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Tue Dec 06 05:28:17 2011 -0800
@@ -39,9 +39,11 @@
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Scope.*;
import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.source.tree.*;
import static com.sun.tools.javac.code.BoundKind.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/**
* Root class for abstract syntax tree nodes. It provides definitions
@@ -79,253 +81,289 @@
public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
/* Tree tag values, identifying kinds of trees */
+ public enum Tag{
+ /** For methods that return an invalid tag if a given condition is not met
+ */
+ NO_TAG,
- /** Toplevel nodes, of type TopLevel, representing entire source files.
- */
- public static final int TOPLEVEL = 1;
+ /** Toplevel nodes, of type TopLevel, representing entire source files.
+ */
+ TOPLEVEL,
- /** Import clauses, of type Import.
- */
- public static final int IMPORT = TOPLEVEL + 1;
+ /** Import clauses, of type Import.
+ */
+ IMPORT,
- /** Class definitions, of type ClassDef.
- */
- public static final int CLASSDEF = IMPORT + 1;
+ /** Class definitions, of type ClassDef.
+ */
+ CLASSDEF,
- /** Method definitions, of type MethodDef.
- */
- public static final int METHODDEF = CLASSDEF + 1;
+ /** Method definitions, of type MethodDef.
+ */
+ METHODDEF,
- /** Variable definitions, of type VarDef.
- */
- public static final int VARDEF = METHODDEF + 1;
+ /** Variable definitions, of type VarDef.
+ */
+ VARDEF,
- /** The no-op statement ";", of type Skip
- */
- public static final int SKIP = VARDEF + 1;
+ /** The no-op statement ";", of type Skip
+ */
+ SKIP,
+
+ /** Blocks, of type Block.
+ */
+ BLOCK,
- /** Blocks, of type Block.
- */
- public static final int BLOCK = SKIP + 1;
+ /** Do-while loops, of type DoLoop.
+ */
+ DOLOOP,
- /** Do-while loops, of type DoLoop.
- */
- public static final int DOLOOP = BLOCK + 1;
+ /** While-loops, of type WhileLoop.
+ */
+ WHILELOOP,
- /** While-loops, of type WhileLoop.
- */
- public static final int WHILELOOP = DOLOOP + 1;
+ /** For-loops, of type ForLoop.
+ */
+ FORLOOP,
- /** For-loops, of type ForLoop.
- */
- public static final int FORLOOP = WHILELOOP + 1;
+ /** Foreach-loops, of type ForeachLoop.
+ */
+ FOREACHLOOP,
- /** Foreach-loops, of type ForeachLoop.
- */
- public static final int FOREACHLOOP = FORLOOP + 1;
+ /** Labelled statements, of type Labelled.
+ */
+ LABELLED,
- /** Labelled statements, of type Labelled.
- */
- public static final int LABELLED = FOREACHLOOP + 1;
+ /** Switch statements, of type Switch.
+ */
+ SWITCH,
- /** Switch statements, of type Switch.
- */
- public static final int SWITCH = LABELLED + 1;
+ /** Case parts in switch statements, of type Case.
+ */
+ CASE,
- /** Case parts in switch statements, of type Case.
- */
- public static final int CASE = SWITCH + 1;
+ /** Synchronized statements, of type Synchonized.
+ */
+ SYNCHRONIZED,
+
+ /** Try statements, of type Try.
+ */
+ TRY,
- /** Synchronized statements, of type Synchonized.
- */
- public static final int SYNCHRONIZED = CASE + 1;
+ /** Catch clauses in try statements, of type Catch.
+ */
+ CATCH,
- /** Try statements, of type Try.
- */
- public static final int TRY = SYNCHRONIZED + 1;
+ /** Conditional expressions, of type Conditional.
+ */
+ CONDEXPR,
- /** Catch clauses in try statements, of type Catch.
- */
- public static final int CATCH = TRY + 1;
+ /** Conditional statements, of type If.
+ */
+ IF,
- /** Conditional expressions, of type Conditional.
- */
- public static final int CONDEXPR = CATCH + 1;
+ /** Expression statements, of type Exec.
+ */
+ EXEC,
- /** Conditional statements, of type If.
- */
- public static final int IF = CONDEXPR + 1;
+ /** Break statements, of type Break.
+ */
+ BREAK,
- /** Expression statements, of type Exec.
- */
- public static final int EXEC = IF + 1;
+ /** Continue statements, of type Continue.
+ */
+ CONTINUE,
- /** Break statements, of type Break.
- */
- public static final int BREAK = EXEC + 1;
+ /** Return statements, of type Return.
+ */
+ RETURN,
- /** Continue statements, of type Continue.
- */
- public static final int CONTINUE = BREAK + 1;
+ /** Throw statements, of type Throw.
+ */
+ THROW,
+
+ /** Assert statements, of type Assert.
+ */
+ ASSERT,
- /** Return statements, of type Return.
- */
- public static final int RETURN = CONTINUE + 1;
+ /** Method invocation expressions, of type Apply.
+ */
+ APPLY,
- /** Throw statements, of type Throw.
- */
- public static final int THROW = RETURN + 1;
+ /** Class instance creation expressions, of type NewClass.
+ */
+ NEWCLASS,
- /** Assert statements, of type Assert.
- */
- public static final int ASSERT = THROW + 1;
+ /** Array creation expressions, of type NewArray.
+ */
+ NEWARRAY,
- /** Method invocation expressions, of type Apply.
- */
- public static final int APPLY = ASSERT + 1;
+ /** Parenthesized subexpressions, of type Parens.
+ */
+ PARENS,
- /** Class instance creation expressions, of type NewClass.
- */
- public static final int NEWCLASS = APPLY + 1;
+ /** Assignment expressions, of type Assign.
+ */
+ ASSIGN,
- /** Array creation expressions, of type NewArray.
- */
- public static final int NEWARRAY = NEWCLASS + 1;
+ /** Type cast expressions, of type TypeCast.
+ */
+ TYPECAST,
- /** Parenthesized subexpressions, of type Parens.
- */
- public static final int PARENS = NEWARRAY + 1;
+ /** Type test expressions, of type TypeTest.
+ */
+ TYPETEST,
- /** Assignment expressions, of type Assign.
- */
- public static final int ASSIGN = PARENS + 1;
+ /** Indexed array expressions, of type Indexed.
+ */
+ INDEXED,
+
+ /** Selections, of type Select.
+ */
+ SELECT,
- /** Type cast expressions, of type TypeCast.
- */
- public static final int TYPECAST = ASSIGN + 1;
+ /** Simple identifiers, of type Ident.
+ */
+ IDENT,
+
+ /** Literals, of type Literal.
+ */
+ LITERAL,
- /** Type test expressions, of type TypeTest.
- */
- public static final int TYPETEST = TYPECAST + 1;
+ /** Basic type identifiers, of type TypeIdent.
+ */
+ TYPEIDENT,
- /** Indexed array expressions, of type Indexed.
- */
- public static final int INDEXED = TYPETEST + 1;
+ /** Array types, of type TypeArray.
+ */
+ TYPEARRAY,
- /** Selections, of type Select.
- */
- public static final int SELECT = INDEXED + 1;
+ /** Parameterized types, of type TypeApply.
+ */
+ TYPEAPPLY,
- /** Simple identifiers, of type Ident.
- */
- public static final int IDENT = SELECT + 1;
+ /** Union types, of type TypeUnion
+ */
+ TYPEUNION,
- /** Literals, of type Literal.
- */
- public static final int LITERAL = IDENT + 1;
+ /** Formal type parameters, of type TypeParameter.
+ */
+ TYPEPARAMETER,
- /** Basic type identifiers, of type TypeIdent.
- */
- public static final int TYPEIDENT = LITERAL + 1;
+ /** Type argument.
+ */
+ WILDCARD,
- /** Array types, of type TypeArray.
- */
- public static final int TYPEARRAY = TYPEIDENT + 1;
-
- /** Parameterized types, of type TypeApply.
- */
- public static final int TYPEAPPLY = TYPEARRAY + 1;
+ /** Bound kind: extends, super, exact, or unbound
+ */
+ TYPEBOUNDKIND,
- /** Union types, of type TypeUnion
- */
- public static final int TYPEUNION = TYPEAPPLY + 1;
+ /** metadata: Annotation.
+ */
+ ANNOTATION,
- /** Formal type parameters, of type TypeParameter.
- */
- public static final int TYPEPARAMETER = TYPEUNION + 1;
+ /** metadata: Modifiers
+ */
+ MODIFIERS,
+
+ ANNOTATED_TYPE,
- /** Type argument.
- */
- public static final int WILDCARD = TYPEPARAMETER + 1;
-
- /** Bound kind: extends, super, exact, or unbound
- */
- public static final int TYPEBOUNDKIND = WILDCARD + 1;
+ /** Error trees, of type Erroneous.
+ */
+ ERRONEOUS,
- /** metadata: Annotation.
- */
- public static final int ANNOTATION = TYPEBOUNDKIND + 1;
+ /** Unary operators, of type Unary.
+ */
+ POS, // +
+ NEG, // -
+ NOT, // !
+ COMPL, // ~
+ PREINC, // ++ _
+ PREDEC, // -- _
+ POSTINC, // _ ++
+ POSTDEC, // _ --
- /** metadata: Modifiers
- */
- public static final int MODIFIERS = ANNOTATION + 1;
-
- public static final int ANNOTATED_TYPE = MODIFIERS + 1;
+ /** unary operator for null reference checks, only used internally.
+ */
+ NULLCHK,
- /** Error trees, of type Erroneous.
- */
- public static final int ERRONEOUS = ANNOTATED_TYPE + 1;
+ /** Binary operators, of type Binary.
+ */
+ OR, // ||
+ AND, // &&
+ BITOR, // |
+ BITXOR, // ^
+ BITAND, // &
+ EQ, // ==
+ NE, // !=
+ LT, // <
+ GT, // >
+ LE, // <=
+ GE, // >=
+ SL, // <<
+ SR, // >>
+ USR, // >>>
+ PLUS, // +
+ MINUS, // -
+ MUL, // *
+ DIV, // /
+ MOD, // %
- /** Unary operators, of type Unary.
- */
- public static final int POS = ERRONEOUS + 1; // +
- public static final int NEG = POS + 1; // -
- public static final int NOT = NEG + 1; // !
- public static final int COMPL = NOT + 1; // ~
- public static final int PREINC = COMPL + 1; // ++ _
- public static final int PREDEC = PREINC + 1; // -- _
- public static final int POSTINC = PREDEC + 1; // _ ++
- public static final int POSTDEC = POSTINC + 1; // _ --
+ /** Assignment operators, of type Assignop.
+ */
+ BITOR_ASG(BITOR), // |=
+ BITXOR_ASG(BITXOR), // ^=
+ BITAND_ASG(BITAND), // &=
- /** unary operator for null reference checks, only used internally.
- */
- public static final int NULLCHK = POSTDEC + 1;
+ SL_ASG(SL), // <<=
+ SR_ASG(SR), // >>=
+ USR_ASG(USR), // >>>=
+ PLUS_ASG(PLUS), // +=
+ MINUS_ASG(MINUS), // -=
+ MUL_ASG(MUL), // *=
+ DIV_ASG(DIV), // /=
+ MOD_ASG(MOD), // %=
- /** Binary operators, of type Binary.
- */
- public static final int OR = NULLCHK + 1; // ||
- public static final int AND = OR + 1; // &&
- public static final int BITOR = AND + 1; // |
- public static final int BITXOR = BITOR + 1; // ^
- public static final int BITAND = BITXOR + 1; // &
- public static final int EQ = BITAND + 1; // ==
- public static final int NE = EQ + 1; // !=
- public static final int LT = NE + 1; // <
- public static final int GT = LT + 1; // >
- public static final int LE = GT + 1; // <=
- public static final int GE = LE + 1; // >=
- public static final int SL = GE + 1; // <<
- public static final int SR = SL + 1; // >>
- public static final int USR = SR + 1; // >>>
- public static final int PLUS = USR + 1; // +
- public static final int MINUS = PLUS + 1; // -
- public static final int MUL = MINUS + 1; // *
- public static final int DIV = MUL + 1; // /
- public static final int MOD = DIV + 1; // %
+ /** A synthetic let expression, of type LetExpr.
+ */
+ LETEXPR; // ala scheme
+
+ private Tag noAssignTag;
+
+ private static int numberOfOperators = MOD.ordinal() - POS.ordinal() + 1;
+
+ private Tag(Tag noAssignTag) {
+ this.noAssignTag = noAssignTag;
+ }
+
+ private Tag() { }
+
+ public static int getNumberOfOperators() {
+ return numberOfOperators;
+ }
- /** Assignment operators, of type Assignop.
- */
- public static final int BITOR_ASG = MOD + 1; // |=
- public static final int BITXOR_ASG = BITOR_ASG + 1; // ^=
- public static final int BITAND_ASG = BITXOR_ASG + 1; // &=
+ public Tag noAssignOp() {
+ if (noAssignTag != null)
+ return noAssignTag;
+ throw new AssertionError("noAssignOp() method is not available for non assignment tags");
+ }
+
+ public boolean isPostUnaryOp() {
+ return (this == POSTINC || this == POSTDEC);
+ }
- public static final int SL_ASG = SL + BITOR_ASG - BITOR; // <<=
- public static final int SR_ASG = SL_ASG + 1; // >>=
- public static final int USR_ASG = SR_ASG + 1; // >>>=
- public static final int PLUS_ASG = USR_ASG + 1; // +=
- public static final int MINUS_ASG = PLUS_ASG + 1; // -=
- public static final int MUL_ASG = MINUS_ASG + 1; // *=
- public static final int DIV_ASG = MUL_ASG + 1; // /=
- public static final int MOD_ASG = DIV_ASG + 1; // %=
+ public boolean isIncOrDecUnaryOp() {
+ return (this == PREINC || this == PREDEC || this == POSTINC || this == POSTDEC);
+ }
- /** A synthetic let expression, of type LetExpr.
- */
- public static final int LETEXPR = MOD_ASG + 1; // ala scheme
+ public boolean isAssignop() {
+ return noAssignTag != null;
+ }
-
- /** The offset between assignment operators and normal operators.
- */
- public static final int ASGOffset = BITOR_ASG - BITOR;
+ public int operatorIndex() {
+ return (this.ordinal() - POS.ordinal());
+ }
+ }
/* The (encoded) position in the source file. @see util.Position.
*/
@@ -337,7 +375,13 @@
/* The tag of this node -- one of the constants declared above.
*/
- public abstract int getTag();
+ public abstract Tag getTag();
+
+ /* Returns true if the tag of this node is equals to tag.
+ */
+ public boolean hasTag(Tag tag) {
+ return tag == getTag();
+ }
/** Convert a tree to a pretty-printed string. */
@Override
@@ -407,7 +451,7 @@
}
// for default DiagnosticPosition
- public int getEndPosition(Map<JCTree, Integer> endPosTable) {
+ public int getEndPosition(EndPosTable endPosTable) {
return TreeInfo.getEndPos(this, endPosTable);
}
@@ -424,7 +468,7 @@
* @param docComments A hashtable that stores all documentation comments
* indexed by the tree nodes they refer to.
* defined only if option -s is set.
- * @param endPositions A hashtable that stores ending positions of source
+ * @param endPositions An object encapsulating ending positions of source
* ranges indexed by the tree nodes they belong to.
* Defined only if option -Xjcov is set.
*/
@@ -438,7 +482,7 @@
public StarImportScope starImportScope;
public Position.LineMap lineMap = null;
public Map<JCTree, String> docComments = null;
- public Map<JCTree, Integer> endPositions = null;
+ public EndPosTable endPositions = null;
protected JCCompilationUnit(List<JCAnnotation> packageAnnotations,
JCExpression pid,
List<JCTree> defs,
@@ -464,10 +508,9 @@
public List<JCImport> getImports() {
ListBuffer<JCImport> imports = new ListBuffer<JCImport>();
for (JCTree tree : defs) {
- int tag = tree.getTag();
- if (tag == IMPORT)
+ if (tree.hasTag(IMPORT))
imports.append((JCImport)tree);
- else if (tag != SKIP)
+ else if (!tree.hasTag(SKIP))
break;
}
return imports.toList();
@@ -482,7 +525,7 @@
public List<JCTree> getTypeDecls() {
List<JCTree> typeDefs;
for (typeDefs = defs; !typeDefs.isEmpty(); typeDefs = typeDefs.tail)
- if (typeDefs.head.getTag() != IMPORT)
+ if (!typeDefs.head.hasTag(IMPORT))
break;
return typeDefs;
}
@@ -492,7 +535,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TOPLEVEL;
}
}
@@ -521,7 +564,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return IMPORT;
}
}
@@ -618,7 +661,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CLASSDEF;
}
}
@@ -690,7 +733,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return METHODDEF;
}
}
@@ -736,7 +779,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return VARDEF;
}
}
@@ -757,7 +800,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return SKIP;
}
}
@@ -790,7 +833,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return BLOCK;
}
}
@@ -817,7 +860,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return DOLOOP;
}
}
@@ -844,7 +887,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return WHILELOOP;
}
}
@@ -885,7 +928,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return FORLOOP;
}
}
@@ -914,7 +957,7 @@
return v.visitEnhancedForLoop(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return FOREACHLOOP;
}
}
@@ -939,7 +982,7 @@
return v.visitLabeledStatement(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return LABELLED;
}
}
@@ -965,7 +1008,7 @@
return v.visitSwitch(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return SWITCH;
}
}
@@ -991,7 +1034,7 @@
return v.visitCase(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CASE;
}
}
@@ -1017,7 +1060,7 @@
return v.visitSynchronized(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return SYNCHRONIZED;
}
}
@@ -1057,7 +1100,7 @@
return resources;
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TRY;
}
}
@@ -1083,7 +1126,7 @@
return v.visitCatch(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CATCH;
}
}
@@ -1115,7 +1158,7 @@
return v.visitConditionalExpression(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CONDEXPR;
}
}
@@ -1147,7 +1190,7 @@
return v.visitIf(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return IF;
}
}
@@ -1172,7 +1215,7 @@
return v.visitExpressionStatement(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return EXEC;
}
@@ -1212,7 +1255,7 @@
return v.visitBreak(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return BREAK;
}
}
@@ -1237,7 +1280,7 @@
return v.visitContinue(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CONTINUE;
}
}
@@ -1260,7 +1303,7 @@
return v.visitReturn(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return RETURN;
}
}
@@ -1283,7 +1326,7 @@
return v.visitThrow(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return THROW;
}
}
@@ -1309,7 +1352,7 @@
return v.visitAssert(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return ASSERT;
}
}
@@ -1352,7 +1395,7 @@
return this;
}
@Override
- public int getTag() {
+ public Tag getTag() {
return(APPLY);
}
}
@@ -1402,7 +1445,7 @@
return v.visitNewClass(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return NEWCLASS;
}
}
@@ -1438,7 +1481,7 @@
return v.visitNewArray(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return NEWARRAY;
}
}
@@ -1461,7 +1504,7 @@
return v.visitParenthesized(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return PARENS;
}
}
@@ -1487,7 +1530,7 @@
return v.visitAssignment(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return ASSIGN;
}
}
@@ -1496,11 +1539,11 @@
* An assignment with "+=", "|=" ...
*/
public static class JCAssignOp extends JCExpression implements CompoundAssignmentTree {
- private int opcode;
+ private Tag opcode;
public JCExpression lhs;
public JCExpression rhs;
public Symbol operator;
- protected JCAssignOp(int opcode, JCTree lhs, JCTree rhs, Symbol operator) {
+ protected JCAssignOp(Tag opcode, JCTree lhs, JCTree rhs, Symbol operator) {
this.opcode = opcode;
this.lhs = (JCExpression)lhs;
this.rhs = (JCExpression)rhs;
@@ -1520,7 +1563,7 @@
return v.visitCompoundAssignment(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return opcode;
}
}
@@ -1529,10 +1572,10 @@
* A unary operation.
*/
public static class JCUnary extends JCExpression implements UnaryTree {
- private int opcode;
+ private Tag opcode;
public JCExpression arg;
public Symbol operator;
- protected JCUnary(int opcode, JCExpression arg) {
+ protected JCUnary(Tag opcode, JCExpression arg) {
this.opcode = opcode;
this.arg = arg;
}
@@ -1549,11 +1592,11 @@
return v.visitUnary(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return opcode;
}
- public void setTag(int tag) {
+ public void setTag(Tag tag) {
opcode = tag;
}
}
@@ -1562,11 +1605,11 @@
* A binary operation.
*/
public static class JCBinary extends JCExpression implements BinaryTree {
- private int opcode;
+ private Tag opcode;
public JCExpression lhs;
public JCExpression rhs;
public Symbol operator;
- protected JCBinary(int opcode,
+ protected JCBinary(Tag opcode,
JCExpression lhs,
JCExpression rhs,
Symbol operator) {
@@ -1589,7 +1632,7 @@
return v.visitBinary(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return opcode;
}
}
@@ -1615,7 +1658,7 @@
return v.visitTypeCast(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPECAST;
}
}
@@ -1641,7 +1684,7 @@
return v.visitInstanceOf(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPETEST;
}
}
@@ -1667,7 +1710,7 @@
return v.visitArrayAccess(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return INDEXED;
}
}
@@ -1698,7 +1741,7 @@
}
public Name getIdentifier() { return name; }
@Override
- public int getTag() {
+ public Tag getTag() {
return SELECT;
}
}
@@ -1724,7 +1767,8 @@
public <R,D> R accept(TreeVisitor<R,D> v, D d) {
return v.visitIdentifier(this, d);
}
- public int getTag() {
+ @Override
+ public Tag getTag() {
return IDENT;
}
}
@@ -1790,7 +1834,7 @@
return this;
}
@Override
- public int getTag() {
+ public Tag getTag() {
return LITERAL;
}
}
@@ -1838,7 +1882,7 @@
return v.visitPrimitiveType(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEIDENT;
}
}
@@ -1861,7 +1905,7 @@
return v.visitArrayType(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEARRAY;
}
}
@@ -1889,7 +1933,7 @@
return v.visitParameterizedType(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEAPPLY;
}
}
@@ -1917,7 +1961,7 @@
return v.visitUnionType(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEUNION;
}
}
@@ -1947,7 +1991,7 @@
return v.visitTypeParameter(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEPARAMETER;
}
}
@@ -1981,7 +2025,7 @@
return v.visitWildcard(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return WILDCARD;
}
}
@@ -2002,7 +2046,7 @@
throw new AssertionError("TypeBoundKind is not part of a public API");
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEBOUNDKIND;
}
}
@@ -2027,7 +2071,7 @@
return v.visitAnnotation(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return ANNOTATION;
}
}
@@ -2054,7 +2098,7 @@
return v.visitModifiers(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return MODIFIERS;
}
}
@@ -2079,7 +2123,7 @@
return v.visitErroneous(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return ERRONEOUS;
}
}
@@ -2103,7 +2147,7 @@
throw new AssertionError("LetExpr is not part of a public API");
}
@Override
- public int getTag() {
+ public Tag getTag() {
return LETEXPR;
}
}
@@ -2175,9 +2219,9 @@
List<JCExpression> elems);
JCParens Parens(JCExpression expr);
JCAssign Assign(JCExpression lhs, JCExpression rhs);
- JCAssignOp Assignop(int opcode, JCTree lhs, JCTree rhs);
- JCUnary Unary(int opcode, JCExpression arg);
- JCBinary Binary(int opcode, JCExpression lhs, JCExpression rhs);
+ JCAssignOp Assignop(Tag opcode, JCTree lhs, JCTree rhs);
+ JCUnary Unary(Tag opcode, JCExpression arg);
+ JCBinary Binary(Tag opcode, JCExpression lhs, JCExpression rhs);
JCTypeCast TypeCast(JCTree expr, JCExpression type);
JCInstanceOf TypeTest(JCExpression expr, JCTree clazz);
JCArrayAccess Indexed(JCExpression indexed, JCExpression index);
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Tue Dec 06 05:28:17 2011 -0800
@@ -36,6 +36,8 @@
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** Prints out a tree as an indented Java source program.
*
@@ -310,7 +312,7 @@
/** Is the given tree an enumerator definition? */
boolean isEnumerator(JCTree t) {
- return t.getTag() == JCTree.VARDEF && (((JCVariableDecl) t).mods.flags & ENUM) != 0;
+ return t.hasTag(VARDEF) && (((JCVariableDecl) t).mods.flags & ENUM) != 0;
}
/** Print unit consisting of package clause and import statements in toplevel,
@@ -331,9 +333,9 @@
}
boolean firstImport = true;
for (List<JCTree> l = tree.defs;
- l.nonEmpty() && (cdef == null || l.head.getTag() == JCTree.IMPORT);
+ l.nonEmpty() && (cdef == null || l.head.hasTag(IMPORT));
l = l.tail) {
- if (l.head.getTag() == JCTree.IMPORT) {
+ if (l.head.hasTag(IMPORT)) {
JCImport imp = (JCImport)l.head;
Name name = TreeInfo.name(imp.qualid);
if (name == name.table.names.asterisk ||
@@ -484,7 +486,7 @@
print("/*public static final*/ ");
print(tree.name);
if (tree.init != null) {
- if (sourceOutput && tree.init.getTag() == JCTree.NEWCLASS) {
+ if (sourceOutput && tree.init.hasTag(NEWCLASS)) {
print(" /*enum*/ ");
JCNewClass init = (JCNewClass) tree.init;
if (init.args != null && init.args.nonEmpty()) {
@@ -545,7 +547,7 @@
printStat(tree.body);
align();
print(" while ");
- if (tree.cond.getTag() == JCTree.PARENS) {
+ if (tree.cond.hasTag(PARENS)) {
printExpr(tree.cond);
} else {
print("(");
@@ -561,7 +563,7 @@
public void visitWhileLoop(JCWhileLoop tree) {
try {
print("while ");
- if (tree.cond.getTag() == JCTree.PARENS) {
+ if (tree.cond.hasTag(PARENS)) {
printExpr(tree.cond);
} else {
print("(");
@@ -579,7 +581,7 @@
try {
print("for (");
if (tree.init.nonEmpty()) {
- if (tree.init.head.getTag() == JCTree.VARDEF) {
+ if (tree.init.head.hasTag(VARDEF)) {
printExpr(tree.init.head);
for (List<JCStatement> l = tree.init.tail; l.nonEmpty(); l = l.tail) {
JCVariableDecl vdef = (JCVariableDecl)l.head;
@@ -626,7 +628,7 @@
public void visitSwitch(JCSwitch tree) {
try {
print("switch ");
- if (tree.selector.getTag() == JCTree.PARENS) {
+ if (tree.selector.hasTag(PARENS)) {
printExpr(tree.selector);
} else {
print("(");
@@ -665,7 +667,7 @@
public void visitSynchronized(JCSynchronized tree) {
try {
print("synchronized ");
- if (tree.lock.getTag() == JCTree.PARENS) {
+ if (tree.lock.hasTag(PARENS)) {
printExpr(tree.lock);
} else {
print("(");
@@ -736,7 +738,7 @@
public void visitIf(JCIf tree) {
try {
print("if ");
- if (tree.cond.getTag() == JCTree.PARENS) {
+ if (tree.cond.hasTag(PARENS)) {
printExpr(tree.cond);
} else {
print("(");
@@ -823,7 +825,7 @@
public void visitApply(JCMethodInvocation tree) {
try {
if (!tree.typeargs.isEmpty()) {
- if (tree.meth.getTag() == JCTree.SELECT) {
+ if (tree.meth.hasTag(SELECT)) {
JCFieldAccess left = (JCFieldAccess)tree.meth;
printExpr(left.selected);
print(".<");
@@ -882,7 +884,7 @@
if (tree.elemtype != null) {
print("new ");
JCTree elem = tree.elemtype;
- if (elem.getTag() == JCTree.TYPEARRAY)
+ if (elem.hasTag(TYPEARRAY))
printBaseElementType((JCArrayTypeTree) elem);
else
printExpr(elem);
@@ -927,36 +929,36 @@
}
}
- public String operatorName(int tag) {
+ public String operatorName(JCTree.Tag tag) {
switch(tag) {
- case JCTree.POS: return "+";
- case JCTree.NEG: return "-";
- case JCTree.NOT: return "!";
- case JCTree.COMPL: return "~";
- case JCTree.PREINC: return "++";
- case JCTree.PREDEC: return "--";
- case JCTree.POSTINC: return "++";
- case JCTree.POSTDEC: return "--";
- case JCTree.NULLCHK: return "<*nullchk*>";
- case JCTree.OR: return "||";
- case JCTree.AND: return "&&";
- case JCTree.EQ: return "==";
- case JCTree.NE: return "!=";
- case JCTree.LT: return "<";
- case JCTree.GT: return ">";
- case JCTree.LE: return "<=";
- case JCTree.GE: return ">=";
- case JCTree.BITOR: return "|";
- case JCTree.BITXOR: return "^";
- case JCTree.BITAND: return "&";
- case JCTree.SL: return "<<";
- case JCTree.SR: return ">>";
- case JCTree.USR: return ">>>";
- case JCTree.PLUS: return "+";
- case JCTree.MINUS: return "-";
- case JCTree.MUL: return "*";
- case JCTree.DIV: return "/";
- case JCTree.MOD: return "%";
+ case POS: return "+";
+ case NEG: return "-";
+ case NOT: return "!";
+ case COMPL: return "~";
+ case PREINC: return "++";
+ case PREDEC: return "--";
+ case POSTINC: return "++";
+ case POSTDEC: return "--";
+ case NULLCHK: return "<*nullchk*>";
+ case OR: return "||";
+ case AND: return "&&";
+ case EQ: return "==";
+ case NE: return "!=";
+ case LT: return "<";
+ case GT: return ">";
+ case LE: return "<=";
+ case GE: return ">=";
+ case BITOR: return "|";
+ case BITXOR: return "^";
+ case BITAND: return "&";
+ case SL: return "<<";
+ case SR: return ">>";
+ case USR: return ">>>";
+ case PLUS: return "+";
+ case MINUS: return "-";
+ case MUL: return "*";
+ case DIV: return "/";
+ case MOD: return "%";
default: throw new Error();
}
}
@@ -965,7 +967,7 @@
try {
open(prec, TreeInfo.assignopPrec);
printExpr(tree.lhs, TreeInfo.assignopPrec + 1);
- print(" " + operatorName(tree.getTag() - JCTree.ASGOffset) + "= ");
+ print(" " + operatorName(tree.getTag().noAssignOp()) + "= ");
printExpr(tree.rhs, TreeInfo.assignopPrec);
close(prec, TreeInfo.assignopPrec);
} catch (IOException e) {
@@ -978,7 +980,7 @@
int ownprec = TreeInfo.opPrec(tree.getTag());
String opname = operatorName(tree.getTag());
open(prec, ownprec);
- if (tree.getTag() <= JCTree.PREDEC) {
+ if (!tree.getTag().isPostUnaryOp()) {
print(opname);
printExpr(tree.arg, ownprec);
} else {
@@ -1153,7 +1155,7 @@
while (true) {
elem = tree.elemtype;
print("[]");
- if (elem.getTag() != JCTree.TYPEARRAY) break;
+ if (!elem.hasTag(TYPEARRAY)) break;
tree = (JCArrayTypeTree) elem;
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Tue Dec 06 05:28:17 2011 -0800
@@ -406,7 +406,7 @@
public JCTree visitOther(Tree node, P p) {
JCTree tree = (JCTree) node;
switch (tree.getTag()) {
- case JCTree.LETEXPR: {
+ case LETEXPR: {
LetExpr t = (LetExpr) node;
List<JCVariableDecl> defs = copy(t.defs, p);
JCTree expr = copy(t.expr, p);
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Tue Dec 06 05:28:17 2011 -0800
@@ -28,13 +28,16 @@
import com.sun.source.tree.Tree;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
-import java.util.Map;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK;
+import static com.sun.tools.javac.tree.JCTree.Tag.SYNCHRONIZED;
/** Utility class containing inspector methods for trees.
*
@@ -56,53 +59,60 @@
/** The names of all operators.
*/
- private Name[] opname = new Name[JCTree.MOD - JCTree.POS + 1];
+ private Name[] opname = new Name[Tag.getNumberOfOperators()];
+
+ private void setOpname(Tag tag, String name, Names names) {
+ setOpname(tag, names.fromString(name));
+ }
+ private void setOpname(Tag tag, Name name) {
+ opname[tag.operatorIndex()] = name;
+ }
private TreeInfo(Context context) {
context.put(treeInfoKey, this);
Names names = Names.instance(context);
- opname[JCTree.POS - JCTree.POS] = names.fromString("+");
- opname[JCTree.NEG - JCTree.POS] = names.hyphen;
- opname[JCTree.NOT - JCTree.POS] = names.fromString("!");
- opname[JCTree.COMPL - JCTree.POS] = names.fromString("~");
- opname[JCTree.PREINC - JCTree.POS] = names.fromString("++");
- opname[JCTree.PREDEC - JCTree.POS] = names.fromString("--");
- opname[JCTree.POSTINC - JCTree.POS] = names.fromString("++");
- opname[JCTree.POSTDEC - JCTree.POS] = names.fromString("--");
- opname[JCTree.NULLCHK - JCTree.POS] = names.fromString("<*nullchk*>");
- opname[JCTree.OR - JCTree.POS] = names.fromString("||");
- opname[JCTree.AND - JCTree.POS] = names.fromString("&&");
- opname[JCTree.EQ - JCTree.POS] = names.fromString("==");
- opname[JCTree.NE - JCTree.POS] = names.fromString("!=");
- opname[JCTree.LT - JCTree.POS] = names.fromString("<");
- opname[JCTree.GT - JCTree.POS] = names.fromString(">");
- opname[JCTree.LE - JCTree.POS] = names.fromString("<=");
- opname[JCTree.GE - JCTree.POS] = names.fromString(">=");
- opname[JCTree.BITOR - JCTree.POS] = names.fromString("|");
- opname[JCTree.BITXOR - JCTree.POS] = names.fromString("^");
- opname[JCTree.BITAND - JCTree.POS] = names.fromString("&");
- opname[JCTree.SL - JCTree.POS] = names.fromString("<<");
- opname[JCTree.SR - JCTree.POS] = names.fromString(">>");
- opname[JCTree.USR - JCTree.POS] = names.fromString(">>>");
- opname[JCTree.PLUS - JCTree.POS] = names.fromString("+");
- opname[JCTree.MINUS - JCTree.POS] = names.hyphen;
- opname[JCTree.MUL - JCTree.POS] = names.asterisk;
- opname[JCTree.DIV - JCTree.POS] = names.slash;
- opname[JCTree.MOD - JCTree.POS] = names.fromString("%");
+ setOpname(POS, "+", names);
+ setOpname(NEG, names.hyphen);
+ setOpname(NOT, "!", names);
+ setOpname(COMPL, "~", names);
+ setOpname(PREINC, "++", names);
+ setOpname(PREDEC, "--", names);
+ setOpname(POSTINC, "++", names);
+ setOpname(POSTDEC, "--", names);
+ setOpname(NULLCHK, "<*nullchk*>", names);
+ setOpname(OR, "||", names);
+ setOpname(AND, "&&", names);
+ setOpname(EQ, "==", names);
+ setOpname(NE, "!=", names);
+ setOpname(LT, "<", names);
+ setOpname(GT, ">", names);
+ setOpname(LE, "<=", names);
+ setOpname(GE, ">=", names);
+ setOpname(BITOR, "|", names);
+ setOpname(BITXOR, "^", names);
+ setOpname(BITAND, "&", names);
+ setOpname(SL, "<<", names);
+ setOpname(SR, ">>", names);
+ setOpname(USR, ">>>", names);
+ setOpname(PLUS, "+", names);
+ setOpname(MINUS, names.hyphen);
+ setOpname(MUL, names.asterisk);
+ setOpname(DIV, names.slash);
+ setOpname(MOD, "%", names);
}
/** Return name of operator with given tree tag.
*/
- public Name operatorName(int tag) {
- return opname[tag - JCTree.POS];
+ public Name operatorName(JCTree.Tag tag) {
+ return opname[tag.operatorIndex()];
}
/** Is tree a constructor declaration?
*/
public static boolean isConstructor(JCTree tree) {
- if (tree.getTag() == JCTree.METHODDEF) {
+ if (tree.hasTag(METHODDEF)) {
Name name = ((JCMethodDecl) tree).name;
return name == name.table.names.init;
} else {
@@ -119,17 +129,17 @@
}
public static boolean isMultiCatch(JCCatch catchClause) {
- return catchClause.param.vartype.getTag() == JCTree.TYPEUNION;
+ return catchClause.param.vartype.hasTag(TYPEUNION);
}
/** Is statement an initializer for a synthetic field?
*/
public static boolean isSyntheticInit(JCTree stat) {
- if (stat.getTag() == JCTree.EXEC) {
+ if (stat.hasTag(EXEC)) {
JCExpressionStatement exec = (JCExpressionStatement)stat;
- if (exec.expr.getTag() == JCTree.ASSIGN) {
+ if (exec.expr.hasTag(ASSIGN)) {
JCAssign assign = (JCAssign)exec.expr;
- if (assign.lhs.getTag() == JCTree.SELECT) {
+ if (assign.lhs.hasTag(SELECT)) {
JCFieldAccess select = (JCFieldAccess)assign.lhs;
if (select.sym != null &&
(select.sym.flags() & SYNTHETIC) != 0) {
@@ -146,9 +156,9 @@
/** If the expression is a method call, return the method name, null
* otherwise. */
public static Name calledMethodName(JCTree tree) {
- if (tree.getTag() == JCTree.EXEC) {
+ if (tree.hasTag(EXEC)) {
JCExpressionStatement exec = (JCExpressionStatement)tree;
- if (exec.expr.getTag() == JCTree.APPLY) {
+ if (exec.expr.hasTag(APPLY)) {
Name mname = TreeInfo.name(((JCMethodInvocation) exec.expr).meth);
return mname;
}
@@ -192,7 +202,7 @@
/** Return the first call in a constructor definition. */
public static JCMethodInvocation firstConstructorCall(JCTree tree) {
- if (tree.getTag() != JCTree.METHODDEF) return null;
+ if (!tree.hasTag(METHODDEF)) return null;
JCMethodDecl md = (JCMethodDecl) tree;
Names names = md.name.table.names;
if (md.name != names.init) return null;
@@ -202,24 +212,24 @@
while (stats.nonEmpty() && isSyntheticInit(stats.head))
stats = stats.tail;
if (stats.isEmpty()) return null;
- if (stats.head.getTag() != JCTree.EXEC) return null;
+ if (!stats.head.hasTag(EXEC)) return null;
JCExpressionStatement exec = (JCExpressionStatement) stats.head;
- if (exec.expr.getTag() != JCTree.APPLY) return null;
+ if (!exec.expr.hasTag(APPLY)) return null;
return (JCMethodInvocation)exec.expr;
}
/** Return true if a tree represents a diamond new expr. */
public static boolean isDiamond(JCTree tree) {
switch(tree.getTag()) {
- case JCTree.TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
- case JCTree.NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
+ case TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
+ case NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
default: return false;
}
}
/** Return true if a tree represents the null literal. */
public static boolean isNull(JCTree tree) {
- if (tree.getTag() != JCTree.LITERAL)
+ if (!tree.hasTag(LITERAL))
return false;
JCLiteral lit = (JCLiteral) tree;
return (lit.typetag == TypeTags.BOT);
@@ -229,7 +239,7 @@
* the block itself if it is empty.
*/
public static int firstStatPos(JCTree tree) {
- if (tree.getTag() == JCTree.BLOCK && ((JCBlock) tree).stats.nonEmpty())
+ if (tree.hasTag(BLOCK) && ((JCBlock) tree).stats.nonEmpty())
return ((JCBlock) tree).stats.head.pos;
else
return tree.pos;
@@ -239,11 +249,11 @@
* defined endpos.
*/
public static int endPos(JCTree tree) {
- if (tree.getTag() == JCTree.BLOCK && ((JCBlock) tree).endpos != Position.NOPOS)
+ if (tree.hasTag(BLOCK) && ((JCBlock) tree).endpos != Position.NOPOS)
return ((JCBlock) tree).endpos;
- else if (tree.getTag() == JCTree.SYNCHRONIZED)
+ else if (tree.hasTag(SYNCHRONIZED))
return endPos(((JCSynchronized) tree).body);
- else if (tree.getTag() == JCTree.TRY) {
+ else if (tree.hasTag(TRY)) {
JCTry t = (JCTry) tree;
return endPos((t.finalizer != null)
? t.finalizer
@@ -263,162 +273,162 @@
return Position.NOPOS;
switch(tree.getTag()) {
- case(JCTree.APPLY):
- return getStartPos(((JCMethodInvocation) tree).meth);
- case(JCTree.ASSIGN):
- return getStartPos(((JCAssign) tree).lhs);
- case(JCTree.BITOR_ASG): case(JCTree.BITXOR_ASG): case(JCTree.BITAND_ASG):
- case(JCTree.SL_ASG): case(JCTree.SR_ASG): case(JCTree.USR_ASG):
- case(JCTree.PLUS_ASG): case(JCTree.MINUS_ASG): case(JCTree.MUL_ASG):
- case(JCTree.DIV_ASG): case(JCTree.MOD_ASG):
- return getStartPos(((JCAssignOp) tree).lhs);
- case(JCTree.OR): case(JCTree.AND): case(JCTree.BITOR):
- case(JCTree.BITXOR): case(JCTree.BITAND): case(JCTree.EQ):
- case(JCTree.NE): case(JCTree.LT): case(JCTree.GT):
- case(JCTree.LE): case(JCTree.GE): case(JCTree.SL):
- case(JCTree.SR): case(JCTree.USR): case(JCTree.PLUS):
- case(JCTree.MINUS): case(JCTree.MUL): case(JCTree.DIV):
- case(JCTree.MOD):
- return getStartPos(((JCBinary) tree).lhs);
- case(JCTree.CLASSDEF): {
- JCClassDecl node = (JCClassDecl)tree;
- if (node.mods.pos != Position.NOPOS)
- return node.mods.pos;
- break;
- }
- case(JCTree.CONDEXPR):
- return getStartPos(((JCConditional) tree).cond);
- case(JCTree.EXEC):
- return getStartPos(((JCExpressionStatement) tree).expr);
- case(JCTree.INDEXED):
- return getStartPos(((JCArrayAccess) tree).indexed);
- case(JCTree.METHODDEF): {
- JCMethodDecl node = (JCMethodDecl)tree;
- if (node.mods.pos != Position.NOPOS)
- return node.mods.pos;
- if (node.typarams.nonEmpty()) // List.nil() used for no typarams
- return getStartPos(node.typarams.head);
- return node.restype == null ? node.pos : getStartPos(node.restype);
- }
- case(JCTree.SELECT):
- return getStartPos(((JCFieldAccess) tree).selected);
- case(JCTree.TYPEAPPLY):
- return getStartPos(((JCTypeApply) tree).clazz);
- case(JCTree.TYPEARRAY):
- return getStartPos(((JCArrayTypeTree) tree).elemtype);
- case(JCTree.TYPETEST):
- return getStartPos(((JCInstanceOf) tree).expr);
- case(JCTree.POSTINC):
- case(JCTree.POSTDEC):
- return getStartPos(((JCUnary) tree).arg);
- case(JCTree.NEWCLASS): {
- JCNewClass node = (JCNewClass)tree;
- if (node.encl != null)
- return getStartPos(node.encl);
- break;
- }
- case(JCTree.VARDEF): {
- JCVariableDecl node = (JCVariableDecl)tree;
- if (node.mods.pos != Position.NOPOS) {
- return node.mods.pos;
- } else {
- return getStartPos(node.vartype);
+ case APPLY:
+ return getStartPos(((JCMethodInvocation) tree).meth);
+ case ASSIGN:
+ return getStartPos(((JCAssign) tree).lhs);
+ case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+ case SL_ASG: case SR_ASG: case USR_ASG:
+ case PLUS_ASG: case MINUS_ASG: case MUL_ASG:
+ case DIV_ASG: case MOD_ASG:
+ return getStartPos(((JCAssignOp) tree).lhs);
+ case OR: case AND: case BITOR:
+ case BITXOR: case BITAND: case EQ:
+ case NE: case LT: case GT:
+ case LE: case GE: case SL:
+ case SR: case USR: case PLUS:
+ case MINUS: case MUL: case DIV:
+ case MOD:
+ return getStartPos(((JCBinary) tree).lhs);
+ case CLASSDEF: {
+ JCClassDecl node = (JCClassDecl)tree;
+ if (node.mods.pos != Position.NOPOS)
+ return node.mods.pos;
+ break;
}
- }
- case(JCTree.ERRONEOUS): {
- JCErroneous node = (JCErroneous)tree;
- if (node.errs != null && node.errs.nonEmpty())
- return getStartPos(node.errs.head);
- }
+ case CONDEXPR:
+ return getStartPos(((JCConditional) tree).cond);
+ case EXEC:
+ return getStartPos(((JCExpressionStatement) tree).expr);
+ case INDEXED:
+ return getStartPos(((JCArrayAccess) tree).indexed);
+ case METHODDEF: {
+ JCMethodDecl node = (JCMethodDecl)tree;
+ if (node.mods.pos != Position.NOPOS)
+ return node.mods.pos;
+ if (node.typarams.nonEmpty()) // List.nil() used for no typarams
+ return getStartPos(node.typarams.head);
+ return node.restype == null ? node.pos : getStartPos(node.restype);
+ }
+ case SELECT:
+ return getStartPos(((JCFieldAccess) tree).selected);
+ case TYPEAPPLY:
+ return getStartPos(((JCTypeApply) tree).clazz);
+ case TYPEARRAY:
+ return getStartPos(((JCArrayTypeTree) tree).elemtype);
+ case TYPETEST:
+ return getStartPos(((JCInstanceOf) tree).expr);
+ case POSTINC:
+ case POSTDEC:
+ return getStartPos(((JCUnary) tree).arg);
+ case NEWCLASS: {
+ JCNewClass node = (JCNewClass)tree;
+ if (node.encl != null)
+ return getStartPos(node.encl);
+ break;
+ }
+ case VARDEF: {
+ JCVariableDecl node = (JCVariableDecl)tree;
+ if (node.mods.pos != Position.NOPOS) {
+ return node.mods.pos;
+ } else {
+ return getStartPos(node.vartype);
+ }
+ }
+ case ERRONEOUS: {
+ JCErroneous node = (JCErroneous)tree;
+ if (node.errs != null && node.errs.nonEmpty())
+ return getStartPos(node.errs.head);
+ }
}
return tree.pos;
}
/** The end position of given tree, given a table of end positions generated by the parser
*/
- public static int getEndPos(JCTree tree, Map<JCTree, Integer> endPositions) {
+ public static int getEndPos(JCTree tree, EndPosTable endPosTable) {
if (tree == null)
return Position.NOPOS;
- if (endPositions == null) {
+ if (endPosTable == null) {
// fall back on limited info in the tree
return endPos(tree);
}
- Integer mapPos = endPositions.get(tree);
- if (mapPos != null)
+ int mapPos = endPosTable.getEndPos(tree);
+ if (mapPos != Position.NOPOS)
return mapPos;
switch(tree.getTag()) {
- case(JCTree.BITOR_ASG): case(JCTree.BITXOR_ASG): case(JCTree.BITAND_ASG):
- case(JCTree.SL_ASG): case(JCTree.SR_ASG): case(JCTree.USR_ASG):
- case(JCTree.PLUS_ASG): case(JCTree.MINUS_ASG): case(JCTree.MUL_ASG):
- case(JCTree.DIV_ASG): case(JCTree.MOD_ASG):
- return getEndPos(((JCAssignOp) tree).rhs, endPositions);
- case(JCTree.OR): case(JCTree.AND): case(JCTree.BITOR):
- case(JCTree.BITXOR): case(JCTree.BITAND): case(JCTree.EQ):
- case(JCTree.NE): case(JCTree.LT): case(JCTree.GT):
- case(JCTree.LE): case(JCTree.GE): case(JCTree.SL):
- case(JCTree.SR): case(JCTree.USR): case(JCTree.PLUS):
- case(JCTree.MINUS): case(JCTree.MUL): case(JCTree.DIV):
- case(JCTree.MOD):
- return getEndPos(((JCBinary) tree).rhs, endPositions);
- case(JCTree.CASE):
- return getEndPos(((JCCase) tree).stats.last(), endPositions);
- case(JCTree.CATCH):
- return getEndPos(((JCCatch) tree).body, endPositions);
- case(JCTree.CONDEXPR):
- return getEndPos(((JCConditional) tree).falsepart, endPositions);
- case(JCTree.FORLOOP):
- return getEndPos(((JCForLoop) tree).body, endPositions);
- case(JCTree.FOREACHLOOP):
- return getEndPos(((JCEnhancedForLoop) tree).body, endPositions);
- case(JCTree.IF): {
- JCIf node = (JCIf)tree;
- if (node.elsepart == null) {
- return getEndPos(node.thenpart, endPositions);
- } else {
- return getEndPos(node.elsepart, endPositions);
+ case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+ case SL_ASG: case SR_ASG: case USR_ASG:
+ case PLUS_ASG: case MINUS_ASG: case MUL_ASG:
+ case DIV_ASG: case MOD_ASG:
+ return getEndPos(((JCAssignOp) tree).rhs, endPosTable);
+ case OR: case AND: case BITOR:
+ case BITXOR: case BITAND: case EQ:
+ case NE: case LT: case GT:
+ case LE: case GE: case SL:
+ case SR: case USR: case PLUS:
+ case MINUS: case MUL: case DIV:
+ case MOD:
+ return getEndPos(((JCBinary) tree).rhs, endPosTable);
+ case CASE:
+ return getEndPos(((JCCase) tree).stats.last(), endPosTable);
+ case CATCH:
+ return getEndPos(((JCCatch) tree).body, endPosTable);
+ case CONDEXPR:
+ return getEndPos(((JCConditional) tree).falsepart, endPosTable);
+ case FORLOOP:
+ return getEndPos(((JCForLoop) tree).body, endPosTable);
+ case FOREACHLOOP:
+ return getEndPos(((JCEnhancedForLoop) tree).body, endPosTable);
+ case IF: {
+ JCIf node = (JCIf)tree;
+ if (node.elsepart == null) {
+ return getEndPos(node.thenpart, endPosTable);
+ } else {
+ return getEndPos(node.elsepart, endPosTable);
+ }
}
- }
- case(JCTree.LABELLED):
- return getEndPos(((JCLabeledStatement) tree).body, endPositions);
- case(JCTree.MODIFIERS):
- return getEndPos(((JCModifiers) tree).annotations.last(), endPositions);
- case(JCTree.SYNCHRONIZED):
- return getEndPos(((JCSynchronized) tree).body, endPositions);
- case(JCTree.TOPLEVEL):
- return getEndPos(((JCCompilationUnit) tree).defs.last(), endPositions);
- case(JCTree.TRY): {
- JCTry node = (JCTry)tree;
- if (node.finalizer != null) {
- return getEndPos(node.finalizer, endPositions);
- } else if (!node.catchers.isEmpty()) {
- return getEndPos(node.catchers.last(), endPositions);
- } else {
- return getEndPos(node.body, endPositions);
+ case LABELLED:
+ return getEndPos(((JCLabeledStatement) tree).body, endPosTable);
+ case MODIFIERS:
+ return getEndPos(((JCModifiers) tree).annotations.last(), endPosTable);
+ case SYNCHRONIZED:
+ return getEndPos(((JCSynchronized) tree).body, endPosTable);
+ case TOPLEVEL:
+ return getEndPos(((JCCompilationUnit) tree).defs.last(), endPosTable);
+ case TRY: {
+ JCTry node = (JCTry)tree;
+ if (node.finalizer != null) {
+ return getEndPos(node.finalizer, endPosTable);
+ } else if (!node.catchers.isEmpty()) {
+ return getEndPos(node.catchers.last(), endPosTable);
+ } else {
+ return getEndPos(node.body, endPosTable);
+ }
}
- }
- case(JCTree.WILDCARD):
- return getEndPos(((JCWildcard) tree).inner, endPositions);
- case(JCTree.TYPECAST):
- return getEndPos(((JCTypeCast) tree).expr, endPositions);
- case(JCTree.TYPETEST):
- return getEndPos(((JCInstanceOf) tree).clazz, endPositions);
- case(JCTree.POS):
- case(JCTree.NEG):
- case(JCTree.NOT):
- case(JCTree.COMPL):
- case(JCTree.PREINC):
- case(JCTree.PREDEC):
- return getEndPos(((JCUnary) tree).arg, endPositions);
- case(JCTree.WHILELOOP):
- return getEndPos(((JCWhileLoop) tree).body, endPositions);
- case(JCTree.ERRONEOUS): {
- JCErroneous node = (JCErroneous)tree;
- if (node.errs != null && node.errs.nonEmpty())
- return getEndPos(node.errs.last(), endPositions);
- }
+ case WILDCARD:
+ return getEndPos(((JCWildcard) tree).inner, endPosTable);
+ case TYPECAST:
+ return getEndPos(((JCTypeCast) tree).expr, endPosTable);
+ case TYPETEST:
+ return getEndPos(((JCInstanceOf) tree).clazz, endPosTable);
+ case POS:
+ case NEG:
+ case NOT:
+ case COMPL:
+ case PREINC:
+ case PREDEC:
+ return getEndPos(((JCUnary) tree).arg, endPosTable);
+ case WHILELOOP:
+ return getEndPos(((JCWhileLoop) tree).body, endPosTable);
+ case ERRONEOUS: {
+ JCErroneous node = (JCErroneous)tree;
+ if (node.errs != null && node.errs.nonEmpty())
+ return getEndPos(node.errs.last(), endPosTable);
+ }
}
return Position.NOPOS;
}
@@ -434,7 +444,7 @@
public JCTree getTree() { return tree; }
public int getStartPosition() { return TreeInfo.getStartPos(tree); }
public int getPreferredPosition() { return endPos; }
- public int getEndPosition(Map<JCTree, Integer> endPosTable) {
+ public int getEndPosition(EndPosTable endPosTable) {
return TreeInfo.getEndPos(tree, endPosTable);
}
};
@@ -443,11 +453,11 @@
/** The position of the finalizer of given try/synchronized statement.
*/
public static int finalizerPos(JCTree tree) {
- if (tree.getTag() == JCTree.TRY) {
+ if (tree.hasTag(TRY)) {
JCTry t = (JCTry) tree;
Assert.checkNonNull(t.finalizer);
return firstStatPos(t.finalizer);
- } else if (tree.getTag() == JCTree.SYNCHRONIZED) {
+ } else if (tree.hasTag(SYNCHRONIZED)) {
return endPos(((JCSynchronized) tree).body);
} else {
throw new AssertionError();
@@ -547,9 +557,9 @@
public static JCTree referencedStatement(JCLabeledStatement tree) {
JCTree t = tree;
do t = ((JCLabeledStatement) t).body;
- while (t.getTag() == JCTree.LABELLED);
+ while (t.hasTag(LABELLED));
switch (t.getTag()) {
- case JCTree.DOLOOP: case JCTree.WHILELOOP: case JCTree.FORLOOP: case JCTree.FOREACHLOOP: case JCTree.SWITCH:
+ case DOLOOP: case WHILELOOP: case FORLOOP: case FOREACHLOOP: case SWITCH:
return t;
default:
return tree;
@@ -559,7 +569,7 @@
/** Skip parens and return the enclosed expression
*/
public static JCExpression skipParens(JCExpression tree) {
- while (tree.getTag() == JCTree.PARENS) {
+ while (tree.hasTag(PARENS)) {
tree = ((JCParens) tree).expr;
}
return tree;
@@ -568,7 +578,7 @@
/** Skip parens and return the enclosed expression
*/
public static JCTree skipParens(JCTree tree) {
- if (tree.getTag() == JCTree.PARENS)
+ if (tree.hasTag(PARENS))
return skipParens((JCParens)tree);
else
return tree;
@@ -588,11 +598,11 @@
*/
public static Name name(JCTree tree) {
switch (tree.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
return ((JCIdent) tree).name;
- case JCTree.SELECT:
+ case SELECT:
return ((JCFieldAccess) tree).name;
- case JCTree.TYPEAPPLY:
+ case TYPEAPPLY:
return name(((JCTypeApply) tree).clazz);
default:
return null;
@@ -605,9 +615,9 @@
public static Name fullName(JCTree tree) {
tree = skipParens(tree);
switch (tree.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
return ((JCIdent) tree).name;
- case JCTree.SELECT:
+ case SELECT:
Name sname = fullName(((JCFieldAccess) tree).selected);
return sname == null ? null : sname.append('.', name(tree));
default:
@@ -618,11 +628,11 @@
public static Symbol symbolFor(JCTree node) {
node = skipParens(node);
switch (node.getTag()) {
- case JCTree.CLASSDEF:
+ case CLASSDEF:
return ((JCClassDecl) node).sym;
- case JCTree.METHODDEF:
+ case METHODDEF:
return ((JCMethodDecl) node).sym;
- case JCTree.VARDEF:
+ case VARDEF:
return ((JCVariableDecl) node).sym;
default:
return null;
@@ -632,9 +642,9 @@
public static boolean isDeclaration(JCTree node) {
node = skipParens(node);
switch (node.getTag()) {
- case JCTree.CLASSDEF:
- case JCTree.METHODDEF:
- case JCTree.VARDEF:
+ case CLASSDEF:
+ case METHODDEF:
+ case VARDEF:
return true;
default:
return false;
@@ -647,11 +657,11 @@
public static Symbol symbol(JCTree tree) {
tree = skipParens(tree);
switch (tree.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
return ((JCIdent) tree).sym;
- case JCTree.SELECT:
+ case SELECT:
return ((JCFieldAccess) tree).sym;
- case JCTree.TYPEAPPLY:
+ case TYPEAPPLY:
return symbol(((JCTypeApply) tree).clazz);
default:
return null;
@@ -661,7 +671,7 @@
/** Return true if this is a nonstatic selection. */
public static boolean nonstaticSelect(JCTree tree) {
tree = skipParens(tree);
- if (tree.getTag() != JCTree.SELECT) return false;
+ if (!tree.hasTag(SELECT)) return false;
JCFieldAccess s = (JCFieldAccess) tree;
Symbol e = symbol(s.selected);
return e == null || (e.kind != Kinds.PCK && e.kind != Kinds.TYP);
@@ -672,9 +682,9 @@
public static void setSymbol(JCTree tree, Symbol sym) {
tree = skipParens(tree);
switch (tree.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
((JCIdent) tree).sym = sym; break;
- case JCTree.SELECT:
+ case SELECT:
((JCFieldAccess) tree).sym = sym; break;
default:
}
@@ -685,13 +695,13 @@
*/
public static long flags(JCTree tree) {
switch (tree.getTag()) {
- case JCTree.VARDEF:
+ case VARDEF:
return ((JCVariableDecl) tree).mods.flags;
- case JCTree.METHODDEF:
+ case METHODDEF:
return ((JCMethodDecl) tree).mods.flags;
- case JCTree.CLASSDEF:
+ case CLASSDEF:
return ((JCClassDecl) tree).mods.flags;
- case JCTree.BLOCK:
+ case BLOCK:
return ((JCBlock) tree).flags;
default:
return 0;
@@ -739,155 +749,155 @@
/** Map operators to their precedence levels.
*/
- public static int opPrec(int op) {
+ public static int opPrec(JCTree.Tag op) {
switch(op) {
- case JCTree.POS:
- case JCTree.NEG:
- case JCTree.NOT:
- case JCTree.COMPL:
- case JCTree.PREINC:
- case JCTree.PREDEC: return prefixPrec;
- case JCTree.POSTINC:
- case JCTree.POSTDEC:
- case JCTree.NULLCHK: return postfixPrec;
- case JCTree.ASSIGN: return assignPrec;
- case JCTree.BITOR_ASG:
- case JCTree.BITXOR_ASG:
- case JCTree.BITAND_ASG:
- case JCTree.SL_ASG:
- case JCTree.SR_ASG:
- case JCTree.USR_ASG:
- case JCTree.PLUS_ASG:
- case JCTree.MINUS_ASG:
- case JCTree.MUL_ASG:
- case JCTree.DIV_ASG:
- case JCTree.MOD_ASG: return assignopPrec;
- case JCTree.OR: return orPrec;
- case JCTree.AND: return andPrec;
- case JCTree.EQ:
- case JCTree.NE: return eqPrec;
- case JCTree.LT:
- case JCTree.GT:
- case JCTree.LE:
- case JCTree.GE: return ordPrec;
- case JCTree.BITOR: return bitorPrec;
- case JCTree.BITXOR: return bitxorPrec;
- case JCTree.BITAND: return bitandPrec;
- case JCTree.SL:
- case JCTree.SR:
- case JCTree.USR: return shiftPrec;
- case JCTree.PLUS:
- case JCTree.MINUS: return addPrec;
- case JCTree.MUL:
- case JCTree.DIV:
- case JCTree.MOD: return mulPrec;
- case JCTree.TYPETEST: return ordPrec;
+ case POS:
+ case NEG:
+ case NOT:
+ case COMPL:
+ case PREINC:
+ case PREDEC: return prefixPrec;
+ case POSTINC:
+ case POSTDEC:
+ case NULLCHK: return postfixPrec;
+ case ASSIGN: return assignPrec;
+ case BITOR_ASG:
+ case BITXOR_ASG:
+ case BITAND_ASG:
+ case SL_ASG:
+ case SR_ASG:
+ case USR_ASG:
+ case PLUS_ASG:
+ case MINUS_ASG:
+ case MUL_ASG:
+ case DIV_ASG:
+ case MOD_ASG: return assignopPrec;
+ case OR: return orPrec;
+ case AND: return andPrec;
+ case EQ:
+ case NE: return eqPrec;
+ case LT:
+ case GT:
+ case LE:
+ case GE: return ordPrec;
+ case BITOR: return bitorPrec;
+ case BITXOR: return bitxorPrec;
+ case BITAND: return bitandPrec;
+ case SL:
+ case SR:
+ case USR: return shiftPrec;
+ case PLUS:
+ case MINUS: return addPrec;
+ case MUL:
+ case DIV:
+ case MOD: return mulPrec;
+ case TYPETEST: return ordPrec;
default: throw new AssertionError();
}
}
- static Tree.Kind tagToKind(int tag) {
+ static Tree.Kind tagToKind(JCTree.Tag tag) {
switch (tag) {
// Postfix expressions
- case JCTree.POSTINC: // _ ++
+ case POSTINC: // _ ++
return Tree.Kind.POSTFIX_INCREMENT;
- case JCTree.POSTDEC: // _ --
+ case POSTDEC: // _ --
return Tree.Kind.POSTFIX_DECREMENT;
// Unary operators
- case JCTree.PREINC: // ++ _
+ case PREINC: // ++ _
return Tree.Kind.PREFIX_INCREMENT;
- case JCTree.PREDEC: // -- _
+ case PREDEC: // -- _
return Tree.Kind.PREFIX_DECREMENT;
- case JCTree.POS: // +
+ case POS: // +
return Tree.Kind.UNARY_PLUS;
- case JCTree.NEG: // -
+ case NEG: // -
return Tree.Kind.UNARY_MINUS;
- case JCTree.COMPL: // ~
+ case COMPL: // ~
return Tree.Kind.BITWISE_COMPLEMENT;
- case JCTree.NOT: // !
+ case NOT: // !
return Tree.Kind.LOGICAL_COMPLEMENT;
// Binary operators
// Multiplicative operators
- case JCTree.MUL: // *
+ case MUL: // *
return Tree.Kind.MULTIPLY;
- case JCTree.DIV: // /
+ case DIV: // /
return Tree.Kind.DIVIDE;
- case JCTree.MOD: // %
+ case MOD: // %
return Tree.Kind.REMAINDER;
// Additive operators
- case JCTree.PLUS: // +
+ case PLUS: // +
return Tree.Kind.PLUS;
- case JCTree.MINUS: // -
+ case MINUS: // -
return Tree.Kind.MINUS;
// Shift operators
- case JCTree.SL: // <<
+ case SL: // <<
return Tree.Kind.LEFT_SHIFT;
- case JCTree.SR: // >>
+ case SR: // >>
return Tree.Kind.RIGHT_SHIFT;
- case JCTree.USR: // >>>
+ case USR: // >>>
return Tree.Kind.UNSIGNED_RIGHT_SHIFT;
// Relational operators
- case JCTree.LT: // <
+ case LT: // <
return Tree.Kind.LESS_THAN;
- case JCTree.GT: // >
+ case GT: // >
return Tree.Kind.GREATER_THAN;
- case JCTree.LE: // <=
+ case LE: // <=
return Tree.Kind.LESS_THAN_EQUAL;
- case JCTree.GE: // >=
+ case GE: // >=
return Tree.Kind.GREATER_THAN_EQUAL;
// Equality operators
- case JCTree.EQ: // ==
+ case EQ: // ==
return Tree.Kind.EQUAL_TO;
- case JCTree.NE: // !=
+ case NE: // !=
return Tree.Kind.NOT_EQUAL_TO;
// Bitwise and logical operators
- case JCTree.BITAND: // &
+ case BITAND: // &
return Tree.Kind.AND;
- case JCTree.BITXOR: // ^
+ case BITXOR: // ^
return Tree.Kind.XOR;
- case JCTree.BITOR: // |
+ case BITOR: // |
return Tree.Kind.OR;
// Conditional operators
- case JCTree.AND: // &&
+ case AND: // &&
return Tree.Kind.CONDITIONAL_AND;
- case JCTree.OR: // ||
+ case OR: // ||
return Tree.Kind.CONDITIONAL_OR;
// Assignment operators
- case JCTree.MUL_ASG: // *=
+ case MUL_ASG: // *=
return Tree.Kind.MULTIPLY_ASSIGNMENT;
- case JCTree.DIV_ASG: // /=
+ case DIV_ASG: // /=
return Tree.Kind.DIVIDE_ASSIGNMENT;
- case JCTree.MOD_ASG: // %=
+ case MOD_ASG: // %=
return Tree.Kind.REMAINDER_ASSIGNMENT;
- case JCTree.PLUS_ASG: // +=
+ case PLUS_ASG: // +=
return Tree.Kind.PLUS_ASSIGNMENT;
- case JCTree.MINUS_ASG: // -=
+ case MINUS_ASG: // -=
return Tree.Kind.MINUS_ASSIGNMENT;
- case JCTree.SL_ASG: // <<=
+ case SL_ASG: // <<=
return Tree.Kind.LEFT_SHIFT_ASSIGNMENT;
- case JCTree.SR_ASG: // >>=
+ case SR_ASG: // >>=
return Tree.Kind.RIGHT_SHIFT_ASSIGNMENT;
- case JCTree.USR_ASG: // >>>=
+ case USR_ASG: // >>>=
return Tree.Kind.UNSIGNED_RIGHT_SHIFT_ASSIGNMENT;
- case JCTree.BITAND_ASG: // &=
+ case BITAND_ASG: // &=
return Tree.Kind.AND_ASSIGNMENT;
- case JCTree.BITXOR_ASG: // ^=
+ case BITXOR_ASG: // ^=
return Tree.Kind.XOR_ASSIGNMENT;
- case JCTree.BITOR_ASG: // |=
+ case BITOR_ASG: // |=
return Tree.Kind.OR_ASSIGNMENT;
// Null check (implementation detail), for example, __.getClass()
- case JCTree.NULLCHK:
+ case NULLCHK:
return Tree.Kind.OTHER;
default:
@@ -901,13 +911,13 @@
*/
public static JCExpression typeIn(JCExpression tree) {
switch (tree.getTag()) {
- case JCTree.IDENT: /* simple names */
- case JCTree.TYPEIDENT: /* primitive name */
- case JCTree.SELECT: /* qualified name */
- case JCTree.TYPEARRAY: /* array types */
- case JCTree.WILDCARD: /* wild cards */
- case JCTree.TYPEPARAMETER: /* type parameters */
- case JCTree.TYPEAPPLY: /* parameterized types */
+ case IDENT: /* simple names */
+ case TYPEIDENT: /* primitive name */
+ case SELECT: /* qualified name */
+ case TYPEARRAY: /* array types */
+ case WILDCARD: /* wild cards */
+ case TYPEPARAMETER: /* type parameters */
+ case TYPEAPPLY: /* parameterized types */
return tree;
default:
throw new AssertionError("Unexpected type tree: " + tree);
@@ -916,9 +926,9 @@
public static JCTree innermostType(JCTree type) {
switch (type.getTag()) {
- case JCTree.TYPEARRAY:
+ case TYPEARRAY:
return innermostType(((JCArrayTypeTree)type).elemtype);
- case JCTree.WILDCARD:
+ case WILDCARD:
return innermostType(((JCWildcard)type).inner);
default:
return type;
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Tue Dec 06 05:28:17 2011 -0800
@@ -363,19 +363,19 @@
return tree;
}
- public JCAssignOp Assignop(int opcode, JCTree lhs, JCTree rhs) {
+ public JCAssignOp Assignop(JCTree.Tag opcode, JCTree lhs, JCTree rhs) {
JCAssignOp tree = new JCAssignOp(opcode, lhs, rhs, null);
tree.pos = pos;
return tree;
}
- public JCUnary Unary(int opcode, JCExpression arg) {
+ public JCUnary Unary(JCTree.Tag opcode, JCExpression arg) {
JCUnary tree = new JCUnary(opcode, arg);
tree.pos = pos;
return tree;
}
- public JCBinary Binary(int opcode, JCExpression lhs, JCExpression rhs) {
+ public JCBinary Binary(JCTree.Tag opcode, JCExpression lhs, JCExpression rhs) {
JCBinary tree = new JCBinary(opcode, lhs, rhs, null);
tree.pos = pos;
return tree;
--- a/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java Tue Dec 06 05:28:17 2011 -0800
@@ -166,7 +166,7 @@
// where
private static JavacOption[] javacFileManagerOptions =
RecognizedOptions.getJavacFileManagerOptions(
- new RecognizedOptions.GrumpyHelper());
+ new RecognizedOptions.GrumpyHelper(Log.instance(new Context())));
public int isSupportedOption(String option) {
for (JavacOption o : javacFileManagerOptions) {
--- a/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. 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
@@ -32,6 +32,7 @@
import javax.tools.JavaFileObject;
import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.tree.JCTree;
import static com.sun.tools.javac.util.LayoutCharacters.*;
@@ -128,11 +129,11 @@
}
}
- public Map<JCTree, Integer> getEndPosTable() {
+ public EndPosTable getEndPosTable() {
return endPosTable;
}
- public void setEndPosTable(Map<JCTree, Integer> t) {
+ public void setEndPosTable(EndPosTable t) {
if (endPosTable != null && endPosTable != t)
throw new IllegalStateException("endPosTable already set");
endPosTable = t;
@@ -199,7 +200,7 @@
/** The underlying file object. */
protected JavaFileObject fileObject;
- protected Map<JCTree, Integer> endPosTable;
+ protected EndPosTable endPosTable;
/** A soft reference to the content of the file object. */
protected SoftReference<char[]> refBuf;
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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
@@ -35,6 +35,7 @@
import com.sun.tools.javac.api.DiagnosticFormatter;
import com.sun.tools.javac.code.Lint.LintCategory;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.tree.JCTree;
import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticType.*;
@@ -70,7 +71,16 @@
this(JavacMessages.instance(context), "compiler");
context.put(diagnosticFactoryKey, this);
- Options options = Options.instance(context);
+ final Options options = Options.instance(context);
+ initOptions(options);
+ options.addListener(new Runnable() {
+ public void run() {
+ initOptions(options);
+ }
+ });
+ }
+
+ private void initOptions(Options options) {
if (options.isSet("onlySyntaxErrorsUnrecoverable"))
defaultErrorFlags.add(DiagnosticFlag.RECOVERABLE);
}
@@ -304,7 +314,7 @@
/** If there is a tree node, and if endPositions are available, get
* the end position of the tree node. Otherwise, just returns the
* same as getPreferredPosition(). */
- int getEndPosition(Map<JCTree, Integer> endPosTable);
+ int getEndPosition(EndPosTable endPosTable);
}
/**
@@ -328,7 +338,7 @@
return pos;
}
- public int getEndPosition(Map<JCTree, Integer> endPosTable) {
+ public int getEndPosition(EndPosTable endPosTable) {
return pos;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java Tue Dec 06 05:28:17 2011 -0800
@@ -82,14 +82,14 @@
}
/** Creates a JavacMessages object.
- * @param bundleName the name to identify the resource buundle of localized messages.
+ * @param bundleName the name to identify the resource bundle of localized messages.
*/
public JavacMessages(String bundleName) throws MissingResourceException {
this(bundleName, null);
}
/** Creates a JavacMessages object.
- * @param bundleName the name to identify the resource buundle of localized messages.
+ * @param bundleName the name to identify the resource bundle of localized messages.
*/
public JavacMessages(String bundleName, Locale locale) throws MissingResourceException {
bundleNames = List.nil();
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java Tue Dec 06 05:28:17 2011 -0800
@@ -25,6 +25,7 @@
package com.sun.tools.javac.util;
+import com.sun.tools.javac.main.Main;
import java.io.*;
import java.util.Arrays;
import java.util.EnumSet;
@@ -37,6 +38,7 @@
import com.sun.tools.javac.api.DiagnosticFormatter;
import com.sun.tools.javac.main.OptionName;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
@@ -60,19 +62,31 @@
public static final Context.Key<PrintWriter> outKey =
new Context.Key<PrintWriter>();
- //@Deprecated
- public final PrintWriter errWriter;
+ /* TODO: Should unify this with prefix handling in JCDiagnostic.Factory. */
+ public enum PrefixKind {
+ JAVAC("javac."),
+ COMPILER_MISC("compiler.misc.");
+ PrefixKind(String v) {
+ value = v;
+ }
+ public String key(String k) {
+ return value + k;
+ }
+ final String value;
+ }
- //@Deprecated
- public final PrintWriter warnWriter;
+ public enum WriterKind { NOTICE, WARNING, ERROR };
+
+ protected PrintWriter errWriter;
- //@Deprecated
- public final PrintWriter noticeWriter;
+ protected PrintWriter warnWriter;
+
+ protected PrintWriter noticeWriter;
/** The maximum number of errors/warnings that are reported.
*/
- public final int MaxErrors;
- public final int MaxWarnings;
+ protected int MaxErrors;
+ protected int MaxWarnings;
/** Switch: prompt user on each error.
*/
@@ -131,28 +145,40 @@
this.warnWriter = warnWriter;
this.noticeWriter = noticeWriter;
- Options options = Options.instance(context);
- this.dumpOnError = options.isSet(DOE);
- this.promptOnError = options.isSet(PROMPT);
- this.emitWarnings = options.isUnset(XLINT_CUSTOM, "none");
- this.suppressNotes = options.isSet("suppressNotes");
- this.MaxErrors = getIntOption(options, XMAXERRS, getDefaultMaxErrors());
- this.MaxWarnings = getIntOption(options, XMAXWARNS, getDefaultMaxWarnings());
-
- boolean rawDiagnostics = options.isSet("rawDiagnostics");
- messages = JavacMessages.instance(context);
- this.diagFormatter = rawDiagnostics ? new RawDiagnosticFormatter(options) :
- new BasicDiagnosticFormatter(options, messages);
@SuppressWarnings("unchecked") // FIXME
DiagnosticListener<? super JavaFileObject> dl =
context.get(DiagnosticListener.class);
this.diagListener = dl;
- String ek = options.get("expectKeys");
- if (ek != null)
- expectDiagKeys = new HashSet<String>(Arrays.asList(ek.split(", *")));
+ messages = JavacMessages.instance(context);
+ messages.add(Main.javacBundleName);
+
+ final Options options = Options.instance(context);
+ initOptions(options);
+ options.addListener(new Runnable() {
+ public void run() {
+ initOptions(options);
+ }
+ });
}
// where
+ private void initOptions(Options options) {
+ this.dumpOnError = options.isSet(DOE);
+ this.promptOnError = options.isSet(PROMPT);
+ this.emitWarnings = options.isUnset(XLINT_CUSTOM, "none");
+ this.suppressNotes = options.isSet("suppressNotes");
+ this.MaxErrors = getIntOption(options, XMAXERRS, getDefaultMaxErrors());
+ this.MaxWarnings = getIntOption(options, XMAXWARNS, getDefaultMaxWarnings());
+
+ boolean rawDiagnostics = options.isSet("rawDiagnostics");
+ this.diagFormatter = rawDiagnostics ? new RawDiagnosticFormatter(options) :
+ new BasicDiagnosticFormatter(options, messages);
+
+ String ek = options.get("expectKeys");
+ if (ek != null)
+ expectDiagKeys = new HashSet<String>(Arrays.asList(ek.split(", *")));
+ }
+
private int getIntOption(Options options, OptionName optionName, int defaultValue) {
String s = options.get(optionName);
try {
@@ -180,7 +206,7 @@
/** The default writer for diagnostics
*/
- static final PrintWriter defaultWriter(Context context) {
+ static PrintWriter defaultWriter(Context context) {
PrintWriter result = context.get(outKey);
if (result == null)
context.put(outKey, result = new PrintWriter(System.err));
@@ -225,9 +251,9 @@
return diagListener != null;
}
- public void setEndPosTable(JavaFileObject name, Map<JCTree, Integer> table) {
+ public void setEndPosTable(JavaFileObject name, EndPosTable endPosTable) {
name.getClass(); // null check
- getSource(name).setEndPosTable(table);
+ getSource(name).setEndPosTable(endPosTable);
}
/** Return current sourcefile.
@@ -248,6 +274,30 @@
this.diagFormatter = diagFormatter;
}
+ public PrintWriter getWriter(WriterKind kind) {
+ switch (kind) {
+ case NOTICE: return noticeWriter;
+ case WARNING: return warnWriter;
+ case ERROR: return errWriter;
+ default: throw new IllegalArgumentException();
+ }
+ }
+
+ public void setWriter(WriterKind kind, PrintWriter pw) {
+ pw.getClass();
+ switch (kind) {
+ case NOTICE: noticeWriter = pw; break;
+ case WARNING: warnWriter = pw; break;
+ case ERROR: errWriter = pw; break;
+ default: throw new IllegalArgumentException();
+ }
+ }
+
+ public void setWriters(PrintWriter pw) {
+ pw.getClass();
+ noticeWriter = warnWriter = errWriter = pw;
+ }
+
/** Flush the logs
*/
public void flush() {
@@ -256,6 +306,10 @@
noticeWriter.flush();
}
+ public void flush(WriterKind kind) {
+ getWriter(kind).flush();
+ }
+
/** Returns true if an error needs to be reported for a given
* source name and pos.
*/
@@ -275,7 +329,6 @@
public void prompt() {
if (promptOnError) {
System.err.println(localize("resume.abort"));
- char ch;
try {
while (true) {
switch (System.in.read()) {
@@ -302,7 +355,7 @@
return;
int col = source.getColumnNumber(pos, false);
- printLines(writer, line);
+ printRawLines(writer, line);
for (int i = 0; i < col - 1; i++) {
writer.print((line.charAt(i) == '\t') ? "\t" : " ");
}
@@ -310,10 +363,48 @@
writer.flush();
}
+ public void printNewline() {
+ noticeWriter.println();
+ }
+
+ public void printNewline(WriterKind wk) {
+ getWriter(wk).println();
+ }
+
+ public void printLines(String key, Object... args) {
+ printRawLines(noticeWriter, localize(key, args));
+ }
+
+ public void printLines(PrefixKind pk, String key, Object... args) {
+ printRawLines(noticeWriter, localize(pk, key, args));
+ }
+
+ public void printLines(WriterKind wk, String key, Object... args) {
+ printRawLines(getWriter(wk), localize(key, args));
+ }
+
+ public void printLines(WriterKind wk, PrefixKind pk, String key, Object... args) {
+ printRawLines(getWriter(wk), localize(pk, key, args));
+ }
+
/** Print the text of a message, translating newlines appropriately
* for the platform.
*/
- public static void printLines(PrintWriter writer, String msg) {
+ public void printRawLines(String msg) {
+ printRawLines(noticeWriter, msg);
+ }
+
+ /** Print the text of a message, translating newlines appropriately
+ * for the platform.
+ */
+ public void printRawLines(WriterKind kind, String msg) {
+ printRawLines(getWriter(kind), msg);
+ }
+
+ /** Print the text of a message, translating newlines appropriately
+ * for the platform.
+ */
+ public static void printRawLines(PrintWriter writer, String msg) {
int nl;
while ((nl = msg.indexOf('\n')) != -1) {
writer.println(msg.substring(0, nl));
@@ -322,30 +413,16 @@
if (msg.length() != 0) writer.println(msg);
}
- /** Print the text of a message to the errWriter stream,
- * translating newlines appropriately for the platform.
- */
- public void printErrLines(String key, Object... args) {
- printLines(errWriter, localize(key, args));
- }
-
- /** Print the text of a message to the noticeWriter stream,
- * translating newlines appropriately for the platform.
- */
- public void printNoteLines(String key, Object... args) {
- printLines(noticeWriter, localize(key, args));
- }
-
/**
* Print the localized text of a "verbose" message to the
* noticeWriter stream.
*/
public void printVerbose(String key, Object... args) {
- printLines(noticeWriter, localize("verbose." + key, args));
+ printRawLines(noticeWriter, localize("verbose." + key, args));
}
protected void directError(String key, Object... args) {
- printErrLines(key, args);
+ printRawLines(errWriter, localize(key, args));
errWriter.flush();
}
@@ -431,7 +508,7 @@
PrintWriter writer = getWriterForDiagnosticType(diag.getType());
- printLines(writer, diagFormatter.format(diag, messages.getCurrentLocale()));
+ printRawLines(writer, diagFormatter.format(diag, messages.getCurrentLocale()));
if (promptOnError) {
switch (diag.getType()) {
@@ -474,7 +551,7 @@
* @param args Fields to substitute into the string.
*/
public static String getLocalizedString(String key, Object ... args) {
- return JavacMessages.getDefaultLocalizedString("compiler.misc." + key, args);
+ return JavacMessages.getDefaultLocalizedString(PrefixKind.COMPILER_MISC.key(key), args);
}
/** Find a localized string in the resource bundle.
@@ -482,9 +559,23 @@
* @param args Fields to substitute into the string.
*/
public String localize(String key, Object... args) {
- return messages.getLocalizedString("compiler.misc." + key, args);
+ return localize(PrefixKind.COMPILER_MISC, key, args);
}
+ /** Find a localized string in the resource bundle.
+ * @param key The key for the localized string.
+ * @param args Fields to substitute into the string.
+ */
+ public String localize(PrefixKind pk, String key, Object... args) {
+ if (useRawMessages)
+ return pk.key(key);
+ else
+ return messages.getLocalizedString(pk.key(key), args);
+ }
+ // where
+ // backdoor hook for testing, should transition to use -XDrawDiagnostics
+ private static boolean useRawMessages = false;
+
/***************************************************************************
* raw error messages without internationalization; used for experimentation
* and quick prototyping
@@ -494,12 +585,12 @@
*/
private void printRawError(int pos, String msg) {
if (source == null || pos == Position.NOPOS) {
- printLines(errWriter, "error: " + msg);
+ printRawLines(errWriter, "error: " + msg);
} else {
int line = source.getLineNumber(pos);
JavaFileObject file = source.getFile();
if (file != null)
- printLines(errWriter,
+ printRawLines(errWriter,
file.getName() + ":" +
line + ": " + msg);
printErrLine(pos, errWriter);
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Options.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Options.java Tue Dec 06 05:28:17 2011 -0800
@@ -157,6 +157,19 @@
return values.size();
}
+ // light-weight notification mechanism
+
+ private List<Runnable> listeners = List.nil();
+
+ public void addListener(Runnable listener) {
+ listeners = listeners.prepend(listener);
+ }
+
+ public void notifyListeners() {
+ for (Runnable r: listeners)
+ r.run();
+ }
+
/** Check for a lint suboption. */
public boolean lint(String s) {
// return true if either the specific option is enabled, or
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Tue Dec 06 05:28:17 2011 -0800
@@ -65,6 +65,7 @@
import com.sun.tools.javac.util.Position;
import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/**
* Represents a java class and provides access to information
@@ -1083,7 +1084,7 @@
Name asterisk = tsym.name.table.names.asterisk;
for (JCTree t : compenv.toplevel.defs) {
- if (t.getTag() == JCTree.IMPORT) {
+ if (t.hasTag(IMPORT)) {
JCTree imp = ((JCImport) t).qualid;
if ((TreeInfo.name(imp) != asterisk) &&
(imp.type.tsym.kind & Kinds.TYP) != 0) {
@@ -1124,7 +1125,7 @@
if (compenv == null) return new PackageDocImpl[0];
for (JCTree t : compenv.toplevel.defs) {
- if (t.getTag() == JCTree.IMPORT) {
+ if (t.hasTag(IMPORT)) {
JCTree imp = ((JCImport) t).qualid;
if (TreeInfo.name(imp) == names.asterisk) {
JCFieldAccess sel = (JCFieldAccess)imp;
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Tue Dec 06 05:28:17 2011 -0800
@@ -419,7 +419,7 @@
ListBuffer<JCClassDecl> result = new ListBuffer<JCClassDecl>();
for (JCCompilationUnit t : trees) {
for (JCTree def : t.defs) {
- if (def.getTag() == JCTree.CLASSDEF)
+ if (def.hasTag(JCTree.Tag.CLASSDEF))
result.append((JCClassDecl)def);
}
}
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java Tue Dec 06 05:28:17 2011 -0800
@@ -31,6 +31,7 @@
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Options;
import java.io.IOException;
@@ -76,9 +77,6 @@
private DocletInvoker docletInvoker;
- private static final int F_VERBOSE = 1 << 0;
- private static final int F_WARNINGS = 1 << 2;
-
/* Treat warnings as errors. */
private boolean rejectWarnings = false;
@@ -171,11 +169,11 @@
messager.error(null, "main.out.of.memory");
failed = true;
} catch (Error ee) {
- ee.printStackTrace();
+ ee.printStackTrace(System.err);
messager.error(null, "main.fatal.error");
failed = true;
} catch (Exception ee) {
- ee.printStackTrace();
+ ee.printStackTrace(System.err);
messager.error(null, "main.fatal.exception");
failed = true;
} finally {
@@ -211,7 +209,7 @@
messager.error(null, "main.cant.read", e.getMessage());
exit();
} catch (IOException e) {
- e.printStackTrace();
+ e.printStackTrace(System.err);
exit();
}
@@ -225,7 +223,9 @@
// options that may be set up below.
Messager.preRegister(context,
messager.programName,
- messager.errWriter, messager.warnWriter, messager.noticeWriter);
+ messager.getWriter(Log.WriterKind.ERROR),
+ messager.getWriter(Log.WriterKind.WARNING),
+ messager.getWriter(Log.WriterKind.NOTICE));
Options compOpts = Options.instance(context);
boolean docClasses = false;
--- a/langtools/test/Makefile Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/test/Makefile Tue Dec 06 05:28:17 2011 -0800
@@ -19,6 +19,7 @@
# Get OS/ARCH specifics
OSNAME = $(shell uname -s)
ifeq ($(OSNAME), SunOS)
+ SLASH_JAVA = /java
PLATFORM = solaris
JT_PLATFORM = solaris
ARCH = $(shell uname -p)
@@ -27,6 +28,7 @@
endif
endif
ifeq ($(OSNAME), Linux)
+ SLASH_JAVA = /java
PLATFORM = linux
JT_PLATFORM = linux
ARCH = $(shell uname -m)
@@ -35,7 +37,16 @@
endif
endif
ifeq ($(OSNAME), Windows_NT)
+ # MKS
+ PLATFORM=windows
+endif
+ifeq ($(PLATFORM),)
PLATFORM = windows
+ CYGPATH = | cygpath -m -s -f -
+endif
+
+ifeq ($(PLATFORM), windows)
+ SLASH_JAVA = J:
JT_PLATFORM = win32
ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
ARCH=ia64
@@ -54,7 +65,7 @@
endif
# Root of this test area (important to use full paths in some places)
-TEST_ROOT := $(shell pwd)
+TEST_ROOT := $(shell pwd $(CYGPATH) )
# Default bundle of all test results (passed or not) (JPRT only)
ifdef JPRT_JOB_ID
@@ -72,7 +83,7 @@
ifdef JPRT_JTREG_HOME
JTREG_HOME = $(JPRT_JTREG_HOME)
else
- JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+ JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg
endif
JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg
JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff
@@ -81,7 +92,7 @@
ifdef JPRT_JCK_HOME
JCK_HOME = $(JPRT_JCK_HOME)
else
- JCK_HOME = $(SLASH_JAVA)/re/jck/7/promoted/latest/binaries
+ JCK_HOME = $(SLASH_JAVA)/re/jck/8/promoted/latest/binaries
endif
# Default JDK for JTREG and JCK
@@ -93,7 +104,7 @@
ifdef JPRT_JAVA_HOME
JT_JAVA = $(JPRT_JAVA_HOME)
else
- JT_JAVA = $(SLASH_JAVA)/re/jdk/1.6.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
+ JT_JAVA = $(SLASH_JAVA)/re/jdk/1.7.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
endif
# Default JDK to test
@@ -195,7 +206,7 @@
ABS_TEST_OUTPUT_DIR := \
$(shell mkdir -p $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools; \
cd $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools; \
- pwd )
+ pwd $(CYGPATH))
# Subdirectories for different test runs
JTREG_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jtreg
JCK_COMPILER_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-compiler
@@ -272,15 +283,17 @@
fi
# Check to make sure these directories exist
-check-jtreg: $(JT_HOME) $(PRODUCT_HOME) $(JTREG)
+check-jtreg: $(PRODUCT_HOME) $(JTREG)
# Run JCK-compiler tests
#
# JCK_HOME
# Installed location of JCK: should include JCK-compiler, and JCK-extras
+# Default is JCK 8.
# JT_JAVA
# Version of java used to run JCK. Should normally be the same as TESTJAVA
+# Default is JDK 7
# TESTJAVA
# Version of java to be tested.
# JCK_COMPILER_OPTIONS
@@ -297,7 +310,7 @@
$(JCK_COMPILER_OUTPUT_DIR)/diff.html $(JCK_COMPILER_OUTPUT_DIR)/status.txt
@mkdir -p $(JCK_COMPILER_OUTPUT_DIR)
$(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \
- -jar $(JCK_HOME)/JCK-compiler-7/lib/jtjck.jar \
+ -jar $(JCK_HOME)/JCK-compiler-8/lib/jtjck.jar \
-v:non-pass \
-r:$(JCK_COMPILER_OUTPUT_DIR)/report \
-w:$(JCK_COMPILER_OUTPUT_DIR)/work \
@@ -346,7 +359,7 @@
$(JCK_RUNTIME_OUTPUT_DIR)/diff.html $(JCK_RUNTIME_OUTPUT_DIR)/status.txt
@mkdir -p $(JCK_RUNTIME_OUTPUT_DIR)
$(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \
- -jar $(JCK_HOME)/JCK-runtime-7/lib/jtjck.jar \
+ -jar $(JCK_HOME)/JCK-runtime-8/lib/jtjck.jar \
-v:non-pass \
-r:$(JCK_RUNTIME_OUTPUT_DIR)/report \
-w:$(JCK_RUNTIME_OUTPUT_DIR)/work \
@@ -373,7 +386,7 @@
fi
# Check to make sure these directories exist
-check-jck: $(JT_HOME) $(JCK_HOME) $(PRODUCT_HOME)
+check-jck: $(JCK_HOME) $(PRODUCT_HOME)
all-summary: FRC
if [ -n "`find $(TEST_OUTPUT_DIR) -name status.txt`" ]; then
--- a/langtools/test/tools/javac/6304921/TestLog.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/test/tools/javac/6304921/TestLog.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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
@@ -33,6 +33,7 @@
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.parser.Parser;
import com.sun.tools.javac.parser.ParserFactory;
import com.sun.tools.javac.tree.JCTree;
@@ -97,9 +98,9 @@
}
private static class LogTester extends TreeScanner {
- LogTester(Log log, java.util.Map<JCTree, Integer> endPositions) {
+ LogTester(Log log, EndPosTable endPosTable) {
this.log = log;
- this.endPositions = endPositions;
+ this.endPosTable = endPosTable;
}
public void visitIf(JCTree.JCIf tree) {
@@ -117,7 +118,7 @@
}
private Log log;
- private java.util.Map<JCTree, Integer> endPositions;
+ private EndPosTable endPosTable;
}
private static class StringJavaFileObject extends SimpleJavaFileObject {
--- a/langtools/test/tools/javac/6410653/T6410653.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/test/tools/javac/6410653/T6410653.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2011, Oracle and/or its affiliates. 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
@@ -28,7 +28,7 @@
* @author Peter von der Ah\u00e9
*/
-import java.lang.reflect.Method;
+import java.lang.reflect.Field;
import java.io.File;
import java.io.ByteArrayOutputStream;
import javax.tools.*;
@@ -39,12 +39,13 @@
String source = new File(testSrc, "T6410653.java").getPath();
ClassLoader cl = ToolProvider.getSystemToolClassLoader();
Tool compiler = ToolProvider.getSystemJavaCompiler();
- Class<?> main = Class.forName("com.sun.tools.javac.main.Main", true, cl);
- Method useRawMessages = main.getMethod("useRawMessages", boolean.class);
- useRawMessages.invoke(null, true);
+ Class<?> log = Class.forName("com.sun.tools.javac.util.Log", true, cl);
+ Field useRawMessages = log.getDeclaredField("useRawMessages");
+ useRawMessages.setAccessible(true);
+ useRawMessages.setBoolean(null, true);
ByteArrayOutputStream out = new ByteArrayOutputStream();
compiler.run(null, null, out, "-d", source, source);
- useRawMessages.invoke(null, false);
+ useRawMessages.setBoolean(null, false);
if (!out.toString().equals(String.format("%s%n%s%n",
"javac: javac.err.file.not.directory",
"javac.msg.usage"))) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.java Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,20 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug 7104201
+ * @summary Refactor DocCommentScanner
+ * @compile/fail/ref=DeprecatedDocComment4.out -XDrawDiagnostics -Werror -Xlint:dep-ann DeprecatedDocComment4.java
+ */
+
+class DeprecatedDocComment4 {
+ /** @deprecated **/
+ /* block */
+ void test1() {};
+
+ /** @deprecated **/
+ /** double javadoc */
+ void test2() {};
+
+ /** @deprecated **/
+ //line comment
+ void test3() {};
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment4.out Tue Dec 06 05:28:17 2011 -0800
@@ -0,0 +1,6 @@
+DeprecatedDocComment4.java:11:10: compiler.warn.missing.deprecated.annotation
+DeprecatedDocComment4.java:15:10: compiler.warn.missing.deprecated.annotation
+DeprecatedDocComment4.java:19:10: compiler.warn.missing.deprecated.annotation
+- compiler.err.warnings.and.werror
+1 error
+3 warnings
--- a/langtools/test/tools/javac/diags/ArgTypeCompilerFactory.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/test/tools/javac/diags/ArgTypeCompilerFactory.java Tue Dec 06 05:28:17 2011 -0800
@@ -105,13 +105,11 @@
Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files);
- JavacTaskImpl t = (JavacTaskImpl) tool.getTask(out, fm, null, opts, null, fos);
- Context c = t.getContext();
+ Context c = new Context();
ArgTypeMessages.preRegister(c);
ArgTypeJavaCompiler.preRegister(c);
- Boolean ok = t.call();
-
- return ok;
+ JavacTaskImpl t = (JavacTaskImpl) tool.getTask(out, fm, null, opts, null, fos, c);
+ return t.call();
}
}
--- a/langtools/test/tools/javac/failover/CheckAttributedTree.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/test/tools/javac/failover/CheckAttributedTree.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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
@@ -55,12 +55,8 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.nio.charset.Charset;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
import javax.tools.JavaFileObject;
@@ -72,8 +68,8 @@
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.tree.JCTree.JCImport;
import com.sun.tools.javac.tree.TreeInfo;
@@ -85,6 +81,8 @@
import java.util.Set;
import javax.lang.model.element.Element;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+
/**
* Utility and test program to check validity of tree positions for tree nodes.
* The program can be run standalone, or as a jtreg test. In standalone mode,
@@ -289,7 +287,7 @@
for (CompilationUnitTree t : trees) {
JCCompilationUnit cu = (JCCompilationUnit)t;
for (JCTree def : cu.defs) {
- if (def.getTag() == JCTree.CLASSDEF &&
+ if (def.hasTag(CLASSDEF) &&
analyzedElems.contains(((JCTree.JCClassDecl)def).sym)) {
//System.out.println("Adding pair...");
res.add(new Pair<>(cu, def));
@@ -373,9 +371,9 @@
private boolean mandatoryType(JCTree that) {
return that instanceof JCTree.JCExpression ||
- that.getTag() == JCTree.VARDEF ||
- that.getTag() == JCTree.METHODDEF ||
- that.getTag() == JCTree.CLASSDEF;
+ that.hasTag(VARDEF) ||
+ that.hasTag(METHODDEF) ||
+ that.hasTag(CLASSDEF);
}
private final List<String> excludedFields = Arrays.asList("varargsElement");
@@ -419,7 +417,7 @@
}
JavaFileObject sourcefile;
- Map<JCTree, Integer> endPosTable;
+ EndPosTable endPosTable;
Info encl;
}
@@ -429,13 +427,13 @@
private class Info {
Info() {
tree = null;
- tag = JCTree.ERRONEOUS;
+ tag = ERRONEOUS;
start = 0;
pos = 0;
end = Integer.MAX_VALUE;
}
- Info(JCTree tree, Map<JCTree, Integer> endPosTable) {
+ Info(JCTree tree, EndPosTable endPosTable) {
this.tree = tree;
tag = tree.getTag();
start = TreeInfo.getStartPos(tree);
@@ -449,7 +447,7 @@
}
final JCTree tree;
- final int tag;
+ final JCTree.Tag tag;
final int start;
final int pos;
final int end;
@@ -457,27 +455,10 @@
/**
* Names for tree tags.
- * javac does not provide an API to convert tag values to strings, so this class uses
- * reflection to determine names of public static final int values in JCTree.
*/
private static class TreeUtil {
- String nameFromTag(int tag) {
- if (names == null) {
- names = new HashMap<Integer, String>();
- Class c = JCTree.class;
- for (Field f : c.getDeclaredFields()) {
- if (f.getType().equals(int.class)) {
- int mods = f.getModifiers();
- if (Modifier.isPublic(mods) && Modifier.isStatic(mods) && Modifier.isFinal(mods)) {
- try {
- names.put(f.getInt(null), f.getName());
- } catch (IllegalAccessException e) {
- }
- }
- }
- }
- }
- String name = names.get(tag);
+ String nameFromTag(JCTree.Tag tag) {
+ String name = tag.name();
return (name == null) ? "??" : name;
}
@@ -496,8 +477,6 @@
}
return buf;
}
-
- private Map<Integer, String> names;
}
/**
--- a/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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
@@ -274,7 +274,7 @@
return fields;
}
// where
- Map<Integer, Set<Field>> map = new HashMap<Integer,Set<Field>>();
+ Map<JCTree.Tag, Set<Field>> map = new HashMap<JCTree.Tag,Set<Field>>();
/** Get the line number for the primary position for a tree.
* The code is intended to be simple, although not necessarily efficient.
--- a/langtools/test/tools/javac/tree/TreePosTest.java Mon Dec 05 12:50:00 2011 -0500
+++ b/langtools/test/tools/javac/tree/TreePosTest.java Tue Dec 06 05:28:17 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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
@@ -73,6 +73,7 @@
import com.sun.source.util.JavacTask;
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.tree.JCTree.JCNewClass;
@@ -80,6 +81,7 @@
import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.tree.TreeScanner;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
import static com.sun.tools.javac.util.Position.NOPOS;
/**
@@ -291,6 +293,14 @@
errors++;
}
+ /**
+ * Names for tree tags.
+ */
+ private static String getTagName(JCTree.Tag tag) {
+ String name = tag.name();
+ return (name == null) ? "??" : name;
+ }
+
/** Number of files that have been analyzed. */
int fileCount;
/** Number of errors reported. */
@@ -312,8 +322,6 @@
Set<File> excludeFiles = new HashSet<File>();
/** Set of tag names to be excluded from analysis. */
Set<String> excludeTags = new HashSet<String>();
- /** Table of printable names for tree tag values. */
- TagNames tagNames = new TagNames();
/**
* Main class for testing assertions concerning tree positions for tree nodes.
@@ -337,7 +345,7 @@
// there is no corresponding source text.
// Redundant semicolons in a class definition can cause empty
// initializer blocks with no positions.
- if ((self.tag == JCTree.MODIFIERS || self.tag == JCTree.BLOCK)
+ if ((self.tag == MODIFIERS || self.tag == BLOCK)
&& self.pos == NOPOS) {
// If pos is NOPOS, so should be the start and end positions
check("start == NOPOS", encl, self, self.start == NOPOS);
@@ -359,15 +367,15 @@
// e.g. int[][] a = new int[2][];
check("encl.start <= start", encl, self, encl.start <= self.start);
check("start <= pos", encl, self, self.start <= self.pos);
- if (!(self.tag == JCTree.TYPEARRAY
- && (encl.tag == JCTree.VARDEF ||
- encl.tag == JCTree.METHODDEF ||
- encl.tag == JCTree.TYPEARRAY))) {
+ if (!(self.tag == TYPEARRAY
+ && (encl.tag == VARDEF ||
+ encl.tag == METHODDEF ||
+ encl.tag == TYPEARRAY))) {
check("encl.pos <= start || end <= encl.pos",
encl, self, encl.pos <= self.start || self.end <= encl.pos);
}
check("pos <= end", encl, self, self.pos <= self.end);
- if (!(self.tag == JCTree.TYPEARRAY && encl.tag == JCTree.TYPEARRAY)) {
+ if (!(self.tag == TYPEARRAY && encl.tag == TYPEARRAY)) {
check("end <= encl.end", encl, self, self.end <= encl.end);
}
}
@@ -388,7 +396,7 @@
if ((tree.mods.flags & Flags.ENUM) != 0) {
scan(tree.mods);
if (tree.init != null) {
- if (tree.init.getTag() == JCTree.NEWCLASS) {
+ if (tree.init.hasTag(NEWCLASS)) {
JCNewClass init = (JCNewClass) tree.init;
if (init.args != null && init.args.nonEmpty()) {
scan(init.args);
@@ -404,11 +412,11 @@
boolean check(Info encl, Info self) {
if (excludeTags.size() > 0) {
- if (encl != null && excludeTags.contains(tagNames.get(encl.tag))
- || excludeTags.contains(tagNames.get(self.tag)))
+ if (encl != null && excludeTags.contains(getTagName(encl.tag))
+ || excludeTags.contains(getTagName(self.tag)))
return false;
}
- return tags.size() == 0 || tags.contains(tagNames.get(self.tag));
+ return tags.size() == 0 || tags.contains(getTagName(self.tag));
}
void check(String label, Info encl, Info self, boolean ok) {
@@ -428,7 +436,7 @@
}
JavaFileObject sourcefile;
- Map<JCTree, Integer> endPosTable;
+ EndPosTable endPosTable;
Info encl;
}
@@ -439,13 +447,13 @@
private class Info {
Info() {
tree = null;
- tag = JCTree.ERRONEOUS;
+ tag = ERRONEOUS;
start = 0;
pos = 0;
end = Integer.MAX_VALUE;
}
- Info(JCTree tree, Map<JCTree, Integer> endPosTable) {
+ Info(JCTree tree, EndPosTable endPosTable) {
this.tree = tree;
tag = tree.getTag();
start = TreeInfo.getStartPos(tree);
@@ -455,46 +463,17 @@
@Override
public String toString() {
- return tagNames.get(tree.getTag()) + "[start:" + start + ",pos:" + pos + ",end:" + end + "]";
+ return getTagName(tree.getTag()) + "[start:" + start + ",pos:" + pos + ",end:" + end + "]";
}
final JCTree tree;
- final int tag;
+ final JCTree.Tag tag;
final int start;
final int pos;
final int end;
}
/**
- * Names for tree tags.
- * javac does not provide an API to convert tag values to strings, so this class uses
- * reflection to determine names of public static final int values in JCTree.
- */
- private static class TagNames {
- String get(int tag) {
- if (map == null) {
- map = new HashMap<Integer, String>();
- Class c = JCTree.class;
- for (Field f : c.getDeclaredFields()) {
- if (f.getType().equals(int.class)) {
- int mods = f.getModifiers();
- if (Modifier.isPublic(mods) && Modifier.isStatic(mods) && Modifier.isFinal(mods)) {
- try {
- map.put(f.getInt(null), f.getName());
- } catch (IllegalAccessException e) {
- }
- }
- }
- }
- }
- String name = map.get(tag);
- return (name == null) ? "??" : name;
- }
-
- private Map<Integer, String> map;
- }
-
- /**
* Thrown when errors are found parsing a java file.
*/
private static class ParseException extends Exception {
@@ -719,7 +698,7 @@
void setInfo(Info info) {
this.info = info;
- tagName.setText(tagNames.get(info.tag));
+ tagName.setText(getTagName(info.tag));
start.setText(String.valueOf(info.start));
pos.setText(String.valueOf(info.pos));
end.setText(String.valueOf(info.end));