Merge
diff --git a/langtools/.hgtags b/langtools/.hgtags
index f651fd7..87f645a 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -21,3 +21,4 @@
28f0b10d6c1afc106465c13b8c663a6afa4fb1a1 jdk7-b44
30db5e0aaf83fe262d9a7227d3fc3e451cd5d459 jdk7-b45
be546a6c08e3c31fba2edcae1de43ae3515d2e59 jdk7-b46
+2b8f6bab23926aa32b9cf7e4c540b9d1ce74b7d5 jdk7-b47
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
index 2a1de89..cc9c810 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -709,12 +709,31 @@
case UNDETVAR:
if (s.tag == WILDCARD) {
UndetVar undetvar = (UndetVar)t;
- undetvar.inst = glb(upperBound(s), undetvar.inst);
- // We should check instantiated type against any of the
- // undetvar's lower bounds.
- for (Type t2 : undetvar.lobounds) {
- if (!isSubtype(t2, undetvar.inst))
- return false;
+ WildcardType wt = (WildcardType)s;
+ switch(wt.kind) {
+ case UNBOUND: //similar to ? extends Object
+ case EXTENDS: {
+ Type bound = upperBound(s);
+ // We should check the new upper bound against any of the
+ // undetvar's lower bounds.
+ for (Type t2 : undetvar.lobounds) {
+ if (!isSubtype(t2, bound))
+ return false;
+ }
+ undetvar.hibounds = undetvar.hibounds.prepend(bound);
+ break;
+ }
+ case SUPER: {
+ Type bound = lowerBound(s);
+ // We should check the new lower bound against any of the
+ // undetvar's lower bounds.
+ for (Type t2 : undetvar.hibounds) {
+ if (!isSubtype(bound, t2))
+ return false;
+ }
+ undetvar.lobounds = undetvar.lobounds.prepend(bound);
+ break;
+ }
}
return true;
} else {
@@ -930,12 +949,16 @@
}
if (t.isCompound()) {
+ Warner oldWarner = warnStack.head;
+ warnStack.head = Warner.noWarnings;
if (!visit(supertype(t), s))
return false;
for (Type intf : interfaces(t)) {
if (!visit(intf, s))
return false;
}
+ if (warnStack.head.unchecked == true)
+ oldWarner.warnUnchecked();
return true;
}
@@ -2108,9 +2131,6 @@
List<Type> to) {
if (tvars.isEmpty())
return tvars;
- if (tvars.tail.isEmpty())
- // fast common case
- return List.<Type>of(substBound((TypeVar)tvars.head, from, to));
ListBuffer<Type> newBoundsBuf = lb();
boolean changed = false;
// calculate new bounds
@@ -2150,8 +2170,14 @@
Type bound1 = subst(t.bound, from, to);
if (bound1 == t.bound)
return t;
- else
- return new TypeVar(t.tsym, bound1, syms.botType);
+ else {
+ // create new type variable without bounds
+ TypeVar tv = new TypeVar(t.tsym, null, syms.botType);
+ // the new bound should use the new type variable in place
+ // of the old
+ tv.bound = subst(bound1, List.<Type>of(t), List.<Type>of(tv));
+ return tv;
+ }
}
// </editor-fold>
@@ -2825,6 +2851,16 @@
// </editor-fold>
// <editor-fold defaultstate="collapsed" desc="Greatest lower bound">
+ public Type glb(List<Type> ts) {
+ Type t1 = ts.head;
+ for (Type t2 : ts.tail) {
+ if (t1.isErroneous())
+ return t1;
+ t1 = glb(t1, t2);
+ }
+ return t1;
+ }
+ //where
public Type glb(Type t, Type s) {
if (s == null)
return t;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
index cfd47e6..9e0b258 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -154,33 +154,15 @@
that.inst = syms.objectType;
else if (that.hibounds.tail.isEmpty())
that.inst = that.hibounds.head;
- else {
- for (List<Type> bs = that.hibounds;
- bs.nonEmpty() && that.inst == null;
- bs = bs.tail) {
- // System.out.println("hibounds = " + that.hibounds);//DEBUG
- if (isSubClass(bs.head, that.hibounds))
- that.inst = types.fromUnknownFun.apply(bs.head);
- }
- if (that.inst == null) {
- int classCount = 0, interfaceCount = 0;
- for (Type t : that.hibounds) {
- if (t.tag == CLASS) {
- if (t.isInterface())
- interfaceCount++;
- else
- classCount++;
- }
- }
- if ((that.hibounds.size() == classCount + interfaceCount) && classCount == 1)
- that.inst = types.makeCompoundType(that.hibounds);
- }
- if (that.inst == null || !types.isSubtypeUnchecked(that.inst, that.hibounds, warn))
- throw ambiguousNoInstanceException
- .setMessage("no.unique.maximal.instance.exists",
- that.qtype, that.hibounds);
- }
+ else
+ that.inst = types.glb(that.hibounds);
}
+ if (that.inst == null ||
+ that.inst.isErroneous() ||
+ !types.isSubtypeUnchecked(that.inst, that.hibounds, warn))
+ throw ambiguousNoInstanceException
+ .setMessage("no.unique.maximal.instance.exists",
+ that.qtype, that.hibounds);
}
//where
private boolean isSubClass(Type t, final List<Type> ts) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 3556ee6..8130dfc 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -371,6 +371,7 @@
context.get(DiagnosticListener.class) != null;
devVerbose = options.get("dev") != null;
processPcks = options.get("process.packages") != null;
+ werror = options.get("-Werror") != null;
verboseCompilePolicy = options.get("verboseCompilePolicy") != null;
@@ -434,6 +435,10 @@
*/
protected boolean processPcks;
+ /** Switch: treat warnings as errors
+ */
+ protected boolean werror;
+
/** Switch: is annotation processing requested explitly via
* CompilationTask.setProcessors?
*/
@@ -490,7 +495,11 @@
public int errorCount() {
if (delegateCompiler != null && delegateCompiler != this)
return delegateCompiler.errorCount();
- else
+ else {
+ if (werror && log.nerrors == 0 && log.nwarnings > 0) {
+ log.error("warnings.and.werror");
+ }
+ }
return log.nerrors;
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java
index 804448b..19f9f6e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java
@@ -406,8 +406,7 @@
}
}
- if (comp.errorCount() != 0 ||
- options.get("-Werror") != null && comp.warningCount() != 0)
+ if (comp.errorCount() != 0)
return EXIT_ERROR;
} catch (IOException ex) {
ioMessage(ex);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java b/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
index 7a2f2c7..980d677 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
@@ -449,7 +449,7 @@
},
// treat warnings as errors
- new HiddenOption(WERROR),
+ new Option(WERROR, "opt.Werror"),
// use complex inference from context in the position of a method call argument
new HiddenOption(COMPLEXINFERENCE),
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
index 0ea7064..a7e75fa 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -346,6 +346,9 @@
compiler.err.pkg.clashes.with.class.of.same.name=\
package {0} clashes with class of same name
+compiler.err.warnings.and.werror=\
+ warnings found and -Werror specified
+
# Errors related to annotation processing
compiler.err.proc.cant.access=\
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
index e0d6d45..4ef8a77 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -69,6 +69,8 @@
Generate class files for specific VM version
javac.opt.source=\
Provide source compatibility with specified release
+javac.opt.Werror=\
+ Terminate compilation if warnings occur
javac.opt.A=\
Options to pass to annotation processors
javac.opt.implicit=\
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
index 698b3cf..3439795 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
@@ -83,7 +83,7 @@
cpString = appendPath(docletPath, cpString);
URL[] urls = pathToURLs(cpString);
if (docletParentClassLoader == null)
- appClassLoader = new URLClassLoader(urls);
+ appClassLoader = new URLClassLoader(urls, getDelegationClassLoader(docletClassName));
else
appClassLoader = new URLClassLoader(urls, docletParentClassLoader);
@@ -98,6 +98,57 @@
docletClass = dc;
}
+ /*
+ * Returns the delegation class loader to use when creating
+ * appClassLoader (used to load the doclet). The context class
+ * loader is the best choice, but legacy behavior was to use the
+ * default delegation class loader (aka system class loader).
+ *
+ * Here we favor using the context class loader. To ensure
+ * compatibility with existing apps, we revert to legacy
+ * behavior if either or both of the following conditions hold:
+ *
+ * 1) the doclet is loadable from the system class loader but not
+ * from the context class loader,
+ *
+ * 2) this.getClass() is loadable from the system class loader but not
+ * from the context class loader.
+ */
+ private ClassLoader getDelegationClassLoader(String docletClassName) {
+ ClassLoader ctxCL = Thread.currentThread().getContextClassLoader();
+ ClassLoader sysCL = ClassLoader.getSystemClassLoader();
+ if (sysCL == null)
+ return ctxCL;
+ if (ctxCL == null)
+ return sysCL;
+
+ // Condition 1.
+ try {
+ sysCL.loadClass(docletClassName);
+ try {
+ ctxCL.loadClass(docletClassName);
+ } catch (ClassNotFoundException e) {
+ return sysCL;
+ }
+ } catch (ClassNotFoundException e) {
+ }
+
+ // Condition 2.
+ try {
+ if (getClass() == sysCL.loadClass(getClass().getName())) {
+ try {
+ if (getClass() != ctxCL.loadClass(getClass().getName()))
+ return sysCL;
+ } catch (ClassNotFoundException e) {
+ return sysCL;
+ }
+ }
+ } catch (ClassNotFoundException e) {
+ }
+
+ return ctxCL;
+ }
+
/**
* Generate documentation here. Return true on success.
*/
@@ -231,6 +282,8 @@
docletClassName, methodName);
throw new DocletInvokeException();
}
+ ClassLoader savedCCL =
+ Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(appClassLoader);
return meth.invoke(null , params);
@@ -256,6 +309,8 @@
exc.getTargetException().printStackTrace();
}
throw new DocletInvokeException();
+ } finally {
+ Thread.currentThread().setContextClassLoader(savedCCL);
}
}
diff --git a/langtools/src/share/classes/javax/lang/model/UnknownEntityException.java b/langtools/src/share/classes/javax/lang/model/UnknownEntityException.java
new file mode 100644
index 0000000..6151927
--- /dev/null
+++ b/langtools/src/share/classes/javax/lang/model/UnknownEntityException.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.lang.model;
+
+/**
+ * Superclass of exceptions which indicate that an unknown kind of
+ * entity was encountered. This situation can occur if the language
+ * evolves and new kinds of constructs are introduced. Subclasses of
+ * this exception may be thrown by visitors to indicate that the
+ * visitor was created for a prior version of the language.
+ *
+ * <p>A common superclass for those exceptions allows a single catch
+ * block to have code handling them uniformly.
+ *
+ * @author Joseph D. Darcy
+ * @see javax.lang.model.element.UnknownElementException
+ * @see javax.lang.model.element.UnknownAnnotationValueException
+ * @see javax.lang.model.type.UnknownTypeException
+ * @since 1.7
+ */
+public class UnknownEntityException extends RuntimeException {
+
+ private static final long serialVersionUID = 269L;
+
+ /**
+ * Creates a new {@code UnknownEntityException} with the specified
+ * detail message.
+ *
+ * @param message the detail message
+ */
+ protected UnknownEntityException(String message) {
+ super(message);
+ }
+}
diff --git a/langtools/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java b/langtools/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
index d77f9e8..fa2a478 100644
--- a/langtools/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
+++ b/langtools/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package javax.lang.model.element;
+import javax.lang.model.UnknownEntityException;
+
/**
* Indicates that an unknown kind of annotation value was encountered.
* This can occur if the language evolves and new kinds of annotation
@@ -39,7 +41,7 @@
* @see AnnotationValueVisitor#visitUnknown
* @since 1.6
*/
-public class UnknownAnnotationValueException extends RuntimeException {
+public class UnknownAnnotationValueException extends UnknownEntityException {
private static final long serialVersionUID = 269L;
diff --git a/langtools/src/share/classes/javax/lang/model/element/UnknownElementException.java b/langtools/src/share/classes/javax/lang/model/element/UnknownElementException.java
index 8206248..911a411 100644
--- a/langtools/src/share/classes/javax/lang/model/element/UnknownElementException.java
+++ b/langtools/src/share/classes/javax/lang/model/element/UnknownElementException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package javax.lang.model.element;
+import javax.lang.model.UnknownEntityException;
+
/**
* Indicates that an unknown kind of element was encountered. This
* can occur if the language evolves and new kinds of elements are
@@ -38,7 +40,7 @@
* @see ElementVisitor#visitUnknown
* @since 1.6
*/
-public class UnknownElementException extends RuntimeException {
+public class UnknownElementException extends UnknownEntityException {
private static final long serialVersionUID = 269L;
diff --git a/langtools/src/share/classes/javax/lang/model/type/UnknownTypeException.java b/langtools/src/share/classes/javax/lang/model/type/UnknownTypeException.java
index e4049cf..cbca20c 100644
--- a/langtools/src/share/classes/javax/lang/model/type/UnknownTypeException.java
+++ b/langtools/src/share/classes/javax/lang/model/type/UnknownTypeException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package javax.lang.model.type;
+import javax.lang.model.UnknownEntityException;
+
/**
* Indicates that an unknown kind of type was encountered. This can
* occur if the language evolves and new kinds of types are added to
@@ -38,7 +40,7 @@
* @see TypeVisitor#visitUnknown
* @since 1.6
*/
-public class UnknownTypeException extends RuntimeException {
+public class UnknownTypeException extends UnknownEntityException {
private static final long serialVersionUID = 269L;
diff --git a/langtools/test/tools/javac/6304921/T6304921.out b/langtools/test/tools/javac/6304921/T6304921.out
index 27b869d..d69e1bd 100644
--- a/langtools/test/tools/javac/6304921/T6304921.out
+++ b/langtools/test/tools/javac/6304921/T6304921.out
@@ -7,12 +7,7 @@
required: java.util.List<java.lang.Integer>
List<Integer> list = new ArrayList();
^
-T6304921.java:445/445/453: warning: [fallthrough] possible fall-through into case
- default:
- ^
-T6304921.java:522/613/614: warning: [finally] finally clause cannot complete normally
- }
- ^
+error: warnings found and -Werror specified
T6304921.java:727/733/737: cannot find symbol
symbol : variable orr
location: class java.lang.System
@@ -21,5 +16,5 @@
T6304921.java:812/816/822: operator + cannot be applied to int,boolean
return 123 + true; // bad binary expression
^
-2 errors
-4 warnings
+3 errors
+2 warnings
diff --git a/langtools/test/tools/javac/6758789/T6758789b.out b/langtools/test/tools/javac/6758789/T6758789b.out
index 2ff12ec..eae65eb 100644
--- a/langtools/test/tools/javac/6758789/T6758789b.out
+++ b/langtools/test/tools/javac/6758789/T6758789b.out
@@ -1,3 +1,5 @@
T6758789b.java:39:11: compiler.warn.prob.found.req: (- compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
T6758789b.java:39:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
+- compiler.err.warnings.and.werror
+1 error
2 warnings
diff --git a/langtools/test/tools/javac/T6241723.out b/langtools/test/tools/javac/T6241723.out
index 32eabe4..2391e43 100644
--- a/langtools/test/tools/javac/T6241723.out
+++ b/langtools/test/tools/javac/T6241723.out
@@ -2,4 +2,6 @@
T6241723.java:23:7: compiler.warn.has.been.deprecated: A2.A21, A2
T6241723.java:26:5: compiler.warn.has.been.deprecated: Z1, unnamed package
T6241723.java:28:7: compiler.warn.has.been.deprecated: Z2.Z21, Z2
+- compiler.err.warnings.and.werror
+1 error
4 warnings
diff --git a/langtools/test/tools/javac/T6595666.java b/langtools/test/tools/javac/T6595666.java
new file mode 100644
index 0000000..009d4a3
--- /dev/null
+++ b/langtools/test/tools/javac/T6595666.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6595666
+ * @summary fix -Werror
+ */
+
+import java.io.*;
+import java.util.*;
+
+public class T6595666 {
+ void m() {
+ // the following line must create warnings with -Xlint, because of unchecked conversion
+ List<Integer> list = new ArrayList();
+ }
+
+ public static void main(String... args) throws Exception {
+ File testSrc = new File(System.getProperty("test.src", "."));
+
+ String basename = T6595666.class.getName();
+ File srcFile = new File(testSrc, basename+".java");
+ File classFile = new File(basename+".class");
+ classFile.delete();
+ if (classFile.exists())
+ throw new Exception("setup error, can't delete " + classFile);
+
+ compile(1, "-d", ".", "-Xlint", "-Werror", srcFile.getPath());
+ if (classFile.exists())
+ throw new Exception("failed: found " + classFile);
+
+ compile(0, "-d", ".", "-Xlint", srcFile.getPath());
+ if (!classFile.exists())
+ throw new Exception("failed: " + classFile + " not found");
+ }
+
+ private static void compile(int rc, String... args) throws Exception {
+ System.err.println("compile: " + Arrays.asList(args));
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ int rc2 = com.sun.tools.javac.Main.compile(args, pw);
+ pw.close();
+ System.err.println(sw);
+ if (rc != rc2)
+ throw new Exception("bad exit code; expected " + rc + ", found " + rc2);
+ }
+}
diff --git a/langtools/test/tools/javac/cast/6557182/T6557182.java b/langtools/test/tools/javac/cast/6557182/T6557182.java
new file mode 100644
index 0000000..56bbe70
--- /dev/null
+++ b/langtools/test/tools/javac/cast/6557182/T6557182.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @author Maurizio Cimadamore
+ * @bug 6557182
+ * @summary Unchecked warning *and* inconvertible types
+ * @compile/fail/ref=T6557182.out -XDrawDiagnostics -Xlint:unchecked T6557182.java
+ */
+
+class T6557182 {
+
+ <T extends Number & Comparable<String>> void test1(T t) {
+ Comparable<Integer> ci = (Comparable<Integer>) t;
+ }
+
+ <T extends Number & Comparable<? extends Number>> void test2(T t) {
+ Comparable<Integer> ci = (Comparable<Integer>) t;
+ }
+}
diff --git a/langtools/test/tools/javac/cast/6557182/T6557182.out b/langtools/test/tools/javac/cast/6557182/T6557182.out
new file mode 100644
index 0000000..9ebe10e
--- /dev/null
+++ b/langtools/test/tools/javac/cast/6557182/T6557182.out
@@ -0,0 +1,4 @@
+T6557182.java:35:56: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
+T6557182.java:39:56: compiler.warn.prob.found.req: (- compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
+1 error
+1 warning
diff --git a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment.out b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment.out
index e3cb33f..2b3f2b6 100644
--- a/langtools/test/tools/javac/depDocComment/DeprecatedDocComment.out
+++ b/langtools/test/tools/javac/depDocComment/DeprecatedDocComment.out
@@ -1,4 +1,6 @@
DeprecatedDocComment.java:27:28: compiler.warn.has.been.deprecated: deprecatedTest1(), DeprecatedDocComment2
DeprecatedDocComment.java:31:28: compiler.warn.has.been.deprecated: deprecatedTest5(), DeprecatedDocComment2
DeprecatedDocComment.java:32:28: compiler.warn.has.been.deprecated: deprecatedTest6(), DeprecatedDocComment2
+- compiler.err.warnings.and.werror
+1 error
3 warnings
diff --git a/langtools/test/tools/javac/generics/6729401/T6729401.java b/langtools/test/tools/javac/generics/6729401/T6729401.java
new file mode 100644
index 0000000..dc7be41
--- /dev/null
+++ b/langtools/test/tools/javac/generics/6729401/T6729401.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6729401
+ *
+ * @summary Compiler error when using F-bounded generics with free type variables
+ * @author Maurizio Cimadamore
+ * @compile T6729401.java
+ *
+ */
+
+class T6729401 {
+
+ interface I<U,W> {
+ <T extends I<U,T>> void m(I<U,T> x);
+ }
+
+ <X extends I<Object,X>,Y extends I<Object,Y>> void test(I<Object,X> x, I<Object,Y> y) {
+ x.<Y>m(y);
+ x.m(y);
+ y.<X>m(x);
+ y.m(x);
+ }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6315770/T6315770.java b/langtools/test/tools/javac/generics/inference/6315770/T6315770.java
new file mode 100644
index 0000000..2bee9a1
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6315770/T6315770.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6315770
+ * @summary javac inference allows creation of strange types: Integer & Runnable
+ * @author Maurizio Cimadamore
+ *
+ * @compile/fail/ref=T6315770.out T6315770.java -XDrawDiagnostics
+ */
+
+class T6315770<V> {
+ <T extends Integer & Runnable> T6315770<T> m() {
+ return null;
+ }
+ void test() {
+ T6315770<?> c1 = m();
+ T6315770<? extends String> c2 = m();
+ T6315770<? super String> c3 = m();
+ }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6315770/T6315770.out b/langtools/test/tools/javac/generics/inference/6315770/T6315770.out
new file mode 100644
index 0000000..8dc60f9
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6315770/T6315770.out
@@ -0,0 +1,3 @@
+T6315770.java:39:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (- compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
+T6315770.java:40:40: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
+2 errors
diff --git a/langtools/test/tools/javac/processing/model/TestExceptions.java b/langtools/test/tools/javac/processing/model/TestExceptions.java
new file mode 100644
index 0000000..0d74688
--- /dev/null
+++ b/langtools/test/tools/javac/processing/model/TestExceptions.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6794071
+ * @summary Test that exceptions have a proper parent class
+ * @author Joseph D. Darcy
+ */
+
+import javax.lang.model.UnknownEntityException;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+
+/*
+ * Verify UnknownFooExceptions can be caught with a common parent
+ * exception.
+ */
+public class TestExceptions {
+ public static void main(String... args) {
+ RuntimeException[] exceptions = {
+ new UnknownElementException((Element)null, (Object)null),
+ new UnknownAnnotationValueException((AnnotationValue) null, (Object) null),
+ new UnknownTypeException((TypeMirror)null, (Object)null)
+ };
+
+ for(RuntimeException exception : exceptions) {
+ try {
+ throw exception;
+ } catch (UnknownEntityException uee) {
+ ;
+ }
+ }
+ }
+}
diff --git a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java
index c77ac09..e783d29 100644
--- a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java
+++ b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 6374357 6308351
+ * @bug 6374357 6308351 6707027
* @summary PackageElement.getEnclosedElements() throws ClassReader$BadClassFileException
* @author Peter von der Ah\u00e9
* @run main/othervm -Xmx256m Main
@@ -118,7 +118,7 @@
packages.size(), classes, nestedClasses);
if (classes < 9000)
throw new AssertionError("Too few classes in PLATFORM_CLASS_PATH ;-)");
- if (packages.size() < 545)
+ if (packages.size() < 530)
throw new AssertionError("Too few packages in PLATFORM_CLASS_PATH ;-)");
if (nestedClasses < 3000)
throw new AssertionError("Too few nested classes in PLATFORM_CLASS_PATH ;-)");
diff --git a/langtools/test/tools/javadoc/6176978/T6176978.java b/langtools/test/tools/javadoc/6176978/T6176978.java
new file mode 100644
index 0000000..892271a
--- /dev/null
+++ b/langtools/test/tools/javadoc/6176978/T6176978.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6176978
+ * @summary current Javadoc's invocation and extension (Doclet) mechanisms are problematic
+ * @build T6176978
+ * @run main T6176978
+ */
+
+import java.io.*;
+import java.net.*;
+
+public class T6176978
+{
+ public static void main(String[] args) throws Exception {
+ // create and use a temp dir that will not be on jtreg's
+ // default class path
+ File tmpDir = new File("tmp");
+ tmpDir.mkdirs();
+
+ File testSrc = new File(System.getProperty("test.src", "."));
+ String[] javac_args = {
+ "-d",
+ "tmp",
+ new File(testSrc, "X.java").getPath()
+ };
+
+ int rc = com.sun.tools.javac.Main.compile(javac_args);
+ if (rc != 0)
+ throw new Error("javac exit code: " + rc);
+
+ String[] jdoc_args = {
+ "-doclet",
+ "X",
+ new File(testSrc, "T6176978.java").getPath()
+ };
+
+ rc = com.sun.tools.javadoc.Main.execute(jdoc_args);
+ if (rc == 0)
+ throw new Error("javadoc unexpectedly succeeded");
+
+
+
+ Thread currThread = Thread.currentThread();
+ ClassLoader saveClassLoader = currThread.getContextClassLoader();
+ URLClassLoader urlCL = new URLClassLoader(new URL[] { tmpDir.toURL() });
+ currThread.setContextClassLoader(urlCL);
+
+ try {
+ rc = com.sun.tools.javadoc.Main.execute(jdoc_args);
+ if (rc != 0)
+ throw new Error("javadoc exit: " + rc);
+ }
+ finally {
+ currThread.setContextClassLoader(saveClassLoader);
+ }
+ }
+}
diff --git a/langtools/test/tools/javadoc/6176978/X.java b/langtools/test/tools/javadoc/6176978/X.java
new file mode 100644
index 0000000..2eb5bf4
--- /dev/null
+++ b/langtools/test/tools/javadoc/6176978/X.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import com.sun.javadoc.*;
+
+public class X {
+ public static boolean start(RootDoc root) {
+ System.out.println("X.start");
+ return true;
+ }
+}
