Merge
diff --git a/src/share/classes/com/sun/source/util/DocTrees.java b/src/share/classes/com/sun/source/util/DocTrees.java
index affc5f3..cd23e78 100644
--- a/src/share/classes/com/sun/source/util/DocTrees.java
+++ b/src/share/classes/com/sun/source/util/DocTrees.java
@@ -30,7 +30,6 @@
import javax.tools.JavaCompiler.CompilationTask;
import com.sun.source.doctree.DocCommentTree;
-import com.sun.source.doctree.ReferenceTree;
import javax.tools.Diagnostic;
/**
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
index ba62e7c..cde30f3 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
@@ -1621,6 +1621,7 @@
text = removeNonInlineHtmlTags(text);
}
text = Util.replaceTabs(configuration, text);
+ text = Util.normalizeNewlines(text);
result.addContent(new RawHtml(text));
}
}
diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
index 1939d68..fc63f4f 100644
--- a/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
@@ -71,7 +71,7 @@
* {@inheritDoc}
*/
protected Content codeTagOutput(Tag tag) {
- Content result = HtmlTree.CODE(new StringContent(tag.text()));
+ Content result = HtmlTree.CODE(new StringContent(Util.normalizeNewlines(tag.text())));
return result;
}
@@ -135,7 +135,7 @@
* {@inheritDoc}
*/
protected Content literalTagOutput(Tag tag) {
- Content result = new StringContent(tag.text());
+ Content result = new StringContent(Util.normalizeNewlines(tag.text()));
return result;
}
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
index acdae45..289f348 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
@@ -631,6 +631,32 @@
return result.toString();
}
+ public static String normalizeNewlines(String text) {
+ StringBuilder sb = new StringBuilder();
+ final int textLength = text.length();
+ final String NL = DocletConstants.NL;
+ int pos = 0;
+ for (int i = 0; i < textLength; i++) {
+ char ch = text.charAt(i);
+ switch (ch) {
+ case '\n':
+ sb.append(text, pos, i);
+ sb.append(NL);
+ pos = i + 1;
+ break;
+ case '\r':
+ sb.append(text, pos, i);
+ sb.append(NL);
+ if (i + 1 < textLength && text.charAt(i + 1) == '\n')
+ i++;
+ pos = i + 1;
+ break;
+ }
+ }
+ sb.append(text, pos, textLength);
+ return sb.toString();
+ }
+
/**
* The documentation for values() and valueOf() in Enums are set by the
* doclet.
diff --git a/src/share/classes/com/sun/tools/doclint/Checker.java b/src/share/classes/com/sun/tools/doclint/Checker.java
index d7b1859..d7d8ada 100644
--- a/src/share/classes/com/sun/tools/doclint/Checker.java
+++ b/src/share/classes/com/sun/tools/doclint/Checker.java
@@ -31,9 +31,11 @@
import java.net.URISyntaxException;
import java.util.Deque;
import java.util.EnumSet;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -45,6 +47,7 @@
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic.Kind;
+import javax.tools.JavaFileObject;
import com.sun.source.doctree.AttributeTree;
import com.sun.source.doctree.AuthorTree;
@@ -88,9 +91,9 @@
public class Checker extends DocTreePathScanner<Void, Void> {
final Env env;
- Set<Element> foundParams = new HashSet<Element>();
- Set<TypeMirror> foundThrows = new HashSet<TypeMirror>();
- Set<String> foundAnchors = new HashSet<String>();
+ Set<Element> foundParams = new HashSet<>();
+ Set<TypeMirror> foundThrows = new HashSet<>();
+ Map<JavaFileObject, Set<String>> foundAnchors = new HashMap<>();
boolean foundInheritDoc = false;
boolean foundReturn = false;
@@ -129,7 +132,7 @@
Checker(Env env) {
env.getClass();
this.env = env;
- tagStack = new LinkedList<TagStackItem>();
+ tagStack = new LinkedList<>();
implicitHeaderLevel = env.implicitHeaderLevel;
}
@@ -138,10 +141,27 @@
boolean isOverridingMethod = !env.currOverriddenMethods.isEmpty();
- if (tree == null) {
- if (!isSynthetic() && !isOverridingMethod)
- reportMissing("dc.missing.comment");
- return null;
+ if (p.getLeaf() == p.getCompilationUnit()) {
+ // If p points to a compilation unit, the implied declaration is the
+ // package declaration (if any) for the compilation unit.
+ // Handle this case specially, because doc comments are only
+ // expected in package-info files.
+ JavaFileObject fo = p.getCompilationUnit().getSourceFile();
+ boolean isPkgInfo = fo.isNameCompatible("package-info", JavaFileObject.Kind.SOURCE);
+ if (tree == null) {
+ if (isPkgInfo)
+ reportMissing("dc.missing.comment");
+ return null;
+ } else {
+ if (!isPkgInfo)
+ reportReference("dc.unexpected.comment");
+ }
+ } else {
+ if (tree == null) {
+ if (!isSynthetic() && !isOverridingMethod)
+ reportMissing("dc.missing.comment");
+ return null;
+ }
}
tagStack.clear();
@@ -184,6 +204,10 @@
env.messages.report(MISSING, Kind.WARNING, env.currPath.getLeaf(), code, args);
}
+ private void reportReference(String code, Object... args) {
+ env.messages.report(REFERENCE, Kind.WARNING, env.currPath.getLeaf(), code, args);
+ }
+
@Override
public Void visitDocComment(DocCommentTree tree, Void ignore) {
super.visitDocComment(tree, ignore);
@@ -508,7 +532,7 @@
if (!validName.matcher(value).matches()) {
env.messages.error(HTML, tree, "dc.invalid.anchor", value);
}
- if (!foundAnchors.add(value)) {
+ if (!checkAnchor(value)) {
env.messages.error(HTML, tree, "dc.anchor.already.defined", value);
}
}
@@ -551,6 +575,14 @@
return super.visitAttribute(tree, ignore);
}
+ private boolean checkAnchor(String name) {
+ JavaFileObject fo = env.currPath.getCompilationUnit().getSourceFile();
+ Set<String> set = foundAnchors.get(fo);
+ if (set == null)
+ foundAnchors.put(fo, set = new HashSet<>());
+ return set.add(name);
+ }
+
// http://www.w3.org/TR/html401/types.html#type-name
private static final Pattern validName = Pattern.compile("[A-Za-z][A-Za-z0-9-_:.]*");
@@ -721,8 +753,7 @@
Element ex = env.trees.getElement(new DocTreePath(getCurrentPath(), exName));
if (ex == null) {
env.messages.error(REFERENCE, tree, "dc.ref.not.found");
- } else if (ex.asType().getKind() == TypeKind.DECLARED
- && env.types.isAssignable(ex.asType(), env.java_lang_Throwable)) {
+ } else if (isThrowable(ex.asType())) {
switch (env.currElement.getKind()) {
case CONSTRUCTOR:
case METHOD:
@@ -741,6 +772,15 @@
return scan(tree.getDescription(), ignore);
}
+ private boolean isThrowable(TypeMirror tm) {
+ switch (tm.getKind()) {
+ case DECLARED:
+ case TYPEVAR:
+ return env.types.isAssignable(tm, env.java_lang_Throwable);
+ }
+ return false;
+ }
+
private void checkThrowsDeclared(ReferenceTree tree, TypeMirror t, List<? extends TypeMirror> list) {
boolean found = false;
for (TypeMirror tl : list) {
diff --git a/src/share/classes/com/sun/tools/doclint/DocLint.java b/src/share/classes/com/sun/tools/doclint/DocLint.java
index 0e5be61..20151d1 100644
--- a/src/share/classes/com/sun/tools/doclint/DocLint.java
+++ b/src/share/classes/com/sun/tools/doclint/DocLint.java
@@ -30,7 +30,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
-import java.util.regex.Pattern;
import javax.lang.model.element.Name;
import javax.tools.StandardLocation;
@@ -166,8 +165,8 @@
}
void processArgs(String... args) throws BadArgs {
- javacOpts = new ArrayList<String>();
- javacFiles = new ArrayList<File>();
+ javacOpts = new ArrayList<>();
+ javacFiles = new ArrayList<>();
if (args.length == 0)
needHelp = true;
@@ -214,7 +213,7 @@
}
List<File> splitPath(String path) {
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
for (String f: path.split(File.pathSeparator)) {
if (f.length() > 0)
files.add(new File(f));
@@ -279,7 +278,6 @@
TaskListener tl = new TaskListener() {
@Override
public void started(TaskEvent e) {
- return;
}
@Override
diff --git a/src/share/classes/com/sun/tools/doclint/resources/doclint.properties b/src/share/classes/com/sun/tools/doclint/resources/doclint.properties
index 8905235..3747097 100644
--- a/src/share/classes/com/sun/tools/doclint/resources/doclint.properties
+++ b/src/share/classes/com/sun/tools/doclint/resources/doclint.properties
@@ -67,6 +67,7 @@
dc.tag.start.unmatched = end tag missing: </{0}>
dc.tag.unknown = unknown tag: {0}
dc.text.not.allowed = text not allowed in <{0}> element
+dc.unexpected.comment=documentation comment not expected here
dc.main.ioerror=IO error: {0}
dc.main.no.files.given=No files given
diff --git a/src/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
index ef03f71..fc8fbe6 100644
--- a/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -69,7 +69,6 @@
import com.sun.tools.javac.code.Type.ErrorType;
import com.sun.tools.javac.code.Type.UnionClassType;
import com.sun.tools.javac.code.Types;
-import com.sun.tools.javac.code.TypeTag;
import com.sun.tools.javac.code.Types.TypeRelation;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
@@ -358,7 +357,7 @@
Log.DeferredDiagnosticHandler deferredDiagnosticHandler =
new Log.DeferredDiagnosticHandler(log);
try {
- final ClassSymbol tsym;
+ final TypeSymbol tsym;
final Name memberName;
if (ref.qualifierExpression == null) {
tsym = env.enclClass.sym;
@@ -387,7 +386,7 @@
return null;
}
} else {
- tsym = (ClassSymbol) t.tsym;
+ tsym = t.tsym;
memberName = ref.memberName;
}
}
@@ -408,15 +407,17 @@
paramTypes = lb.toList();
}
- Symbol msym = (memberName == tsym.name)
- ? findConstructor(tsym, paramTypes)
- : findMethod(tsym, memberName, paramTypes);
+ ClassSymbol sym = (ClassSymbol) types.upperBound(tsym.type).tsym;
+
+ Symbol msym = (memberName == sym.name)
+ ? findConstructor(sym, paramTypes)
+ : findMethod(sym, memberName, paramTypes);
if (paramTypes != null) {
// explicit (possibly empty) arg list given, so cannot be a field
return msym;
}
- VarSymbol vsym = (ref.paramTypes != null) ? null : findField(tsym, memberName);
+ VarSymbol vsym = (ref.paramTypes != null) ? null : findField(sym, memberName);
// prefer a field over a method with no parameters
if (vsym != null &&
(msym == null ||
@@ -789,6 +790,7 @@
case METHOD:
// System.err.println("METHOD: " + ((JCMethodDecl)tree).sym.getSimpleName());
method = (JCMethodDecl)tree;
+ env = memberEnter.getMethodEnv(method, env);
break;
case VARIABLE:
// System.err.println("FIELD: " + ((JCVariableDecl)tree).sym.getSimpleName());
@@ -800,7 +802,6 @@
try {
Assert.check(method.body == tree);
method.body = copier.copy((JCBlock)tree, (JCTree) path.getLeaf());
- env = memberEnter.getMethodEnv(method, env);
env = attribStatToTree(method.body, env, copier.leafCopy);
} finally {
method.body = (JCBlock) tree;
diff --git a/src/share/classes/com/sun/tools/javac/code/Symbol.java b/src/share/classes/com/sun/tools/javac/code/Symbol.java
index e05418e..f8b18d1 100644
--- a/src/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -596,7 +596,7 @@
// This method is part of the javax.lang.model API, do not use this in javac code.
public <A extends java.lang.annotation.Annotation> A[] getAnnotationsByType(Class<A> annoType) {
- return JavacAnnoConstructs.getAnnotations(this, annoType);
+ return JavacAnnoConstructs.getAnnotationsByType(this, annoType);
}
// TODO: getEnclosedElements should return a javac List, fix in FilteredMemberList
diff --git a/src/share/classes/com/sun/tools/javac/code/Types.java b/src/share/classes/com/sun/tools/javac/code/Types.java
index 6b7e275..e1887b5 100644
--- a/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -134,7 +134,7 @@
* @return the upper bound of the given type
*/
public Type upperBound(Type t) {
- return upperBound.visit(t);
+ return upperBound.visit(t).unannotatedType();
}
// where
private final MapVisitor<Void> upperBound = new MapVisitor<Void>() {
@@ -620,7 +620,9 @@
* (ii) perform functional interface bridge calculation.
*/
public ClassSymbol makeFunctionalInterfaceClass(Env<AttrContext> env, Name name, List<Type> targets, long cflags) {
- Assert.check(targets.nonEmpty() && isFunctionalInterface(targets.head));
+ if (targets.isEmpty() || !isFunctionalInterface(targets.head)) {
+ return null;
+ }
Symbol descSym = findDescriptorSymbol(targets.head.tsym);
Type descType = findDescriptorType(targets.head);
ClassSymbol csym = new ClassSymbol(cflags, name, env.enclClass.sym.outermostClass());
@@ -1130,9 +1132,9 @@
HashSet<UniqueType> set = new HashSet<UniqueType>();
for (Type x : interfaces(t))
- set.add(new UniqueType(x, Types.this));
+ set.add(new UniqueType(x.unannotatedType(), Types.this));
for (Type x : interfaces(s)) {
- if (!set.remove(new UniqueType(x, Types.this)))
+ if (!set.remove(new UniqueType(x.unannotatedType(), Types.this)))
return false;
}
return (set.isEmpty());
diff --git a/src/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/share/classes/com/sun/tools/javac/comp/Annotate.java
index ebc6fa3..3958755 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -273,7 +273,7 @@
continue;
}
JCIdent left = (JCIdent)assign.lhs;
- Symbol method = rs.resolveQualifiedMethod(left.pos(),
+ Symbol method = rs.resolveQualifiedMethod(assign.rhs.pos(),
env,
a.type,
left.name,
diff --git a/src/share/classes/com/sun/tools/javac/comp/Attr.java b/src/share/classes/com/sun/tools/javac/comp/Attr.java
index 20bfc25..335c324 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1948,6 +1948,8 @@
clazzid1 = make.at(clazz.pos).Select(make.Type(encltype),
((JCIdent) clazzid).name);
+ EndPosTable endPosTable = this.env.toplevel.endPositions;
+ endPosTable.storeEnd(clazzid1, tree.getEndPosition(endPosTable));
if (clazz.hasTag(ANNOTATED_TYPE)) {
JCAnnotatedType annoType = (JCAnnotatedType) clazz;
List<JCAnnotation> annos = annoType.annotations;
@@ -2193,7 +2195,9 @@
syms.objectType :
clazztype;
if (!inferred.isErroneous() &&
- types.isAssignable(inferred, pt().hasTag(NONE) ? polyPt : pt(), types.noWarnings)) {
+ (allowPoly && pt() == Infer.anyPoly ?
+ types.isSameType(inferred, clazztype) :
+ types.isAssignable(inferred, pt().hasTag(NONE) ? polyPt : pt(), types.noWarnings))) {
String key = types.isSameType(clazztype, inferred) ?
"diamond.redundant.args" :
"diamond.redundant.args.1";
@@ -2968,7 +2972,9 @@
//check that functional interface class is well-formed
ClassSymbol csym = types.makeFunctionalInterfaceClass(env,
names.empty, List.of(fExpr.targets.head), ABSTRACT);
- chk.checkImplementations(env.tree, csym, csym);
+ if (csym != null) {
+ chk.checkImplementations(env.tree, csym, csym);
+ }
}
}
}
diff --git a/src/share/classes/com/sun/tools/javac/comp/Check.java b/src/share/classes/com/sun/tools/javac/comp/Check.java
index 49ea617..71f191b 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -2997,7 +2997,8 @@
for (Scope.Entry e = a.annotationType.type.tsym.members().elems;
e != null;
e = e.sibling)
- if (e.sym.kind == MTH && e.sym.name != names.clinit)
+ if (e.sym.kind == MTH && e.sym.name != names.clinit &&
+ (e.sym.flags() & SYNTHETIC) == 0)
members.add((MethodSymbol) e.sym);
// remove the ones that are assigned values
diff --git a/src/share/classes/com/sun/tools/javac/comp/Env.java b/src/share/classes/com/sun/tools/javac/comp/Env.java
index c788055..fc200a9 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Env.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Env.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -124,7 +124,16 @@
@Override
public String toString() {
- return "Env[" + info + (outer == null ? "" : ",outer=" + outer) + "]";
+ StringBuilder sb = new StringBuilder();
+ sb.append("Env[").append(info);
+// if (enclMethod != null)
+// sb.append(",enclMethod=").append(Pretty.toSimpleString(enclMethod));
+// if (enclClass != null)
+// sb.append(",enclClass=").append(Pretty.toSimpleString(enclClass));
+ if (outer != null)
+ sb.append(",outer=").append(outer);
+ sb.append("]");
+ return sb.toString();
}
public Iterator<Env<A>> iterator() {
diff --git a/src/share/classes/com/sun/tools/javac/comp/Flow.java b/src/share/classes/com/sun/tools/javac/comp/Flow.java
index dbab4de..10ff59c 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -1339,7 +1339,7 @@
/** A mapping from addresses to variable symbols.
*/
- VarSymbol[] vars;
+ JCVariableDecl[] vardecls;
/** The current class being defined.
*/
@@ -1417,13 +1417,14 @@
* to the next available sequence number and entering it under that
* index into the vars array.
*/
- void newVar(VarSymbol sym) {
- vars = ArrayUtils.ensureCapacity(vars, nextadr);
+ void newVar(JCVariableDecl varDecl) {
+ VarSymbol sym = varDecl.sym;
+ vardecls = ArrayUtils.ensureCapacity(vardecls, nextadr);
if ((sym.flags() & FINAL) == 0) {
sym.flags_field |= EFFECTIVELY_FINAL;
}
sym.adr = nextadr;
- vars[nextadr] = sym;
+ vardecls[nextadr] = varDecl;
inits.excl(nextadr);
uninits.incl(nextadr);
nextadr++;
@@ -1493,11 +1494,13 @@
/** Check that trackable variable is initialized.
*/
void checkInit(DiagnosticPosition pos, VarSymbol sym) {
+ checkInit(pos, sym, "var.might.not.have.been.initialized");
+ }
+ void checkInit(DiagnosticPosition pos, VarSymbol sym, String errkey) {
if ((sym.adr >= firstadr || sym.owner.kind != TYP) &&
trackable(sym) &&
!inits.isMember(sym.adr)) {
- log.error(pos, "var.might.not.have.been.initialized",
- sym);
+ log.error(pos, errkey, sym);
inits.incl(sym.adr);
}
}
@@ -1599,7 +1602,7 @@
if ((def.mods.flags & STATIC) != 0) {
VarSymbol sym = def.sym;
if (trackable(sym))
- newVar(sym);
+ newVar(def);
}
}
}
@@ -1619,7 +1622,7 @@
if ((def.mods.flags & STATIC) == 0) {
VarSymbol sym = def.sym;
if (trackable(sym))
- newVar(sym);
+ newVar(def);
}
}
}
@@ -1678,9 +1681,22 @@
scan(tree.body);
if (isInitialConstructor) {
- for (int i = firstadr; i < nextadr; i++)
- if (vars[i].owner == classDef.sym)
- checkInit(TreeInfo.diagEndPos(tree.body), vars[i]);
+ boolean isSynthesized = (tree.sym.flags() &
+ GENERATEDCONSTR) != 0;
+ for (int i = firstadr; i < nextadr; i++) {
+ JCVariableDecl vardecl = vardecls[i];
+ VarSymbol var = vardecl.sym;
+ if (var.owner == classDef.sym) {
+ // choose the diagnostic position based on whether
+ // the ctor is default(synthesized) or not
+ if (isSynthesized) {
+ checkInit(TreeInfo.diagnosticPositionFor(var, vardecl),
+ var, "var.not.initialized.in.default.constructor");
+ } else {
+ checkInit(TreeInfo.diagEndPos(tree.body), var);
+ }
+ }
+ }
}
List<AssignPendingExit> exits = pendingExits.toList();
pendingExits = new ListBuffer<AssignPendingExit>();
@@ -1691,7 +1707,7 @@
if (isInitialConstructor) {
inits.assign(exit.exit_inits);
for (int i = firstadr; i < nextadr; i++)
- checkInit(exit.tree.pos(), vars[i]);
+ checkInit(exit.tree.pos(), vardecls[i].sym);
}
}
} finally {
@@ -1706,7 +1722,7 @@
public void visitVarDef(JCVariableDecl tree) {
boolean track = trackable(tree.sym);
- if (track && tree.sym.owner.kind == MTH) newVar(tree.sym);
+ if (track && tree.sym.owner.kind == MTH) newVar(tree);
if (tree.init != null) {
Lint lintPrev = lint;
lint = lint.augment(tree.sym);
@@ -2239,11 +2255,11 @@
Flow.this.make = make;
startPos = tree.pos().getStartPosition();
- if (vars == null)
- vars = new VarSymbol[32];
+ if (vardecls == null)
+ vardecls = new JCVariableDecl[32];
else
- for (int i=0; i<vars.length; i++)
- vars[i] = null;
+ for (int i=0; i<vardecls.length; i++)
+ vardecls[i] = null;
firstadr = 0;
nextadr = 0;
pendingExits = new ListBuffer<AssignPendingExit>();
@@ -2255,8 +2271,8 @@
startPos = -1;
resetBits(inits, uninits, uninitsTry, initsWhenTrue,
initsWhenFalse, uninitsWhenTrue, uninitsWhenFalse);
- if (vars != null) for (int i=0; i<vars.length; i++)
- vars[i] = null;
+ if (vardecls != null) for (int i=0; i<vardecls.length; i++)
+ vardecls[i] = null;
firstadr = 0;
nextadr = 0;
pendingExits = null;
diff --git a/src/share/classes/com/sun/tools/javac/comp/Infer.java b/src/share/classes/com/sun/tools/javac/comp/Infer.java
index ebc6867..a87156a 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -1240,7 +1240,8 @@
CAPTURED(InferenceBound.UPPER) {
@Override
public boolean accepts(UndetVar t, InferenceContext inferenceContext) {
- return !inferenceContext.free(t.getBounds(InferenceBound.UPPER, InferenceBound.LOWER));
+ return t.isCaptured() &&
+ !inferenceContext.free(t.getBounds(InferenceBound.UPPER, InferenceBound.LOWER));
}
@Override
diff --git a/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/share/classes/com/sun/tools/javac/comp/Resolve.java
index ff4d048..897cf21 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -2649,6 +2649,13 @@
InferenceContext inferenceContext) {
MethodResolutionPhase maxPhase = boxingAllowed ? VARARITY : BASIC;
+ if (site.hasTag(TYPEVAR)) {
+ return resolveMemberReference(pos, env, referenceTree, site.getUpperBound(),
+ name, argtypes, typeargtypes, boxingAllowed, methodCheck, inferenceContext);
+ }
+
+ site = types.capture(site);
+
ReferenceLookupHelper boundLookupHelper;
if (!name.equals(names.init)) {
//method reference
@@ -2675,24 +2682,52 @@
//merge results
Pair<Symbol, ReferenceLookupHelper> res;
- if (!lookupSuccess(unboundSym)) {
- res = new Pair<Symbol, ReferenceLookupHelper>(boundSym, boundLookupHelper);
- env.info.pendingResolutionPhase = boundEnv.info.pendingResolutionPhase;
- } else if (lookupSuccess(boundSym)) {
- res = new Pair<Symbol, ReferenceLookupHelper>(ambiguityError(boundSym, unboundSym), boundLookupHelper);
- env.info.pendingResolutionPhase = boundEnv.info.pendingResolutionPhase;
- } else {
- res = new Pair<Symbol, ReferenceLookupHelper>(unboundSym, unboundLookupHelper);
- env.info.pendingResolutionPhase = unboundEnv.info.pendingResolutionPhase;
- }
+ Symbol bestSym = choose(boundSym, unboundSym);
+ res = new Pair<Symbol, ReferenceLookupHelper>(bestSym,
+ bestSym == unboundSym ? unboundLookupHelper : boundLookupHelper);
+ env.info.pendingResolutionPhase = bestSym == unboundSym ?
+ unboundEnv.info.pendingResolutionPhase :
+ boundEnv.info.pendingResolutionPhase;
return res;
}
- //private
- boolean lookupSuccess(Symbol s) {
+ //where
+ private Symbol choose(Symbol s1, Symbol s2) {
+ if (lookupSuccess(s1) && lookupSuccess(s2)) {
+ return ambiguityError(s1, s2);
+ } else if (lookupSuccess(s1) ||
+ (canIgnore(s2) && !canIgnore(s1))) {
+ return s1;
+ } else if (lookupSuccess(s2) ||
+ (canIgnore(s1) && !canIgnore(s2))) {
+ return s2;
+ } else {
+ return s1;
+ }
+ }
+
+ private boolean lookupSuccess(Symbol s) {
return s.kind == MTH || s.kind == AMBIGUOUS;
}
+ private boolean canIgnore(Symbol s) {
+ switch (s.kind) {
+ case ABSENT_MTH:
+ return true;
+ case WRONG_MTH:
+ InapplicableSymbolError errSym =
+ (InapplicableSymbolError)s;
+ return new Template(MethodCheckDiag.ARITY_MISMATCH.regex())
+ .matches(errSym.errCandidate().snd);
+ case WRONG_MTHS:
+ InapplicableSymbolsError errSyms =
+ (InapplicableSymbolsError)s;
+ return errSyms.filterCandidates(errSyms.mapCandidates()).isEmpty();
+ default:
+ return false;
+ }
+ }
+
/**
* Helper for defining custom method-like lookup logic; a lookup helper
* provides hooks for (i) the actual lookup logic and (ii) accessing the
@@ -3504,7 +3539,9 @@
List<Type> argtypes,
List<Type> typeargtypes) {
Map<Symbol, JCDiagnostic> candidatesMap = mapCandidates();
- Map<Symbol, JCDiagnostic> filteredCandidates = filterCandidates(candidatesMap);
+ Map<Symbol, JCDiagnostic> filteredCandidates = compactMethodDiags ?
+ filterCandidates(candidatesMap) :
+ mapCandidates();
if (filteredCandidates.isEmpty()) {
filteredCandidates = candidatesMap;
}
@@ -3556,8 +3593,7 @@
Map<Symbol, JCDiagnostic> candidates = new LinkedHashMap<Symbol, JCDiagnostic>();
for (Map.Entry<Symbol, JCDiagnostic> _entry : candidatesMap.entrySet()) {
JCDiagnostic d = _entry.getValue();
- if (!compactMethodDiags ||
- !new Template(MethodCheckDiag.ARITY_MISMATCH.regex()).matches(d)) {
+ if (!new Template(MethodCheckDiag.ARITY_MISMATCH.regex()).matches(d)) {
candidates.put(_entry.getKey(), d);
}
}
diff --git a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
index 710617b..47cc589 100644
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -674,7 +674,11 @@
if (tree.varargsElement != null)
tree.varargsElement = types.erasure(tree.varargsElement);
else
- Assert.check(tree.args.length() == argtypes.length());
+ if (tree.args.length() != argtypes.length()) {
+ log.error(tree.pos(),
+ "method.invoked.with.incorrect.number.arguments",
+ tree.args.length(), argtypes.length());
+ }
tree.args = translateArgs(tree.args, argtypes, tree.varargsElement);
tree.type = types.erasure(tree.type);
diff --git a/src/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/share/classes/com/sun/tools/javac/jvm/Gen.java
index 241845e..3f0fc86 100644
--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -1820,7 +1820,6 @@
msym.externalType(types).getParameterTypes());
if (!msym.isDynamic()) {
code.statBegin(tree.pos);
- code.markStatBegin();
}
result = m.invoke();
}
diff --git a/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java b/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java
index 2f70954..882449f 100644
--- a/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java
+++ b/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java
@@ -108,20 +108,38 @@
}
// Helper to getAnnotation[s]
- private static <A extends Annotation> Attribute.Compound getAttributeOnClass(ClassSymbol annotated,
- Class<A> annoType) {
+ private static <A extends Annotation> Attribute.Compound getAttributeOnClass(
+ ClassSymbol annotated,
+ final Class<A> annoType)
+ {
boolean inherited = annoType.isAnnotationPresent(Inherited.class);
Attribute.Compound result = null;
- while (annotated.name != annotated.name.table.names.java_lang_Object) {
+
+ result = getAttribute(annotated, annoType);
+ if (result != null || !inherited)
+ return result;
+
+ while ((annotated = nextSupertypeToSearch(annotated)) != null) {
result = getAttribute(annotated, annoType);
- if (result != null || !inherited)
- break;
- Type sup = annotated.getSuperclass();
- if (!sup.hasTag(CLASS) || sup.isErroneous())
- break;
- annotated = (ClassSymbol) sup.tsym;
+ if (result != null)
+ return result;
}
- return result;
+ return null; // no more supertypes to search
+ }
+
+ /**
+ * Returns the next type to search for inherited annotations or {@code null}
+ * if the next type can't be found.
+ */
+ private static ClassSymbol nextSupertypeToSearch(ClassSymbol annotated) {
+ if (annotated.name == annotated.name.table.names.java_lang_Object)
+ return null;
+
+ Type sup = annotated.getSuperclass();
+ if (!sup.hasTag(CLASS) || sup.isErroneous())
+ return null;
+
+ return (ClassSymbol) sup.tsym;
}
/**
@@ -129,8 +147,9 @@
* annotations. This is the implementation of
* Element.getAnnotations(Class).
*/
- public static <A extends Annotation> A[] getAnnotations(Symbol annotated,
- Class<A> annoType) {
+ public static <A extends Annotation> A[] getAnnotationsByType(Symbol annotated,
+ Class<A> annoType)
+ {
if (!annoType.isAnnotation())
throw new IllegalArgumentException("Not an annotation type: "
+ annoType);
@@ -153,62 +172,48 @@
}
// So we have a containing type
- String name = annoType.getName();
String annoTypeName = annoType.getSimpleName();
String containerTypeName = containerType.getSimpleName();
int directIndex = -1, containerIndex = -1;
Attribute.Compound direct = null, container = null;
- Attribute.Compound[] rawAttributes = annotated.getRawAttributes().toArray(new Attribute.Compound[0]);
-
- // Find directly present annotations
- for (int i = 0; i < rawAttributes.length; i++) {
- if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
- directIndex = i;
- direct = rawAttributes[i];
+ // Find directly (explicit or implicit) present annotations
+ int index = -1;
+ for (List<Attribute.Compound> list = annotated.getAnnotationMirrors();
+ !list.isEmpty();
+ list = list.tail) {
+ Attribute.Compound attribute = list.head;
+ index++;
+ if (attribute.type.tsym.flatName().contentEquals(annoTypeName)) {
+ directIndex = index;
+ direct = attribute;
} else if(containerTypeName != null &&
- containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
- containerIndex = i;
- container = rawAttributes[i];
+ attribute.type.tsym.flatName().contentEquals(containerTypeName)) {
+ containerIndex = index;
+ container = attribute;
}
}
// Deal with inherited annotations
- if (annotated.kind == Kinds.TYP &&
- (annotated instanceof ClassSymbol)) {
- ClassSymbol s = (ClassSymbol)annotated;
- if (direct == null && container == null) {
- direct = getAttributeOnClass(s, annoType);
- container = getAttributeOnClass(s, containerType);
-
- // both are inherited and found, put container last
- if (direct != null && container != null) {
- directIndex = 0;
- containerIndex = 1;
- } else if (direct != null) {
- directIndex = 0;
- } else {
- containerIndex = 0;
- }
- } else if (direct == null) {
- direct = getAttributeOnClass(s, annoType);
- if (direct != null)
- directIndex = containerIndex + 1;
- } else if (container == null) {
- container = getAttributeOnClass(s, containerType);
- if (container != null)
- containerIndex = directIndex + 1;
+ if (direct == null && container == null) {
+ if (annotated.kind == Kinds.TYP &&
+ (annotated instanceof ClassSymbol)) {
+ ClassSymbol s = nextSupertypeToSearch((ClassSymbol)annotated);
+ if (s != null)
+ return getAnnotationsByType(s, annoType);
}
}
// Pack them in an array
- Attribute[] contained0 = new Attribute[0];
+ Attribute[] contained0 = null;
if (container != null)
contained0 = unpackAttributes(container);
ListBuffer<Attribute.Compound> compounds = ListBuffer.lb();
- for (Attribute a : contained0)
- if (a instanceof Attribute.Compound)
- compounds = compounds.append((Attribute.Compound)a);
- Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]);
+ if (contained0 != null) {
+ for (Attribute a : contained0)
+ if (a instanceof Attribute.Compound)
+ compounds = compounds.append((Attribute.Compound)a);
+ }
+ Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[compounds.size()]);
int size = (direct == null ? 0 : 1) + contained.length;
@SuppressWarnings("unchecked") // annoType is the Class for A
@@ -298,35 +303,38 @@
}
// So we have a containing type
- String name = annoType.getName();
String annoTypeName = annoType.getSimpleName();
String containerTypeName = containerType.getSimpleName();
int directIndex = -1, containerIndex = -1;
Attribute.Compound direct = null, container = null;
- Attribute.Compound[] rawAttributes = annotated.getAnnotationMirrors().toArray(new Attribute.Compound[0]);
-
- // Find directly present annotations
- for (int i = 0; i < rawAttributes.length; i++) {
- if (annoTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
- directIndex = i;
- direct = rawAttributes[i];
+ // Find directly (explicit or implicit) present annotations
+ int index = -1;
+ for (List<? extends Attribute.Compound> list = annotated.getAnnotationMirrors();
+ !list.isEmpty();
+ list = list.tail) {
+ Attribute.Compound attribute = list.head;
+ index++;
+ if (attribute.type.tsym.flatName().contentEquals(annoTypeName)) {
+ directIndex = index;
+ direct = attribute;
} else if(containerTypeName != null &&
- containerTypeName.equals(rawAttributes[i].type.tsym.flatName().toString())) {
- containerIndex = i;
- container = rawAttributes[i];
+ attribute.type.tsym.flatName().contentEquals(containerTypeName)) {
+ containerIndex = index;
+ container = attribute;
}
}
// Pack them in an array
- Attribute[] contained0 = new Attribute[0];
+ Attribute[] contained0 = null;
if (container != null)
contained0 = unpackAttributes(container);
ListBuffer<Attribute.Compound> compounds = ListBuffer.lb();
- for (Attribute a : contained0) {
- if (a instanceof Attribute.Compound)
- compounds = compounds.append((Attribute.Compound)a);
+ if (contained0 != null) {
+ for (Attribute a : contained0)
+ if (a instanceof Attribute.Compound)
+ compounds = compounds.append((Attribute.Compound)a);
}
- Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[0]);
+ Attribute.Compound[] contained = compounds.toArray(new Attribute.Compound[compounds.size()]);
int size = (direct == null ? 0 : 1) + contained.length;
@SuppressWarnings("unchecked") // annoType is the Class for A
diff --git a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
index b247218..182f211 100644
--- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -4053,7 +4053,7 @@
endPosMap = new HashMap<JCTree, Integer>();
}
- protected void storeEnd(JCTree tree, int endpos) {
+ public void storeEnd(JCTree tree, int endpos) {
endPosMap.put(tree, errorEndPos > endpos ? errorEndPos : endpos);
}
@@ -4091,7 +4091,7 @@
super(parser);
}
- protected void storeEnd(JCTree tree, int endpos) { /* empty */ }
+ public void storeEnd(JCTree tree, int endpos) { /* empty */ }
protected <T extends JCTree> T to(T t) {
return t;
@@ -4127,14 +4127,6 @@
}
/**
- * 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.
diff --git a/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/share/classes/com/sun/tools/javac/resources/compiler.properties
index 2487b7b..908b0af 100644
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -905,6 +905,10 @@
compiler.err.report.access=\
{0} has {1} access in {2}
+# 0: symbol, 1: set of modifier, 2: symbol
+compiler.misc.report.access=\
+ {0} has {1} access in {2}
+
compiler.err.ret.outside.meth=\
return outside method
@@ -914,6 +918,10 @@
compiler.err.signature.doesnt.match.intf=\
signature does not match {0}; incompatible interfaces
+# 0: number, 1: number
+compiler.err.method.invoked.with.incorrect.number.arguments=\
+ method invoked with incorrect number of arguments; expected {0}, found {1}
+
# 0: symbol, 1: symbol, 2: symbol
compiler.err.does.not.override.abstract=\
{0} is not abstract and does not override abstract method {1} in {2}
@@ -1069,6 +1077,10 @@
variable {0} might not have been initialized
# 0: symbol
+compiler.err.var.not.initialized.in.default.constructor=\
+ variable {0} not initialized in the default constructor
+
+# 0: symbol
compiler.err.var.might.be.assigned.in.loop=\
variable {0} might be assigned in loop
diff --git a/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java b/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java
index 1f9eefa..d68ba83 100644
--- a/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java
+++ b/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -43,10 +43,17 @@
public int getEndPos(JCTree tree);
/**
+ * 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.
+ */
+ public abstract void storeEnd(JCTree tree, int endpos);
+
+ /**
* 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
diff --git a/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java b/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
index 99b5233..e12feab 100644
--- a/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
+++ b/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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
@@ -38,7 +38,7 @@
public class TestCRLineSeparator extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4979486";
+ private static final String BUG_ID = "4979486-8014636";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -47,7 +47,7 @@
//Input for string search tests.
private static final String[][] TEST = {
- {BUG_ID + FS + "pkg" + FS + "MyClass.html", "Line 1\n Line 2"}
+ {BUG_ID + FS + "pkg" + FS + "MyClass.html", "Line 1" + NL + " Line 2"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
diff --git a/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java b/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
index 65df062..11c3eab 100644
--- a/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
+++ b/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, 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,11 +23,11 @@
/*
* @test
- * @bug 4232882
+ * @bug 4232882 8014636
* @summary Javadoc strips all of the leading spaces when the comment
* does not begin with a star. This RFE allows users to
* begin their comment without a leading star without leading
- * spaces striped
+ * spaces stripped
* @author jamieh
* @library ../lib/
* @build JavadocTester
@@ -37,15 +37,15 @@
public class LeadingSpaces extends JavadocTester {
- private static final String BUG_ID = "4232882";
+ private static final String BUG_ID = "4232882-8014636";
private static final String[][] TEST = {
{BUG_ID + FS + "LeadingSpaces.html",
-" 1\n" +
-" 2\n" +
-" 3\n" +
-" 4\n" +
-" 5\n" +
-" 6\n" +
+" 1" + NL +
+" 2" + NL +
+" 3" + NL +
+" 4" + NL +
+" 5" + NL +
+" 6" + NL +
" 7"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
diff --git a/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java b/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
index 74e81a8..4720fe4 100644
--- a/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
+++ b/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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 4732864 6280605 7064544
+ * @bug 4732864 6280605 7064544 8014636
* @summary Make sure that you can link from one member to another using
* non-qualified name, furthermore, ensure the right one is linked.
* @author jamieh
@@ -36,7 +36,7 @@
public class TestLinkTaglet extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4732864-6280605-7064544";
+ private static final String BUG_ID = "4732864-6280605-7064544-8014636";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -46,16 +46,16 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
- "Qualified Link: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
- " Unqualified Link1: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
- " Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
- " Qualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>\n" +
- " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>\n" +
+ "Qualified Link: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL +
+ " Unqualified Link1: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL +
+ " Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL +
+ " Qualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>" + NL +
+ " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>" + NL +
" Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(InnerC, InnerC2)</code></a>.<br/>"
},
{BUG_ID + FS + "pkg" + FS + "C.InnerC.html",
- "Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>\n" +
- " Link to member in inner class: <a href=\"../pkg/C.InnerC2.html#MEMBER2\"><code>C.InnerC2.MEMBER2</code></a> <br/>\n" +
+ "Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>" + NL +
+ " Link to member in inner class: <a href=\"../pkg/C.InnerC2.html#MEMBER2\"><code>C.InnerC2.MEMBER2</code></a> <br/>" + NL +
" Link to another inner class: <a href=\"../pkg/C.InnerC2.html\" title=\"class in pkg\"><code>C.InnerC2</code></a>"
},
{BUG_ID + FS + "pkg" + FS + "C.InnerC2.html",
diff --git a/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java b/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
index bce27a9..592dd52 100644
--- a/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
+++ b/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8002387
+ * @bug 8002387 8014636
* @summary Improve rendered HTML formatting for {@code}
* @library ../lib/
* @build JavadocTester TestLiteralCodeInPre
@@ -33,7 +33,7 @@
public class TestLiteralCodeInPre extends JavadocTester {
//Test information.
- private static final String BUG_ID = "8002387";
+ private static final String BUG_ID = "8002387-8014636";
private static final String OUTPUT_DIR = BUG_ID;
//Javadoc arguments.
diff --git a/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java b/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
index e8c2d05..513d738 100644
--- a/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
+++ b/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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,11 +23,9 @@
/*
* @test
- * @bug 4460354
+ * @bug 4460354 8014636
* @summary Test to make sure that relative paths are redirected in the
* output so that they are not broken.
- * NOTE: these tests have \\n instead of NL because they are user
- * generated new lines, not Java generated.
* @author jamieh
* @library ../lib/
* @build JavadocTester
@@ -38,7 +36,7 @@
public class TestRelativeLinks extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4460354";
+ private static final String BUG_ID = "4460354-8014636";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -58,7 +56,7 @@
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
"<a href=\"relative-package-link.html\">relative package link</a>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
- " <a\n" +
+ " <a" + NL +
" href=\"relative-multi-line-link.html\">relative-multi-line-link</a>."},
//These relative paths should be redirected because they are in different
@@ -74,7 +72,7 @@
{BUG_ID + FS + "index-all.html",
"<a href=\"./pkg/relative-package-link.html\">relative package link</a>"},
{BUG_ID + FS + "index-all.html",
- " <a\n" +
+ " <a" + NL +
" href=\"./pkg/relative-multi-line-link.html\">relative-multi-line-link</a>."},
@@ -92,7 +90,7 @@
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
"<a href=\"../../pkg/relative-package-link.html\">relative package link</a>"},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
- " <a\n" +
+ " <a" + NL +
" href=\"../../pkg/relative-multi-line-link.html\">relative-multi-line-link</a>."},
//PACKAGE OVERVIEW
diff --git a/test/tools/doclint/AnchorTest2.java b/test/tools/doclint/AnchorTest2.java
new file mode 100644
index 0000000..7d7441f
--- /dev/null
+++ b/test/tools/doclint/AnchorTest2.java
@@ -0,0 +1,20 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8020313
+ * @summary doclint doesn't reset HTML anchors correctly
+ * @build DocLintTester
+ * @run main DocLintTester -ref AnchorTest2.out AnchorTest2.java AnchorTest2a.java
+ * @run main DocLintTester -ref AnchorTest2.out AnchorTest2a.java AnchorTest2.java
+ */
+
+/** */
+public class AnchorTest2 {
+ /** <a name="AnchorTest2"> </a> */
+ public void a_name_AnchorTest2() { }
+
+ /** <a name="AnchorTest2"> </a> */
+ public void a_name_AnchorTest2_already_defined() { }
+
+ /** <a name="AnchorTest2a"> </a> */
+ public void a_name_AnchorTest2a_defined_in_other_file() { }
+}
diff --git a/test/tools/doclint/AnchorTest2.out b/test/tools/doclint/AnchorTest2.out
new file mode 100644
index 0000000..a976294
--- /dev/null
+++ b/test/tools/doclint/AnchorTest2.out
@@ -0,0 +1,4 @@
+AnchorTest2.java:15: error: anchor already defined: AnchorTest2
+ /** <a name="AnchorTest2"> </a> */
+ ^
+1 error
diff --git a/test/tools/doclint/AnchorTest2a.java b/test/tools/doclint/AnchorTest2a.java
new file mode 100644
index 0000000..3a19713
--- /dev/null
+++ b/test/tools/doclint/AnchorTest2a.java
@@ -0,0 +1,7 @@
+/* /nodynamiccopyright/ */
+
+/**
+ * <a name="AnchorTest2a"> </a>
+ */
+public class AnchorTest2a { }
+
diff --git a/test/tools/doclint/BadPackageCommentTest.out b/test/tools/doclint/BadPackageCommentTest.out
index 57b4db9..768d9cb 100644
--- a/test/tools/doclint/BadPackageCommentTest.out
+++ b/test/tools/doclint/BadPackageCommentTest.out
@@ -1,3 +1,6 @@
+BadPackageCommentTest.java:13: warning: documentation comment not expected here
+package p;
+^
BadPackageCommentTest.java:11: error: no tag name after @
* @@@
^
@@ -8,3 +11,4 @@
* @@@
^
3 errors
+1 warning
diff --git a/test/tools/doclint/DocLintTester.java b/test/tools/doclint/DocLintTester.java
index 848e284..78c052a 100644
--- a/test/tools/doclint/DocLintTester.java
+++ b/test/tools/doclint/DocLintTester.java
@@ -123,7 +123,7 @@
private static final Pattern dirFileLine = Pattern.compile(
"(?m)" // multi-line mode
+ "^(.*?)" // directory part of file name
- + "([A-Za-z0-9.]+:[0-9]+:)"); // file name and line number
+ + "([-A-Za-z0-9.]+:[0-9]+:)"); // file name and line number
String removeFileNames(String s) {
Matcher m = dirFileLine.matcher(s);
diff --git a/test/tools/doclint/ReferenceTest.java b/test/tools/doclint/ReferenceTest.java
index e25c56c..57b26ae 100644
--- a/test/tools/doclint/ReferenceTest.java
+++ b/test/tools/doclint/ReferenceTest.java
@@ -1,6 +1,6 @@
/*
* @test /nodynamiccopyright/
- * @bug 8004832
+ * @bug 8004832 8020556
* @summary Add new doclint package
* @build DocLintTester
* @run main DocLintTester -Xmsgs:-reference ReferenceTest.java
@@ -48,5 +48,11 @@
* @throws Exception description
*/
public void exception_not_thrown() { }
+
+ /**
+ * @param <T> throwable
+ * @throws T description
+ */
+ public <T extends Throwable> void valid_throws_generic() throws T { }
}
diff --git a/test/tools/doclint/packageTests/bad/Test.java b/test/tools/doclint/packageTests/bad/Test.java
new file mode 100644
index 0000000..83706d3
--- /dev/null
+++ b/test/tools/doclint/packageTests/bad/Test.java
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8020664 8021215
+ * @summary doclint gives incorrect warnings on normal package statements
+ * @library ../..
+ * @build DocLintTester
+ * @run main DocLintTester -ref Test.out Test.java
+ * @compile/fail/ref=Test.javac.out -XDrawDiagnostics -Werror -Xdoclint:all Test.java
+ */
+
+/** Unexpected comment */
+package bad;
+
+/** */
+class Test { }
+
diff --git a/test/tools/doclint/packageTests/bad/Test.javac.out b/test/tools/doclint/packageTests/bad/Test.javac.out
new file mode 100644
index 0000000..0967f4d
--- /dev/null
+++ b/test/tools/doclint/packageTests/bad/Test.javac.out
@@ -0,0 +1,4 @@
+Test.java:12:1: compiler.warn.proc.messager: documentation comment not expected here
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/test/tools/doclint/packageTests/bad/Test.out b/test/tools/doclint/packageTests/bad/Test.out
new file mode 100644
index 0000000..76a5512
--- /dev/null
+++ b/test/tools/doclint/packageTests/bad/Test.out
@@ -0,0 +1,4 @@
+Test.java:12: warning: documentation comment not expected here
+package bad;
+^
+1 warning
diff --git a/test/tools/doclint/packageTests/bad/package-info.java b/test/tools/doclint/packageTests/bad/package-info.java
new file mode 100644
index 0000000..2653c89
--- /dev/null
+++ b/test/tools/doclint/packageTests/bad/package-info.java
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8020664 8021215
+ * @summary doclint gives incorrect warnings on normal package statements
+ * @library ../..
+ * @build DocLintTester
+ * @run main DocLintTester -ref package-info.out package-info.java
+ * @compile/fail/ref=package-info.javac.out -XDrawDiagnostics -Werror -Xdoclint:all package-info.java
+ */
+
+// missing comment
+package bad;
diff --git a/test/tools/doclint/packageTests/bad/package-info.javac.out b/test/tools/doclint/packageTests/bad/package-info.javac.out
new file mode 100644
index 0000000..184eb41
--- /dev/null
+++ b/test/tools/doclint/packageTests/bad/package-info.javac.out
@@ -0,0 +1,4 @@
+package-info.java:12:1: compiler.warn.proc.messager: no comment
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/test/tools/doclint/packageTests/bad/package-info.out b/test/tools/doclint/packageTests/bad/package-info.out
new file mode 100644
index 0000000..1d07cd6
--- /dev/null
+++ b/test/tools/doclint/packageTests/bad/package-info.out
@@ -0,0 +1,4 @@
+package-info.java:12: warning: no comment
+package bad;
+^
+1 warning
diff --git a/test/tools/doclint/packageTests/good/Test.java b/test/tools/doclint/packageTests/good/Test.java
new file mode 100644
index 0000000..223d89a
--- /dev/null
+++ b/test/tools/doclint/packageTests/good/Test.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2012, 2013, 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 /nodynamiccopyright/
+ * @bug 8020664 8021215
+ * @summary doclint gives incorrect warnings on normal package statements
+ * @library ../..
+ * @build DocLintTester
+ * @run main DocLintTester Test.java
+ * @compile -Xdoclint:all Test.java
+ */
+
+// no doc comment
+package good;
+
+/** */
+class Test { }
+
diff --git a/test/tools/doclint/packageTests/good/package-info.java b/test/tools/doclint/packageTests/good/package-info.java
new file mode 100644
index 0000000..d60412d
--- /dev/null
+++ b/test/tools/doclint/packageTests/good/package-info.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2012, 2013, 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 /nodynamiccopyright/
+ * @bug 8020664 8021215
+ * @summary doclint gives incorrect warnings on normal package statements
+ * @library ../..
+ * @build DocLintTester
+ * @run main DocLintTester package-info.java
+ * @compile -Xdoclint:all package-info.java
+ */
+
+/** Description. */
+package good;
diff --git a/test/tools/javac/annotations/typeAnnotations/ErasureTest.java b/test/tools/javac/annotations/typeAnnotations/ErasureTest.java
new file mode 100644
index 0000000..d4131a9
--- /dev/null
+++ b/test/tools/javac/annotations/typeAnnotations/ErasureTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2013, 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 8016013
+ * @summary Compiler incorrectly treats annotated and unannotated type variable bounds as different types
+ * @compile -doe ErasureTest.java
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER })
+@interface Advanced {}
+
+class U {}
+interface I {}
+
+class ErasureTest {
+ <T extends U & @Advanced I> void TestMethod(T arg1) { }
+ public static void main(String argv[]) {
+ ErasureTest t1 = new ErasureTest(){
+ public <T extends @Advanced U & I> void TestMethod(T arg1) { }
+ };
+
+ ErasureTest t2 = new ErasureTest(){
+ public <T extends U & @Advanced I> void TestMethod(T arg1) { }
+ };
+ }
+}
diff --git a/test/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java b/test/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java
new file mode 100644
index 0000000..e4a782b
--- /dev/null
+++ b/test/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+// key: compiler.err.method.invoked.with.incorrect.number.arguments
+// options: -Xlint:-options -source 6 -target 6
+
+class MethodInvokedWithWrongNumberOfArgs {
+ static java.lang.invoke.MethodHandle getNamedMember;
+ public static Object getMember(String name, Object rec) throws Throwable {
+ return getNamedMember.invoke(rec, name);
+ }
+}
diff --git a/test/tools/javac/diags/examples/ReportAccessFragment.java b/test/tools/javac/diags/examples/ReportAccessFragment.java
new file mode 100644
index 0000000..8acba1d
--- /dev/null
+++ b/test/tools/javac/diags/examples/ReportAccessFragment.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+// key: compiler.err.prob.found.req
+// key: compiler.misc.invalid.mref
+// key: compiler.misc.report.access
+
+class ReportAccessFragment {
+ void test(Object o) {
+ Runnable r = o::clone;
+ }
+}
diff --git a/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java b/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java
new file mode 100644
index 0000000..91f44a3
--- /dev/null
+++ b/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+// key: compiler.err.var.not.initialized.in.default.constructor
+
+class X {
+ final int j;
+}
diff --git a/test/tools/javac/generics/diamond/6939780/T6939780.java b/test/tools/javac/generics/diamond/6939780/T6939780.java
index 57bbe4a..d3f41e4 100644
--- a/test/tools/javac/generics/diamond/6939780/T6939780.java
+++ b/test/tools/javac/generics/diamond/6939780/T6939780.java
@@ -1,6 +1,6 @@
/*
* @test /nodynamiccopyright/
- * @bug 6939780 7020044 8009459
+ * @bug 6939780 7020044 8009459 8021338
*
* @summary add a warning to detect diamond sites
* @author mcimadamore
@@ -36,4 +36,15 @@
void gw(Foo<?> fw) { }
void gn(Foo<Number> fn) { }
+
+ static class Foo2<X> {
+ X copy(X t) {
+ return t;
+ }
+ }
+
+ void testReciever() {
+ Number s = new Foo2<Number>().copy(0);
+ }
+
}
diff --git a/test/tools/javac/jvm/T8020689.java b/test/tools/javac/jvm/T8020689.java
new file mode 100644
index 0000000..ce8bcb6
--- /dev/null
+++ b/test/tools/javac/jvm/T8020689.java
@@ -0,0 +1,36 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8020689
+ * @summary Making sure the LineNumberTable entry is correctly generated for the leading method invocation in the else section
+ * @compile T8020689.java
+ * @run main T8020689
+ */
+
+public class T8020689 {
+
+ public static void main(String... args) {
+ if (args.length > 0) {
+ a();
+ } else {
+ b();
+ }
+ }
+
+ static void a() {
+ }
+
+ static void b() {
+ assertLine(15);
+ }
+
+ public static void assertLine(int expectedline) {
+ Exception e = new Exception("expected line#: " + expectedline);
+ int myline = e.getStackTrace()[2].getLineNumber();
+ if( myline != expectedline) {
+ throw new RuntimeException("Incorrect line number " +
+ "expected: " + expectedline +
+ ", got: " + myline, e);
+ }
+ System.out.format("Got expected line number %d correct %n", myline);
+ }
+}
diff --git a/test/tools/javac/lambda/8016081/T8016081.java b/test/tools/javac/lambda/8016081/T8016081.java
new file mode 100644
index 0000000..648955f
--- /dev/null
+++ b/test/tools/javac/lambda/8016081/T8016081.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2013, 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 8016081
+ * @summary field initialized with lambda in annotation types doesn't compile
+ * @compile T8016081.java
+ */
+
+class T8016081 {
+ interface fint { int get(); }
+
+ @interface atype {
+ fint fld = ()->( fld == null ?0 : 1);
+ }
+
+ @atype class T {}
+}
diff --git a/test/tools/javac/lambda/8020804/T8020804.java b/test/tools/javac/lambda/8020804/T8020804.java
new file mode 100644
index 0000000..ce8b98e
--- /dev/null
+++ b/test/tools/javac/lambda/8020804/T8020804.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2013, 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 8020804
+ * @summary javac crashes when speculative attribution infers intersection type with array component
+ * @compile T8020804.java
+ */
+
+import java.util.*;
+
+class T8020804 {
+ interface Supplier<D> {
+ D make();
+ }
+
+ void m(Object o) { }
+ void m(char[] c) { }
+
+ <C extends Collection<?>> C g(Supplier<C> sc) { return null; }
+
+ void test() {
+ m(g(LinkedList<Double>::new));
+ }
+}
diff --git a/test/tools/javac/lambda/8020843/T8020843a.java b/test/tools/javac/lambda/8020843/T8020843a.java
new file mode 100644
index 0000000..1b3e890
--- /dev/null
+++ b/test/tools/javac/lambda/8020843/T8020843a.java
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8020843
+ * @summary javac crashes on accessibility check with method reference with typevar receiver
+ * @compile/fail/ref=T8020843a.out -XDrawDiagnostics T8020843a.java
+ */
+
+class T8020843a {
+ interface Function<X, Y> {
+ Y m(X x);
+ }
+
+ <T> void test(T t) {
+ Function<T, Object> ss = T::clone;
+ }
+}
diff --git a/test/tools/javac/lambda/8020843/T8020843a.out b/test/tools/javac/lambda/8020843/T8020843a.out
new file mode 100644
index 0000000..8b89eee
--- /dev/null
+++ b/test/tools/javac/lambda/8020843/T8020843a.out
@@ -0,0 +1,2 @@
+T8020843a.java:14:34: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.report.access: clone(), protected, java.lang.Object))
+1 error
diff --git a/test/tools/javac/lambda/8020843/T8020843b.java b/test/tools/javac/lambda/8020843/T8020843b.java
new file mode 100644
index 0000000..727b2cd
--- /dev/null
+++ b/test/tools/javac/lambda/8020843/T8020843b.java
@@ -0,0 +1,27 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8020843
+ * @summary javac crashes on accessibility check with method reference with typevar receiver
+ * @compile/fail/ref=T8020843b.out -XDrawDiagnostics T8020843b.java
+ */
+
+class T8020843b {
+ interface Function<X, Y> {
+ Y m(X x);
+ }
+
+ interface BiFunction<X, Y, Z> {
+ Z m(X x, Y y);
+ }
+
+ Object m(int i) { return null; }
+ static Object m(String t) { return null; }
+
+ Object m2(int i) { return null; }
+ static Object m2(long t) { return null; }
+
+ static void test() {
+ Function<T8020843b, Object> f1 = T8020843b::m; //show bound case diag
+ BiFunction<T8020843b, String, Object> f2 = T8020843b::m2; //show unbound case diag
+ }
+}
diff --git a/test/tools/javac/lambda/8020843/T8020843b.out b/test/tools/javac/lambda/8020843/T8020843b.out
new file mode 100644
index 0000000..41b38c8
--- /dev/null
+++ b/test/tools/javac/lambda/8020843/T8020843b.out
@@ -0,0 +1,3 @@
+T8020843b.java:24:42: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbols: kindname.method, m, T8020843b,{(compiler.misc.inapplicable.method: kindname.method, T8020843b, m(int), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: T8020843b, int))),(compiler.misc.inapplicable.method: kindname.method, T8020843b, m(java.lang.String), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: T8020843b, java.lang.String)))}))
+T8020843b.java:25:52: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbols: kindname.method, m2, T8020843b,java.lang.String,{(compiler.misc.inapplicable.method: kindname.method, T8020843b, m2(int), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, int))),(compiler.misc.inapplicable.method: kindname.method, T8020843b, m2(long), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, long)))}))
+2 errors
diff --git a/test/tools/javac/lambda/MethodReference28.out b/test/tools/javac/lambda/MethodReference28.out
index 123cb51..042ade1 100644
--- a/test/tools/javac/lambda/MethodReference28.out
+++ b/test/tools/javac/lambda/MethodReference28.out
@@ -9,6 +9,6 @@
MethodReference28.java:46:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m3, java.lang.String, int, kindname.class, MethodReference28, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))))
MethodReference28.java:47:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m4, java.lang.String[], int, kindname.class, MethodReference28, (compiler.misc.varargs.argument.mismatch: (compiler.misc.inconvertible.types: int, java.lang.String))))
MethodReference28.java:52:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m2, java.lang.Integer,java.lang.Integer, MethodReference28,int, kindname.class, MethodReference28, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: MethodReference28, java.lang.Integer))))
-MethodReference28.java:53:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m3, java.lang.String, MethodReference28,int, kindname.class, MethodReference28, (compiler.misc.arg.length.mismatch)))
+MethodReference28.java:53:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m3, java.lang.String, MethodReference28,int, kindname.class, MethodReference28, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: int, java.lang.String))))
MethodReference28.java:54:19: compiler.err.prob.found.req: (compiler.misc.invalid.mref: kindname.method, (compiler.misc.cant.apply.symbol: kindname.method, m4, java.lang.String[], MethodReference28,int, kindname.class, MethodReference28, (compiler.misc.varargs.argument.mismatch: (compiler.misc.inconvertible.types: MethodReference28, java.lang.String))))
13 errors
diff --git a/test/tools/javac/positions/TreeEndPosTest.java b/test/tools/javac/positions/TreeEndPosTest.java
new file mode 100644
index 0000000..9618037
--- /dev/null
+++ b/test/tools/javac/positions/TreeEndPosTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2013, 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 8017216 8019422 8019421
+ * @summary verify start and end positions
+ * @run main TreeEndPosTest
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class TreeEndPosTest {
+ private static JavaFileManager getJavaFileManager(JavaCompiler compiler,
+ DiagnosticCollector dc) {
+ return compiler.getStandardFileManager(dc, null, null);
+ }
+
+ static class JavaSource extends SimpleJavaFileObject {
+
+ final String source;
+ int startPos;
+ int endPos;
+
+ private JavaSource(String filename, String source) {
+ super(URI.create("myfo:/" + filename), JavaFileObject.Kind.SOURCE);
+ this.source = source;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return source;
+ }
+
+ static JavaSource createJavaSource(String preamble, String body,
+ String postamble, String expected) {
+ JavaSource js = createJavaSource(preamble, body, postamble, -1, -1);
+ js.startPos = js.source.indexOf(expected);
+ js.endPos = js.startPos + expected.length();
+ return js;
+ }
+
+ static JavaSource createJavaSource(String body, String expected) {
+ return createJavaSource(null, body, null, expected);
+ }
+
+ private static JavaSource createJavaSource(String preamble, String body,
+ String postamble, int start, int end) {
+ final String name = "Bug";
+ StringBuilder code = new StringBuilder();
+ if (preamble != null) {
+ code.append(preamble);
+ }
+ code.append("public class " + name + "{");
+ if (body != null) {
+ code.append(body);
+ }
+ code.append("}");
+ if (postamble != null) {
+ code.append(postamble);
+ }
+ JavaSource js = new JavaSource(name + ".java", code.toString());
+ js.startPos = start;
+ js.endPos = end;
+ return js;
+ }
+ }
+
+ public static void main(String... args) throws IOException {
+ testUninitializedVariable();
+ testMissingAnnotationValue();
+ testFinalVariableWithDefaultConstructor();
+ testFinalVariableWithConstructor();
+ }
+
+ static void testUninitializedVariable() throws IOException {
+ compile(JavaSource.createJavaSource("Object o = new A().new B(); class A { }",
+ "B()"));
+ }
+ static void testMissingAnnotationValue() throws IOException {
+ compile(JavaSource.createJavaSource("@Foo(\"vvvv\")",
+ null, "@interface Foo { }", "\"vvvv\""));
+ }
+
+ static void testFinalVariableWithDefaultConstructor() throws IOException {
+ compile(JavaSource.createJavaSource("private static final String Foo; public void bar() { }",
+ "private static final String Foo;"));
+ }
+
+ static void testFinalVariableWithConstructor() throws IOException {
+ compile(JavaSource.createJavaSource("public Bug (){} private static final String Foo; public void bar() { }",
+ "{}"));
+ }
+
+ static void compile(JavaSource src) throws IOException {
+ ByteArrayOutputStream ba = new ByteArrayOutputStream();
+ PrintWriter writer = new PrintWriter(ba);
+ File tempDir = new File(".");
+ JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+ DiagnosticCollector dc = new DiagnosticCollector();
+ JavaFileManager javaFileManager = getJavaFileManager(compiler, dc);
+ List<String> options = new ArrayList<>();
+ options.add("-cp");
+ options.add(tempDir.getPath());
+ options.add("-d");
+ options.add(tempDir.getPath());
+ options.add("-XDshouldStopPolicy=GENERATE");
+
+ List<JavaFileObject> sources = new ArrayList<>();
+ sources.add(src);
+ JavaCompiler.CompilationTask task =
+ compiler.getTask(writer, javaFileManager,
+ dc, options, null,
+ sources);
+ task.call();
+ for (Diagnostic diagnostic : (List<Diagnostic>) dc.getDiagnostics()) {
+ long actualStart = diagnostic.getStartPosition();
+ long actualEnd = diagnostic.getEndPosition();
+ System.out.println("Source: " + src.source);
+ System.out.println("Diagnostic: " + diagnostic);
+ System.out.print("Start position: Expected: " + src.startPos);
+ System.out.println(", Actual: " + actualStart);
+ System.out.print("End position: Expected: " + src.endPos);
+ System.out.println(", Actual: " + actualEnd);
+ if (src.startPos != actualStart || src.endPos != actualEnd) {
+ throw new RuntimeException("error: trees don't match");
+ }
+ }
+ }
+}
diff --git a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java
index 8844cd1..e1ffd9e 100644
--- a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java
+++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java
@@ -23,12 +23,11 @@
/*
* @test
- * @bug 8004822
+ * @bug 8004822 8007961
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
- * @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only
* MixRepeatableAndOfficialContainerInheritedA1Test.java
diff --git a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java
index e2141da..2a3f822 100644
--- a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java
+++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java
@@ -23,12 +23,11 @@
/*
* @test
- * @bug 8004822
+ * @bug 8004822 8007961
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
- * @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only
* MixRepeatableAndOfficialContainerInheritedB1Test.java
diff --git a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java
index fb6efb4..52b86a7 100644
--- a/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java
+++ b/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java
@@ -23,12 +23,11 @@
/*
* @test
- * @bug 8004822
+ * @bug 8004822 8007961
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
- * @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only
* MixRepeatableAndOfficialContainerInheritedB2Test.java
diff --git a/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java
index 395a2a6..124ceea 100644
--- a/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java
+++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java
@@ -23,12 +23,11 @@
/*
* @test
- * @bug 8004822
+ * @bug 8004822 8007961
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
- * @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideATest.java
*/
diff --git a/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java
index f16ec7a..6357074 100644
--- a/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java
+++ b/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java
@@ -23,12 +23,11 @@
/*
* @test
- * @bug 8004822
+ * @bug 8004822 8007961
* @author mnunez
* @summary Language model api test basics for repeating annotations
* @library /tools/javac/lib
* @library supportingAnnotations
- * @ignore 8013407: test failures for repeating annotations
* @build JavacTestingAbstractProcessor ElementRepAnnoTester
* @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideBTest.java
*/
diff --git a/test/tools/javac/processing/model/inheritedByType/EnsureOrder.java b/test/tools/javac/processing/model/inheritedByType/EnsureOrder.java
new file mode 100644
index 0000000..77fcd11
--- /dev/null
+++ b/test/tools/javac/processing/model/inheritedByType/EnsureOrder.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2013, 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 test that order is respected when inheriting both legacy container and single anno
+ * @bug 8007961
+ * @library /tools/javac/lib
+ * @build JavacTestingAbstractProcessor EnsureOrder
+ * @compile -processor EnsureOrder -proc:only EnsureOrder.java
+ */
+
+import java.util.Set;
+import java.lang.annotation.*;
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import static javax.lang.model.SourceVersion.*;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+import static javax.lang.model.util.ElementFilter.*;
+import static javax.tools.Diagnostic.Kind.*;
+import static javax.tools.StandardLocation.*;
+import com.sun.tools.javac.util.Assert;
+
+@Target({ElementType.TYPE_PARAMETER, ElementType.TYPE})
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Foos.class)
+@interface Foo {
+ int value();
+}
+
+@Target({ElementType.TYPE_PARAMETER, ElementType.TYPE})
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@interface Foos {
+ Foo[] value();
+}
+
+@Foos({@Foo(0), @Foo(1)}) @Foo(2)
+class Base {}
+
+class Sub extends Base {}
+
+public class EnsureOrder<@Foos({@Foo(0), @Foo(1)}) @Foo(2)T> extends JavacTestingAbstractProcessor {
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ if (!roundEnv.processingOver()) {
+ int hasRun = 0;
+ for (Element element : roundEnv.getRootElements()) {
+ Name elemName = element.getSimpleName();
+ if (elemName.contentEquals("Base")) {
+ hasRun++;
+ Foo[] foos = element.getAnnotationsByType(Foo.class);
+ Assert.check(foos.length == 3);
+ Assert.check(foos[0].value() == 0);
+ Assert.check(foos[1].value() == 1);
+ Assert.check(foos[2].value() == 2);
+ }
+ if (elemName.contentEquals("Sub")) {
+ hasRun++;
+ Foo[] foos = element.getAnnotationsByType(Foo.class);
+ Assert.check(foos.length == 3);
+ Assert.check(foos[0].value() == 0);
+ Assert.check(foos[1].value() == 1);
+ Assert.check(foos[2].value() == 2);
+ }
+ if (elemName.contentEquals("EnsureOrder")) {
+ for (TypeParameterElement t : ((TypeElement)element).getTypeParameters()) {
+ if (t.getSimpleName().contentEquals("T")) {
+ hasRun++;
+ Foo[] foos = t.getAnnotationsByType(Foo.class);
+ Assert.check(foos.length == 3);
+ Assert.check(foos[0].value() == 0);
+ Assert.check(foos[1].value() == 1);
+ Assert.check(foos[2].value() == 2);
+ }
+ }
+ }
+ }
+ if (hasRun != 3)
+ throw new RuntimeException("Couldn't find elements");
+ }
+ return true;
+ }
+}
