Merge
diff --git a/src/share/classes/com/sun/source/util/TaskEvent.java b/src/share/classes/com/sun/source/util/TaskEvent.java
index eefabcb..5ecde4d 100644
--- a/src/share/classes/com/sun/source/util/TaskEvent.java
+++ b/src/share/classes/com/sun/source/util/TaskEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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
@@ -68,7 +68,15 @@
/**
* For events relating to an individual annotation processing round.
**/
- ANNOTATION_PROCESSING_ROUND
+ ANNOTATION_PROCESSING_ROUND,
+ /**
+ * Sent before parsing first source file, and after writing the last output file.
+ * This event is not sent when using {@link JavacTask#parse()},
+ * {@link JavacTask#analyze()} or {@link JavacTask#generate()}.
+ *
+ * @since 1.9
+ */
+ COMPILATION,
}
public TaskEvent(Kind kind) {
diff --git a/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java b/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
index 0467c2c..6fd5b52 100644
--- a/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
+++ b/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, 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
@@ -202,9 +202,6 @@
// <editor-fold defaultstate="collapsed" desc="Wrapper classes">
- // FIXME: all these classes should be converted to use multi-catch when
- // that is available in the bootstrap compiler.
-
protected class WrappedJavaFileManager implements JavaFileManager {
protected JavaFileManager clientJavaFileManager;
WrappedJavaFileManager(JavaFileManager clientJavaFileManager) {
diff --git a/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
index 9dba0ba..9d9ad45 100644
--- a/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
+++ b/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
@@ -161,6 +161,15 @@
compilerMain.log = Log.instance(context);
compilerMain.setOptions(Options.instance(context));
compilerMain.filenames = new LinkedHashSet<>();
+ compilerMain.deferredFileManagerOptions = new LinkedHashMap<>();
+ // The following line is conceptually wrong. It should not refer to args
+ // which may include inappropriate file manager options.
+ // (Ideally, args should not even be passed into JavacTaskImpl at all.)
+ // The "no filenames in args" check should have been handled by the use of
+ // the GrumpyHelper in JavacTool.getTask, but processArgs also has some
+ // additional checking, which should be factored out and called separately.
+ // If we fix this, then filenames and deferredFileManagerOptions in Main
+ // can revert to being protected or private, not public.
Collection<File> filenames = compilerMain.processArgs(CommandLine.parse(args), classNames);
if (filenames != null && !filenames.isEmpty())
throw new IllegalArgumentException("Malformed arguments " + toString(filenames, " "));
diff --git a/src/share/classes/com/sun/tools/javac/code/Attribute.java b/src/share/classes/com/sun/tools/javac/code/Attribute.java
index f2cff56..e789314 100644
--- a/src/share/classes/com/sun/tools/javac/code/Attribute.java
+++ b/src/share/classes/com/sun/tools/javac/code/Attribute.java
@@ -142,7 +142,7 @@
* access this attribute.
*/
public final List<Pair<MethodSymbol,Attribute>> values;
- public TypeAnnotationPosition position;
+ public final TypeAnnotationPosition position;
private boolean synthesized = false;
@@ -170,53 +170,9 @@
@Override
public TypeAnnotationPosition getPosition() {
- if (hasUnknownPosition()) {
- if (values.size() != 0) {
- Name valueName = values.head.fst.name.table.names.value;
- Pair<MethodSymbol, Attribute> res = getElemPair(valueName);
- position = res == null ? null : res.snd.getPosition();
- }
- }
return position;
}
- public boolean isContainerTypeCompound() {
- if (isSynthesized() && values.size() == 1)
- return getFirstEmbeddedTC() != null;
- return false;
- }
-
- private Compound getFirstEmbeddedTC() {
- if (values.size() == 1) {
- Pair<MethodSymbol, Attribute> val = values.get(0);
- if (val.fst.getSimpleName().contentEquals("value")
- && val.snd instanceof Array) {
- Array arr = (Array) val.snd;
- if (arr.values.length != 0
- && arr.values[0] instanceof Attribute.TypeCompound)
- return (Attribute.TypeCompound) arr.values[0];
- }
- }
- return null;
- }
-
- public boolean tryFixPosition() {
- if (!isContainerTypeCompound())
- return false;
-
- Compound from = getFirstEmbeddedTC();
- if (from != null && from.position != null &&
- from.position.type != TargetType.UNKNOWN) {
- position = from.position;
- return true;
- }
- return false;
- }
-
- public boolean hasUnknownPosition() {
- return position.type == TargetType.UNKNOWN;
- }
-
public void accept(Visitor v) { v.visitCompound(this); }
/**
@@ -280,6 +236,12 @@
valmap.put(value.fst, value.snd);
return valmap;
}
+
+ public TypeCompound toTypeCompound() {
+ // It is safe to alias the position.
+ return new TypeCompound(this, this.position);
+ }
+
}
public static class TypeCompound extends Compound {
diff --git a/src/share/classes/com/sun/tools/javac/code/Flags.java b/src/share/classes/com/sun/tools/javac/code/Flags.java
index 220c276..88f421c 100644
--- a/src/share/classes/com/sun/tools/javac/code/Flags.java
+++ b/src/share/classes/com/sun/tools/javac/code/Flags.java
@@ -296,7 +296,8 @@
ModifierFlags = ((long)StandardFlags & ~INTERFACE) | DEFAULT,
InterfaceMethodMask = ABSTRACT | STATIC | PUBLIC | STRICTFP | DEFAULT,
AnnotationTypeElementMask = ABSTRACT | PUBLIC,
- LocalVarFlags = FINAL | PARAMETER;
+ LocalVarFlags = FINAL | PARAMETER,
+ ReceiverParamFlags = PARAMETER;
public static Set<Modifier> asModifierSet(long flags) {
diff --git a/src/share/classes/com/sun/tools/javac/code/TargetType.java b/src/share/classes/com/sun/tools/javac/code/TargetType.java
index 0876749..2ac4ca8 100644
--- a/src/share/classes/com/sun/tools/javac/code/TargetType.java
+++ b/src/share/classes/com/sun/tools/javac/code/TargetType.java
@@ -107,10 +107,7 @@
CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT(0x4A, true),
/** For annotations on a type argument of a method reference. */
- METHOD_REFERENCE_TYPE_ARGUMENT(0x4B, true),
-
- /** For annotations with an unknown target. */
- UNKNOWN(0xFF);
+ METHOD_REFERENCE_TYPE_ARGUMENT(0x4B, true);
private static final int MAXIMUM_TARGET_TYPE_VALUE = 0x4B;
@@ -150,26 +147,15 @@
targets = new TargetType[MAXIMUM_TARGET_TYPE_VALUE + 1];
TargetType[] alltargets = values();
for (TargetType target : alltargets) {
- if (target.targetTypeValue != UNKNOWN.targetTypeValue)
targets[target.targetTypeValue] = target;
}
- for (int i = 0; i <= MAXIMUM_TARGET_TYPE_VALUE; ++i) {
- if (targets[i] == null)
- targets[i] = UNKNOWN;
- }
}
public static boolean isValidTargetTypeValue(int tag) {
- if (tag == UNKNOWN.targetTypeValue)
- return true;
-
return (tag >= 0 && tag < targets.length);
}
public static TargetType fromTargetTypeValue(int tag) {
- if (tag == UNKNOWN.targetTypeValue)
- return UNKNOWN;
-
if (tag < 0 || tag >= targets.length)
Assert.error("Unknown TargetType: " + tag);
return targets[tag];
diff --git a/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java b/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
index 55412a2..76a9fa9 100644
--- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
+++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
@@ -259,9 +259,6 @@
case METHOD_RETURN:
case FIELD:
break;
- case UNKNOWN:
- sb.append(", position UNKNOWN!");
- break;
default:
Assert.error("Unknown target type: " + type);
}
@@ -428,7 +425,7 @@
}
/**
- * Create a {@code TypeAnnotationPosition} for a method receiver.
+ * Create a {@code TypeAnnotationPosition} for a method receiver parameter.
*
* @param location The type path.
* @param onLambda The lambda for this parameter.
@@ -445,7 +442,7 @@
}
/**
- * Create a {@code TypeAnnotationPosition} for a method receiver.
+ * Create a {@code TypeAnnotationPosition} for a method receiver parameter.
*
* @param location The type path.
*/
@@ -455,7 +452,7 @@
}
/**
- * Create a {@code TypeAnnotationPosition} for a method receiver.
+ * Create a {@code TypeAnnotationPosition} for a method receiver parameter.
*
* @param pos The position from the associated tree node.
*/
@@ -664,10 +661,11 @@
public static TypeAnnotationPosition
exceptionParameter(final List<TypePathEntry> location,
final JCLambda onLambda,
+ final int type_index,
final int pos) {
return new TypeAnnotationPosition(TargetType.EXCEPTION_PARAMETER, pos,
Integer.MIN_VALUE, onLambda,
- Integer.MIN_VALUE, Integer.MIN_VALUE,
+ type_index, Integer.MIN_VALUE,
location);
}
@@ -680,7 +678,7 @@
public static TypeAnnotationPosition
exceptionParameter(final JCLambda onLambda,
final int pos) {
- return exceptionParameter(emptyPath, onLambda, pos);
+ return exceptionParameter(emptyPath, onLambda, Integer.MIN_VALUE, pos);
}
/**
@@ -690,7 +688,7 @@
*/
public static TypeAnnotationPosition
exceptionParameter(final List<TypePathEntry> location) {
- return exceptionParameter(location, null, -1);
+ return exceptionParameter(location, null, Integer.MIN_VALUE, -1);
}
@@ -1204,12 +1202,4 @@
return methodTypeParameterBound(location, null, parameter_index,
bound_index, -1);
}
-
- // Consider this deprecated on arrival. We eventually want to get
- // rid of this value altogether. Do not use it for anything new.
- public static final TypeAnnotationPosition unknown =
- new TypeAnnotationPosition(TargetType.UNKNOWN, -1,
- Integer.MIN_VALUE, null,
- Integer.MIN_VALUE, Integer.MIN_VALUE,
- emptyPath);
}
diff --git a/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java b/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
deleted file mode 100644
index 1fa63c1..0000000
--- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
+++ /dev/null
@@ -1,1397 +0,0 @@
-/*
- * Copyright (c) 2009, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.javac.code;
-
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.type.TypeKind;
-
-import javax.tools.JavaFileObject;
-
-import com.sun.tools.javac.code.Attribute.TypeCompound;
-import com.sun.tools.javac.code.Type.ArrayType;
-import com.sun.tools.javac.code.Type.CapturedType;
-import com.sun.tools.javac.code.Type.ClassType;
-import com.sun.tools.javac.code.Type.ErrorType;
-import com.sun.tools.javac.code.Type.ForAll;
-import com.sun.tools.javac.code.Type.MethodType;
-import com.sun.tools.javac.code.Type.PackageType;
-import com.sun.tools.javac.code.Type.TypeVar;
-import com.sun.tools.javac.code.Type.UndetVar;
-import com.sun.tools.javac.code.Type.Visitor;
-import com.sun.tools.javac.code.Type.WildcardType;
-import com.sun.tools.javac.code.TypeAnnotationPosition.TypePathEntry;
-import com.sun.tools.javac.code.TypeAnnotationPosition.TypePathEntryKind;
-import com.sun.tools.javac.code.Symbol.VarSymbol;
-import com.sun.tools.javac.code.Symbol.MethodSymbol;
-import com.sun.tools.javac.comp.Annotate;
-import com.sun.tools.javac.comp.Annotate.Worker;
-import com.sun.tools.javac.comp.Attr;
-import com.sun.tools.javac.comp.AttrContext;
-import com.sun.tools.javac.comp.Env;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeInfo;
-import com.sun.tools.javac.tree.JCTree.JCBlock;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCLambda;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
-import com.sun.tools.javac.tree.JCTree.JCNewClass;
-import com.sun.tools.javac.tree.JCTree.JCTypeApply;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.tree.TreeScanner;
-import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.util.Assert;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Names;
-import com.sun.tools.javac.util.Options;
-
-/**
- * Contains operations specific to processing type annotations.
- * This class has two functions:
- * separate declaration from type annotations and insert the type
- * annotations to their types;
- * and determine the TypeAnnotationPositions for all type annotations.
- */
-public class TypeAnnotations {
- protected static final Context.Key<TypeAnnotations> typeAnnosKey = new Context.Key<>();
-
- public static TypeAnnotations instance(Context context) {
- TypeAnnotations instance = context.get(typeAnnosKey);
- if (instance == null)
- instance = new TypeAnnotations(context);
- return instance;
- }
-
- final Log log;
- final Names names;
- final Symtab syms;
- final Annotate annotate;
- final Attr attr;
-
- protected TypeAnnotations(Context context) {
- context.put(typeAnnosKey, this);
- names = Names.instance(context);
- log = Log.instance(context);
- syms = Symtab.instance(context);
- annotate = Annotate.instance(context);
- attr = Attr.instance(context);
- Options options = Options.instance(context);
- }
-
- /**
- * Separate type annotations from declaration annotations and
- * determine the correct positions for type annotations.
- * This version only visits types in signatures and should be
- * called from MemberEnter.
- * The method takes the Annotate object as parameter and
- * adds an Annotate.Worker to the correct Annotate queue for
- * later processing.
- */
- public void organizeTypeAnnotationsSignatures(final Env<AttrContext> env, final JCClassDecl tree) {
- annotate.afterRepeated( new Worker() {
- @Override
- public void run() {
- JavaFileObject oldSource = log.useSource(env.toplevel.sourcefile);
-
- try {
- new TypeAnnotationPositions(true).scan(tree);
- } finally {
- log.useSource(oldSource);
- }
- }
- } );
- }
-
- public void validateTypeAnnotationsSignatures(final Env<AttrContext> env, final JCClassDecl tree) {
- annotate.validate(new Worker() { //validate annotations
- @Override
- public void run() {
- JavaFileObject oldSource = log.useSource(env.toplevel.sourcefile);
-
- try {
- attr.validateTypeAnnotations(tree, true);
- } finally {
- log.useSource(oldSource);
- }
- }
- } );
- }
-
- /**
- * This version only visits types in bodies, that is, field initializers,
- * top-level blocks, and method bodies, and should be called from Attr.
- */
- public void organizeTypeAnnotationsBodies(JCClassDecl tree) {
- new TypeAnnotationPositions(false).scan(tree);
- }
-
- public enum AnnotationType { DECLARATION, TYPE, BOTH }
-
- /**
- * Determine whether an annotation is a declaration annotation,
- * a type annotation, or both.
- */
- public AnnotationType annotationType(Attribute.Compound a, Symbol s) {
- Attribute.Compound atTarget =
- a.type.tsym.attribute(syms.annotationTargetType.tsym);
- if (atTarget == null) {
- return inferTargetMetaInfo(a, s);
- }
- Attribute atValue = atTarget.member(names.value);
- if (!(atValue instanceof Attribute.Array)) {
- Assert.error("annotationType(): bad @Target argument " + atValue +
- " (" + atValue.getClass() + ")");
- return AnnotationType.DECLARATION; // error recovery
- }
- Attribute.Array arr = (Attribute.Array) atValue;
- boolean isDecl = false, isType = false;
- for (Attribute app : arr.values) {
- if (!(app instanceof Attribute.Enum)) {
- Assert.error("annotationType(): unrecognized Attribute kind " + app +
- " (" + app.getClass() + ")");
- isDecl = true;
- continue;
- }
- Attribute.Enum e = (Attribute.Enum) app;
- if (e.value.name == names.TYPE) {
- if (s.kind == Kinds.TYP)
- isDecl = true;
- } else if (e.value.name == names.FIELD) {
- if (s.kind == Kinds.VAR &&
- s.owner.kind != Kinds.MTH)
- isDecl = true;
- } else if (e.value.name == names.METHOD) {
- if (s.kind == Kinds.MTH &&
- !s.isConstructor())
- isDecl = true;
- } else if (e.value.name == names.PARAMETER) {
- if (s.kind == Kinds.VAR &&
- s.owner.kind == Kinds.MTH &&
- (s.flags() & Flags.PARAMETER) != 0)
- isDecl = true;
- } else if (e.value.name == names.CONSTRUCTOR) {
- if (s.kind == Kinds.MTH &&
- s.isConstructor())
- isDecl = true;
- } else if (e.value.name == names.LOCAL_VARIABLE) {
- if (s.kind == Kinds.VAR &&
- s.owner.kind == Kinds.MTH &&
- (s.flags() & Flags.PARAMETER) == 0)
- isDecl = true;
- } else if (e.value.name == names.ANNOTATION_TYPE) {
- if (s.kind == Kinds.TYP &&
- (s.flags() & Flags.ANNOTATION) != 0)
- isDecl = true;
- } else if (e.value.name == names.PACKAGE) {
- if (s.kind == Kinds.PCK)
- isDecl = true;
- } else if (e.value.name == names.TYPE_USE) {
- if (s.kind == Kinds.TYP ||
- s.kind == Kinds.VAR ||
- (s.kind == Kinds.MTH && !s.isConstructor() &&
- !s.type.getReturnType().hasTag(TypeTag.VOID)) ||
- (s.kind == Kinds.MTH && s.isConstructor()))
- isType = true;
- } else if (e.value.name == names.TYPE_PARAMETER) {
- /* Irrelevant in this case */
- // TYPE_PARAMETER doesn't aid in distinguishing between
- // Type annotations and declaration annotations on an
- // Element
- } else {
- Assert.error("annotationType(): unrecognized Attribute name " + e.value.name +
- " (" + e.value.name.getClass() + ")");
- isDecl = true;
- }
- }
- if (isDecl && isType) {
- return AnnotationType.BOTH;
- } else if (isType) {
- return AnnotationType.TYPE;
- } else {
- return AnnotationType.DECLARATION;
- }
- }
-
- /** Infer the target annotation kind, if none is give.
- * We only infer declaration annotations.
- */
- private static AnnotationType inferTargetMetaInfo(Attribute.Compound a, Symbol s) {
- return AnnotationType.DECLARATION;
- }
-
-
- private class TypeAnnotationPositions extends TreeScanner {
-
- private final boolean sigOnly;
-
- TypeAnnotationPositions(boolean sigOnly) {
- this.sigOnly = sigOnly;
- }
-
- /*
- * When traversing the AST we keep the "frames" of visited
- * trees in order to determine the position of annotations.
- */
- private ListBuffer<JCTree> frames = new ListBuffer<>();
-
- protected void push(JCTree t) { frames = frames.prepend(t); }
- protected JCTree pop() { return frames.next(); }
- // could this be frames.elems.tail.head?
- private JCTree peek2() { return frames.toList().tail.head; }
-
- @Override
- public void scan(JCTree tree) {
- push(tree);
- super.scan(tree);
- pop();
- }
-
- /**
- * Separates type annotations from declaration annotations.
- * This step is needed because in certain locations (where declaration
- * and type annotations can be mixed, e.g. the type of a field)
- * we never build an JCAnnotatedType. This step finds these
- * annotations and marks them as if they were part of the type.
- */
- private void separateAnnotationsKinds(JCTree typetree, Type type, Symbol sym,
- TypeAnnotationPosition pos) {
- List<Attribute.Compound> annotations = sym.getRawAttributes();
- ListBuffer<Attribute.Compound> declAnnos = new ListBuffer<>();
- ListBuffer<Attribute.TypeCompound> typeAnnos = new ListBuffer<>();
- ListBuffer<Attribute.TypeCompound> onlyTypeAnnos = new ListBuffer<>();
-
- for (Attribute.Compound a : annotations) {
- switch (annotationType(a, sym)) {
- case DECLARATION:
- declAnnos.append(a);
- break;
- case BOTH: {
- declAnnos.append(a);
- Attribute.TypeCompound ta = toTypeCompound(a, pos);
- typeAnnos.append(ta);
- break;
- }
- case TYPE: {
- Attribute.TypeCompound ta = toTypeCompound(a, pos);
- typeAnnos.append(ta);
- // Also keep track which annotations are only type annotations
- onlyTypeAnnos.append(ta);
- break;
- }
- }
- }
-
- sym.resetAnnotations();
- sym.setDeclarationAttributes(declAnnos.toList());
-
- if (typeAnnos.isEmpty()) {
- return;
- }
-
- List<Attribute.TypeCompound> typeAnnotations = typeAnnos.toList();
-
- if (type == null) {
- // When type is null, put the type annotations to the symbol.
- // This is used for constructor return annotations, for which
- // we use the type of the enclosing class.
- type = sym.getEnclosingElement().asType();
-
- // Declaration annotations are always allowed on constructor returns.
- // Therefore, use typeAnnotations instead of onlyTypeAnnos.
- type = typeWithAnnotations(typetree, type, typeAnnotations, typeAnnotations);
- // Note that we don't use the result, the call to
- // typeWithAnnotations side-effects the type annotation positions.
- // This is important for constructors of nested classes.
- sym.appendUniqueTypeAttributes(typeAnnotations);
- return;
- }
-
- // type is non-null and annotations are added to that type
- type = typeWithAnnotations(typetree, type, typeAnnotations, onlyTypeAnnos.toList());
-
- if (sym.getKind() == ElementKind.METHOD) {
- sym.type.asMethodType().restype = type;
- } else if (sym.getKind() == ElementKind.PARAMETER) {
- sym.type = type;
- if (sym.getQualifiedName().equals(names._this)) {
- sym.owner.type.asMethodType().recvtype = type;
- // note that the typeAnnotations will also be added to the owner below.
- } else {
- MethodType methType = sym.owner.type.asMethodType();
- List<VarSymbol> params = ((MethodSymbol)sym.owner).params;
- List<Type> oldArgs = methType.argtypes;
- ListBuffer<Type> newArgs = new ListBuffer<>();
- while (params.nonEmpty()) {
- if (params.head == sym) {
- newArgs.add(type);
- } else {
- newArgs.add(oldArgs.head);
- }
- oldArgs = oldArgs.tail;
- params = params.tail;
- }
- methType.argtypes = newArgs.toList();
- }
- } else {
- sym.type = type;
- }
-
- sym.appendUniqueTypeAttributes(typeAnnotations);
-
- if (sym.getKind() == ElementKind.PARAMETER ||
- sym.getKind() == ElementKind.LOCAL_VARIABLE ||
- sym.getKind() == ElementKind.RESOURCE_VARIABLE ||
- sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
- // Make sure all type annotations from the symbol are also
- // on the owner.
- sym.owner.appendUniqueTypeAttributes(sym.getRawTypeAttributes());
- }
- }
-
- // This method has a similar purpose as
- // {@link com.sun.tools.javac.parser.JavacParser.insertAnnotationsToMostInner(JCExpression, List<JCTypeAnnotation>, boolean)}
- // We found a type annotation in a declaration annotation position,
- // for example, on the return type.
- // Such an annotation is _not_ part of an JCAnnotatedType tree and we therefore
- // need to set its position explicitly.
- // The method returns a copy of type that contains these annotations.
- //
- // As a side effect the method sets the type annotation position of "annotations".
- // Note that it is assumed that all annotations share the same position.
- private Type typeWithAnnotations(final JCTree typetree, final Type type,
- final List<Attribute.TypeCompound> annotations,
- final List<Attribute.TypeCompound> onlyTypeAnnotations) {
- //System.err.printf("typeWithAnnotations(typetree: %s, type: %s, annotations: %s, onlyTypeAnnotations: %s)%n",
- // typetree, type, annotations, onlyTypeAnnotations);
- if (annotations.isEmpty()) {
- return type;
- }
- if (type.hasTag(TypeTag.ARRAY)) {
- Type.ArrayType arType = (Type.ArrayType) type;
- Type.ArrayType tomodify = new Type.ArrayType(null, arType.tsym,
- Type.noAnnotations);
- Type toreturn;
- if (type.isAnnotated()) {
- toreturn = tomodify.annotatedType(type.getAnnotationMirrors());
- } else {
- toreturn = tomodify;
- }
-
- JCArrayTypeTree arTree = arrayTypeTree(typetree);
-
- ListBuffer<TypePathEntry> depth = new ListBuffer<>();
- depth = depth.append(TypePathEntry.ARRAY);
- while (arType.elemtype.hasTag(TypeTag.ARRAY)) {
- if (arType.elemtype.isAnnotated()) {
- Type aelemtype = arType.elemtype;
- arType = (Type.ArrayType) aelemtype;
- ArrayType prevToMod = tomodify;
- tomodify = new Type.ArrayType(null, arType.tsym,
- Type.noAnnotations);
- prevToMod.elemtype = tomodify.annotatedType(arType.elemtype.getAnnotationMirrors());
- } else {
- arType = (Type.ArrayType) arType.elemtype;
- tomodify.elemtype = new Type.ArrayType(null, arType.tsym,
- Type.noAnnotations);
- tomodify = (Type.ArrayType) tomodify.elemtype;
- }
- arTree = arrayTypeTree(arTree.elemtype);
- depth = depth.append(TypePathEntry.ARRAY);
- }
- Type arelemType = typeWithAnnotations(arTree.elemtype, arType.elemtype, annotations, onlyTypeAnnotations);
- tomodify.elemtype = arelemType;
- {
- // All annotations share the same position; modify the first one.
- Attribute.TypeCompound a = annotations.get(0);
- TypeAnnotationPosition p = a.position;
- p.location = p.location.prependList(depth.toList());
- }
- typetree.type = toreturn;
- return toreturn;
- } else if (type.hasTag(TypeTag.TYPEVAR)) {
- // Nothing to do for type variables.
- return type;
- } else if (type.getKind() == TypeKind.UNION) {
- // There is a TypeKind, but no TypeTag.
- JCTypeUnion tutree = (JCTypeUnion) typetree;
- JCExpression fst = tutree.alternatives.get(0);
- Type res = typeWithAnnotations(fst, fst.type, annotations, onlyTypeAnnotations);
- fst.type = res;
- // TODO: do we want to set res as first element in uct.alternatives?
- // UnionClassType uct = (com.sun.tools.javac.code.Type.UnionClassType)type;
- // Return the un-annotated union-type.
- return type;
- } else {
- Type enclTy = type;
- Element enclEl = type.asElement();
- JCTree enclTr = typetree;
-
- while (enclEl != null &&
- enclEl.getKind() != ElementKind.PACKAGE &&
- enclTy != null &&
- enclTy.getKind() != TypeKind.NONE &&
- enclTy.getKind() != TypeKind.ERROR &&
- (enclTr.getKind() == JCTree.Kind.MEMBER_SELECT ||
- enclTr.getKind() == JCTree.Kind.PARAMETERIZED_TYPE ||
- enclTr.getKind() == JCTree.Kind.ANNOTATED_TYPE)) {
- // Iterate also over the type tree, not just the type: the type is already
- // completely resolved and we cannot distinguish where the annotation
- // belongs for a nested type.
- if (enclTr.getKind() == JCTree.Kind.MEMBER_SELECT) {
- // only change encl in this case.
- enclTy = enclTy.getEnclosingType();
- enclEl = enclEl.getEnclosingElement();
- enclTr = ((JCFieldAccess)enclTr).getExpression();
- } else if (enclTr.getKind() == JCTree.Kind.PARAMETERIZED_TYPE) {
- enclTr = ((JCTypeApply)enclTr).getType();
- } else {
- // only other option because of while condition
- enclTr = ((JCAnnotatedType)enclTr).getUnderlyingType();
- }
- }
-
- /** We are trying to annotate some enclosing type,
- * but nothing more exists.
- */
- if (enclTy != null &&
- enclTy.hasTag(TypeTag.NONE)) {
- switch (onlyTypeAnnotations.size()) {
- case 0:
- // Don't issue an error if all type annotations are
- // also declaration annotations.
- // If the annotations are also declaration annotations, they are
- // illegal as type annotations but might be legal as declaration annotations.
- // The normal declaration annotation checks make sure that the use is valid.
- break;
- case 1:
- log.error(typetree.pos(), "cant.type.annotate.scoping.1",
- onlyTypeAnnotations);
- break;
- default:
- log.error(typetree.pos(), "cant.type.annotate.scoping",
- onlyTypeAnnotations);
- }
- return type;
- }
-
- // At this point we have visited the part of the nested
- // type that is written in the source code.
- // Now count from here to the actual top-level class to determine
- // the correct nesting.
-
- // The genericLocation for the annotation.
- ListBuffer<TypePathEntry> depth = new ListBuffer<>();
-
- Type topTy = enclTy;
- while (enclEl != null &&
- enclEl.getKind() != ElementKind.PACKAGE &&
- topTy != null &&
- topTy.getKind() != TypeKind.NONE &&
- topTy.getKind() != TypeKind.ERROR) {
- topTy = topTy.getEnclosingType();
- enclEl = enclEl.getEnclosingElement();
-
- if (topTy != null && topTy.getKind() != TypeKind.NONE) {
- // Only count enclosing types.
- depth = depth.append(TypePathEntry.INNER_TYPE);
- }
- }
-
- if (depth.nonEmpty()) {
- // Only need to change the annotation positions
- // if they are on an enclosed type.
- // All annotations share the same position; modify the first one.
- Attribute.TypeCompound a = annotations.get(0);
- TypeAnnotationPosition p = a.position;
- p.location = p.location.appendList(depth.toList());
- }
-
- Type ret = typeWithAnnotations(type, enclTy, annotations);
- typetree.type = ret;
- return ret;
- }
- }
-
- private JCArrayTypeTree arrayTypeTree(JCTree typetree) {
- if (typetree.getKind() == JCTree.Kind.ARRAY_TYPE) {
- return (JCArrayTypeTree) typetree;
- } else if (typetree.getKind() == JCTree.Kind.ANNOTATED_TYPE) {
- return (JCArrayTypeTree) ((JCAnnotatedType)typetree).underlyingType;
- } else {
- Assert.error("Could not determine array type from type tree: " + typetree);
- return null;
- }
- }
-
- /** Return a copy of the first type that only differs by
- * inserting the annotations to the left-most/inner-most type
- * or the type given by stopAt.
- *
- * We need the stopAt parameter to know where on a type to
- * put the annotations.
- * If we have nested classes Outer > Middle > Inner, and we
- * have the source type "@A Middle.Inner", we will invoke
- * this method with type = Outer.Middle.Inner,
- * stopAt = Middle.Inner, and annotations = @A.
- *
- * @param type The type to copy.
- * @param stopAt The type to stop at.
- * @param annotations The annotations to insert.
- * @return A copy of type that contains the annotations.
- */
- private Type typeWithAnnotations(final Type type,
- final Type stopAt,
- final List<Attribute.TypeCompound> annotations) {
- //System.err.println("typeWithAnnotations " + type + " " + annotations + " stopAt " + stopAt);
- Visitor<Type, List<TypeCompound>> visitor =
- new Type.Visitor<Type, List<Attribute.TypeCompound>>() {
- @Override
- public Type visitClassType(ClassType t, List<TypeCompound> s) {
- // assert that t.constValue() == null?
- if (t == stopAt ||
- t.getEnclosingType() == Type.noType) {
- return t.annotatedType(s);
- } else {
- ClassType ret = new ClassType(t.getEnclosingType().accept(this, s),
- t.typarams_field, t.tsym,
- t.getAnnotationMirrors());
- ret.all_interfaces_field = t.all_interfaces_field;
- ret.allparams_field = t.allparams_field;
- ret.interfaces_field = t.interfaces_field;
- ret.rank_field = t.rank_field;
- ret.supertype_field = t.supertype_field;
- return ret;
- }
- }
-
- @Override
- public Type visitWildcardType(WildcardType t, List<TypeCompound> s) {
- return t.annotatedType(s);
- }
-
- @Override
- public Type visitArrayType(ArrayType t, List<TypeCompound> s) {
- ArrayType ret = new ArrayType(t.elemtype.accept(this, s), t.tsym,
- t.getAnnotationMirrors());
- return ret;
- }
-
- @Override
- public Type visitMethodType(MethodType t, List<TypeCompound> s) {
- // Impossible?
- return t;
- }
-
- @Override
- public Type visitPackageType(PackageType t, List<TypeCompound> s) {
- // Impossible?
- return t;
- }
-
- @Override
- public Type visitTypeVar(TypeVar t, List<TypeCompound> s) {
- return t.annotatedType(s);
- }
-
- @Override
- public Type visitCapturedType(CapturedType t, List<TypeCompound> s) {
- return t.annotatedType(s);
- }
-
- @Override
- public Type visitForAll(ForAll t, List<TypeCompound> s) {
- // Impossible?
- return t;
- }
-
- @Override
- public Type visitUndetVar(UndetVar t, List<TypeCompound> s) {
- // Impossible?
- return t;
- }
-
- @Override
- public Type visitErrorType(ErrorType t, List<TypeCompound> s) {
- return t.annotatedType(s);
- }
-
- @Override
- public Type visitType(Type t, List<TypeCompound> s) {
- return t.annotatedType(s);
- }
- };
-
- return type.accept(visitor, annotations);
- }
-
- private Attribute.TypeCompound toTypeCompound(Attribute.Compound a, TypeAnnotationPosition p) {
- // It is safe to alias the position.
- return new Attribute.TypeCompound(a, p);
- }
-
-
- /* This is the beginning of the second part of organizing
- * type annotations: determine the type annotation positions.
- */
-
- // This method is considered deprecated, and will be removed
- // in the near future. Don't use it for anything new.
- private TypeAnnotationPosition
- resolveFrame(JCTree tree,
- JCTree frame,
- List<JCTree> path,
- JCLambda currentLambda,
- int outer_type_index,
- ListBuffer<TypePathEntry> location) {
- /*
- System.out.println("Resolving tree: " + tree + " kind: " + tree.getKind());
- System.out.println(" Framing tree: " + frame + " kind: " + frame.getKind());
- */
-
- // Note that p.offset is set in
- // com.sun.tools.javac.jvm.Gen.setTypeAnnotationPositions(int)
-
- switch (frame.getKind()) {
- case TYPE_CAST:
- return TypeAnnotationPosition.typeCast(location.toList(),
- currentLambda,
- outer_type_index,
- frame.pos);
-
- case INSTANCE_OF:
- return TypeAnnotationPosition.instanceOf(location.toList(),
- currentLambda,
- frame.pos);
-
- case NEW_CLASS:
- final JCNewClass frameNewClass = (JCNewClass) frame;
- if (frameNewClass.def != null) {
- // Special handling for anonymous class instantiations
- final JCClassDecl frameClassDecl = frameNewClass.def;
- if (frameClassDecl.extending == tree) {
- return TypeAnnotationPosition
- .classExtends(location.toList(), currentLambda,
- frame.pos);
- } else if (frameClassDecl.implementing.contains(tree)) {
- final int type_index =
- frameClassDecl.implementing.indexOf(tree);
- return TypeAnnotationPosition
- .classExtends(location.toList(), currentLambda,
- type_index, frame.pos);
- } else {
- // In contrast to CLASS below, typarams cannot occur here.
- throw new AssertionError("Could not determine position of tree " + tree +
- " within frame " + frame);
- }
- } else if (frameNewClass.typeargs.contains(tree)) {
- final int type_index =
- frameNewClass.typeargs.indexOf(tree);
- return TypeAnnotationPosition
- .constructorInvocationTypeArg(location.toList(),
- currentLambda,
- type_index,
- frame.pos);
- } else {
- return TypeAnnotationPosition
- .newObj(location.toList(), currentLambda,
- frame.pos);
- }
-
- case NEW_ARRAY:
- return TypeAnnotationPosition
- .newObj(location.toList(), currentLambda, frame.pos);
-
- case ANNOTATION_TYPE:
- case CLASS:
- case ENUM:
- case INTERFACE:
- if (((JCClassDecl)frame).extending == tree) {
- return TypeAnnotationPosition
- .classExtends(location.toList(), currentLambda,
- frame.pos);
- } else if (((JCClassDecl)frame).implementing.contains(tree)) {
- final int type_index =
- ((JCClassDecl)frame).implementing.indexOf(tree);
- return TypeAnnotationPosition
- .classExtends(location.toList(), currentLambda,
- type_index, frame.pos);
- } else if (((JCClassDecl)frame).typarams.contains(tree)) {
- final int parameter_index =
- ((JCClassDecl)frame).typarams.indexOf(tree);
- return TypeAnnotationPosition
- .typeParameter(location.toList(), currentLambda,
- parameter_index, frame.pos);
- } else {
- throw new AssertionError("Could not determine position of tree " +
- tree + " within frame " + frame);
- }
-
- case METHOD: {
- final JCMethodDecl frameMethod = (JCMethodDecl) frame;
- if (frameMethod.thrown.contains(tree)) {
- final int type_index = frameMethod.thrown.indexOf(tree);
- return TypeAnnotationPosition
- .methodThrows(location.toList(), currentLambda,
- type_index, frame.pos);
- } else if (frameMethod.restype == tree) {
- return TypeAnnotationPosition
- .methodReturn(location.toList(), currentLambda,
- frame.pos);
- } else if (frameMethod.typarams.contains(tree)) {
- final int parameter_index =
- frameMethod.typarams.indexOf(tree);
- return TypeAnnotationPosition
- .methodTypeParameter(location.toList(),
- currentLambda,
- parameter_index, frame.pos);
- } else {
- throw new AssertionError("Could not determine position of tree " + tree +
- " within frame " + frame);
- }
- }
-
- case PARAMETERIZED_TYPE: {
- List<JCTree> newPath = path.tail;
-
- if (((JCTypeApply)frame).clazz == tree) {
- // generic: RAW; noop
- } else if (((JCTypeApply)frame).arguments.contains(tree)) {
- JCTypeApply taframe = (JCTypeApply) frame;
- int arg = taframe.arguments.indexOf(tree);
- location = location.prepend(
- new TypePathEntry(TypePathEntryKind.TYPE_ARGUMENT,
- arg));
-
- Type typeToUse;
- if (newPath.tail != null &&
- newPath.tail.head.hasTag(Tag.NEWCLASS)) {
- // If we are within an anonymous class
- // instantiation, use its type, because it
- // contains a correctly nested type.
- typeToUse = newPath.tail.head.type;
- } else {
- typeToUse = taframe.type;
- }
-
- location = locateNestedTypes(typeToUse, location);
- } else {
- throw new AssertionError("Could not determine type argument position of tree " + tree +
- " within frame " + frame);
- }
-
- return resolveFrame(newPath.head, newPath.tail.head,
- newPath, currentLambda,
- outer_type_index, location);
- }
-
- case MEMBER_REFERENCE: {
- JCMemberReference mrframe = (JCMemberReference) frame;
-
- if (mrframe.expr == tree) {
- switch (mrframe.mode) {
- case INVOKE:
- return TypeAnnotationPosition
- .methodRef(location.toList(), currentLambda,
- frame.pos);
- case NEW:
- return TypeAnnotationPosition
- .constructorRef(location.toList(),
- currentLambda,
- frame.pos);
- default:
- throw new AssertionError("Unknown method reference mode " + mrframe.mode +
- " for tree " + tree + " within frame " + frame);
- }
- } else if (mrframe.typeargs != null &&
- mrframe.typeargs.contains(tree)) {
- final int type_index = mrframe.typeargs.indexOf(tree);
- switch (mrframe.mode) {
- case INVOKE:
- return TypeAnnotationPosition
- .methodRefTypeArg(location.toList(),
- currentLambda,
- type_index, frame.pos);
- case NEW:
- return TypeAnnotationPosition
- .constructorRefTypeArg(location.toList(),
- currentLambda,
- type_index, frame.pos);
- default:
- throw new AssertionError("Unknown method reference mode " + mrframe.mode +
- " for tree " + tree + " within frame " + frame);
- }
- } else {
- throw new AssertionError("Could not determine type argument position of tree " + tree +
- " within frame " + frame);
- }
- }
-
- case ARRAY_TYPE: {
- location = location.prepend(TypePathEntry.ARRAY);
- List<JCTree> newPath = path.tail;
- while (true) {
- JCTree npHead = newPath.tail.head;
- if (npHead.hasTag(JCTree.Tag.TYPEARRAY)) {
- newPath = newPath.tail;
- location = location.prepend(TypePathEntry.ARRAY);
- } else if (npHead.hasTag(JCTree.Tag.ANNOTATED_TYPE)) {
- newPath = newPath.tail;
- } else {
- break;
- }
- }
- return resolveFrame(newPath.head, newPath.tail.head,
- newPath, currentLambda,
- outer_type_index, location);
- }
-
- case TYPE_PARAMETER:
- if (path.tail.tail.head.hasTag(JCTree.Tag.CLASSDEF)) {
- final JCClassDecl clazz =
- (JCClassDecl)path.tail.tail.head;
- final int parameter_index =
- clazz.typarams.indexOf(path.tail.head);
- final int bound_index =
- ((JCTypeParameter)frame).bounds.get(0)
- .type.isInterface() ?
- ((JCTypeParameter)frame).bounds.indexOf(tree) + 1:
- ((JCTypeParameter)frame).bounds.indexOf(tree);
- return TypeAnnotationPosition
- .typeParameterBound(location.toList(),
- currentLambda,
- parameter_index, bound_index,
- frame.pos);
- } else if (path.tail.tail.head.hasTag(JCTree.Tag.METHODDEF)) {
- final JCMethodDecl method =
- (JCMethodDecl)path.tail.tail.head;
- final int parameter_index =
- method.typarams.indexOf(path.tail.head);
- final int bound_index =
- ((JCTypeParameter)frame).bounds.get(0)
- .type.isInterface() ?
- ((JCTypeParameter)frame).bounds.indexOf(tree) + 1:
- ((JCTypeParameter)frame).bounds.indexOf(tree);
- return TypeAnnotationPosition
- .methodTypeParameterBound(location.toList(),
- currentLambda,
- parameter_index,
- bound_index,
- frame.pos);
- } else {
- throw new AssertionError("Could not determine position of tree " + tree +
- " within frame " + frame);
- }
-
- case VARIABLE:
- VarSymbol v = ((JCVariableDecl)frame).sym;
- if (v.getKind() != ElementKind.FIELD) {
- v.owner.appendUniqueTypeAttributes(v.getRawTypeAttributes());
- }
- switch (v.getKind()) {
- case LOCAL_VARIABLE:
- return TypeAnnotationPosition
- .localVariable(location.toList(), currentLambda,
- frame.pos);
- case FIELD:
- return TypeAnnotationPosition.field(location.toList(),
- currentLambda,
- frame.pos);
- case PARAMETER:
- if (v.getQualifiedName().equals(names._this)) {
- return TypeAnnotationPosition
- .methodReceiver(location.toList(),
- currentLambda,
- frame.pos);
- } else {
- final int parameter_index =
- methodParamIndex(path, frame);
- return TypeAnnotationPosition
- .methodParameter(location.toList(),
- currentLambda,
- parameter_index,
- frame.pos);
- }
- case EXCEPTION_PARAMETER:
- return TypeAnnotationPosition
- .exceptionParameter(location.toList(),
- currentLambda,
- frame.pos);
- case RESOURCE_VARIABLE:
- return TypeAnnotationPosition
- .resourceVariable(location.toList(),
- currentLambda,
- frame.pos);
- default:
- throw new AssertionError("Found unexpected type annotation for variable: " + v + " with kind: " + v.getKind());
- }
-
- case ANNOTATED_TYPE: {
- if (frame == tree) {
- // This is only true for the first annotated type we see.
- // For any other annotated types along the path, we do
- // not care about inner types.
- JCAnnotatedType atypetree = (JCAnnotatedType) frame;
- final Type utype = atypetree.underlyingType.type;
- Assert.checkNonNull(utype);
- Symbol tsym = utype.tsym;
- if (tsym.getKind().equals(ElementKind.TYPE_PARAMETER) ||
- utype.getKind().equals(TypeKind.WILDCARD) ||
- utype.getKind().equals(TypeKind.ARRAY)) {
- // Type parameters, wildcards, and arrays have the declaring
- // class/method as enclosing elements.
- // There is actually nothing to do for them.
- } else {
- location = locateNestedTypes(utype, location);
- }
- }
- List<JCTree> newPath = path.tail;
- return resolveFrame(newPath.head, newPath.tail.head,
- newPath, currentLambda,
- outer_type_index, location);
- }
-
- case UNION_TYPE: {
- List<JCTree> newPath = path.tail;
- return resolveFrame(newPath.head, newPath.tail.head,
- newPath, currentLambda,
- outer_type_index, location);
- }
-
- case INTERSECTION_TYPE: {
- JCTypeIntersection isect = (JCTypeIntersection)frame;
- final List<JCTree> newPath = path.tail;
- return resolveFrame(newPath.head, newPath.tail.head,
- newPath, currentLambda,
- isect.bounds.indexOf(tree), location);
- }
-
- case METHOD_INVOCATION: {
- JCMethodInvocation invocation = (JCMethodInvocation)frame;
- if (!invocation.typeargs.contains(tree)) {
- throw new AssertionError("{" + tree + "} is not an argument in the invocation: " + invocation);
- }
- MethodSymbol exsym = (MethodSymbol) TreeInfo.symbol(invocation.getMethodSelect());
- final int type_index = invocation.typeargs.indexOf(tree);
- if (exsym == null) {
- throw new AssertionError("could not determine symbol for {" + invocation + "}");
- } else if (exsym.isConstructor()) {
- return TypeAnnotationPosition
- .constructorInvocationTypeArg(location.toList(),
- currentLambda,
- type_index,
- invocation.pos);
- } else {
- return TypeAnnotationPosition
- .methodInvocationTypeArg(location.toList(),
- currentLambda,
- type_index,
- invocation.pos);
- }
- }
-
- case EXTENDS_WILDCARD:
- case SUPER_WILDCARD: {
- // Annotations in wildcard bounds
- final List<JCTree> newPath = path.tail;
- return resolveFrame(newPath.head, newPath.tail.head,
- newPath, currentLambda,
- outer_type_index,
- location.prepend(TypePathEntry.WILDCARD));
- }
-
- case MEMBER_SELECT: {
- final List<JCTree> newPath = path.tail;
- return resolveFrame(newPath.head, newPath.tail.head,
- newPath, currentLambda,
- outer_type_index, location);
- }
-
- default:
- throw new AssertionError("Unresolved frame: " + frame +
- " of kind: " + frame.getKind() +
- "\n Looking for tree: " + tree);
- }
- }
-
- private ListBuffer<TypePathEntry>
- locateNestedTypes(Type type,
- ListBuffer<TypePathEntry> depth) {
- Type encl = type.getEnclosingType();
- while (encl != null &&
- encl.getKind() != TypeKind.NONE &&
- encl.getKind() != TypeKind.ERROR) {
- depth = depth.prepend(TypePathEntry.INNER_TYPE);
- encl = encl.getEnclosingType();
- }
- return depth;
- }
-
- private int methodParamIndex(List<JCTree> path, JCTree param) {
- List<JCTree> curr = path;
- while (curr.head.getTag() != Tag.METHODDEF &&
- curr.head.getTag() != Tag.LAMBDA) {
- curr = curr.tail;
- }
- if (curr.head.getTag() == Tag.METHODDEF) {
- JCMethodDecl method = (JCMethodDecl)curr.head;
- return method.params.indexOf(param);
- } else if (curr.head.getTag() == Tag.LAMBDA) {
- JCLambda lambda = (JCLambda)curr.head;
- return lambda.params.indexOf(param);
- } else {
- Assert.error("methodParamIndex expected to find method or lambda for param: " + param);
- return -1;
- }
- }
-
- // Each class (including enclosed inner classes) is visited separately.
- // This flag is used to prevent from visiting inner classes.
- private boolean isInClass = false;
-
- @Override
- public void visitClassDef(JCClassDecl tree) {
- if (isInClass)
- return;
- isInClass = true;
-
- if (sigOnly) {
- scan(tree.mods);
- scan(tree.typarams);
- scan(tree.extending);
- scan(tree.implementing);
- }
- scan(tree.defs);
- }
-
- /**
- * Resolve declaration vs. type annotations in methods and
- * then determine the positions.
- */
- @Override
- public void visitMethodDef(final JCMethodDecl tree) {
- if (tree.sym == null) {
- Assert.error("Visiting tree node before memberEnter");
- }
- if (sigOnly) {
- if (!tree.mods.annotations.isEmpty()) {
- if (tree.sym.isConstructor()) {
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.methodReturn(tree.pos);
- // Use null to mark that the annotations go
- // with the symbol.
- separateAnnotationsKinds(tree, null, tree.sym, pos);
- } else {
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.methodReturn(tree.restype.pos);
- separateAnnotationsKinds(tree.restype,
- tree.sym.type.getReturnType(),
- tree.sym, pos);
- }
- }
- if (tree.recvparam != null && tree.recvparam.sym != null &&
- !tree.recvparam.mods.annotations.isEmpty()) {
- // Nothing to do for separateAnnotationsKinds if
- // there are no annotations of either kind.
- // TODO: make sure there are no declaration annotations.
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.methodReceiver(tree.recvparam.vartype.pos);
- separateAnnotationsKinds(tree.recvparam.vartype,
- tree.recvparam.sym.type,
- tree.recvparam.sym, pos);
- }
- int i = 0;
- for (JCVariableDecl param : tree.params) {
- if (!param.mods.annotations.isEmpty()) {
- // Nothing to do for separateAnnotationsKinds if
- // there are no annotations of either kind.
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.methodParameter(i, param.vartype.pos);
- separateAnnotationsKinds(param.vartype,
- param.sym.type,
- param.sym, pos);
- }
- ++i;
- }
- }
-
- push(tree);
- // super.visitMethodDef(tree);
- if (sigOnly) {
- scan(tree.mods);
- scan(tree.restype);
- scan(tree.typarams);
- scan(tree.recvparam);
- scan(tree.params);
- scan(tree.thrown);
- } else {
- scan(tree.defaultValue);
- scan(tree.body);
- }
- pop();
- }
-
- /* Store a reference to the current lambda expression, to
- * be used by all type annotations within this expression.
- */
- private JCLambda currentLambda = null;
-
- public void visitLambda(JCLambda tree) {
- JCLambda prevLambda = currentLambda;
- try {
- currentLambda = tree;
-
- int i = 0;
- for (JCVariableDecl param : tree.params) {
- if (!param.mods.annotations.isEmpty()) {
- // Nothing to do for separateAnnotationsKinds if
- // there are no annotations of either kind.
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.methodParameter(tree, i,
- param.vartype.pos);
- separateAnnotationsKinds(param.vartype, param.sym.type, param.sym, pos);
- }
- ++i;
- }
-
- push(tree);
- scan(tree.body);
- scan(tree.params);
- pop();
- } finally {
- currentLambda = prevLambda;
- }
- }
-
- /**
- * Resolve declaration vs. type annotations in variable declarations and
- * then determine the positions.
- */
- @Override
- public void visitVarDef(final JCVariableDecl tree) {
- if (tree.mods.annotations.isEmpty()) {
- // Nothing to do for separateAnnotationsKinds if
- // there are no annotations of either kind.
- } else if (tree.sym == null) {
- Assert.error("Visiting tree node before memberEnter");
- } else if (tree.sym.getKind() == ElementKind.PARAMETER) {
- // Parameters are handled in visitMethodDef or visitLambda.
- } else if (tree.sym.getKind() == ElementKind.FIELD) {
- if (sigOnly) {
- TypeAnnotationPosition pos =
- TypeAnnotationPosition.field(tree.pos);
- separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
- }
- } else if (tree.sym.getKind() == ElementKind.LOCAL_VARIABLE) {
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.localVariable(currentLambda,
- tree.pos);
- separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
- } else if (tree.sym.getKind() == ElementKind.EXCEPTION_PARAMETER) {
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.exceptionParameter(currentLambda,
- tree.pos);
- separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
- } else if (tree.sym.getKind() == ElementKind.RESOURCE_VARIABLE) {
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.resourceVariable(currentLambda,
- tree.pos);
- separateAnnotationsKinds(tree.vartype, tree.sym.type, tree.sym, pos);
- } else if (tree.sym.getKind() == ElementKind.ENUM_CONSTANT) {
- // No type annotations can occur here.
- } else {
- // There is nothing else in a variable declaration that needs separation.
- Assert.error("Unhandled variable kind: " + tree + " of kind: " + tree.sym.getKind());
- }
-
- push(tree);
- // super.visitVarDef(tree);
- scan(tree.mods);
- scan(tree.vartype);
- if (!sigOnly) {
- scan(tree.init);
- }
- pop();
- }
-
- @Override
- public void visitBlock(JCBlock tree) {
- // Do not descend into top-level blocks when only interested
- // in the signature.
- if (!sigOnly) {
- scan(tree.stats);
- }
- }
-
- @Override
- public void visitAnnotatedType(JCAnnotatedType tree) {
- push(tree);
- findPosition(tree, tree, tree.annotations);
- pop();
- super.visitAnnotatedType(tree);
- }
-
- @Override
- public void visitTypeParameter(JCTypeParameter tree) {
- findPosition(tree, peek2(), tree.annotations);
- super.visitTypeParameter(tree);
- }
-
- private void copyNewClassAnnotationsToOwner(JCNewClass tree) {
- Symbol sym = tree.def.sym;
- final TypeAnnotationPosition pos =
- TypeAnnotationPosition.newObj(tree.pos);
- ListBuffer<Attribute.TypeCompound> newattrs = new ListBuffer<>();
-
- for (Attribute.TypeCompound old : sym.getRawTypeAttributes()) {
- newattrs.append(new Attribute.TypeCompound(old.type, old.values,
- pos));
- }
-
- sym.owner.appendUniqueTypeAttributes(newattrs.toList());
- }
-
- @Override
- public void visitNewClass(JCNewClass tree) {
- if (tree.def != null &&
- !tree.def.mods.annotations.isEmpty()) {
- JCClassDecl classdecl = tree.def;
- TypeAnnotationPosition pos;
-
- if (classdecl.extending == tree.clazz) {
- pos = TypeAnnotationPosition.classExtends(tree.pos);
- } else if (classdecl.implementing.contains(tree.clazz)) {
- final int index = classdecl.implementing.indexOf(tree.clazz);
- pos = TypeAnnotationPosition.classExtends(index, tree.pos);
- } else {
- // In contrast to CLASS elsewhere, typarams cannot occur here.
- throw new AssertionError("Could not determine position of tree " + tree);
- }
- Type before = classdecl.sym.type;
- separateAnnotationsKinds(classdecl, tree.clazz.type, classdecl.sym, pos);
- copyNewClassAnnotationsToOwner(tree);
- // classdecl.sym.type now contains an annotated type, which
- // is not what we want there.
- // TODO: should we put this type somewhere in the superclass/interface?
- classdecl.sym.type = before;
- }
-
- scan(tree.encl);
- scan(tree.typeargs);
- scan(tree.clazz);
- scan(tree.args);
-
- // The class body will already be scanned.
- // scan(tree.def);
- }
-
- @Override
- public void visitNewArray(JCNewArray tree) {
- findPosition(tree, tree, tree.annotations);
- int dimAnnosCount = tree.dimAnnotations.size();
- ListBuffer<TypePathEntry> depth = new ListBuffer<>();
-
- // handle annotations associated with dimensions
- for (int i = 0; i < dimAnnosCount; ++i) {
- ListBuffer<TypePathEntry> location =
- new ListBuffer<TypePathEntry>();
- if (i != 0) {
- depth = depth.append(TypePathEntry.ARRAY);
- location = location.appendList(depth.toList());
- }
- final TypeAnnotationPosition p =
- TypeAnnotationPosition.newObj(location.toList(),
- currentLambda,
- tree.pos);
-
- setTypeAnnotationPos(tree.dimAnnotations.get(i), p);
- }
-
- // handle "free" annotations
- // int i = dimAnnosCount == 0 ? 0 : dimAnnosCount - 1;
- // TODO: is depth.size == i here?
- JCExpression elemType = tree.elemtype;
- depth = depth.append(TypePathEntry.ARRAY);
- while (elemType != null) {
- if (elemType.hasTag(JCTree.Tag.ANNOTATED_TYPE)) {
- JCAnnotatedType at = (JCAnnotatedType)elemType;
- final ListBuffer<TypePathEntry> locationbuf =
- locateNestedTypes(elemType.type,
- new ListBuffer<TypePathEntry>());
- final List<TypePathEntry> location =
- locationbuf.toList().prependList(depth.toList());
- final TypeAnnotationPosition p =
- TypeAnnotationPosition.newObj(location, currentLambda,
- tree.pos);
- setTypeAnnotationPos(at.annotations, p);
- elemType = at.underlyingType;
- } else if (elemType.hasTag(JCTree.Tag.TYPEARRAY)) {
- depth = depth.append(TypePathEntry.ARRAY);
- elemType = ((JCArrayTypeTree)elemType).elemtype;
- } else if (elemType.hasTag(JCTree.Tag.SELECT)) {
- elemType = ((JCFieldAccess)elemType).selected;
- } else {
- break;
- }
- }
- scan(tree.elems);
- }
-
- private void findPosition(JCTree tree, JCTree frame, List<JCAnnotation> annotations) {
- if (!annotations.isEmpty()) {
- /*
- System.err.println("Finding pos for: " + annotations);
- System.err.println(" tree: " + tree + " kind: " + tree.getKind());
- System.err.println(" frame: " + frame + " kind: " + frame.getKind());
- */
- final TypeAnnotationPosition p =
- resolveFrame(tree, frame, frames.toList(), currentLambda, 0,
- new ListBuffer<TypePathEntry>());
- setTypeAnnotationPos(annotations, p);
- }
- }
-
- private void setTypeAnnotationPos(List<JCAnnotation> annotations,
- TypeAnnotationPosition position) {
- for (JCAnnotation anno : annotations) {
- // attribute might be null during DeferredAttr;
- // we will be back later.
- if (anno.attribute != null) {
- ((Attribute.TypeCompound) anno.attribute).position = position;
- }
- }
- }
-
- @Override
- public String toString() {
- return super.toString() + ": sigOnly: " + sigOnly;
- }
- }
-}
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 783f628..ba65311 100644
--- a/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -1212,17 +1212,38 @@
TypeRelation isSameTypeLoose = new LooseSameTypeVisitor();
private class LooseSameTypeVisitor extends SameTypeVisitor {
+
+ /** cache of the type-variable pairs being (recursively) tested. */
+ private Set<TypePair> cache = new HashSet<>();
+
@Override
boolean sameTypeVars(TypeVar tv1, TypeVar tv2) {
- return tv1.tsym == tv2.tsym && visit(tv1.getUpperBound(), tv2.getUpperBound());
+ return tv1.tsym == tv2.tsym && checkSameBounds(tv1, tv2);
}
@Override
protected boolean containsTypes(List<Type> ts1, List<Type> ts2) {
return containsTypeEquivalent(ts1, ts2);
}
- }
- /**
+ /**
+ * Since type-variable bounds can be recursive, we need to protect against
+ * infinite loops - where the same bounds are checked over and over recursively.
+ */
+ private boolean checkSameBounds(TypeVar tv1, TypeVar tv2) {
+ TypePair p = new TypePair(tv1, tv2, true);
+ if (cache.add(p)) {
+ try {
+ return visit(tv1.getUpperBound(), tv2.getUpperBound());
+ } finally {
+ cache.remove(p);
+ }
+ } else {
+ return false;
+ }
+ }
+ };
+
+ /**
* Strict type-equality relation - type variables are considered
* equals if they share the same object identity.
*/
@@ -3396,9 +3417,16 @@
class TypePair {
final Type t1;
final Type t2;
+ boolean strict;
+
TypePair(Type t1, Type t2) {
+ this(t1, t2, false);
+ }
+
+ TypePair(Type t1, Type t2, boolean strict) {
this.t1 = t1;
this.t2 = t2;
+ this.strict = strict;
}
@Override
public int hashCode() {
@@ -3409,8 +3437,8 @@
if (!(obj instanceof TypePair))
return false;
TypePair typePair = (TypePair)obj;
- return isSameType(t1, typePair.t1)
- && isSameType(t2, typePair.t2);
+ return isSameType(t1, typePair.t1, strict)
+ && isSameType(t2, typePair.t2, strict);
}
}
Set<TypePair> mergeCache = new HashSet<>();
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 04e475e..296c98a 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -29,12 +29,15 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.type.TypeKind;
import javax.tools.JavaFileObject;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.code.TypeAnnotationPosition.*;
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
@@ -259,36 +262,78 @@
* Compute an attribute from its annotation.
*********************************************************************/
- /** Process a single compound annotation, returning its
- * Attribute. Used from MemberEnter for attaching the attributes
- * to the annotated symbol.
+ /**
+ * Enter (and attribute) a single regular annotation, returning
+ * its Attribute. We give these annotations a position in case we
+ * end up creating a type annotation from using toTypeCompound.
+ *
+ * In some cases, namely on annotations that can never be type
+ * annotations (like package annotations), the position can be
+ * null; however, if this annotation is in a place where it might
+ * possibly denote a type annotation, it will have a non-null
+ * position.
+ *
+ * @param a Annotation to attribute.
+ * @param expected Expected annotation type.
+ * @param env The environment.
+ * @param position The type annotation position this will have if
+ * it's converted to a type annotation.
+ * @return The Attribute.Compound representing this annotation.
*/
Attribute.Compound enterAnnotation(JCAnnotation a,
Type expected,
- Env<AttrContext> env) {
- List<Pair<MethodSymbol,Attribute>> elems =
- enterAttributeValues(a, expected, env);
- Attribute.Compound ac = new Attribute.Compound(a.type, elems);
+ Env<AttrContext> env,
+ TypeAnnotationPosition position) {
+ List<Pair<MethodSymbol,Attribute>> buf =
+ enterAttributeValues(a, expected, env, position);
+ Attribute.Compound ac =
+ new Attribute.Compound(a.type, buf, position);
a.attribute = ac;
return ac;
}
+ /**
+ * Enter (and attribute) a single type annotation, returning its
+ * Attribute.
+ *
+ * Things are a bit complicated, though, because a single source
+ * annotation (JCAnnotation) might give rise to several bytecode
+ * annotations (Attribute.TypeCompound), but we can only associate
+ * a source annotation with one bytecode annotation. Thus, we
+ * have to distinguish between the "primary" (which will be stored
+ * to the JCAnnotation) and "secondary" (which won't) annotations.
+ * The primary place this gets used is for anonymous classes.
+ *
+ * The annotations we generate for the new instruction are the
+ * primary, and the ones we generate for the class are the
+ * secondaries. (Note: this choice is arbitrary, and it does not
+ * appear to cause any problems if these roles are reversed)
+ *
+ * @param a The annotation to attribute.
+ * @param expected The expected annotation type.
+ * @param env The environment.
+ * @param position The type annotation position to give the type
+ * annotation.
+ * @param secondaryAttr Whether or not this is a secondary (ie
+ * will ignore the .attribute field on a).
+ * @return The Attribute.TypeCompound representing the annotation.
+ */
Attribute.TypeCompound enterTypeAnnotation(JCAnnotation a,
Type expected,
- Env<AttrContext> env) {
- List<Pair<MethodSymbol,Attribute>> elems =
- enterAttributeValues(a, expected, env);
+ Env<AttrContext> env,
+ TypeAnnotationPosition position,
+ boolean secondaryAttr) {
+ List<Pair<MethodSymbol,Attribute>> buf =
+ enterAttributeValues(a, expected, env, position);
- if (a.attribute == null || !(a.attribute instanceof Attribute.TypeCompound)) {
+ // Secondary attr means we do not set the .attribute field of
+ // the JCAnnotation, nor do we pay attention to it.
+ if (!secondaryAttr || a.attribute == null ||
+ !(a.attribute instanceof Attribute.TypeCompound)) {
// Create a new TypeCompound
-
Attribute.TypeCompound tc =
- new Attribute.TypeCompound(a.type, elems,
- // TODO: Eventually, we will get rid of this use of
- // unknown, because we'll get a position from
- // MemberEnter (task 8027262).
- TypeAnnotationPosition.unknown);
+ new Attribute.TypeCompound(a.type, buf, position);
a.attribute = tc;
return tc;
} else {
@@ -297,10 +342,12 @@
}
}
+ // Attribute all the annotation's values.
private List<Pair<MethodSymbol,Attribute>>
enterAttributeValues(JCAnnotation a,
Type expected,
- Env<AttrContext> env) {
+ Env<AttrContext> env,
+ TypeAnnotationPosition position) {
// The annotation might have had its type attributed (but not
// checked) by attr.attribAnnotationTypes during MemberEnter,
// in which case we do not need to do it again.
@@ -325,13 +372,13 @@
JCExpression t = tl.head;
if (!t.hasTag(ASSIGN)) {
log.error(t.pos(), "annotation.value.must.be.name.value");
- enterAttributeValue(t.type = syms.errType, t, env);
+ enterAttributeValue(t.type = syms.errType, t, env, position);
continue;
}
JCAssign assign = (JCAssign)t;
if (!assign.lhs.hasTag(IDENT)) {
log.error(t.pos(), "annotation.value.must.be.name.value");
- enterAttributeValue(t.type = syms.errType, t, env);
+ enterAttributeValue(t.type = syms.errType, t, env, position);
continue;
}
JCIdent left = (JCIdent)assign.lhs;
@@ -346,7 +393,7 @@
if (method.owner != a.type.tsym && !isError)
log.error(left.pos(), "no.annotation.member", left.name, a.type);
Type result = method.type.getReturnType();
- Attribute value = enterAttributeValue(result, assign.rhs, env);
+ Attribute value = enterAttributeValue(result, assign.rhs, env, position);
if (!method.type.isErroneous())
buf.append(new Pair<>((MethodSymbol)method, value));
t.type = result;
@@ -357,6 +404,13 @@
Attribute enterAttributeValue(Type expected,
JCExpression tree,
Env<AttrContext> env) {
+ return enterAttributeValue(expected, tree, env, null);
+ }
+
+ Attribute enterAttributeValue(Type expected,
+ JCExpression tree,
+ Env<AttrContext> env,
+ TypeAnnotationPosition position) {
//first, try completing the attribution value sym - if a completion
//error is thrown, we should recover gracefully, and display an
//ordinary resolution diagnostic.
@@ -378,8 +432,7 @@
ListBuffer<Attribute> buf = new ListBuffer<>();
for (List<JCExpression> l = na.elems; l.nonEmpty(); l=l.tail) {
buf.append(enterAttributeValue(types.elemtype(expected),
- l.head,
- env));
+ l.head, env, position));
}
na.type = expected;
return new Attribute.
@@ -393,15 +446,13 @@
log.error(na.elemtype.pos(), "new.not.allowed.in.annotation");
}
for (List<JCExpression> l = na.elems; l.nonEmpty(); l=l.tail) {
- enterAttributeValue(syms.errType,
- l.head,
- env);
+ enterAttributeValue(syms.errType, l.head, env, position);
}
return new Attribute.Error(syms.errType);
}
if ((expected.tsym.flags() & Flags.ANNOTATION) != 0) {
if (tree.hasTag(ANNOTATION)) {
- return enterAnnotation((JCAnnotation)tree, expected, env);
+ return enterAnnotation((JCAnnotation)tree, expected, env, position);
} else {
log.error(tree.pos(), "annotation.value.must.be.annotation");
expected = syms.errType;
@@ -410,7 +461,7 @@
if (tree.hasTag(ANNOTATION)) { //error recovery
if (!expected.isErroneous())
log.error(tree.pos(), "annotation.not.valid.for.type", expected);
- enterAnnotation((JCAnnotation)tree, syms.errType, env);
+ enterAnnotation((JCAnnotation)tree, syms.errType, env, position);
return new Attribute.Error(((JCAnnotation)tree).annotationType.type);
}
if (expected.isPrimitive() ||
@@ -477,9 +528,11 @@
* synthesized container annotation or null IFF all repeating
* annotation are invalid. This method reports errors/warnings.
*/
- private <T extends Attribute.Compound> T processRepeatedAnnotations(List<T> annotations,
+ private <T extends Attribute.Compound> T processRepeatedAnnotations(
+ List<T> annotations,
AnnotationContext<T> ctx,
- Symbol on) {
+ Symbol on,
+ TypeAnnotationPosition position) {
T firstOccurrence = annotations.head;
List<Attribute> repeated = List.nil();
Type origAnnoType = null;
@@ -491,12 +544,8 @@
!annotations.tail.isEmpty()); // i.e. size() > 1
int count = 0;
- for (List<T> al = annotations;
- !al.isEmpty();
- al = al.tail)
- {
+ for (List<T> al = annotations; !al.isEmpty(); al = al.tail) {
count++;
-
// There must be more than a single anno in the annotation list
Assert.check(count > 1 || !al.tail.isEmpty());
@@ -536,26 +585,16 @@
new Pair<MethodSymbol, Attribute>(containerValueSymbol,
new Attribute.Array(arrayOfOrigAnnoType, repeated));
if (ctx.isTypeCompound) {
- /* TODO: the following code would be cleaner:
- Attribute.TypeCompound at = new Attribute.TypeCompound(targetContainerType, List.of(p),
- ((Attribute.TypeCompound)annotations.head).position);
- JCTypeAnnotation annoTree = m.TypeAnnotation(at);
- at = enterTypeAnnotation(annoTree, targetContainerType, ctx.env);
- */
- // However, we directly construct the TypeCompound to keep the
- // direct relation to the contained TypeCompounds.
- Attribute.TypeCompound at = new Attribute.TypeCompound(targetContainerType, List.of(p),
- ((Attribute.TypeCompound)annotations.head).position);
-
- // TODO: annotation applicability checks from below?
-
+ Attribute.TypeCompound at = new Attribute.TypeCompound(targetContainerType, List.of(p), position);
at.setSynthesized(true);
@SuppressWarnings("unchecked")
T x = (T) at;
return x;
} else {
- Attribute.Compound c = new Attribute.Compound(targetContainerType, List.of(p));
+ Attribute.Compound c = new Attribute.Compound(targetContainerType,
+ List.of(p),
+ position);
JCAnnotation annoTree = m.Annotation(c);
if (!chk.annotationApplicable(annoTree, on))
@@ -564,7 +603,7 @@
if (!chk.validateAnnotationDeferErrors(annoTree))
log.error(annoTree.pos(), "duplicate.annotation.invalid.repeated", origAnnoType);
- c = enterAnnotation(annoTree, targetContainerType, ctx.env);
+ c = enterAnnotation(annoTree, targetContainerType, ctx.env, position);
c.setSynthesized(true);
@SuppressWarnings("unchecked")
@@ -576,6 +615,7 @@
}
}
+
/** Fetches the actual Type that should be the containing annotation. */
private Type getContainingType(Attribute.Compound currentAnno,
DiagnosticPosition pos,
@@ -705,31 +745,53 @@
return fatalError ? null : containerValueSymbol;
}
+ /**
+ * First step of repeating annotations handling: go through a list
+ * of annotations, and gather up all the repeated ones into a map,
+ * which we use to build an AnnotationContext.
+ *
+ * Because we do this, we need to get all the annotations for a
+ * given AST node at once (ie. if we have "@A @B @A int foo;", we
+ * have to get "@A @B @A" at the same time).
+ *
+ * @param annotations The annotations being attached.
+ * @param env The environment.
+ * @param sym The symbol to which the annotations will be attached.
+ * @param creator The attribute creator used to enter the annotations.
+ * @param position The position for any type annotations.
+ * @return The AnnotaionContext for use in the next phase.
+ */
private <T extends Attribute.Compound> AnnotationContext<T>
prepareEnterAnnotations(List<JCAnnotation> annotations,
Env<AttrContext> env,
Symbol sym,
AttributeCreator<T> creator,
- boolean isTypeCompound) {
+ TypeAnnotationPosition position) {
Map<TypeSymbol, ListBuffer<T>> annotated = new LinkedHashMap<>();
Map<T, DiagnosticPosition> pos = new HashMap<>();
+ // Go through the annotation list, build up a map from
+ // annotation types to lists of annotations.
for (List<JCAnnotation> al = annotations; !al.isEmpty(); al = al.tail) {
JCAnnotation a = al.head;
- T c = creator.create(a, syms.annotationType, env);
+ T c = creator.create(a, syms.annotationType, env, position);
Assert.checkNonNull(c, "Failed to create annotation");
if (annotated.containsKey(a.type.tsym)) {
+ // Make sure we even allow repeating annotations.
if (!allowRepeatedAnnos) {
log.error(a.pos(), "repeatable.annotations.not.supported.in.source");
allowRepeatedAnnos = true;
}
+ // Append the annotation to the list for this kind of
+ // annotation.
ListBuffer<T> l = annotated.get(a.type.tsym);
l = l.append(c);
annotated.put(a.type.tsym, l);
pos.put(c, a.pos());
} else {
+ // We are seeing the first annotation of this kind.
annotated.put(a.type.tsym, ListBuffer.of(c));
pos.put(c, a.pos());
}
@@ -743,25 +805,54 @@
}
return new AnnotationContext<>(env, annotated, pos,
- isTypeCompound);
+ creator.createsTypeCompound());
}
- // Gather up annotations into a map from type symbols to lists of
- // Compound attributes, then continue on with repeating
- // annotations processing
+ /**
+ * Entry-point for repeating annotations handling. At this point,
+ * we should know the type annotation position, and we should have
+ * all the annotations for a given source location.
+ *
+ * We first gather up all the repeated annotations and build an
+ * AnnotationContext. Then create Placeholder's for any repeated
+ * annotations and send them further down the pipeline.
+ *
+ * Something to keep in mind here is that even if we are handling
+ * "declaration" annotations, it is still possible that those
+ * might turn into type annotations (consider "@A @B int foo;",
+ * for example).
+ *
+ * The pipeline uses a sort of continuation-passing like style,
+ * with creator and attacher. This allows two things. First, it
+ * allows for a single pipeline for repeating annotations,
+ * regardless of what eventually happens to the annotations.
+ * Second, it allows us to avoid some unsafe casts we would
+ * otherwise have to make.
+ *
+ * @param annotations The annotations to handle.
+ * @param env The environment.
+ * @param sym The symbol to which to attach annotations.
+ * @param position The position for type annotations.
+ * @param creator The creator to use to enter annotations.
+ * @param attacher The attacher to use to attach annotations.
+ */
private <T extends Attribute.Compound>
void attachAttributesLater(final List<JCAnnotation> annotations,
final Env<AttrContext> env,
final Symbol sym,
- final boolean isTypeCompound,
+ final TypeAnnotationPosition position,
final AttributeCreator<T> creator,
final AttributeAttacher<T> attacher) {
+ // First, gather up all the repeated annotations.
final AnnotationContext<T> ctx =
- prepareEnterAnnotations(annotations, env, sym, creator, isTypeCompound);
+ prepareEnterAnnotations(annotations, env, sym, creator, position);
final Map<Symbol.TypeSymbol, ListBuffer<T>> annotated =
ctx.annotated;
boolean hasRepeated = false;
+ // Now run through all the annotation types in the
+ // AnnotationContext. If there are any that have more than
+ // one entry, then we set up a Placeholder for them.
List<T> buf = List.<T>nil();
for (ListBuffer<T> lb : annotated.values()) {
if (lb.size() == 1) {
@@ -776,14 +867,62 @@
final List<T> attrs = buf.reverse();
- if (!isTypeCompound) {
+ if (!creator.createsTypeCompound()) {
// Attach declaration attributes early, so
// that @Repeatable and other annotations get attached.
// Since the attacher uses setDeclarationAttributes, this
// will be overwritten later.
- attacher.attach(sym, attrs);
+ //
+ // The root cause of this is that annotations are
+ // themselves defined using annotations. However, it is
+ // never the case that a type annotation affects the
+ // definition of an annotation, so we don't have to do
+ // this.
+ //
+ // We really should find a better way to do this.
+ @SuppressWarnings("unchecked")
+ List<Attribute.Compound> tempattrs = (List<Attribute.Compound>) attrs;
+ sym.setDeclarationAttributes(tempattrs);
}
+
if (hasRepeated) {
+ // If we have repeated annotations, then we go to the next
+ // pipeline step, which replaces all the placeholders.
+ replacePlaceholdersAndAttach(attrs, ctx, env, sym, attacher);
+ } else {
+ // If we don't have repeated annotations, then we still
+ // have to run the annotations through the rest of the
+ // pipeline.
+ //
+ // For type annotations, we might have error-reporting to
+ // do, and the attacher might end up attaching the
+ // annotation to the symbol's owner as well.
+ //
+ // For regular annotations, we might have a
+ // classifyingAttacher, in which case we have to pull the
+ // annotations off the symbol, classify them, and then put
+ // them in the right place.
+ attachAttributesAfterRepeated(attrs, env, attacher);
+ }
+ }
+
+ /**
+ * Next pipeline step for repeated annotations: replate all the
+ * placeholders, and then send the result further down the pipe.
+ *
+ * @param attrs The Attributes representing the annotations.
+ * @param ctx The AnnotationContext being used.
+ * @param env The environment.
+ * @param sym The symbol to which to attach annotations.
+ * @param attacher The attacher to use to attach annotations.
+ */
+ private <T extends Attribute.Compound>
+ void replacePlaceholdersAndAttach(final List<T> attrs,
+ final AnnotationContext<T> ctx,
+ final Env<AttrContext> env,
+ final Symbol sym,
+ final AttributeAttacher<T> attacher) {
+ // Set up a Worker.
repeated(new Annotate.Worker() {
@Override
public String toString() {
@@ -795,38 +934,493 @@
JavaFileObject oldSource =
log.useSource(env.toplevel.sourcefile);
try {
- attacher.attach(sym, replacePlaceholders(attrs, ctx, sym));
+ // Replace placeholders
+ final List<T> replaced =
+ replacePlaceholders(attrs, ctx, sym);
+ // Then send the result to the final pipeline stage.
+ attachAttributesAfterRepeated(replaced, env, attacher);
} finally {
log.useSource(oldSource);
}
}
});
+ }
+
+ /**
+ * Final pipeline stage. Simply use the attacher to deal with the
+ * annotations however we want to deal with them. Note that
+ * attachers may do a number of things, like attach annotations to
+ * other symbols (as is the case with some type annotations, which
+ * get attached to their symbol's owner as well), report errors,
+ * or even create copies (as is the case with classifyingAttacher)
+ *
+ * At this point, we have to be able to guarantee that we don't
+ * see any Placeholders.
+ *
+ * @param attrs The Attributes representing the annotations.
+ * @param env The environment.
+ * @param attacher The attacher we use to finish handling the
+ * annotations.
+ */
+ private <T extends Attribute.Compound>
+ void attachAttributesAfterRepeated(final List<T> attrs,
+ final Env<AttrContext> env,
+ final AttributeAttacher<T> attacher) {
+ // Set up a Worker that just calls the attacher.
+ afterRepeated(new Worker() {
+ @Override
+ public String toString() {
+ return "attach pass for: " + attrs;
+ }
+
+ @Override
+ public void run() {
+ JavaFileObject oldSource =
+ log.useSource(env.toplevel.sourcefile);
+ try {
+ attacher.attach(attrs);
+ } finally {
+ log.useSource(oldSource);
+ }
+ }
+ });
+ }
+
+ /**
+ * AttributeAttachers are similar to continuations. That contains
+ * the behavior of the final stage of the annotation pipeline,
+ * when we've creted Attributes (which have a type annotation
+ * position), and we've dealt with repeating annotations. Once we
+ * have done all that, we simply hand off the list of attributes
+ * to the attacher and let it do its work.
+ *
+ * If we didn't have the multiple deferred steps, we could
+ * implement this by returning a list of Attributes from a
+ * top-level method representing the entire repeating annotations
+ * pipeline. Since we have to handle annotations in multiple
+ * steps, we can't do that. Therefore, in this light, we can
+ * think of an attacher as being essentially a return
+ * continuation.
+ *
+ * We also have ways to "build" more complex attachers out of
+ * simple ones, such as classifyingAttacher. This allows us
+ * considerable flexibility in how we deal with annotations at the
+ * end of the pipeline (which is necessary, because there are a
+ * lot of cases).
+ */
+ public interface AttributeAttacher<T extends Attribute.Compound> {
+ public void attach(List<T> attrs);
+ }
+
+ /**
+ * An interface for describing error reporting behaviors for
+ * type-only annotations. Sometimes, we need to report errors if
+ * any annotations wind up being type-only annotations (the best
+ * example being for illegal scoping). But at the point where we
+ * know this, we don't always know if a given annotation will be a
+ * type-only annotation, a regular annotation, or both. So we
+ * have to defer the error-reporting until we do know.
+ */
+ public interface Reporter<T extends Attribute.Compound> {
+ public void report(List<T> attrs);
+ }
+
+ public enum AnnotationKind { DECLARATION, TYPE, BOTH }
+
+ public Attribute[] getTargetTypes(Attribute.Compound a) {
+ Attribute.Compound atTarget =
+ a.type.tsym.attribute(syms.annotationTargetType.tsym);
+ if (atTarget == null) {
+ return null;
+ }
+ Attribute atValue = atTarget.member(names.value);
+ Assert.check(atValue instanceof Attribute.Array);
+ return ((Attribute.Array) atValue).values;
+ }
+
+ public boolean hasTypeUseTarget(Attribute.Compound a,
+ boolean isTypeParameter) {
+ Attribute[] targets = getTargetTypes(a);
+ if (targets != null) {
+ for (Attribute app : targets) {
+ Assert.check(app instanceof Attribute.Enum);
+ Attribute.Enum e = (Attribute.Enum) app;
+ if (e.value.name == names.TYPE_USE ||
+ (isTypeParameter && e.value.name == names.TYPE_PARAMETER)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Determine whether an annotation is a declaration annotation,
+ * a type annotation, or both.
+ */
+ public AnnotationKind annotationKind(Attribute.Compound a, Symbol s) {
+ Attribute[] targets = getTargetTypes(a);
+ if (targets == null) {
+ return AnnotationKind.DECLARATION;
+ }
+ boolean isDecl = false, isType = false;
+ for (Attribute app : targets) {
+ Assert.check(app instanceof Attribute.Enum);
+ Attribute.Enum e = (Attribute.Enum) app;
+ if (e.value.name == names.TYPE) {
+ if (s.kind == Kinds.TYP) {
+ ElementKind skind = s.getKind();
+ // The only symbols we should see here correspond
+ // to definitions.
+ Assert.check(skind == ElementKind.ANNOTATION_TYPE ||
+ skind == ElementKind.INTERFACE ||
+ skind == ElementKind.ENUM ||
+ skind == ElementKind.CLASS);
+ isDecl = true;
+ }
+ } else if (e.value.name == names.FIELD) {
+ if (s.kind == Kinds.VAR &&
+ s.owner.kind != Kinds.MTH)
+ isDecl = true;
+ } else if (e.value.name == names.METHOD) {
+ if (s.kind == Kinds.MTH &&
+ !s.isConstructor())
+ isDecl = true;
+ } else if (e.value.name == names.PARAMETER) {
+ if (s.kind == Kinds.VAR &&
+ s.owner.kind == Kinds.MTH &&
+ (s.flags() & Flags.PARAMETER) != 0)
+ isDecl = true;
+ } else if (e.value.name == names.CONSTRUCTOR) {
+ if (s.kind == Kinds.MTH &&
+ s.isConstructor())
+ isDecl = true;
+ } else if (e.value.name == names.LOCAL_VARIABLE) {
+ if (s.kind == Kinds.VAR &&
+ s.owner.kind == Kinds.MTH &&
+ (s.flags() & Flags.PARAMETER) == 0)
+ isDecl = true;
+ } else if (e.value.name == names.ANNOTATION_TYPE) {
+ if (s.kind == Kinds.TYP &&
+ (s.flags() & Flags.ANNOTATION) != 0)
+ isDecl = true;
+ } else if (e.value.name == names.PACKAGE) {
+ if (s.kind == Kinds.PCK)
+ isDecl = true;
+ } else if (e.value.name == names.TYPE_USE) {
+ if (s.kind == Kinds.TYP ||
+ s.kind == Kinds.VAR ||
+ (s.kind == Kinds.MTH && !s.isConstructor() &&
+ !s.type.getReturnType().hasTag(TypeTag.VOID)) ||
+ (s.kind == Kinds.MTH && s.isConstructor()))
+ isType = true;
+ } else if (e.value.name == names.TYPE_PARAMETER) {
+ /* Irrelevant in this case: we will never see symbols
+ * that are type parameters, as we never attach
+ * declaration annotations to them. */
+ Assert.check(s.getKind() != ElementKind.TYPE_PARAMETER);
+ } else {
+ Assert.error("annotationKind(): unrecognized Attribute name " + e.value.name +
+ " (" + e.value.name.getClass() + ")");
+ }
+ }
+ if (isDecl && isType) {
+ return AnnotationKind.BOTH;
+ } else if (isType) {
+ return AnnotationKind.TYPE;
} else {
- attacher.attach(sym, attrs);
+ return AnnotationKind.DECLARATION;
}
}
- private interface AttributeAttacher<T extends Attribute.Compound> {
- public void attach(Symbol sym, List<T> attrs);
- }
-
- private final AttributeAttacher<Attribute.Compound> declAnnotationsAttacher =
- new AttributeAttacher<Attribute.Compound>() {
+ /**
+ * An attacher that just attaches annotations as declaration
+ * annotations. This is used in places where we know for a fact
+ * that type annotations cannot occur.
+ */
+ private AttributeAttacher<Attribute.Compound>
+ declAnnotationsAttacher(final Symbol sym) {
+ return new AttributeAttacher<Attribute.Compound>() {
@Override
- public void attach(Symbol sym, List<Attribute.Compound> attrs) {
+ public String toString() {
+ return "Attacher for strictly declaration annotations, for " +
+ sym;
+ }
+
+ @Override
+ public void attach(List<Attribute.Compound> attrs) {
sym.resetAnnotations();
sym.setDeclarationAttributes(attrs);
}
};
+ }
- private final AttributeAttacher<Attribute.TypeCompound> typeAnnotationsAttacher =
- new AttributeAttacher<Attribute.TypeCompound>() {
+ /**
+ * An attacher that just attaches annotations as type annotations.
+ * We use this in places where only type annotations can occur.
+ * The most common use for this is any annotation where we have to
+ * "parse" a type (arrays, inner classes, type arguments, bounds,
+ * etc.). We also use this for base types for non-declarations
+ * (ie. casts, instanceofs, etc). A more subtle case is for
+ * anonymous classes and receiver parameters, both of which cannot
+ * have regular annotations.
+ */
+ private AttributeAttacher<Attribute.TypeCompound>
+ typeAnnotationsAttacher(final Symbol sym) {
+ return new AttributeAttacher<Attribute.TypeCompound>() {
@Override
- public void attach(Symbol sym, List<Attribute.TypeCompound> attrs) {
- sym.appendUniqueTypeAttributes(attrs);
+ public String toString() {
+ return "Attacher for strictly type annotations, for " + sym;
+ }
+
+ @Override
+ public void attach(List<Attribute.TypeCompound> attrs) {
+ if (!attrs.isEmpty()) {
+ attachTypeAnnotations(sym, attrs);
+ }
}
};
+ }
+ /**
+ * Attach type-only annotations using an attacher, and run a
+ * reporter. Either the reporter or the attacher may be null, in
+ * which case we skip that step.
+ */
+ private AttributeAttacher<Attribute.TypeCompound>
+ reportingTypeAnnotationsAttacher(final AttributeAttacher<Attribute.TypeCompound> attacher,
+ final Reporter<Attribute.TypeCompound> reporter) {
+ return new AttributeAttacher<Attribute.TypeCompound>() {
+ @Override
+ public String toString() {
+ return "Error-reporting type annotation, attacher is: " + attacher +
+ "\n reporter is: " + reporter;
+ }
+
+ @Override
+ public void attach(List<Attribute.TypeCompound> attrs) {
+ if (attacher != null)
+ attacher.attach(attrs);
+
+ if (reporter != null)
+ reporter.report(attrs);
+ }
+ };
+ }
+
+ /**
+ * Attach type-only annotations to a symbol and also update the
+ * .type field on a tree (unless it is a package type). This is
+ * used to put annotations on to a type as well as a symbol.
+ */
+ private AttributeAttacher<Attribute.TypeCompound>
+ typeUpdatingTypeAnnotationsAttacher(final AttributeAttacher<Attribute.TypeCompound> attacher,
+ final JCTree tree) {
+ return new AttributeAttacher<Attribute.TypeCompound>() {
+ @Override
+ public String toString() {
+ return "Type-updating type annotation attacher, attacher is: " + attacher +
+ "\n tree is: " + tree;
+ }
+
+ @Override
+ public void attach(List<Attribute.TypeCompound> attrs) {
+ if (null != attacher)
+ attacher.attach(attrs);
+
+ if (!attrs.isEmpty() && !tree.type.hasTag(TypeTag.PACKAGE)) {
+ tree.type = tree.type.annotatedType(attrs);
+ }
+ }
+ };
+ }
+
+ /**
+ * A Reporter for illegal scoping. We set one of these up in
+ * TypeAnnotate whenever we are in a place that corresponds to a
+ * package or static class that cannot be annotated.
+ */
+ private void reportIllegalScoping(List<Attribute.TypeCompound> attrs,
+ int pos) {
+ switch (attrs.size()) {
+ case 0:
+ // Don't issue an error if all type annotations are
+ // also declaration annotations.
+ // If the annotations are also declaration annotations, they are
+ // illegal as type annotations but might be legal as declaration annotations.
+ // The normal declaration annotation checks make sure that the use is valid.
+ break;
+ case 1:
+ log.error(pos, "cant.type.annotate.scoping.1", attrs);
+ break;
+ default:
+ log.error(pos, "cant.type.annotate.scoping", attrs);
+ }
+ }
+
+ private Reporter<Attribute.TypeCompound>
+ illegalScopingReporter(final int pos) {
+ return new Reporter<Attribute.TypeCompound>() {
+ @Override
+ public String toString() {
+ return "Illegal scoping reporter at position " + pos;
+ }
+
+ @Override
+ public void report(List<Attribute.TypeCompound> attrs) {
+ reportIllegalScoping(attrs, pos);
+ }
+ };
+ }
+
+ // Create the "simple case": just attach type and regular
+ // annotations, no reporting.
+ private AttributeAttacher<Attribute.Compound>
+ classifyingAttacher(final Symbol sym) {
+ return classifyingAttacher(sym, declAnnotationsAttacher(sym),
+ typeAnnotationsAttacher(sym),
+ null);
+ }
+
+
+ /**
+ * Build an attacher for handling the case where we have
+ * annotations, but we don't know for sure whether they are
+ * declaration annotations, type annotations, or both.
+ *
+ * We do this by taking an attacher for declaration annotations,
+ * another one for type annotations, and (possibly) a reporter for
+ * type-only annotations. We then use the logic from
+ * annotationKind to figure out what kind each annotation is and
+ * deal with it accordingly.
+ *
+ * Any of the declAttacher, the typeAttacher, or the Reporter can
+ * be null, in which case we skip it.
+ *
+ * We have to have the reporter *separate* from the type
+ * annotation attacher, because we might be attaching type
+ * annotations that are also declaration annotations. But the
+ * semantics of reporters are that they get called for type-only
+ * annotations. For an example of where this matters, consider
+ * "@A java.lang.Object foo;", where @A can annotate packages and
+ * type uses. We would create the classifyingAttacher with null
+ * for the type attacher and an illegal scoping reporter. Both
+ * attachers would end up getting called on @A (which, we'd skip
+ * the type attacher, because it's null), the result being that @A
+ * goes on foo as a declaration annotation. The reporter would
+ * not get called, because there are no type-only annotations.
+ * However, if @A can only annotate type uses, then it's a
+ * type-only annotation, and we report an illegal scoping error.
+ *
+ * Note: there is a case where we want both attachers to be null:
+ * speculative attribution.
+ *
+ * @param sym The symbol to which to attach annotations.
+ * @param declAttacher The attacher to use for declaration (and
+ * both) annotations, or null.
+ * @param typeAttacher The attacher to use for type (and both)
+ * annotations, or null.
+ * @param reporter The reporter to use for type-only annotations, or null.
+ * @return The created attacher.
+ */
+ private AttributeAttacher<Attribute.Compound>
+ classifyingAttacher(final Symbol sym,
+ final AttributeAttacher<Attribute.Compound> declAttacher,
+ final AttributeAttacher<Attribute.TypeCompound> typeAttacher,
+ final Reporter<Attribute.TypeCompound> reporter) {
+ return new AttributeAttacher<Attribute.Compound>() {
+ @Override
+ public String toString() {
+ return "Classifying attacher, attaching to " + sym +
+ "\n declaration annotation attacher is: " + declAttacher +
+ "\n type annotation attacher is: " + typeAttacher +
+ "\n reporter for strictly type annotations is: " + reporter;
+ }
+
+ @Override
+ public void attach(List<Attribute.Compound> attrs) {
+ // We sort annotations into "buckets" based on what
+ // kind they are.
+ ListBuffer<Attribute.Compound> declAnnos = new ListBuffer<>();
+ ListBuffer<Attribute.TypeCompound> typeAnnos = new ListBuffer<>();
+ // We also need to keep track of the type-only
+ // annotations, in case we have a reporting action.
+ ListBuffer<Attribute.TypeCompound> onlyTypeAnnos = new ListBuffer<>();
+
+ for (Attribute.Compound a : attrs) {
+ Assert.check(!(a instanceof Placeholder),
+ "Placeholders found in annotations being attached!");
+ switch (annotationKind(a, sym)) {
+ case DECLARATION:
+ declAnnos.append(a);
+ break;
+ case BOTH: {
+ declAnnos.append(a);
+ Attribute.TypeCompound ta = a.toTypeCompound();
+ Assert.checkNonNull(ta.position);
+ typeAnnos.append(ta);
+ break;
+ }
+ case TYPE: {
+ Attribute.TypeCompound ta = a.toTypeCompound();
+ Assert.checkNonNull(ta.position);
+ typeAnnos.append(ta);
+ // Also keep track which annotations are only type annotations
+ onlyTypeAnnos.append(ta);
+ break;
+ }
+ default:
+ throw new AssertionError("Unknown annotation type");
+ }
+ }
+
+ if (declAttacher != null)
+ declAttacher.attach(declAnnos.toList());
+
+ if (typeAttacher != null)
+ typeAttacher.attach(typeAnnos.toList());
+
+ if (reporter != null)
+ reporter.report(onlyTypeAnnos.toList());
+ }
+ };
+ }
+
+ /**
+ * Actually attach a list of type annotations to a symbol. For
+ * variables defined in methods, we need to attach to both the
+ * variable symbol, as well as the method symbol. This takes care
+ * of that.
+ *
+ * @param sym The symbol to which to attach.
+ * @param attrs The annotations to attach.
+ */
+ public void attachTypeAnnotations(Symbol sym, List<Attribute.TypeCompound> attrs) {
+ sym.appendUniqueTypeAttributes(attrs);
+
+ // For type annotations on variables in methods, make
+ // sure they are attached to the owner too.
+ switch(sym.getKind()) {
+ case PARAMETER:
+ case LOCAL_VARIABLE:
+ case RESOURCE_VARIABLE:
+ case EXCEPTION_PARAMETER:
+ // Make sure all type annotations from the symbol are also
+ // on the owner.
+ sym.owner.appendUniqueTypeAttributes(attrs);
+ break;
+ }
+ }
+
+ /**
+ * Final task for repeating annotations: go through a list of
+ * Attributes and replace all the placeholders with containers.
+ *
+ * @param buf The list of Attributes.
+ * @param ctx The AnnotationContext.
+ * @param sym The symbol to which we are attaching.
+ * @return The list of attributes with all placeholders replaced.
+ */
private <T extends Attribute.Compound> List<T>
replacePlaceholders(List<T> buf,
Annotate.AnnotationContext<T> ctx,
@@ -848,13 +1442,16 @@
return result.reverse();
}
+ /**
+ * Replace one placeholder with a container.
+ */
private <T extends Attribute.Compound> T replaceOne(Placeholder<T> placeholder,
Annotate.AnnotationContext<T> ctx,
Symbol sym) {
// Process repeated annotations
T validRepeated =
processRepeatedAnnotations(placeholder.getPlaceholderFor(),
- ctx, sym);
+ ctx, sym, placeholder.position);
if (validRepeated != null) {
// Check that the container isn't manually
@@ -875,16 +1472,65 @@
* Annotation processing
*********************************************************************/
- /** Queue annotations for later processing. */
+ /**
+ * Run a list of annotations through the repeating annotations
+ * pipeline, and attach them. We don't have any diagnostic
+ * position.
+ */
+ void annotateLater(final List<JCAnnotation> annotations,
+ final Env<AttrContext> localEnv,
+ final Symbol s) {
+ annotateLater(annotations, localEnv, s, null);
+ }
+
+ /**
+ * Run a list of annotations through the repeating annotations
+ * pipeline and attach them. This is for when we have annotations
+ * that cannot possibly be type annotations (thus, we have no type
+ * annotation position).
+ */
void annotateLater(final List<JCAnnotation> annotations,
final Env<AttrContext> localEnv,
final Symbol s,
final DiagnosticPosition deferPos) {
+ // Only attach declaration annotations.
+ doAnnotateLater(annotations, localEnv, s, deferPos, null,
+ declAnnotationsAttacher(s));
+ }
+
+ /**
+ * Run a list of annotations through the repeating annotation
+ * pipeline, and then classify and attach them. This is used
+ * whenever we have annotations that might be regular annotations,
+ * type annotations, or both.
+ */
+ void annotateWithClassifyLater(final List<JCAnnotation> annotations,
+ final Env<AttrContext> localEnv,
+ final Symbol s,
+ final DiagnosticPosition deferPos,
+ final TypeAnnotationPosition tapos) {
+ // Set up just the basic classifying attacher.
+ doAnnotateLater(annotations, localEnv, s, deferPos, tapos,
+ classifyingAttacher(s));
+ }
+
+ /**
+ * Set up a worker for handling annotations without parsing a type tree.
+ */
+ private void doAnnotateLater(final List<JCAnnotation> annotations,
+ final Env<AttrContext> localEnv,
+ final Symbol s,
+ final DiagnosticPosition deferPos,
+ final TypeAnnotationPosition tapos,
+ final AttributeAttacher<Attribute.Compound> attacher) {
if (annotations.isEmpty()) {
return;
}
+ // Mark annotations as incomplete for now.
+ //
+ // This should probably get redesigned at some point.
if (s.kind != PCK) {
- s.resetAnnotations(); // mark Annotations as incomplete for now
+ s.resetAnnotations();
}
normal(new Annotate.Worker() {
@Override
@@ -894,12 +1540,44 @@
@Override
public void run() {
+ annotateNow(annotations, localEnv, s, deferPos,
+ tapos, attacher);
+ }
+ });
+
+ validate(annotationValidator(annotations, localEnv, s));
+ }
+
+ /**
+ * Run a list of declaration (meaning they are in a declaration
+ * position) annotations through the repeating annotations
+ * pipeline.
+ *
+ * Note that in some cases, these annotations might end up being
+ * type annotations, or both declaration and type annotations.
+ *
+ * @param annotations The annotations to handle.
+ * @param localEnv the environment.
+ * @param s The symbol to which to attach.
+ * @param deferPos The diagnostic position to use.
+ * @param position The type annotation position to use if some of
+ * the annotations end up being type annotations.
+ * @param attacher The attacher to use.
+ */
+ private void annotateNow(final List<JCAnnotation> annotations,
+ final Env<AttrContext> localEnv,
+ final Symbol s,
+ final DiagnosticPosition deferPos,
+ final TypeAnnotationPosition position,
+ final AttributeAttacher<Attribute.Compound> attacher) {
+ if (annotations.isEmpty()) {
+ return;
+ }
Assert.check(s.kind == PCK || s.annotationsPendingCompletion());
JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
- DiagnosticPosition prevLintPos =
- deferPos != null
- ? deferredLintHandler.setPos(deferPos)
- : deferredLintHandler.immediate();
+ DiagnosticPosition prevLintPos = deferPos != null ?
+ deferredLintHandler.setPos(deferPos) :
+ deferredLintHandler.immediate();
Lint prevLint = deferPos != null ? null : chk.setLint(lint);
try {
if (s.hasAnnotations() &&
@@ -907,7 +1585,7 @@
log.error(annotations.head.pos,
"already.annotated",
kindName(s), s);
- actualEnterAnnotations(annotations, localEnv, s);
+ actualEnterAnnotations(annotations, localEnv, s, position, attacher);
} finally {
if (prevLint != null)
chk.setLint(prevLint);
@@ -915,9 +1593,12 @@
log.useSource(prev);
}
}
- });
- validate(new Annotate.Worker() { //validate annotations
+ // Set up a validator to enforce some rules on regular annotations.
+ private Annotate.Worker annotationValidator(final List<JCAnnotation> annotations,
+ final Env<AttrContext> localEnv,
+ final Symbol s) {
+ return new Annotate.Worker() { //validate annotations
@Override
public void run() {
JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
@@ -927,52 +1608,140 @@
log.useSource(prev);
}
}
- });
+ };
}
+ private void checkForDeclarationAnnotations(List<? extends JCAnnotation> annotations,
+ boolean isTypeParameter) {
+ // Ensure that no declaration annotations are present.
+ // Note that a tree type might be an AnnotatedType with
+ // empty annotations, if only declaration annotations were given.
+ // This method will raise an error for such a type.
+ for (JCAnnotation ai : annotations) {
+ Assert.checkNonNull(ai.type);
+ Assert.checkNonNull(ai.attribute);
+
+ if (!ai.type.isErroneous() &&
+ !hasTypeUseTarget(ai.attribute, isTypeParameter)) {
+ log.error(ai.pos(), "annotation.type.not.applicable");
+ }
+ }
+ }
+
+ // Set up a validator to enforce some rules on type annotations.
+ // In addition to those enforced by Check.validateTypeAnnotations,
+ // this enforces that declaration annotations cannot occur on type
+ // parameters.
+ private Annotate.Worker typeAnnotationValidator(final List<JCAnnotation> annotations,
+ final Env<AttrContext> localEnv,
+ final boolean isTypeParameter) {
+ return new Annotate.Worker() { //validate annotations
+ @Override
+ public void run() {
+ JavaFileObject prev = log.useSource(localEnv.toplevel.sourcefile);
+ try {
+ checkForDeclarationAnnotations(annotations, isTypeParameter);
+ chk.validateTypeAnnotations(annotations, isTypeParameter);
+ } finally {
+ log.useSource(prev);
+ }
+ }
+ };
+ }
+
+ /**
+ * This is an interface that wraps up the functionality of
+ * enterAnnotations and enterTypeAnnotations. This allows some
+ * code duplication to be removed from the original repeating
+ * annotations pipeline. It also allows for some unsafe casts to
+ * be eliminated.
+ *
+ * Note: when Lambdas can be used in the compiler, we can just use
+ * method refs for enterAnnotations and enterTypeAnnotations.
+ */
private interface AttributeCreator<T extends Attribute.Compound> {
- public T create(JCAnnotation a, Type expected, Env<AttrContext> env);
+ public T create(JCAnnotation a,
+ Type expected,
+ Env<AttrContext> env,
+ TypeAnnotationPosition position);
+ public abstract boolean createsTypeCompound();
}
- // TODO: When SE8 features can be used, these can go away and be
- // replaced by method refs.
+ // Note: try to avoid doing anything that makes these any more
+ // than just the equivalent of method refs in a pre-lambda
+ // setting. That way, they can go away when we are allowed to use
+ // lambda.
private final AttributeCreator<Attribute.Compound> enterAnnotationsCreator =
new AttributeCreator<Attribute.Compound>() {
@Override
+ public String toString() {
+ return "Attribute creator for regular declaration annotations";
+ }
+
+ @Override
public Attribute.Compound create(JCAnnotation a,
Type expected,
- Env<AttrContext> env) {
- return enterAnnotation(a, syms.annotationType, env);
+ Env<AttrContext> env,
+ TypeAnnotationPosition position) {
+ return enterAnnotation(a, syms.annotationType, env, position);
}
+
+ @Override
+ public boolean createsTypeCompound() { return false; }
};
- private final AttributeCreator<Attribute.TypeCompound> enterTypeAnnotationsCreator =
- new AttributeCreator<Attribute.TypeCompound>() {
+
+ private AttributeCreator<Attribute.TypeCompound>
+ enterTypeAnnotationsCreator(final boolean secondaryAttr) {
+ return new AttributeCreator<Attribute.TypeCompound>() {
+ @Override
+ public String toString() {
+ if (!secondaryAttr) {
+ return "Attribute creator for regular type annotations";
+ } else {
+ return "Attribute creator for regular type annotations, ignores cached attributes";
+ }
+ }
+
@Override
public Attribute.TypeCompound create(JCAnnotation a,
Type expected,
- Env<AttrContext> env) {
- return enterTypeAnnotation(a, syms.annotationType, env);
+ Env<AttrContext> env,
+ TypeAnnotationPosition position) {
+ return enterTypeAnnotation(a, syms.annotationType,
+ env, position, secondaryAttr);
}
- };
- /** Enter a set of annotations. */
- private void actualEnterAnnotations(List<JCAnnotation> annotations,
- Env<AttrContext> env,
- Symbol s) {
- Assert.checkNonNull(s, "Symbol argument to actualEnterAnnotations is null");
- attachAttributesLater(annotations, env, s, false,
- enterAnnotationsCreator,
- declAnnotationsAttacher);
+ @Override
+ public boolean createsTypeCompound() { return true; }
+ };
}
- /*
- * If the symbol is non-null, attach the type annotation to it.
+ /**
+ * Send a list of annotations (which occurred in a declaration
+ * position) into the repeating annotations pipeline.
+ */
+ private void actualEnterAnnotations(List<JCAnnotation> annotations,
+ Env<AttrContext> env,
+ Symbol s,
+ TypeAnnotationPosition position,
+ AttributeAttacher<Attribute.Compound> attacher) {
+ Assert.checkNonNull(s);
+ attachAttributesLater(annotations, env, s, position,
+ enterAnnotationsCreator, attacher);
+ }
+
+ /**
+ * Send a list of annotations (which occurred in a type-use
+ * position) into the repeating annotations pipeline.
*/
private void actualEnterTypeAnnotations(final List<JCAnnotation> annotations,
final Env<AttrContext> env,
final Symbol s,
- final DiagnosticPosition deferPos) {
- Assert.checkNonNull(s, "Symbol argument to actualEnterTypeAnnotations is nul/");
+ final DiagnosticPosition deferPos,
+ final boolean secondaryAttr,
+ final TypeAnnotationPosition position,
+ final AttributeAttacher<Attribute.TypeCompound> attacher) {
+ Assert.checkNonNull(s);
JavaFileObject prev = log.useSource(env.toplevel.sourcefile);
DiagnosticPosition prevLintPos = null;
@@ -980,9 +1749,9 @@
prevLintPos = deferredLintHandler.setPos(deferPos);
}
try {
- attachAttributesLater(annotations, env, s, true,
- enterTypeAnnotationsCreator,
- typeAnnotationsAttacher);
+ attachAttributesLater(annotations, env, s, position,
+ enterTypeAnnotationsCreator(secondaryAttr),
+ attacher);
} finally {
if (prevLintPos != null)
deferredLintHandler.setPos(prevLintPos);
@@ -990,11 +1759,114 @@
}
}
+ /**
+ * Given a type tree, walk down it and handle any annotations we
+ * find.
+ *
+ * @param tree The type tree to scan.
+ * @param env The environment.
+ * @param sym The symbol to which to attach any annotations we
+ * might find.
+ * @param deferPos The diagnostic position to use.
+ * @param creator The creator to use for making positions.
+ */
public void annotateTypeLater(final JCTree tree,
final Env<AttrContext> env,
final Symbol sym,
- final DiagnosticPosition deferPos) {
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator) {
+ doAnnotateTypeLater(tree, List.<JCAnnotation>nil(), env,
+ sym, deferPos, creator, false, false);
+ }
+
+ /**
+ * Given a type tree, walk down it and handle any annotations we
+ * find. We also have a set of base-type annotations (which
+ * occurred in a declaration position in source), which may either
+ * be declaration annotations or annotations on the base type.
+ * For an example, in "@A int @B []", we would have the type tree
+ * "int @B []" with base-type annotations "@A".
+ *
+ * @param tree The type tree to scan.
+ * @param baseTypeAnnos The base-type annotations.
+ * @param env The environment.
+ * @param sym The symbol to which to attach any annotations we
+ * might find.
+ * @param deferPos The diagnostic position to use.
+ * @param creator The creator to use for making positions.
+ */
+ public void annotateTypeLater(final JCTree tree,
+ final List<JCAnnotation> baseTypeAnnos,
+ final Env<AttrContext> env,
+ final Symbol sym,
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator) {
+ doAnnotateTypeLater(tree, baseTypeAnnos, env, sym, deferPos,
+ creator, false, false);
+ }
+
+ /**
+ * Given a type tree, walk down it and handle any annotations we
+ * find. We also have a set of base-type annotations (which
+ * occurred in a declaration position in source), which must be
+ * type annotations on the base type.
+ *
+ * @param tree The type tree to scan.
+ * @param baseTypeAnnos The base-type annotations.
+ * @param env The environment.
+ * @param sym The symbol to which to attach any annotations we
+ * might find.
+ * @param deferPos The diagnostic position to use.
+ * @param creator The creator to use for making positions.
+ */
+ public void annotateStrictTypeLater(final JCTree tree,
+ final List<JCAnnotation> baseTypeAnnos,
+ final Env<AttrContext> env,
+ final Symbol sym,
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator) {
+ doAnnotateTypeLater(tree, baseTypeAnnos, env, sym, deferPos,
+ creator, true, false);
+ }
+
+ /**
+ * Given a type tree representing an anonymous class' supertype,
+ * walk down it and handle any annotations we find. We also have
+ * a set of base-type annotations (which occurred in a declaration
+ * position in source), which must be type annotations on the base
+ * type.
+ *
+ * @param tree The type tree to scan.
+ * @param baseTypeAnnos The base-type annotations.
+ * @param env The environment.
+ * @param sym The symbol to which to attach any annotations we
+ * might find.
+ * @param deferPos The diagnostic position to use.
+ * @param creator The creator to use for making positions.
+ */
+ public void annotateAnonClassDefLater(final JCTree tree,
+ final List<JCAnnotation> baseTypeAnnos,
+ final Env<AttrContext> env,
+ final Symbol sym,
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator) {
+ doAnnotateTypeLater(tree, baseTypeAnnos, env, sym, deferPos,
+ creator, true, true);
+ }
+
+ // The combined worker function for the annotateTypeLater family.
+ public void doAnnotateTypeLater(final JCTree tree,
+ final List<JCAnnotation> baseTypeAnnos,
+ final Env<AttrContext> env,
+ final Symbol sym,
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator,
+ final boolean onlyTypeAnnos,
+ final boolean secondaryAttr) {
Assert.checkNonNull(sym);
+ Assert.checkNonNull(baseTypeAnnos);
+ Assert.checkNonNull(creator);
+
normal(new Annotate.Worker() {
@Override
public String toString() {
@@ -1002,93 +1874,912 @@
}
@Override
public void run() {
- tree.accept(new TypeAnnotate(env, sym, deferPos));
+ if (!baseTypeAnnos.isEmpty()) {
+ sym.resetAnnotations(); // mark Annotations as incomplete for now
+ }
+
+ tree.accept(typeAnnotator(baseTypeAnnos, sym, env, deferPos,
+ creator, onlyTypeAnnos,
+ secondaryAttr));
}
});
}
/**
- * We need to use a TreeScanner, because it is not enough to visit the top-level
- * annotations. We also need to visit type arguments, etc.
+ * A client passed into various visitors that takes a type path as
+ * an argument and performs an action (typically creating a
+ * TypeAnnotationPosition and then creating a {@code Worker} and
+ * adding it to a queue.
+ */
+ public abstract class PositionCreator {
+ public abstract TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex);
+ }
+
+ // For when we don't have a creator. Throws an exception.
+ public final PositionCreator noCreator =
+ new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Sentinel null position creator";
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ throw new AssertionError("No annotation position creator registered");
+ }
+ };
+
+ // For when we are creating annotations that will inevitably
+ // trigger errors. Creates null.
+ public final PositionCreator errorCreator =
+ new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for annotations that represent errors";
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return null;
+ }
+ };
+
+ // Create class extension positions
+ public final PositionCreator extendsCreator =
+ new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for extends";
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.classExtends(path, lambda, -1);
+ }
+ };
+
+ // Create interface implementation positions
+ public PositionCreator implementsCreator(final int idx) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for implements, index " + idx;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.classExtends(path, lambda, idx, -1);
+ }
+ };
+ }
+
+ // Create method parameter positions
+ public final PositionCreator paramCreator(final int idx) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for parameter " + idx;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.methodParameter(path, lambda, idx, -1);
+ }
+ };
+ }
+
+ // Create class type parameter positions
+ public PositionCreator typeParamCreator(final int idx) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for class type parameter " + idx;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.typeParameter(path, lambda, idx, -1);
+ }
+ };
+ }
+
+ public PositionCreator typeParamBoundCreator(final JCTypeParameter typaram,
+ final int param_idx,
+ final int bound_idx) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for class type parameter " + param_idx +
+ ", bound " + bound_idx;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ final int real_bound_idx =
+ typaram.bounds.head.type.isInterface() ? bound_idx + 1 : bound_idx;
+ return TypeAnnotationPosition
+ .typeParameterBound(path, lambda, param_idx, real_bound_idx, -1);
+ }
+ };
+ }
+
+ // Create field positions
+ public final PositionCreator fieldCreator =
+ new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for field declaration";
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.field(path, lambda, -1);
+ }
+ };
+
+ // Create local variable positions
+ public PositionCreator localVarCreator(final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for local variable declaration at " +
+ pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.localVariable(path, lambda, pos);
+ }
+ };
+ }
+
+ // Create resource variable positions.
+ public PositionCreator resourceVarCreator(final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for resource variable declaration at " +
+ pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.resourceVariable(path, lambda, pos);
+ }
+ };
+ }
+
+ // Create exception parameter positions.
+ public PositionCreator exceptionParamCreator(final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for exception param declaration at " +
+ pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.exceptionParameter(path, lambda,
+ typeIndex, pos);
+ }
+ };
+ }
+
+ // Create constructor reference type argument positions.
+ public PositionCreator constructorRefTypeArgCreator(final int idx,
+ final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for constructor reference type argument " + idx +
+ " at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition
+ .constructorRefTypeArg(path, lambda, idx, pos);
+ }
+ };
+ }
+
+ public PositionCreator methodInvokeTypeArgCreator(final int idx,
+ final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for method invoke type argument " + idx +
+ " at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.methodInvocationTypeArg(path, lambda, idx, pos);
+ }
+ };
+ }
+
+ public PositionCreator methodTypeParamCreator(final int idx) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for method type parameter " + idx;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.methodTypeParameter(path, lambda, idx, -1);
+ }
+ };
+ }
+
+ public PositionCreator methodTypeParamBoundCreator(final JCTypeParameter typaram,
+ final int param_idx,
+ final int bound_idx) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for method type parameter " + param_idx +
+ " bound " + bound_idx;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ final int real_bound_idx =
+ typaram.bounds.head.type.isInterface() ? bound_idx + 1 : bound_idx;
+ return TypeAnnotationPosition
+ .methodTypeParameterBound(path, lambda, param_idx, real_bound_idx, -1);
+ }
+ };
+ }
+
+ public PositionCreator throwCreator(final int idx) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for throw, type index " + idx;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.methodThrows(path, lambda, idx, -1);
+ }
+ };
+ }
+
+ public final PositionCreator returnCreator =
+ new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for method return type";
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.methodReturn(path, lambda, -1);
+ }
+ };
+
+ public PositionCreator receiverCreator =
+ new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for method receiver parameter type";
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.methodReceiver(path, lambda, -1);
+ }
+ };
+
+ public PositionCreator methodRefCreator(final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for method reference at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.methodRef(path, lambda, pos);
+ }
+ };
+ }
+
+ public PositionCreator methodRefTypeArgCreator(final int idx,
+ final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for method reference type argument " + idx +
+ " at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.methodRefTypeArg(path, lambda, idx, pos);
+ }
+ };
+ }
+
+ public PositionCreator constructorRefCreator(final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for constructor reference at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.constructorRef(path, lambda, pos);
+ }
+ };
+ }
+
+ public PositionCreator constructorInvokeTypeArgCreator(final int idx,
+ final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for constructor invoke type argument " + idx +
+ " at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.constructorInvocationTypeArg(path, lambda, idx, pos);
+ }
+ };
+ }
+
+ public PositionCreator instanceOfCreator(final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for instanceof at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.instanceOf(path, lambda, pos);
+ }
+ };
+ }
+
+ public PositionCreator newObjCreator(final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for new at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.newObj(path, lambda, pos);
+ }
+ };
+ }
+
+ public PositionCreator castCreator(final int pos) {
+ return new PositionCreator() {
+ @Override
+ public String toString() {
+ return "Position creator for cast at " + pos;
+ }
+
+ @Override
+ public TypeAnnotationPosition create(List<TypePathEntry> path,
+ JCLambda lambda,
+ int typeIndex) {
+ return TypeAnnotationPosition.typeCast(path, lambda, typeIndex, pos);
+ }
+ };
+ }
+
+ public static List<TypePathEntry> makeInners(Type type) {
+ return addInners(type, List.<TypePathEntry>nil());
+ }
+
+ private static List<TypePathEntry> addInners(Type type,
+ List<TypePathEntry> typepath) {
+ Type encl = type.getEnclosingType();
+ while (encl != null && encl.getKind() != TypeKind.NONE &&
+ encl.getKind() != TypeKind.ERROR) {
+ typepath = typepath.append(TypePathEntry.INNER_TYPE);
+ encl = encl.getEnclosingType();
+ }
+ return typepath;
+ }
+
+ /**
+ * Set up the visitor to scan the type tree and handle any
+ * annotations we find. If we are in speculative attribution, we
+ * will not actually attach anything, we will just enter the
+ * annotations and run them through the pipeline to pick up any
+ * errors that might occur.
+ *
+ * @param baseTypeAnnos Annotations on the base type, which need
+ * to be classified if onlyTypeAnnos is false.
+ * @param sym The symbol to which to attach.
+ * @param env The environment.
+ * @param creator The position creator to use.
+ * @param onlyTypeAnnos Whether or not baseTypeAnnos can represent
+ * declaration annotations.
+ * @param secondaryAttr Whether or not we are creating secondary
+ * attributes (see enterTypeAnnotations).
+ */
+ public TypeAnnotate typeAnnotator(final List<JCAnnotation> baseTypeAnnos,
+ final Symbol sym,
+ final Env<AttrContext> env,
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator,
+ final boolean onlyTypeAnnos,
+ final boolean secondaryAttr) {
+ if (!env.info.isSpeculative) {
+ return new TypeAnnotate(baseTypeAnnos, sym, env, deferPos, creator,
+ declAnnotationsAttacher(sym),
+ typeAnnotationsAttacher(sym),
+ onlyTypeAnnos, secondaryAttr);
+ } else {
+ return new TypeAnnotate(baseTypeAnnos, sym, env, deferPos, creator,
+ null, null, onlyTypeAnnos, secondaryAttr);
+ }
+ }
+
+ /**
+ * A visitor that scans a type tree and handles an annotations it finds.
+ *
*/
private class TypeAnnotate extends TreeScanner {
- private final Env<AttrContext> env;
+ // The creator we use to create positions.
+ protected PositionCreator creator;
+ // The current type path
+ private List<TypePathEntry> typepath = List.nil();
+ // The current innermost lambda
+ private JCLambda currentLambda;
+ // The current type index, if we are looking at an
+ // intersection type.
+ private int type_index = 0;
+ // Whether or not we are looking at the innermost type. This
+ // gets used to figure out where to attach base type
+ // annotations.
+ private boolean innermost;
+ // The attachers and reporter we use.
+ private AttributeAttacher<Attribute.Compound> declAttacher;
+ private AttributeAttacher<Attribute.TypeCompound> typeAttacher;
+ private Reporter<Attribute.TypeCompound> reporter;
+ // The symbol to which we are attaching.
private final Symbol sym;
- private DiagnosticPosition deferPos;
+ // The diagnostic position we use.
+ private final DiagnosticPosition deferPos;
+ // The environment
+ private final Env<AttrContext> env;
+ private final List<JCAnnotation> baseTypeAnnos;
+ // Whether or not baseTypeAnnos can be declaration
+ // annotations, or just strictly type annotations.
+ private final boolean onlyTypeAnnos;
+ // Whether or not we are creating secondary attributes (see
+ // enterTypeAnnotations).
+ private final boolean secondaryAttr;
- public TypeAnnotate(final Env<AttrContext> env,
+ public TypeAnnotate(final List<JCAnnotation> baseTypeAnnos,
final Symbol sym,
- final DiagnosticPosition deferPos) {
-
- this.env = env;
+ final Env<AttrContext> env,
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator,
+ final AttributeAttacher<Attribute.Compound> declAttacher,
+ final AttributeAttacher<Attribute.TypeCompound> typeAttacher,
+ final boolean onlyTypeAnnos,
+ final boolean secondaryAttr) {
+ this.baseTypeAnnos = baseTypeAnnos;
this.sym = sym;
+ this.env = env;
this.deferPos = deferPos;
+ this.currentLambda = env.getLambda();
+ this.creator = creator;
+ this.innermost = true;
+ this.declAttacher = declAttacher;
+ this.typeAttacher = typeAttacher;
+ this.reporter = null;
+ this.onlyTypeAnnos = onlyTypeAnnos;
+ this.secondaryAttr = secondaryAttr;
+ }
+
+ // Deal with the base-type annotations. This should only get
+ // called when we are at the inner-most type.
+ private void doBaseTypeAnnos() {
+ if (onlyTypeAnnos) {
+ // If the base type annotations can only be type
+ // annotations, then handle them as such.
+ doTypeAnnos(baseTypeAnnos, false);
+ } else if (!baseTypeAnnos.isEmpty()) {
+ // Otherwise, send them into the repeating annotations
+ // pipeline with a classifying attacher we build based
+ // on the current state.
+ final TypeAnnotationPosition tapos =
+ creator.create(typepath, currentLambda, type_index);
+ annotateNow(baseTypeAnnos, env, sym, deferPos, tapos,
+ classifyingAttacher(sym, declAttacher,
+ typeAttacher, reporter));
+ // Also set up a validator.
+ validate(annotationValidator(baseTypeAnnos, env, sym));
+ }
+ }
+
+ // Deal with type annotations we found while scanning the tree.
+ private void doTypeAnnos(List<JCAnnotation> annos,
+ boolean isTypeParameter) {
+ if (!annos.isEmpty()) {
+ // Grab the reporter and the type attacher (which,
+ // it's ok for either to be null), and combine them
+ // into a reporting attacher.
+ final AttributeAttacher<Attribute.TypeCompound> attacher =
+ reportingTypeAnnotationsAttacher(typeAttacher, reporter);
+ // Create the position using the current type path and
+ // type index.
+ final TypeAnnotationPosition tapos =
+ creator.create(typepath, currentLambda, type_index);
+ // Send the annotations into the repeating annotations
+ // pipeline, and set up a validator.
+ actualEnterTypeAnnotations(annos, env, sym, deferPos, secondaryAttr,
+ tapos, attacher);
+ validate(typeAnnotationValidator(annos, env, isTypeParameter));
+ }
}
@Override
- public void visitAnnotatedType(final JCAnnotatedType tree) {
- actualEnterTypeAnnotations(tree.annotations, env, sym, deferPos);
- super.visitAnnotatedType(tree);
+ public void visitTypeIdent(final JCPrimitiveTypeTree tree) {
+ // This is one place that can represent the base type.
+ // But we need to make sure we're actually in the
+ // innermost type (ie not a type argument or something).
+ if (innermost) {
+ final AttributeAttacher<Attribute.TypeCompound> oldTypeAttacher = typeAttacher;
+ // We want to update the Type to have annotations.
+ typeAttacher = typeUpdatingTypeAnnotationsAttacher(oldTypeAttacher,
+ tree);
+ // We can't possibly have any INNER_TYPE type path
+ // elements, because these are all primitives.
+ doBaseTypeAnnos();
+ typeAttacher = oldTypeAttacher;
+ }
}
@Override
- public void visitTypeParameter(final JCTypeParameter tree) {
- actualEnterTypeAnnotations(tree.annotations, env, sym, deferPos);
- super.visitTypeParameter(tree);
+ public void visitIdent(final JCIdent tree) {
+ // This is one place that can represent the base type.
+ // But we need to make sure we're actually in the
+ // innermost type (ie not a type argument or something).
+ if (innermost) {
+ final AttributeAttacher<Attribute.TypeCompound> oldTypeAttacher = typeAttacher;
+ // Set up an attacher that updates the Type, so we get
+ // the annotations.
+ typeAttacher = typeUpdatingTypeAnnotationsAttacher(oldTypeAttacher,
+ tree);
+ // Add any INNER_TYPE type path elements we might need.
+ if (tree.type != null) {
+ final List<TypePathEntry> oldpath = typepath;
+ typepath = addInners(tree.type, typepath);
+ doBaseTypeAnnos();
+ typepath = oldpath;
+ } else {
+ doBaseTypeAnnos();
+ }
+ typeAttacher = oldTypeAttacher;
+ }
}
@Override
- public void visitNewArray(final JCNewArray tree) {
- actualEnterTypeAnnotations(tree.annotations, env, sym, deferPos);
- for (List<JCAnnotation> dimAnnos : tree.dimAnnotations)
- actualEnterTypeAnnotations(dimAnnos, env, sym, deferPos);
- super.visitNewArray(tree);
+ public void visitAnnotatedType(JCAnnotatedType tree) {
+ // This is one place where we run into pure type
+ // annotations.
+ Assert.checkNonNull(tree.getUnderlyingType().type);
+ final boolean oldinnermost = innermost;
+ // Make sure we don't consider ourselves "innermost" when
+ // scanning the annotations.
+ innermost = false;
+ scan(tree.annotations);
+ innermost = oldinnermost;
+ scan(tree.underlyingType);
+ final List<TypePathEntry> oldpath = typepath;
+ typepath = addInners(tree.getUnderlyingType().type, typepath);
+ doTypeAnnos(tree.annotations, false);
+ typepath = oldpath;
}
@Override
- public void visitMethodDef(final JCMethodDecl tree) {
- scan(tree.mods);
- scan(tree.restype);
- scan(tree.typarams);
- scan(tree.recvparam);
+ public void visitTypeArray(JCArrayTypeTree tree) {
+ // This case is simple: just add an ARRAY to the type path.
+ final List<TypePathEntry> oldpath = typepath;
+ typepath = typepath.append(TypePathEntry.ARRAY);
+ super.visitTypeArray(tree);
+ typepath = oldpath;
+ }
+
+ @Override
+ public void visitTypeApply(JCTypeApply tree) {
+ // Handle type arguments
+ Assert.checkNonNull(tree.getType().type);
+ final List<TypePathEntry> oldpath = typepath;
+ // First, look at the base type.
+ scan(tree.clazz);
+
+ // Add any INNER_TYPE path elements we need first
+ if (tree.getType() != null && tree.getType().type != null) {
+ typepath = addInners(tree.getType().type, typepath);
+ }
+ // Make sure we're not considering ourselves innermost
+ // when looking at type arguments.
+ final boolean oldinnermost = innermost;
+ innermost = false;
+ // For each type argument, add a TYPE_ARGUMENT path
+ // element for the right index.
+ int i = 0;
+ for (List<JCExpression> l = tree.arguments; l.nonEmpty();
+ l = l.tail, i++) {
+ final JCExpression arg = l.head;
+ final List<TypePathEntry> noargpath = typepath;
+ typepath = typepath.append(new TypePathEntry(TypePathEntryKind.TYPE_ARGUMENT, i));
+ scan(arg);
+ typepath = noargpath;
+ }
+ typepath = oldpath;
+ innermost = oldinnermost;
+ }
+
+ @Override
+ public void visitNewArray(JCNewArray tree) {
+ // We can also run into type annotations here, on dimAnnos.
+ final List<TypePathEntry> oldpath = typepath;
+ final PositionCreator oldcreator = creator;
+ creator = newObjCreator(tree.pos);
+ doTypeAnnos(tree.annotations, false);
+
+ // Go through the dimensions, set up the type path, and
+ // handle any annetations we find.
+ for (int i = 0; i < tree.dimAnnotations.size(); i++) {
+ final List<JCAnnotation> dimAnnos = tree.dimAnnotations.get(i);
+ doTypeAnnos(dimAnnos, false);
+ // This is right. As per the type annotations spec,
+ // the first array dimension has no arrays in the type
+ // path, the second has one, and so on, and the
+ // element type has n for n dimensions.
+ typepath = typepath.append(TypePathEntry.ARRAY);
+ }
+
+ // The element type is sometimes null, in the case of
+ // array literals.
+ scan(tree.elemtype);
+ typepath = oldpath;
+ creator = oldcreator;
+ }
+
+ @Override
+ public void visitWildcard(JCWildcard tree) {
+ // Simple: add a WILDCARD type path element and continue.
+ final List<TypePathEntry> oldpath = typepath;
+ typepath = typepath.append(TypePathEntry.WILDCARD);
+ super.visitWildcard(tree);
+ typepath = oldpath;
+ }
+
+ @Override
+ public void visitTypeParameter(JCTypeParameter tree) {
+ // This is another place where we can run into pure type
+ // annotations.
+ scan(tree.annotations);
+ Assert.checkNonNull(tree.type);
+ doTypeAnnos(tree.annotations, true);
+ }
+
+ @Override
+ public void visitLambda(JCLambda tree) {
+ // If we run into a lambda, set the current lambda to it.
+ final JCLambda oldLambda = currentLambda;
+ currentLambda = tree;
+ scan(tree.body);
scan(tree.params);
- scan(tree.thrown);
- scan(tree.defaultValue);
- // Do not annotate the body, just the signature.
- // scan(tree.body);
+ currentLambda = oldLambda;
}
@Override
+ public void visitTypeIntersection(JCTypeIntersection tree) {
+ final boolean oldinnermost = innermost;
+ // Run through the options, and update the type_index
+ // accordingly.
+ for (List<JCExpression> l = tree.bounds; l.nonEmpty();
+ l = l.tail, type_index++) {
+ scan(l.head);
+ // Set innermost to false after the first element
+ innermost = false;
+ }
+ innermost = oldinnermost;
+ }
+
+ @Override
+ public void visitTypeUnion(JCTypeUnion tree) {
+ final boolean oldinnermost = innermost;
+ // Run through the options, and update the type_index
+ // accordingly.
+ for (List<JCExpression> l = tree.alternatives; l.nonEmpty();
+ l = l.tail, type_index++) {
+ scan(l.head);
+ // Set innermost to false after the first element
+ innermost = false;
+ }
+ innermost = oldinnermost;
+ }
+
+ @Override
+ public void visitSelect(JCFieldAccess tree) {
+ // In this case, we need to possibly set up an
+ // illegalScopingReporter, if the selected type cannot be
+ // annotated.
+ Symbol sym = tree.sym;
+ final AttributeAttacher<Attribute.TypeCompound> oldTypeAttacher = typeAttacher;
+ final Reporter<Attribute.TypeCompound> oldReporter = reporter;
+ // If we're selecting from an interface or a static class,
+ // set up attachers that will only attach declaration
+ // annotations and will report type annotations as errors.
+ Type selectedTy = tree.selected.type;
+ if ((sym != null && (sym.isStatic() || sym.isInterface() ||
+ selectedTy.hasTag(TypeTag.PACKAGE))) ||
+ tree.name == names._class) {
+ typeAttacher = null;
+ reporter = illegalScopingReporter(tree.pos);
+ }
+ super.visitSelect(tree);
+ typeAttacher = oldTypeAttacher;
+ reporter = oldReporter;
+ }
+
+ // These methods stop the visitor from continuing on when it
+ // sees a definition.
+ @Override
public void visitVarDef(final JCVariableDecl tree) {
- DiagnosticPosition prevPos = deferPos;
- deferPos = tree.pos();
- try {
- if (sym != null && sym.kind == Kinds.VAR) {
- // Don't visit a parameter once when the sym is the method
- // and once when the sym is the parameter.
- scan(tree.mods);
- scan(tree.vartype);
- }
- scan(tree.init);
- } finally {
- deferPos = prevPos;
- }
}
@Override
public void visitClassDef(JCClassDecl tree) {
- // We can only hit a classdef if it is declared within
- // a method. Ignore it - the class will be visited
- // separately later.
}
@Override
public void visitNewClass(JCNewClass tree) {
- if (tree.def == null) {
- // For an anonymous class instantiation the class
- // will be visited separately.
- super.visitNewClass(tree);
+
}
}
+
+ // A derived TypeAnnotate visitor that also scans expressions
+ // within Deferred attribution.
+ private class TypeAnnotateExpr extends TypeAnnotate {
+ // This constructor creates an instance suitable for deferred
+ // attribution.
+ public TypeAnnotateExpr(final Symbol sym,
+ final Env<AttrContext> env,
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator) {
+ super(List.<JCAnnotation>nil(), sym, env, deferPos,
+ creator, null, null, false, false);
+ }
+
+ @Override
+ public void visitTypeCast(final JCTypeCast tree) {
+ final PositionCreator oldcreator = creator;
+ creator = castCreator(tree.pos);
+ super.visitTypeCast(tree);
+ creator = oldcreator;
+ }
+
+ @Override
+ public void visitTypeTest(JCInstanceOf tree) {
+ final PositionCreator oldcreator = creator;
+ creator = instanceOfCreator(tree.pos);
+ super.visitTypeTest(tree);
+ creator = oldcreator;
+ }
+
+ @Override
+ public void visitReference(JCMemberReference that) {
+ final boolean isConstructor = that.getName() == names.init;
+ final PositionCreator oldcreator = creator;
+ creator = isConstructor ? constructorRefCreator(that.pos) :
+ methodRefCreator(that.pos);
+ scan(that.expr);
+
+ if (null != that.typeargs) {
+ int i = 0;
+ for (List<JCExpression> l = that.typeargs;
+ l.nonEmpty(); l = l.tail, i++) {
+ final Annotate.PositionCreator typeArgCreator =
+ isConstructor ? constructorRefTypeArgCreator(i, that.pos) :
+ methodRefTypeArgCreator(i, that.pos);
+ final JCExpression arg = l.head;
+ scan(that.expr);
+ }
+ }
+
+ creator = oldcreator;
+ }
+
+ @Override
+ public void visitNewClass(JCNewClass tree) {
+ // This will be visited by Attr later, so don't do
+ // anything.
+ }
+ }
+
+ /**
+ * Set up a visitor to scan an expression and handle any type
+ * annotations it finds, within a deferred attribution context.
+ */
+ public void typeAnnotateExprLater(final JCTree tree,
+ final Env<AttrContext> env,
+ final Symbol sym,
+ final DiagnosticPosition deferPos,
+ final PositionCreator creator) {
+ Assert.checkNonNull(sym);
+ Assert.checkNonNull(creator);
+
+ normal(new Annotate.Worker() {
+ @Override
+ public String toString() {
+ return "type annotate " + tree + " onto " + sym + " in " + sym.owner;
+ }
+ @Override
+ public void run() {
+ tree.accept(new TypeAnnotateExpr(sym, env, deferPos, creator));
+ }
+ });
}
}
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 ba72525..8762d12 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -91,7 +91,6 @@
final Types types;
final JCDiagnostic.Factory diags;
final Annotate annotate;
- final TypeAnnotations typeAnnotations;
final DeferredLintHandler deferredLintHandler;
public static Attr instance(Context context) {
@@ -120,7 +119,6 @@
types = Types.instance(context);
diags = JCDiagnostic.Factory.instance(context);
annotate = Annotate.instance(context);
- typeAnnotations = TypeAnnotations.instance(context);
deferredLintHandler = DeferredLintHandler.instance(context);
Options options = Options.instance(context);
@@ -137,6 +135,7 @@
allowTypeAnnos = source.allowTypeAnnotations();
allowLambda = source.allowLambda();
allowDefaultMethods = source.allowDefaultMethods();
+ allowStaticInterfaceMethods = source.allowStaticInterfaceMethods();
sourceName = source.name;
relax = (options.isSet("-retrofit") ||
options.isSet("-relax"));
@@ -194,6 +193,10 @@
*/
boolean allowDefaultMethods;
+ /** Switch: static interface methods enabled?
+ */
+ boolean allowStaticInterfaceMethods;
+
/** Switch: allow references to surrounding object from anonymous
* objects during constructor call?
*/
@@ -434,8 +437,7 @@
public Type attribImportQualifier(JCImport tree, Env<AttrContext> env) {
// Attribute qualifying package or class.
JCFieldAccess s = (JCFieldAccess)tree.qualid;
- return attribTree(s.selected,
- env,
+ return attribTree(s.selected, env,
new ResultInfo(tree.staticImport ? TYP : (TYP | PCK),
Type.noType));
}
@@ -638,7 +640,8 @@
/** Derived visitor method: attribute an expression tree.
*/
public Type attribExpr(JCTree tree, Env<AttrContext> env, Type pt) {
- return attribTree(tree, env, new ResultInfo(VAL, !pt.hasTag(ERROR) ? pt : Type.noType));
+ return attribTree(tree, env,
+ new ResultInfo(VAL, !pt.hasTag(ERROR) ? pt : Type.noType));
}
/** Derived visitor method: attribute an expression tree with
@@ -650,6 +653,7 @@
/** Derived visitor method: attribute a type tree.
*/
+
public Type attribType(JCTree tree, Env<AttrContext> env) {
Type result = attribType(tree, env, Type.noType);
return result;
@@ -664,6 +668,7 @@
/** Derived visitor method: attribute a statement or definition tree.
*/
+
public Type attribStat(JCTree tree, Env<AttrContext> env) {
return attribTree(tree, env, statInfo);
}
@@ -731,7 +736,8 @@
a.tsym.flags_field |= UNATTRIBUTED;
a.bound = Type.noType;
if (!tvar.bounds.isEmpty()) {
- List<Type> bounds = List.of(attribType(tvar.bounds.head, env));
+ List<Type> bounds =
+ List.of(attribType(tvar.bounds.head, env));
for (JCExpression bound : tvar.bounds.tail)
bounds = bounds.prepend(attribType(bound, env));
types.setBounds(a, bounds.reverse());
@@ -765,7 +771,7 @@
* @param type The expected type, or null
* @see VarSymbol#setLazyConstValue
*/
- public Object attribLazyConstantValue(Env<AttrContext> env,
+ public Object attribLazyConstantValue(final Env<AttrContext> env,
JCVariableDecl variable,
Type type) {
@@ -884,6 +890,7 @@
c.flags_field |= NOOUTERTHIS;
}
attribClass(tree.pos(), c);
+
result = tree.type = c.type;
}
}
@@ -1021,10 +1028,6 @@
}
}
- // Attribute all type annotations in the body
- annotate.annotateTypeLater(tree.body, localEnv, m, null);
- annotate.flush();
-
// Attribute method body.
attribStat(tree.body, localEnv);
}
@@ -1038,21 +1041,59 @@
}
}
- public void visitVarDef(JCVariableDecl tree) {
+ public Annotate.PositionCreator getVarCreator(final JCVariableDecl tree) {
+ // Form the enclosing tree node, figure out what kind
+ // of definition we are looking at.
+ switch(env.tree.getTag()) {
+ case TRY:
+ // If it's a try, then we have a resource variable
+ return annotate.resourceVarCreator(tree.pos);
+ case CATCH:
+ // If it's a catch, then we have an exception parameter
+ return annotate.exceptionParamCreator(tree.pos);
+ case LAMBDA: {
+ // If it's a lambda, then we could have a local
+ // variable or a parameter.
+ final JCLambda lambda = (JCLambda) env.tree;
+ // We have to figure out what the index of the
+ // parameter is, and unfortunately, the visitor
+ // and tree APIs don't help us much here. If we
+ // don't find the declaration in the parameter
+ // list, then it must be a local variable.
+ //
+ // This could easily be replaced by an index
+ // parameter, which is -1 for non-indexed
+ // definitions.
+ int index = -1;
+ int i = 0;
+ for (List<JCVariableDecl> l = lambda.params;
+ l.nonEmpty(); l = l.tail, i++) {
+ if (l.head == tree) {
+ index = i;
+ break;
+ }
+ }
+ if (index == -1) {
+ return annotate.localVarCreator(tree.pos);
+ } else {
+ return annotate.paramCreator(index);
+ }
+ }
+ default:
+ // The default case is to treat any declaration as a local
+ // variable.
+ return annotate.localVarCreator(tree.pos);
+ }
+ }
+
+ public void visitVarDef(final JCVariableDecl tree) {
// Local variables have not been entered yet, so we need to do it now:
if (env.info.scope.owner.kind == MTH) {
if (tree.sym != null) {
// parameters have already been entered
env.info.scope.enter(tree.sym);
} else {
- memberEnter.memberEnter(tree, env);
- annotate.flush();
- }
- } else {
- if (tree.init != null) {
- // Field initializer expression need to be entered.
- annotate.annotateTypeLater(tree.init, env, tree.sym, tree.pos());
- annotate.flush();
+ memberEnter.memberEnter(tree, env, getVarCreator(tree));
}
}
@@ -1103,17 +1144,15 @@
// Block is a static or instance initializer;
// let the owner of the environment be a freshly
// created BLOCK-method.
- Env<AttrContext> localEnv =
+ final Env<AttrContext> localEnv =
env.dup(tree, env.info.dup(env.info.scope.dupUnshared()));
localEnv.info.scope.owner =
new MethodSymbol(tree.flags | BLOCK |
env.info.scope.owner.flags() & STRICTFP, names.empty, null,
env.info.scope.owner);
- if ((tree.flags & STATIC) != 0) localEnv.info.staticLevel++;
- // Attribute all type annotations in the block
- annotate.annotateTypeLater(tree, localEnv, localEnv.info.scope.owner, null);
- annotate.flush();
+ if ((tree.flags & STATIC) != 0) localEnv.info.staticLevel++;
+ attribStats(tree.stats, localEnv);
{
// Store init and clinit type annotations with the ClassSymbol
@@ -1126,8 +1165,6 @@
cs.appendInitTypeAttributes(tas);
}
}
-
- attribStats(tree.stats, localEnv);
} else {
// Create a new local environment with a local scope.
Env<AttrContext> localEnv =
@@ -1481,17 +1518,21 @@
isBooleanOrNumeric(env, condTree.falsepart);
case APPLY:
JCMethodInvocation speculativeMethodTree =
- (JCMethodInvocation)deferredAttr.attribSpeculative(tree, env, unknownExprInfo);
+ (JCMethodInvocation)deferredAttr.attribSpeculative(tree, env, unknownExprInfo,
+ annotate.noCreator);
Type owntype = TreeInfo.symbol(speculativeMethodTree.meth).type.getReturnType();
return types.unboxedTypeOrType(owntype).isPrimitive();
case NEWCLASS:
JCExpression className =
removeClassParams.translate(((JCNewClass)tree).clazz);
JCExpression speculativeNewClassTree =
- (JCExpression)deferredAttr.attribSpeculative(className, env, unknownTypeInfo);
+ (JCExpression)deferredAttr.attribSpeculative(className,
+ env,
+ unknownTypeInfo,
+ annotate.newObjCreator(tree.pos));
return types.unboxedTypeOrType(speculativeNewClassTree.type).isPrimitive();
default:
- Type speculativeType = deferredAttr.attribSpeculative(tree, env, unknownExprInfo).type;
+ Type speculativeType = deferredAttr.attribSpeculative(tree, env, unknownExprInfo, annotate.noCreator).type;
speculativeType = types.unboxedTypeOrType(speculativeType);
return speculativeType.isPrimitive();
}
@@ -1754,7 +1795,28 @@
// Attribute arguments, yielding list of argument types.
attribArgs(tree.args, localEnv, argtypesBuf);
argtypes = argtypesBuf.toList();
- typeargtypes = attribTypes(tree.typeargs, localEnv);
+
+ // Attribute and annotate the type arguments
+ ListBuffer<Type> typeargtypesbuf = new ListBuffer<>();
+ int i = 0;
+
+ for (List<JCExpression> l = tree.typeargs;
+ l.nonEmpty(); l = l.tail, i++) {
+ final JCExpression arg = l.head;
+ try {
+ annotate.enterStart();
+ typeargtypesbuf.append(attribType(arg, localEnv));
+ annotate.annotateTypeLater(arg, localEnv,
+ localEnv.info.scope.owner,
+ tree.pos(),
+ annotate.constructorInvokeTypeArgCreator(i, tree.pos));
+ } finally {
+ annotate.enterDone();
+ }
+ }
+
+ typeargtypes =
+ chk.checkRefTypes(tree.typeargs, typeargtypesbuf.toList());
// Variable `site' points to the class in which the called
// constructor is defined.
@@ -1827,7 +1889,27 @@
// Attribute the arguments, yielding list of argument types, ...
int kind = attribArgs(tree.args, localEnv, argtypesBuf);
argtypes = argtypesBuf.toList();
- typeargtypes = attribAnyTypes(tree.typeargs, localEnv);
+
+ // Attribute and annotate the type arguments
+ ListBuffer<Type> typeargtypesbuf = new ListBuffer<>();
+ int i = 0;
+
+ for (List<JCExpression> l = tree.typeargs;
+ l.nonEmpty(); l = l.tail, i++) {
+ final JCExpression arg = l.head;
+ try {
+ annotate.enterStart();
+ typeargtypesbuf.append(attribType(arg, localEnv));
+ annotate.annotateTypeLater(arg, localEnv,
+ localEnv.info.scope.owner,
+ tree.pos(),
+ annotate.methodInvokeTypeArgCreator(i, tree.pos));
+ } finally {
+ annotate.enterDone();
+ }
+ }
+
+ typeargtypes = typeargtypesbuf.toList();
// ... and attribute the method using as a prototype a methodtype
// whose formal argument types is exactly the list of actual
@@ -1852,6 +1934,7 @@
// current context. Also, capture the return type
result = check(tree, capture(restype), VAL, resultInfo);
}
+
chk.validate(tree.typeargs, localEnv);
}
//where
@@ -1927,14 +2010,12 @@
annoclazzid = (JCAnnotatedType) clazzid;
clazzid = annoclazzid.underlyingType;
}
- } else {
- if (clazz.hasTag(ANNOTATED_TYPE)) {
+ } else if (clazz.hasTag(ANNOTATED_TYPE)) {
annoclazzid = (JCAnnotatedType) clazz;
clazzid = annoclazzid.underlyingType;
} else {
clazzid = clazz;
}
- }
JCExpression clazzid1 = clazzid; // The same in fully qualified form
@@ -1956,11 +2037,12 @@
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;
+ if (annoclazzid != null) {
+ JCAnnotatedType annoType = annoclazzid;
+ List<JCAnnotation> annos = annoclazzid.annotations;
- if (annoType.underlyingType.hasTag(TYPEAPPLY)) {
+ if (clazz.hasTag(TYPEAPPLY)) {
+
clazzid1 = make.at(tree.pos).
TypeApply(clazzid1,
((JCTypeApply) clazz).arguments);
@@ -1977,12 +2059,32 @@
clazz = clazzid1;
}
+ Type clazztype;
+
+ try {
+ annotate.enterStart();
// Attribute clazz expression and store
// symbol + type back into the attributed tree.
- Type clazztype = TreeInfo.isEnumInit(env.tree) ?
+ clazztype = TreeInfo.isEnumInit(env.tree) ?
attribIdentAsEnumType(env, (JCIdent)clazz) :
attribType(clazz, env);
+ if (cdef != null) {
+ // If we are looking at an anonymous class creation, then
+ // we are not allowed to have declaration annotations on
+ // the base type.
+ annotate.annotateStrictTypeLater(clazz, cdef.mods.annotations, localEnv,
+ env.info.scope.owner, tree.pos(),
+ annotate.newObjCreator(tree.pos));
+ } else {
+ // Otherwise, we are.
+ annotate.annotateTypeLater(clazz, localEnv, env.info.scope.owner,
+ tree.pos(), annotate.newObjCreator(tree.pos));
+ }
+ } finally {
+ annotate.enterDone();
+ }
+
clazztype = chk.checkDiamond(tree, clazztype);
chk.validate(clazz, localEnv);
if (tree.encl != null) {
@@ -2011,7 +2113,29 @@
ListBuffer<Type> argtypesBuf = new ListBuffer<>();
int pkind = attribArgs(tree.args, localEnv, argtypesBuf);
List<Type> argtypes = argtypesBuf.toList();
- List<Type> typeargtypes = attribTypes(tree.typeargs, localEnv);
+ List<Type> typeargtypes;
+
+ // Attribute and annotate the type arguments
+ ListBuffer<Type> typeargtypesbuf = new ListBuffer<>();
+ int i = 0;
+
+ for (List<JCExpression> l = tree.typeargs;
+ l.nonEmpty(); l = l.tail, i++) {
+ final JCExpression arg = l.head;
+ try {
+ annotate.enterStart();
+ typeargtypesbuf.append(attribType(arg, localEnv));
+ annotate.annotateTypeLater(arg, localEnv,
+ localEnv.info.scope.owner,
+ tree.pos(),
+ annotate.constructorInvokeTypeArgCreator(i, tree.pos));
+ } finally {
+ annotate.enterDone();
+ }
+ }
+
+ typeargtypes =
+ chk.checkRefTypes(tree.typeargs, typeargtypesbuf.toList());
// If we have made no mistakes in the class type...
if (clazztype.hasTag(CLASS)) {
@@ -2194,7 +2318,9 @@
ta.arguments = List.nil();
ResultInfo findDiamondResult = new ResultInfo(VAL,
resultInfo.checkContext.inferenceContext().free(resultInfo.pt) ? Type.noType : pt());
- Type inferred = deferredAttr.attribSpeculative(tree, env, findDiamondResult).type;
+ Type inferred = deferredAttr.attribSpeculative(tree, env,
+ findDiamondResult,
+ annotate.newObjCreator(tree.pos)).type;
Type polyPt = allowPoly ?
syms.objectType :
clazztype;
@@ -2256,8 +2382,20 @@
Type owntype = types.createErrorType(tree.type);
Env<AttrContext> localEnv = env.dup(tree);
Type elemtype;
+
+ for(List<JCAnnotation> dim : tree.dimAnnotations) {
+ this.attribAnnotationTypes(dim, localEnv);
+ }
+
if (tree.elemtype != null) {
+ try {
+ annotate.enterStart();
elemtype = attribType(tree.elemtype, localEnv);
+ annotate.annotateTypeLater(tree, env, env.info.scope.owner, tree.pos(),
+ annotate.newObjCreator(tree.pos));
+ } finally {
+ annotate.enterDone();
+ }
chk.validate(tree.elemtype, localEnv);
owntype = elemtype;
for (List<JCExpression> l = tree.dims; l.nonEmpty(); l = l.tail) {
@@ -2278,6 +2416,7 @@
elemtype = types.createErrorType(pt());
}
}
+
if (tree.elems != null) {
attribExprs(tree.elems, localEnv, elemtype);
owntype = new ArrayType(elemtype, syms.arrayClass,
@@ -2672,6 +2811,8 @@
@Override
public void visitReference(final JCMemberReference that) {
+ final boolean isConstructor = that.getName() == names.init;
+
if (pt().isErroneous() || (pt().hasTag(NONE) && pt() != Type.recoveryType)) {
if (pt().hasTag(NONE)) {
//method reference only allowed in assignment or method invocation/cast context
@@ -2682,9 +2823,20 @@
}
final Env<AttrContext> localEnv = env.dup(that);
try {
+ Type exprType;
+ try {
+ annotate.enterStart();
//attribute member reference qualifier - if this is a constructor
//reference, the expected kind must be a type
- Type exprType = attribTree(that.expr, env, memberReferenceQualifierResult(that));
+ exprType = attribTree(that.expr, env, memberReferenceQualifierResult(that));
+ final Annotate.PositionCreator creator =
+ isConstructor ? annotate.constructorRefCreator(that.pos) :
+ annotate.methodRefCreator(that.pos);
+ annotate.annotateTypeLater(that.expr, localEnv, env.info.scope.owner,
+ that.pos(), creator);
+ } finally {
+ annotate.enterDone();
+ }
if (that.getMode() == JCMemberReference.ReferenceMode.NEW) {
exprType = chk.checkConstructorRefType(that.expr, exprType);
@@ -2714,7 +2866,24 @@
//attrib type-arguments
List<Type> typeargtypes = List.nil();
if (that.typeargs != null) {
+ try {
+ annotate.enterStart();
typeargtypes = attribTypes(that.typeargs, localEnv);
+
+ // Annotate type arguments
+ int i = 0;
+ for (List<JCExpression> l = that.typeargs;
+ l.nonEmpty(); l = l.tail, i++) {
+ final Annotate.PositionCreator typeArgCreator =
+ isConstructor ? annotate.constructorRefTypeArgCreator(i, that.pos) :
+ annotate.methodRefTypeArgCreator(i, that.pos);
+ final JCExpression arg = l.head;
+ annotate.annotateTypeLater(arg, env, env.info.scope.owner,
+ that.pos(), typeArgCreator);
+ }
+ } finally {
+ annotate.enterDone();
+ }
}
Type desc;
@@ -3088,7 +3257,15 @@
}
public void visitTypeCast(final JCTypeCast tree) {
- Type clazztype = attribType(tree.clazz, env);
+ Type clazztype;
+ try {
+ annotate.enterStart();
+ clazztype = attribType(tree.clazz, env);
+ annotate.annotateTypeLater(tree.clazz, env, env.info.scope.owner,
+ tree.pos(), annotate.castCreator(tree.pos));
+ } finally {
+ annotate.enterDone();
+ }
chk.validate(tree.clazz, env, false);
//a fresh environment is required for 292 inference to work properly ---
//see Infer.instantiatePolymorphicSignatureInstance()
@@ -3121,7 +3298,16 @@
public void visitTypeTest(JCInstanceOf tree) {
Type exprtype = chk.checkNullOrRefType(
tree.expr.pos(), attribExpr(tree.expr, env));
- Type clazztype = attribType(tree.clazz, env);
+ Type clazztype;
+ try {
+ annotate.enterStart();
+ clazztype = attribType(tree.clazz, env);
+ annotate.annotateTypeLater(tree.clazz, env, env.info.scope.owner, tree.pos(),
+ annotate.instanceOfCreator(tree.pos));
+ } finally {
+ annotate.enterDone();
+ }
+
if (!clazztype.hasTag(TYPEVAR)) {
clazztype = chk.checkClassOrArrayType(tree.clazz.pos(), clazztype);
}
@@ -3250,9 +3436,12 @@
if ((pkind() & (PCK | TYP)) == 0)
site = capture(site); // Capture field access
- // don't allow T.class T[].class, etc
if (skind == TYP) {
+ // If the qualifier is a type, annotate it
+ annotate.annotateTypeLater(tree, env, env.info.scope.owner,
+ tree.pos(), annotate.errorCreator);
Type elt = site;
+ // don't allow T.class T[].class, etc
while (elt.hasTag(ARRAY))
elt = ((ArrayType)elt).elemtype;
if (elt.hasTag(TYPEVAR)) {
@@ -3334,6 +3523,10 @@
tree.pos(), site, sym.name, true);
}
}
+ if (!allowStaticInterfaceMethods && sitesym.isInterface() &&
+ sym.isStatic() && sym.kind == MTH) {
+ log.error(tree.pos(), "static.intf.method.invoke.not.supported.in.source", sourceName);
+ }
} else if (sym.kind != ERR && (sym.flags() & STATIC) != 0 && sym.name != names._class) {
// If the qualified item is not a type and the selected item is static, report
// a warning. Make allowance for the class of an array type e.g. Object[].class)
@@ -4081,8 +4274,13 @@
Assert.error("should be handled in Annotate");
}
+ /* This needs to be removed or otherwise changed, as it implicitly
+ * relies on the annotated types having previously been visited by
+ * Annotate.TypeAnnotate.
+ */
public void visitAnnotatedType(JCAnnotatedType tree) {
- Type underlyingType = attribType(tree.getUnderlyingType(), env);
+ Type underlyingType = attribTree(tree.getUnderlyingType(), env,
+ resultInfo);
this.attribAnnotationTypes(tree.annotations, env);
annotateType(tree, tree.annotations);
result = tree.type = underlyingType;
@@ -4101,8 +4299,10 @@
public void run() {
List<Attribute.TypeCompound> compounds = fromAnnotations(annotations);
Assert.check(annotations.size() == compounds.size());
+ if (!tree.type.hasTag(TypeTag.PACKAGE)) {
tree.type = tree.type.annotatedType(compounds);
}
+ }
});
}
@@ -4353,13 +4553,6 @@
checkForSerial(c)) {
checkSerialVersionUID(tree, c);
}
- if (allowTypeAnnos) {
- // Correctly organize the postions of the type annotations
- typeAnnotations.organizeTypeAnnotationsBodies(tree);
-
- // Check type annotations applicability rules
- validateTypeAnnotations(tree, false);
- }
}
// where
boolean checkForSerial(ClassSymbol c) {
@@ -4433,233 +4626,6 @@
return types.capture(type);
}
- public void validateTypeAnnotations(JCTree tree, boolean sigOnly) {
- tree.accept(new TypeAnnotationsValidator(sigOnly));
- }
- //where
- private final class TypeAnnotationsValidator extends TreeScanner {
-
- private final boolean sigOnly;
- public TypeAnnotationsValidator(boolean sigOnly) {
- this.sigOnly = sigOnly;
- }
-
- public void visitAnnotation(JCAnnotation tree) {
- chk.validateTypeAnnotation(tree, false);
- super.visitAnnotation(tree);
- }
- public void visitAnnotatedType(JCAnnotatedType tree) {
- if (!tree.underlyingType.type.isErroneous()) {
- super.visitAnnotatedType(tree);
- }
- }
- public void visitTypeParameter(JCTypeParameter tree) {
- chk.validateTypeAnnotations(tree.annotations, true);
- scan(tree.bounds);
- // Don't call super.
- // This is needed because above we call validateTypeAnnotation with
- // false, which would forbid annotations on type parameters.
- // super.visitTypeParameter(tree);
- }
- public void visitMethodDef(JCMethodDecl tree) {
- if (tree.recvparam != null &&
- !tree.recvparam.vartype.type.isErroneous()) {
- checkForDeclarationAnnotations(tree.recvparam.mods.annotations,
- tree.recvparam.vartype.type.tsym);
- }
- if (tree.restype != null && tree.restype.type != null) {
- validateAnnotatedType(tree.restype, tree.restype.type);
- }
- if (sigOnly) {
- scan(tree.mods);
- scan(tree.restype);
- scan(tree.typarams);
- scan(tree.recvparam);
- scan(tree.params);
- scan(tree.thrown);
- } else {
- scan(tree.defaultValue);
- scan(tree.body);
- }
- }
- public void visitVarDef(final JCVariableDecl tree) {
- //System.err.println("validateTypeAnnotations.visitVarDef " + tree);
- if (tree.sym != null && tree.sym.type != null)
- validateAnnotatedType(tree.vartype, tree.sym.type);
- scan(tree.mods);
- scan(tree.vartype);
- if (!sigOnly) {
- scan(tree.init);
- }
- }
- public void visitTypeCast(JCTypeCast tree) {
- if (tree.clazz != null && tree.clazz.type != null)
- validateAnnotatedType(tree.clazz, tree.clazz.type);
- super.visitTypeCast(tree);
- }
- public void visitTypeTest(JCInstanceOf tree) {
- if (tree.clazz != null && tree.clazz.type != null)
- validateAnnotatedType(tree.clazz, tree.clazz.type);
- super.visitTypeTest(tree);
- }
- public void visitNewClass(JCNewClass tree) {
- if (tree.clazz.hasTag(ANNOTATED_TYPE)) {
- checkForDeclarationAnnotations(((JCAnnotatedType) tree.clazz).annotations,
- tree.clazz.type.tsym);
- }
- if (tree.def != null) {
- checkForDeclarationAnnotations(tree.def.mods.annotations, tree.clazz.type.tsym);
- }
- if (tree.clazz.type != null) {
- validateAnnotatedType(tree.clazz, tree.clazz.type);
- }
- super.visitNewClass(tree);
- }
- public void visitNewArray(JCNewArray tree) {
- if (tree.elemtype != null && tree.elemtype.type != null) {
- if (tree.elemtype.hasTag(ANNOTATED_TYPE)) {
- checkForDeclarationAnnotations(((JCAnnotatedType) tree.elemtype).annotations,
- tree.elemtype.type.tsym);
- }
- validateAnnotatedType(tree.elemtype, tree.elemtype.type);
- }
- super.visitNewArray(tree);
- }
- public void visitClassDef(JCClassDecl tree) {
- //System.err.println("validateTypeAnnotations.visitClassDef " + tree);
- if (sigOnly) {
- scan(tree.mods);
- scan(tree.typarams);
- scan(tree.extending);
- scan(tree.implementing);
- }
- for (JCTree member : tree.defs) {
- if (member.hasTag(Tag.CLASSDEF)) {
- continue;
- }
- scan(member);
- }
- }
- public void visitBlock(JCBlock tree) {
- if (!sigOnly) {
- scan(tree.stats);
- }
- }
-
- /* I would want to model this after
- * com.sun.tools.javac.comp.Check.Validator.visitSelectInternal(JCFieldAccess)
- * and override visitSelect and visitTypeApply.
- * However, we only set the annotated type in the top-level type
- * of the symbol.
- * Therefore, we need to override each individual location where a type
- * can occur.
- */
- private void validateAnnotatedType(final JCTree errtree, final Type type) {
- //System.err.println("Attr.validateAnnotatedType: " + errtree + " type: " + type);
-
- if (type.isPrimitiveOrVoid()) {
- return;
- }
-
- JCTree enclTr = errtree;
- Type enclTy = type;
-
- boolean repeat = true;
- while (repeat) {
- if (enclTr.hasTag(TYPEAPPLY)) {
- List<Type> tyargs = enclTy.getTypeArguments();
- List<JCExpression> trargs = ((JCTypeApply)enclTr).getTypeArguments();
- if (trargs.length() > 0) {
- // Nothing to do for diamonds
- if (tyargs.length() == trargs.length()) {
- for (int i = 0; i < tyargs.length(); ++i) {
- validateAnnotatedType(trargs.get(i), tyargs.get(i));
- }
- }
- // If the lengths don't match, it's either a diamond
- // or some nested type that redundantly provides
- // type arguments in the tree.
- }
-
- // Look at the clazz part of a generic type
- enclTr = ((JCTree.JCTypeApply)enclTr).clazz;
- }
-
- if (enclTr.hasTag(SELECT)) {
- enclTr = ((JCTree.JCFieldAccess)enclTr).getExpression();
- if (enclTy != null &&
- !enclTy.hasTag(NONE)) {
- enclTy = enclTy.getEnclosingType();
- }
- } else if (enclTr.hasTag(ANNOTATED_TYPE)) {
- JCAnnotatedType at = (JCTree.JCAnnotatedType) enclTr;
- if (enclTy == null || enclTy.hasTag(NONE)) {
- if (at.getAnnotations().size() == 1) {
- log.error(at.underlyingType.pos(), "cant.type.annotate.scoping.1", at.getAnnotations().head.attribute);
- } else {
- ListBuffer<Attribute.Compound> comps = new ListBuffer<>();
- for (JCAnnotation an : at.getAnnotations()) {
- comps.add(an.attribute);
- }
- log.error(at.underlyingType.pos(), "cant.type.annotate.scoping", comps.toList());
- }
- repeat = false;
- }
- enclTr = at.underlyingType;
- // enclTy doesn't need to be changed
- } else if (enclTr.hasTag(IDENT)) {
- repeat = false;
- } else if (enclTr.hasTag(JCTree.Tag.WILDCARD)) {
- JCWildcard wc = (JCWildcard) enclTr;
- if (wc.getKind() == JCTree.Kind.EXTENDS_WILDCARD) {
- validateAnnotatedType(wc.getBound(), ((WildcardType)enclTy).getExtendsBound());
- } else if (wc.getKind() == JCTree.Kind.SUPER_WILDCARD) {
- validateAnnotatedType(wc.getBound(), ((WildcardType)enclTy).getSuperBound());
- } else {
- // Nothing to do for UNBOUND
- }
- repeat = false;
- } else if (enclTr.hasTag(TYPEARRAY)) {
- JCArrayTypeTree art = (JCArrayTypeTree) enclTr;
- validateAnnotatedType(art.getType(), ((ArrayType)enclTy).getComponentType());
- repeat = false;
- } else if (enclTr.hasTag(TYPEUNION)) {
- JCTypeUnion ut = (JCTypeUnion) enclTr;
- for (JCTree t : ut.getTypeAlternatives()) {
- validateAnnotatedType(t, t.type);
- }
- repeat = false;
- } else if (enclTr.hasTag(TYPEINTERSECTION)) {
- JCTypeIntersection it = (JCTypeIntersection) enclTr;
- for (JCTree t : it.getBounds()) {
- validateAnnotatedType(t, t.type);
- }
- repeat = false;
- } else if (enclTr.getKind() == JCTree.Kind.PRIMITIVE_TYPE ||
- enclTr.getKind() == JCTree.Kind.ERRONEOUS) {
- repeat = false;
- } else {
- Assert.error("Unexpected tree: " + enclTr + " with kind: " + enclTr.getKind() +
- " within: "+ errtree + " with kind: " + errtree.getKind());
- }
- }
- }
-
- private void checkForDeclarationAnnotations(List<? extends JCAnnotation> annotations,
- Symbol sym) {
- // Ensure that no declaration annotations are present.
- // Note that a tree type might be an AnnotatedType with
- // empty annotations, if only declaration annotations were given.
- // This method will raise an error for such a type.
- for (JCAnnotation ai : annotations) {
- if (!ai.type.isErroneous() &&
- typeAnnotations.annotationType(ai.attribute, sym) == TypeAnnotations.AnnotationType.DECLARATION) {
- log.error(ai.pos(), "annotation.type.not.applicable");
- }
- }
- }
- }
-
// <editor-fold desc="post-attribution visitor">
/**
diff --git a/src/share/classes/com/sun/tools/javac/comp/AttrContext.java b/src/share/classes/com/sun/tools/javac/comp/AttrContext.java
index e9e6224..3ffda24 100644
--- a/src/share/classes/com/sun/tools/javac/comp/AttrContext.java
+++ b/src/share/classes/com/sun/tools/javac/comp/AttrContext.java
@@ -58,6 +58,11 @@
*/
boolean isSerializable = false;
+ /**
+ * Are we doing speculative attribution?
+ */
+ boolean isSpeculative = false;
+
/** Are arguments to current function applications boxed into an array for varargs?
*/
Resolve.MethodResolutionPhase pendingResolutionPhase = null;
@@ -94,6 +99,7 @@
info.returnResult = returnResult;
info.defaultSuperCallSite = defaultSuperCallSite;
info.isSerializable = isSerializable;
+ info.isSpeculative = isSpeculative;
return info;
}
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 7cfb78e..2857b4d 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1041,7 +1041,9 @@
switch (sym.kind) {
case VAR:
- if (sym.owner.kind != TYP)
+ if (TreeInfo.isReceiverParam(tree))
+ mask = ReceiverParamFlags;
+ else if (sym.owner.kind != TYP)
mask = LocalVarFlags;
else if ((sym.owner.flags_field & INTERFACE) != 0)
mask = implicit = InterfaceVarFlags;
@@ -1818,6 +1820,11 @@
Type t1,
Type t2,
Type site) {
+ if ((site.tsym.flags() & COMPOUND) != 0) {
+ // special case for intersections: need to eliminate wildcards in supertypes
+ t1 = types.capture(t1);
+ t2 = types.capture(t2);
+ }
return firstIncompatibility(pos, t1, t2, site) == null;
}
diff --git a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
index 1517948..3f2157c 100644
--- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
+++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
@@ -25,6 +25,7 @@
package com.sun.tools.javac.comp;
+import com.sun.source.tree.*;
import com.sun.source.tree.LambdaExpressionTree.BodyKind;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.tree.*;
@@ -76,6 +77,7 @@
final Types types;
final Flow flow;
final Names names;
+ final Annotate annotate;
public static DeferredAttr instance(Context context) {
DeferredAttr instance = context.get(deferredAttrKey);
@@ -99,6 +101,7 @@
flow = Flow.instance(context);
names = Names.instance(context);
stuckTree = make.Ident(names.empty).setType(Type.stuckType);
+ annotate = Annotate.instance(context);
emptyDeferredAttrContext =
new DeferredAttrContext(AttrMode.CHECK, null, MethodResolutionPhase.BOX, infer.emptyContext, null, null) {
@Override
@@ -133,7 +136,8 @@
AttrMode mode;
SpeculativeCache speculativeCache;
- DeferredType(JCExpression tree, Env<AttrContext> env) {
+ DeferredType(JCExpression tree,
+ Env<AttrContext> env) {
super(null, noAnnotations);
this.tree = tree;
this.env = attr.copyEnv(env);
@@ -277,12 +281,18 @@
//Note: if a symbol is imported twice we might do two identical
//speculative rounds...
Assert.check(dt.mode == null || dt.mode == AttrMode.SPECULATIVE);
- JCTree speculativeTree = attribSpeculative(dt.tree, dt.env, resultInfo);
+ JCTree speculativeTree = attribSpeculative(dt.tree, dt.env,
+ resultInfo,
+ annotate.noCreator);
dt.speculativeCache.put(speculativeTree, resultInfo);
return speculativeTree.type;
case CHECK:
Assert.check(dt.mode != null);
- return attr.attribTree(dt.tree, dt.env, resultInfo);
+ final boolean oldSpeculative = dt.env.info.isSpeculative;
+ dt.env.info.isSpeculative = false;
+ Type out = attr.attribTree(dt.tree, dt.env, resultInfo);
+ dt.env.info.isSpeculative = oldSpeculative;
+ return out;
}
Assert.error();
return null;
@@ -359,9 +369,13 @@
* restored after type-checking. All diagnostics (but critical ones) are
* disabled during speculative type-checking.
*/
- JCTree attribSpeculative(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo) {
+ JCTree attribSpeculative(JCTree tree,
+ Env<AttrContext> env,
+ ResultInfo resultInfo,
+ Annotate.PositionCreator creator) {
final JCTree newTree = new TreeCopier<>(make).copy(tree);
Env<AttrContext> speculativeEnv = env.dup(newTree, env.info.dup(env.info.scope.dupUnshared()));
+ speculativeEnv.info.isSpeculative = true;
speculativeEnv.info.scope.owner = env.info.scope.owner;
Log.DeferredDiagnosticHandler deferredDiagnosticHandler =
new Log.DeferredDiagnosticHandler(log, new Filter<JCDiagnostic>() {
@@ -385,6 +399,9 @@
});
try {
attr.attribTree(newTree, speculativeEnv, resultInfo);
+ annotate.typeAnnotateExprLater(newTree, speculativeEnv,
+ speculativeEnv.info.scope.owner,
+ newTree.pos(), creator);
unenterScanner.scan(newTree);
return newTree;
} finally {
@@ -741,8 +758,11 @@
checkContext.report(null, ex.getDiagnostic());
}
Env<AttrContext> localEnv = env.dup(tree);
- JCExpression exprTree = (JCExpression)attribSpeculative(tree.getQualifierExpression(), localEnv,
- attr.memberReferenceQualifierResult(tree));
+ JCExpression exprTree =
+ (JCExpression)attribSpeculative(tree.getQualifierExpression(),
+ localEnv,
+ attr.memberReferenceQualifierResult(tree),
+ annotate.methodRefCreator(tree.pos));
ListBuffer<Type> argtypes = new ListBuffer<>();
for (Type t : types.findDescriptorType(pt).getParameterTypes()) {
argtypes.append(Type.noType);
@@ -1164,8 +1184,11 @@
public void visitReference(JCMemberReference tree) {
//perform arity-based check
Env<AttrContext> localEnv = env.dup(tree);
- JCExpression exprTree = (JCExpression)attribSpeculative(tree.getQualifierExpression(), localEnv,
- attr.memberReferenceQualifierResult(tree));
+ JCExpression exprTree =
+ (JCExpression)attribSpeculative(tree.getQualifierExpression(),
+ localEnv,
+ attr.memberReferenceQualifierResult(tree),
+ annotate.methodRefCreator(tree.pos));
JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree);
mref2.expr = exprTree;
Symbol res =
@@ -1309,7 +1332,7 @@
return null;
site = resolvedReturnType.type;
} else {
- site = attribSpeculative(rec, env, attr.unknownTypeExprInfo).type;
+ site = attribSpeculative(rec, env, attr.unknownTypeExprInfo, annotate.noCreator).type;
}
} else {
site = env.enclClass.sym.type;
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 e189d99..e354991 100644
--- a/src/share/classes/com/sun/tools/javac/comp/Env.java
+++ b/src/share/classes/com/sun/tools/javac/comp/Env.java
@@ -26,6 +26,7 @@
package com.sun.tools.javac.comp;
import com.sun.tools.javac.tree.*;
+import com.sun.tools.javac.tree.JCTree.JCLambda;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -156,4 +157,10 @@
}
};
}
+
+ public JCLambda getLambda() {
+ Env<A> out = enclosing(JCTree.Tag.LAMBDA);
+
+ return out != null ? (JCLambda) out.tree : null;
+ }
}
diff --git a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
index 4fddfb1..a1b51f6 100644
--- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
@@ -35,8 +35,9 @@
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.code.Type.*;
+import com.sun.tools.javac.code.TypeAnnotationPosition.*;
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
@@ -75,7 +76,6 @@
private final TreeMaker make;
private final Todo todo;
private final Annotate annotate;
- private final TypeAnnotations typeAnnotations;
private final Types types;
private final JCDiagnostic.Factory diags;
private final Source source;
@@ -101,7 +101,6 @@
make = TreeMaker.instance(context);
todo = Todo.instance(context);
annotate = Annotate.instance(context);
- typeAnnotations = TypeAnnotations.instance(context);
types = Types.instance(context);
diags = JCDiagnostic.Factory.instance(context);
source = Source.instance(context);
@@ -131,6 +130,13 @@
*/
boolean completionEnabled = true;
+ /** The creator that will be used for any varDef's we visit. This
+ * is used to create the position for any type annotations (or
+ * annotations that potentially are type annotations) that we
+ * encounter.
+ */
+ Annotate.PositionCreator creator;
+
/* ---------- Processing import clauses ----------------
*/
@@ -348,6 +354,7 @@
}
/** Construct method type from method signature.
+ * @param msym The MethodSymbol for the method.
* @param typarams The method's type parameters.
* @param params The method's value parameters.
* @param res The method's result type,
@@ -356,33 +363,89 @@
* null if none given; TODO: or already set here?
* @param thrown The method's thrown exceptions.
* @param env The method's (local) environment.
+ * @param declAnnos The annotations on the method declaration,
+ * some of which may be type annotations on
+ * the return type.
+ * @param deferPos The deferred diagnostic position for error
+ * reporting.
*/
- Type signature(MethodSymbol msym,
- List<JCTypeParameter> typarams,
- List<JCVariableDecl> params,
- JCTree res,
- JCVariableDecl recvparam,
- List<JCExpression> thrown,
- Env<AttrContext> env) {
+ Type signature(final MethodSymbol msym,
+ final List<JCTypeParameter> typarams,
+ final List<JCVariableDecl> params,
+ final JCTree res,
+ final JCVariableDecl recvparam,
+ final List<JCExpression> thrown,
+ final Env<AttrContext> env,
+ final List<JCAnnotation> declAnnos,
+ final DiagnosticPosition deferPos) {
+ int i;
// Enter and attribute type parameters.
List<Type> tvars = enter.classEnter(typarams, env);
attr.attribTypeVariables(typarams, env);
- // Enter and attribute value parameters.
+ // Handle type annotations on type parameters.
+ i = 0;
+ for (List<JCTypeParameter> l = typarams; l.nonEmpty();
+ l = l.tail, i++) {
+ final JCTypeParameter param = l.head;
+ annotate.annotateTypeLater(param, env, msym, deferPos,
+ annotate.methodTypeParamCreator(i));
+ // ...and bounds on type parameters.
+ int j = 0;
+ for (List<JCExpression> bounds = param.bounds;
+ bounds.nonEmpty(); bounds = bounds.tail, j++) {
+ annotate.annotateTypeLater(bounds.head, env, msym, deferPos,
+ annotate.methodTypeParamBoundCreator(param, i, j));
+ }
+ }
+
+ // Enter and attribute value parameters. Type annotations get
+ // METHOD_FORMAL_PARAMETER positions.
ListBuffer<Type> argbuf = new ListBuffer<>();
- for (List<JCVariableDecl> l = params; l.nonEmpty(); l = l.tail) {
- memberEnter(l.head, env);
+ i = 0;
+ for (List<JCVariableDecl> l = params; l.nonEmpty(); l = l.tail, i++) {
+ // The types will get annotated by visitVarDef
+ memberEnter(l.head, env, annotate.paramCreator(i));
argbuf.append(l.head.vartype.type);
}
// Attribute result type, if one is given.
- Type restype = res == null ? syms.voidType : attr.attribType(res, env);
+ Type restype;
+
+ if (res != null) {
+ // If we have any declaration annotations, they might
+ // be/also be type annotations on the return type. We
+ // pass them in, so they get classified and then attached
+ // to the method, or the return type, or both.
+ restype = attr.attribType(res, env);
+ annotate.annotateTypeLater(res, declAnnos, env, msym, deferPos,
+ annotate.returnCreator);
+ } else {
+ // For constructors, we don't actually have a type, so we
+ // can't have a type path (except for INNER_TYPE), and we
+ // don't have annotations on arrays, type arguments, and
+ // the like.
+
+ // The only type path we have is if we are in an inner type.
+ List<TypePathEntry> typepath = Annotate.makeInners(msym.owner.type);
+ TypeAnnotationPosition tapos =
+ TypeAnnotationPosition.methodReturn(typepath, env.getLambda(), -1);
+
+ // We don't have to walk down a type. We just have to do
+ // repeating annotation handling, then classify and attach
+ // the annotations.
+ annotate.annotateWithClassifyLater(declAnnos, env, msym,
+ deferPos, tapos);
+ restype = syms.voidType;
+ }
+
// Attribute receiver type, if one is given.
Type recvtype;
if (recvparam!=null) {
- memberEnter(recvparam, env);
+ // The type will get annotated by visitVarDef
+ memberEnter(recvparam, env, annotate.receiverCreator);
recvtype = recvparam.vartype.type;
} else {
recvtype = null;
@@ -390,8 +453,12 @@
// Attribute thrown exceptions.
ListBuffer<Type> thrownbuf = new ListBuffer<>();
- for (List<JCExpression> l = thrown; l.nonEmpty(); l = l.tail) {
+ i = 0;
+ for (List<JCExpression> l = thrown; l.nonEmpty(); l = l.tail, i++) {
Type exc = attr.attribType(l.head, env);
+ // Annotate each exception type.
+ annotate.annotateTypeLater(l.head, env, msym, deferPos,
+ annotate.throwCreator(i));
if (!exc.hasTag(TYPEVAR)) {
exc = chk.checkClassType(l.head.pos(), exc);
} else if (exc.tsym.owner == msym) {
@@ -420,33 +487,49 @@
/** Enter field and method definitions and process import
* clauses, catching any completion failure exceptions.
*/
- protected void memberEnter(JCTree tree, Env<AttrContext> env) {
+ protected void memberEnter(JCTree tree, Env<AttrContext> env,
+ Annotate.PositionCreator creator) {
Env<AttrContext> prevEnv = this.env;
+ Annotate.PositionCreator prevCreator = this.creator;
try {
this.env = env;
+ this.creator = creator;
tree.accept(this);
} catch (CompletionFailure ex) {
chk.completionError(tree.pos(), ex);
} finally {
+ this.creator = prevCreator;
this.env = prevEnv;
}
}
+
+ protected void memberEnter(JCTree tree, Env<AttrContext> env) {
+ memberEnter(tree, env, annotate.noCreator);
+ }
+
/** Enter members from a list of trees.
*/
- void memberEnter(List<? extends JCTree> trees, Env<AttrContext> env) {
+ void memberEnter(List<? extends JCTree> trees,
+ Env<AttrContext> env,
+ Annotate.PositionCreator creator) {
for (List<? extends JCTree> l = trees; l.nonEmpty(); l = l.tail)
- memberEnter(l.head, env);
+ memberEnter(l.head, env, creator);
+ }
+
+ void memberEnter(List<? extends JCTree> trees,
+ Env<AttrContext> env) {
+ memberEnter(trees, env, annotate.noCreator);
}
/** Enter members for a class.
*/
- void finishClass(JCClassDecl tree, Env<AttrContext> env) {
+ void finishClass(final JCClassDecl tree, final Env<AttrContext> env) {
if ((tree.mods.flags & Flags.ENUM) != 0 &&
(types.supertype(tree.sym.type).tsym.flags() & Flags.ENUM) == 0) {
addEnumMembers(tree, env);
}
- memberEnter(tree.defs, env);
+ memberEnter(tree.defs, env, annotate.fieldCreator);
}
/** Add the implicit members for an enum type
@@ -521,7 +604,7 @@
}
}
// process package annotations
- annotate.annotateLater(tree.annotations, env, env.toplevel.packge, null);
+ annotate.annotateLater(tree.annotations, env, env.toplevel.packge);
}
// process the non-static imports and the static imports of types.
@@ -567,15 +650,13 @@
Env<AttrContext> localEnv = methodEnv(tree, env);
- annotate.enterStart();
- try {
DiagnosticPosition prevLintPos = deferredLintHandler.setPos(tree.pos());
try {
// Compute the method type
m.type = signature(m, tree.typarams, tree.params,
tree.restype, tree.recvparam,
- tree.thrown,
- localEnv);
+ tree.thrown, localEnv,
+ tree.mods.annotations, tree.pos());
} finally {
deferredLintHandler.setPos(prevLintPos);
}
@@ -602,16 +683,9 @@
enclScope.enter(m);
}
- annotate.annotateLater(tree.mods.annotations, localEnv, m, tree.pos());
- // Visit the signature of the method. Note that
- // TypeAnnotate doesn't descend into the body.
- annotate.annotateTypeLater(tree, localEnv, m, tree.pos());
-
if (tree.defaultValue != null)
- annotateDefaultValueLater(tree.defaultValue, localEnv, m);
- } finally {
- annotate.enterDone();
- }
+ annotateDefaultValueLater(tree.defaultValue, localEnv,
+ m, annotate.noCreator);
}
/** Create a fresh environment for method bodies.
@@ -646,22 +720,8 @@
attr.attribIdentAsEnumType(localEnv, (JCIdent)tree.vartype);
} else {
attr.attribType(tree.vartype, localEnv);
- if (tree.nameexpr != null) {
- attr.attribExpr(tree.nameexpr, localEnv);
- MethodSymbol m = localEnv.enclMethod.sym;
- if (m.isConstructor()) {
- Type outertype = m.owner.owner.type;
- if (outertype.hasTag(TypeTag.CLASS)) {
- checkType(tree.vartype, outertype, "incorrect.constructor.receiver.type");
- checkType(tree.nameexpr, outertype, "incorrect.constructor.receiver.name");
- } else {
- log.error(tree, "receiver.parameter.not.applicable.constructor.toplevel.class");
- }
- } else {
- checkType(tree.vartype, m.owner.type, "incorrect.receiver.type");
- checkType(tree.nameexpr, m.owner.type, "incorrect.receiver.name");
- }
- }
+ if (TreeInfo.isReceiverParam(tree))
+ checkReceiver(tree, localEnv);
}
} finally {
deferredLintHandler.setPos(prevLintPos);
@@ -695,8 +755,18 @@
chk.checkTransparentVar(tree.pos(), v, enclScope);
enclScope.enter(v);
}
- annotate.annotateLater(tree.mods.annotations, localEnv, v, tree.pos());
- annotate.annotateTypeLater(tree.vartype, env, v, tree.pos());
+ if (TreeInfo.isReceiverParam(tree)) {
+ // If we are dealing with a receiver parameter, then
+ // we only allow base type annotations to be type
+ // annotations. Receivers are not allowed to have
+ // declaration annotations.
+ annotate.annotateStrictTypeLater(tree.vartype, tree.mods.annotations,
+ localEnv, v, tree.pos(), creator);
+ } else {
+ // Otherwise, we annotate the type.
+ annotate.annotateTypeLater(tree.vartype, tree.mods.annotations,
+ localEnv, v, tree.pos(), creator);
+ }
v.pos = tree.pos;
} finally {
annotate.enterDone();
@@ -708,6 +778,26 @@
log.error(tree, diag, type, tree.type);
}
}
+ void checkReceiver(JCVariableDecl tree, Env<AttrContext> localEnv) {
+ attr.attribExpr(tree.nameexpr, localEnv);
+ MethodSymbol m = localEnv.enclMethod.sym;
+ if (m.isConstructor()) {
+ Type outertype = m.owner.owner.type;
+ if (outertype.hasTag(TypeTag.METHOD)) {
+ // we have a local inner class
+ outertype = m.owner.owner.owner.type;
+ }
+ if (outertype.hasTag(TypeTag.CLASS)) {
+ checkType(tree.vartype, outertype, "incorrect.constructor.receiver.type");
+ checkType(tree.nameexpr, outertype, "incorrect.constructor.receiver.name");
+ } else {
+ log.error(tree, "receiver.parameter.not.applicable.constructor.toplevel.class");
+ }
+ } else {
+ checkType(tree.vartype, m.owner.type, "incorrect.receiver.type");
+ checkType(tree.nameexpr, m.owner.type, "incorrect.receiver.name");
+ }
+ }
public boolean needsLazyConstValue(JCTree tree) {
InitTreeVisitor initTreeVisitor = new InitTreeVisitor();
@@ -849,7 +939,8 @@
/** Queue processing of an attribute default value. */
void annotateDefaultValueLater(final JCExpression defaultValue,
final Env<AttrContext> localEnv,
- final MethodSymbol m) {
+ final MethodSymbol m,
+ final Annotate.PositionCreator creator) {
annotate.normal(new Annotate.Worker() {
@Override
public String toString() {
@@ -936,22 +1027,44 @@
// create an environment for evaluating the base clauses
Env<AttrContext> baseEnv = baseEnv(tree, env);
- if (tree.extending != null)
- annotate.annotateTypeLater(tree.extending, baseEnv, sym, tree.pos());
- for (JCExpression impl : tree.implementing)
- annotate.annotateTypeLater(impl, baseEnv, sym, tree.pos());
- annotate.flush();
+ // Annotations.
+ // In general, we cannot fully process annotations yet, but we
+ // can attribute the annotation types and then check to see if the
+ // @Deprecated annotation is present.
+ attr.attribAnnotationTypes(tree.mods.annotations, baseEnv);
+ if (hasDeprecatedAnnotation(tree.mods.annotations))
+ c.flags_field |= DEPRECATED;
+
+ // Don't attach declaration annotations to anonymous
+ // classes, they get handled specially below.
+ if (!sym.isAnonymous()) {
+ annotate.annotateLater(tree.mods.annotations, baseEnv,
+ c, tree.pos());
+ }
// Determine supertype.
- Type supertype =
- (tree.extending != null)
- ? attr.attribBase(tree.extending, baseEnv, true, false, true)
- : ((tree.mods.flags & Flags.ENUM) != 0)
+ Type supertype;
+
+ if (tree.extending != null) {
+ supertype = attr.attribBase(tree.extending, baseEnv,
+ true, false, true);
+ if (sym.isAnonymous()) {
+ annotate.annotateAnonClassDefLater(tree.extending,
+ tree.mods.annotations,
+ baseEnv, sym, tree.pos(),
+ annotate.extendsCreator);
+ } else {
+ annotate.annotateTypeLater(tree.extending, baseEnv, sym,
+ tree.pos(), annotate.extendsCreator);
+ }
+ } else {
+ supertype = ((tree.mods.flags & Flags.ENUM) != 0)
? attr.attribBase(enumBase(tree.pos, c), baseEnv,
true, false, false)
: (c.fullname == names.java_lang_Object)
? Type.noType
: syms.objectType;
+ }
ct.supertype_field = modelMissingTypes(supertype, tree.extending, false);
// Determine interfaces.
@@ -959,18 +1072,33 @@
ListBuffer<Type> all_interfaces = null; // lazy init
Set<Type> interfaceSet = new HashSet<>();
List<JCExpression> interfaceTrees = tree.implementing;
+ int i = 0;
for (JCExpression iface : interfaceTrees) {
- Type i = attr.attribBase(iface, baseEnv, false, true, true);
- if (i.hasTag(CLASS)) {
- interfaces.append(i);
- if (all_interfaces != null) all_interfaces.append(i);
- chk.checkNotRepeated(iface.pos(), types.erasure(i), interfaceSet);
+ Type it = attr.attribBase(iface, baseEnv, false, true, true);
+ if (it.hasTag(CLASS)) {
+ interfaces.append(it);
+ if (all_interfaces != null) all_interfaces.append(it);
+ chk.checkNotRepeated(iface.pos(), types.erasure(it), interfaceSet);
} else {
if (all_interfaces == null)
all_interfaces = new ListBuffer<Type>().appendList(interfaces);
- all_interfaces.append(modelMissingTypes(i, iface, true));
+ all_interfaces.append(modelMissingTypes(it, iface, true));
+
}
+ if (sym.isAnonymous()) {
+ // Note: if an anonymous class ever has more than
+ // one supertype for some reason, this will
+ // incorrectly attach tree.mods.annotations to ALL
+ // supertypes, not just the first.
+ annotate.annotateAnonClassDefLater(iface, tree.mods.annotations,
+ baseEnv, sym, tree.pos(),
+ annotate.implementsCreator(i++));
+ } else {
+ annotate.annotateTypeLater(iface, baseEnv, sym, tree.pos(),
+ annotate.implementsCreator(i++));
}
+ }
+
if ((c.flags_field & ANNOTATION) != 0) {
ct.interfaces_field = List.of(syms.annotationType);
ct.all_interfaces_field = ct.interfaces_field;
@@ -993,22 +1121,28 @@
}
}
- // Annotations.
- // In general, we cannot fully process annotations yet, but we
- // can attribute the annotation types and then check to see if the
- // @Deprecated annotation is present.
- attr.attribAnnotationTypes(tree.mods.annotations, baseEnv);
- if (hasDeprecatedAnnotation(tree.mods.annotations))
- c.flags_field |= DEPRECATED;
- annotate.annotateLater(tree.mods.annotations, baseEnv, c, tree.pos());
// class type parameters use baseEnv but everything uses env
chk.checkNonCyclicDecl(tree);
attr.attribTypeVariables(tree.typarams, baseEnv);
// Do this here, where we have the symbol.
- for (JCTypeParameter tp : tree.typarams)
- annotate.annotateTypeLater(tp, baseEnv, sym, tree.pos());
+ int j = 0;
+ for (List<JCTypeParameter> l = tree.typarams; l.nonEmpty();
+ l = l.tail, j++) {
+ final JCTypeParameter typaram = l.head;
+ annotate.annotateTypeLater(typaram, baseEnv, sym, tree.pos(),
+ annotate.typeParamCreator(j));
+
+ int k = 0;
+ for(List<JCExpression> b = typaram.bounds; b.nonEmpty();
+ b = b.tail, k++) {
+ final JCExpression bound = b.head;
+ annotate.annotateTypeLater(bound, baseEnv, sym, tree.pos(),
+ annotate.typeParamBoundCreator(typaram, j, k));
+ }
+
+ }
// Add default constructor if needed.
if ((c.flags() & INTERFACE) == 0 &&
@@ -1088,10 +1222,6 @@
while (halfcompleted.nonEmpty()) {
Env<AttrContext> toFinish = halfcompleted.next();
finish(toFinish);
- if (allowTypeAnnos) {
- typeAnnotations.organizeTypeAnnotationsSignatures(toFinish, (JCClassDecl)toFinish.tree);
- typeAnnotations.validateTypeAnnotationsSignatures(toFinish, (JCClassDecl)toFinish.tree);
- }
}
} finally {
isFirst = true;
diff --git a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
index f57ce74..25f062b 100644
--- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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
@@ -158,11 +158,6 @@
symbolFileEnabled = b;
}
- @Override
- public boolean isDefaultBootClassPath() {
- return locations.isDefaultBootClassPath();
- }
-
public JavaFileObject getFileForInput(String name) {
return getRegularFile(new File(name));
}
@@ -579,15 +574,6 @@
}
}
- private String defaultEncodingName;
- private String getDefaultEncodingName() {
- if (defaultEncodingName == null) {
- defaultEncodingName =
- new OutputStreamWriter(new ByteArrayOutputStream()).getEncoding();
- }
- return defaultEncodingName;
- }
-
public ClassLoader getClassLoader(Location location) {
nullCheck(location);
Iterable<? extends File> path = getLocation(location);
diff --git a/src/share/classes/com/sun/tools/javac/file/Locations.java b/src/share/classes/com/sun/tools/javac/file/Locations.java
index 3ba1d11..4106849 100644
--- a/src/share/classes/com/sun/tools/javac/file/Locations.java
+++ b/src/share/classes/com/sun/tools/javac/file/Locations.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -22,12 +22,10 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-
package com.sun.tools.javac.file;
-import java.io.FileNotFoundException;
-import java.util.Iterator;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
@@ -38,64 +36,72 @@
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.zip.ZipFile;
+
+import javax.tools.JavaFileManager;
import javax.tools.JavaFileManager.Location;
+import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import com.sun.tools.javac.code.Lint;
import com.sun.tools.javac.main.Option;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Options;
import com.sun.tools.javac.util.StringUtils;
-import javax.tools.JavaFileManager;
-import javax.tools.StandardJavaFileManager;
-import static javax.tools.StandardLocation.*;
-import static com.sun.tools.javac.main.Option.*;
+import static javax.tools.StandardLocation.CLASS_PATH;
+import static javax.tools.StandardLocation.PLATFORM_CLASS_PATH;
+import static javax.tools.StandardLocation.SOURCE_PATH;
-/** This class converts command line arguments, environment variables
- * and system properties (in File.pathSeparator-separated String form)
- * into a boot class path, user class path, and source path (in
- * {@code Collection<String>} form).
+import static com.sun.tools.javac.main.Option.BOOTCLASSPATH;
+import static com.sun.tools.javac.main.Option.DJAVA_ENDORSED_DIRS;
+import static com.sun.tools.javac.main.Option.DJAVA_EXT_DIRS;
+import static com.sun.tools.javac.main.Option.ENDORSEDDIRS;
+import static com.sun.tools.javac.main.Option.EXTDIRS;
+import static com.sun.tools.javac.main.Option.XBOOTCLASSPATH;
+import static com.sun.tools.javac.main.Option.XBOOTCLASSPATH_APPEND;
+import static com.sun.tools.javac.main.Option.XBOOTCLASSPATH_PREPEND;
+
+/**
+ * This class converts command line arguments, environment variables and system properties (in
+ * File.pathSeparator-separated String form) into a boot class path, user class path, and source
+ * path (in {@code Collection<String>} form).
*
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
+ * <p>
+ * <b>This is NOT part of any supported API. If you write code that depends on this, you do so at
+ * your own risk. This code and its internal interfaces are subject to change or deletion without
+ * notice.</b>
*/
public class Locations {
- /** The log to use for warning output */
+ /**
+ * The log to use for warning output
+ */
private Log log;
- /** Collection of command-line options */
- private Options options;
-
- /** Handler for -Xlint options */
- private Lint lint;
-
- /** Access to (possibly cached) file info */
+ /**
+ * Access to (possibly cached) file info
+ */
private FSInfo fsInfo;
- /** Whether to warn about non-existent path elements */
+ /**
+ * Whether to warn about non-existent path elements
+ */
private boolean warn;
- // TODO: remove need for this
- private boolean inited = false; // TODO? caching bad?
-
public Locations() {
initHandlers();
}
- public void update(Log log, Options options, Lint lint, FSInfo fsInfo) {
+ // could replace Lint by "boolean warn"
+ public void update(Log log, Lint lint, FSInfo fsInfo) {
this.log = log;
- this.options = options;
- this.lint = lint;
+ warn = lint.isEnabled(Lint.LintCategory.PATH);
this.fsInfo = fsInfo;
}
@@ -104,14 +110,14 @@
}
public boolean isDefaultBootClassPath() {
- BootClassPathLocationHandler h =
- (BootClassPathLocationHandler) getHandler(PLATFORM_CLASS_PATH);
+ BootClassPathLocationHandler h
+ = (BootClassPathLocationHandler) getHandler(PLATFORM_CLASS_PATH);
return h.isDefault();
}
boolean isDefaultBootClassPathRtJar(File file) {
- BootClassPathLocationHandler h =
- (BootClassPathLocationHandler) getHandler(PLATFORM_CLASS_PATH);
+ BootClassPathLocationHandler h
+ = (BootClassPathLocationHandler) getHandler(PLATFORM_CLASS_PATH);
return h.isDefaultRtJar(file);
}
@@ -127,6 +133,7 @@
/**
* Split a path into its elements. Empty path elements will be ignored.
+ *
* @param path The path to be split
* @return The elements of the path
*/
@@ -135,12 +142,13 @@
}
/**
- * Split a path into its elements. If emptyPathDefault is not null, all
- * empty elements in the path, including empty elements at either end of
- * the path, will be replaced with the value of emptyPathDefault.
+ * Split a path into its elements. If emptyPathDefault is not null, all empty elements in the
+ * path, including empty elements at either end of the path, will be replaced with the value of
+ * emptyPathDefault.
+ *
* @param path The path to be split
- * @param emptyPathDefault The value to substitute for empty path elements,
- * or null, to ignore empty path elements
+ * @param emptyPathDefault The value to substitute for empty path elements, or null, to ignore
+ * empty path elements
* @return The elements of the path
*/
private static Iterable<File> getPathEntries(String path, File emptyPathDefault) {
@@ -148,33 +156,38 @@
int start = 0;
while (start <= path.length()) {
int sep = path.indexOf(File.pathSeparatorChar, start);
- if (sep == -1)
+ if (sep == -1) {
sep = path.length();
- if (start < sep)
+ }
+ if (start < sep) {
entries.add(new File(path.substring(start, sep)));
- else if (emptyPathDefault != null)
+ } else if (emptyPathDefault != null) {
entries.add(emptyPathDefault);
+ }
start = sep + 1;
}
return entries;
}
/**
- * Utility class to help evaluate a path option.
- * Duplicate entries are ignored, jar class paths can be expanded.
+ * Utility class to help evaluate a path option. Duplicate entries are ignored, jar class paths
+ * can be expanded.
*/
private class Path extends LinkedHashSet<File> {
+
private static final long serialVersionUID = 0;
private boolean expandJarClassPaths = false;
- private Set<File> canonicalValues = new HashSet<>();
+ private final Set<File> canonicalValues = new HashSet<>();
public Path expandJarClassPaths(boolean x) {
expandJarClassPaths = x;
return this;
}
- /** What to use when path element is the empty string */
+ /**
+ * What to use when path element is the empty string
+ */
private File emptyPathDefault = null;
public Path emptyPathDefault(File x) {
@@ -182,15 +195,15 @@
return this;
}
- public Path() { super(); }
-
public Path addDirectories(String dirs, boolean warn) {
boolean prev = expandJarClassPaths;
expandJarClassPaths = true;
try {
- if (dirs != null)
- for (File dir : getPathEntries(dirs))
+ if (dirs != null) {
+ for (File dir : getPathEntries(dirs)) {
addDirectory(dir, warn);
+ }
+ }
return this;
} finally {
expandJarClassPaths = prev;
@@ -203,19 +216,22 @@
private void addDirectory(File dir, boolean warn) {
if (!dir.isDirectory()) {
- if (warn)
+ if (warn) {
log.warning(Lint.LintCategory.PATH,
"dir.path.element.not.found", dir);
+ }
return;
}
File[] files = dir.listFiles();
- if (files == null)
+ if (files == null) {
return;
+ }
for (File direntry : files) {
- if (isArchive(direntry))
+ if (isArchive(direntry)) {
addFile(direntry, warn);
+ }
}
}
@@ -232,8 +248,9 @@
public Path addFiles(Iterable<? extends File> files, boolean warn) {
if (files != null) {
- for (File file: files)
+ for (File file : files) {
addFile(file, warn);
+ }
}
return this;
}
@@ -248,7 +265,7 @@
return;
}
- if (! fsInfo.exists(file)) {
+ if (!fsInfo.exists(file)) {
/* No such file or directory exists */
if (warn) {
log.warning(Lint.LintCategory.PATH,
@@ -288,12 +305,13 @@
}
/* Now what we have left is either a directory or a file name
- conforming to archive naming convention */
+ conforming to archive naming convention */
super.add(file);
canonicalValues.add(canonFile);
- if (expandJarClassPaths && fsInfo.isFile(file))
+ if (expandJarClassPaths && fsInfo.isFile(file)) {
addJarClassPath(file, warn);
+ }
}
// Adds referenced classpath elements from a jar's Class-Path
@@ -302,7 +320,7 @@
// filenames, but if we do, we should redo all path-related code.
private void addJarClassPath(File jarFile, boolean warn) {
try {
- for (File f: fsInfo.getJarClassPath(jarFile)) {
+ for (File f : fsInfo.getJarClassPath(jarFile)) {
addFile(f, warn);
}
} catch (IOException e) {
@@ -312,53 +330,56 @@
}
/**
- * Base class for handling support for the representation of Locations.
- * Implementations are responsible for handling the interactions between
- * the command line options for a location, and API access via setLocation.
+ * Base class for handling support for the representation of Locations. Implementations are
+ * responsible for handling the interactions between the command line options for a location,
+ * and API access via setLocation.
+ *
* @see #initHandlers
* @see #getHandler
*/
protected abstract class LocationHandler {
+
final Location location;
final Set<Option> options;
/**
- * Create a handler. The location and options provide a way to map
- * from a location or an option to the corresponding handler.
+ * Create a handler. The location and options provide a way to map from a location or an
+ * option to the corresponding handler.
+ *
+ * @param location the location for which this is the handler
+ * @param options the options affecting this location
* @see #initHandlers
*/
protected LocationHandler(Location location, Option... options) {
this.location = location;
- this.options = options.length == 0 ?
- EnumSet.noneOf(Option.class):
- EnumSet.copyOf(Arrays.asList(options));
+ this.options = options.length == 0
+ ? EnumSet.noneOf(Option.class)
+ : EnumSet.copyOf(Arrays.asList(options));
}
- // TODO: TEMPORARY, while Options still used for command line options
- void update(Options optionTable) {
- for (Option o: options) {
- String v = optionTable.get(o);
- if (v != null) {
- handleOption(o, v);
- }
- }
- }
-
- /** @see JavaFileManager#handleOption */
+ /**
+ * @see JavaFileManager#handleOption
+ */
abstract boolean handleOption(Option option, String value);
- /** @see StandardJavaFileManager#getLocation */
+
+ /**
+ * @see StandardJavaFileManager#getLocation
+ */
abstract Collection<File> getLocation();
- /** @see StandardJavaFileManager#setLocation */
+
+ /**
+ * @see StandardJavaFileManager#setLocation
+ */
abstract void setLocation(Iterable<? extends File> files) throws IOException;
}
/**
- * General purpose implementation for output locations,
- * such as -d/CLASS_OUTPUT and -s/SOURCE_OUTPUT.
- * All options are treated as equivalent (i.e. aliases.)
- * The value is a single file, possibly null.
+ * General purpose implementation for output locations, such as -d/CLASS_OUTPUT and
+ * -s/SOURCE_OUTPUT. All options are treated as equivalent (i.e. aliases.) The value is a single
+ * file, possibly null.
*/
private class OutputLocationHandler extends LocationHandler {
+
private File outputDir;
OutputLocationHandler(Location location, Option... options) {
@@ -367,14 +388,15 @@
@Override
boolean handleOption(Option option, String value) {
- if (!options.contains(option))
+ if (!options.contains(option)) {
return false;
+ }
// TODO: could/should validate outputDir exists and is a directory
// need to decide how best to report issue for benefit of
// direct API call on JavaFileManager.handleOption(specifies IAE)
// vs. command line decoding.
- outputDir = new File(value);
+ outputDir = (value == null) ? null : new File(value);
return true;
}
@@ -389,27 +411,30 @@
outputDir = null;
} else {
Iterator<? extends File> pathIter = files.iterator();
- if (!pathIter.hasNext())
+ if (!pathIter.hasNext()) {
throw new IllegalArgumentException("empty path for directory");
+ }
File dir = pathIter.next();
- if (pathIter.hasNext())
+ if (pathIter.hasNext()) {
throw new IllegalArgumentException("path too long for directory");
- if (!dir.exists())
+ }
+ if (!dir.exists()) {
throw new FileNotFoundException(dir + ": does not exist");
- else if (!dir.isDirectory())
+ } else if (!dir.isDirectory()) {
throw new IOException(dir + ": not a directory");
+ }
outputDir = dir;
}
}
}
/**
- * General purpose implementation for search path locations,
- * such as -sourcepath/SOURCE_PATH and -processorPath/ANNOTATION_PROCESS_PATH.
- * All options are treated as equivalent (i.e. aliases.)
+ * General purpose implementation for search path locations, such as -sourcepath/SOURCE_PATH and
+ * -processorPath/ANNOTATION_PROCESS_PATH. All options are treated as equivalent (i.e. aliases.)
* The value is an ordered set of files and/or directories.
*/
private class SimpleLocationHandler extends LocationHandler {
+
protected Collection<File> searchPath;
SimpleLocationHandler(Location location, Option... options) {
@@ -418,10 +443,11 @@
@Override
boolean handleOption(Option option, String value) {
- if (!options.contains(option))
+ if (!options.contains(option)) {
return false;
- searchPath = value == null ? null :
- Collections.unmodifiableCollection(createPath().addFiles(value));
+ }
+ searchPath = value == null ? null
+ : Collections.unmodifiableCollection(createPath().addFiles(value));
return true;
}
@@ -451,11 +477,11 @@
}
/**
- * Subtype of SimpleLocationHandler for -classpath/CLASS_PATH.
- * If no value is given, a default is provided, based on system properties
- * and other values.
+ * Subtype of SimpleLocationHandler for -classpath/CLASS_PATH. If no value is given, a default
+ * is provided, based on system properties and other values.
*/
private class ClassPathLocationHandler extends SimpleLocationHandler {
+
ClassPathLocationHandler() {
super(StandardLocation.CLASS_PATH,
Option.CLASSPATH, Option.CP);
@@ -472,15 +498,20 @@
String cp = value;
// CLASSPATH environment variable when run from `javac'.
- if (cp == null) cp = System.getProperty("env.class.path");
+ if (cp == null) {
+ cp = System.getProperty("env.class.path");
+ }
// If invoked via a java VM (not the javac launcher), use the
// platform class path
- if (cp == null && System.getProperty("application.home") == null)
+ if (cp == null && System.getProperty("application.home") == null) {
cp = System.getProperty("java.class.path");
+ }
// Default to current working directory.
- if (cp == null) cp = ".";
+ if (cp == null) {
+ cp = ".";
+ }
return createPath().addFiles(cp);
}
@@ -488,38 +519,37 @@
@Override
protected Path createPath() {
return new Path()
- .expandJarClassPaths(true) // Only search user jars for Class-Paths
- .emptyPathDefault(new File(".")); // Empty path elt ==> current directory
+ .expandJarClassPaths(true) // Only search user jars for Class-Paths
+ .emptyPathDefault(new File(".")); // Empty path elt ==> current directory
}
private void lazy() {
- if (searchPath == null)
+ if (searchPath == null) {
setLocation(null);
+ }
}
}
/**
- * Custom subtype of LocationHandler for PLATFORM_CLASS_PATH.
- * Various options are supported for different components of the
- * platform class path.
- * Setting a value with setLocation overrides all existing option values.
- * Setting any option overrides any value set with setLocation, and reverts
- * to using default values for options that have not been set.
- * Setting -bootclasspath or -Xbootclasspath overrides any existing
- * value for -Xbootclasspath/p: and -Xbootclasspath/a:.
+ * Custom subtype of LocationHandler for PLATFORM_CLASS_PATH. Various options are supported for
+ * different components of the platform class path. Setting a value with setLocation overrides
+ * all existing option values. Setting any option overrides any value set with setLocation, and
+ * reverts to using default values for options that have not been set. Setting -bootclasspath or
+ * -Xbootclasspath overrides any existing value for -Xbootclasspath/p: and -Xbootclasspath/a:.
*/
private class BootClassPathLocationHandler extends LocationHandler {
+
private Collection<File> searchPath;
final Map<Option, String> optionValues = new EnumMap<>(Option.class);
/**
- * rt.jar as found on the default bootclasspath.
- * If the user specified a bootclasspath, null is used.
+ * rt.jar as found on the default bootclasspath. If the user specified a bootclasspath, null
+ * is used.
*/
private File defaultBootClassPathRtJar = null;
/**
- * Is bootclasspath the default?
+ * Is bootclasspath the default?
*/
private boolean isDefaultBootClassPath;
@@ -544,8 +574,9 @@
@Override
boolean handleOption(Option option, String value) {
- if (!options.contains(option))
+ if (!options.contains(option)) {
return false;
+ }
option = canonicalize(option);
optionValues.put(option, value);
@@ -557,20 +588,20 @@
return true;
}
// where
- // TODO: would be better if option aliasing was handled at a higher
- // level
- private Option canonicalize(Option option) {
- switch (option) {
- case XBOOTCLASSPATH:
- return Option.BOOTCLASSPATH;
- case DJAVA_ENDORSED_DIRS:
- return Option.ENDORSEDDIRS;
- case DJAVA_EXT_DIRS:
- return Option.EXTDIRS;
- default:
- return option;
- }
+ // TODO: would be better if option aliasing was handled at a higher
+ // level
+ private Option canonicalize(Option option) {
+ switch (option) {
+ case XBOOTCLASSPATH:
+ return Option.BOOTCLASSPATH;
+ case DJAVA_ENDORSED_DIRS:
+ return Option.ENDORSEDDIRS;
+ case DJAVA_EXT_DIRS:
+ return Option.EXTDIRS;
+ default:
+ return option;
}
+ }
@Override
Collection<File> getLocation() {
@@ -602,10 +633,11 @@
String xbootclasspathAppendOpt = optionValues.get(XBOOTCLASSPATH_APPEND);
path.addFiles(xbootclasspathPrependOpt);
- if (endorseddirsOpt != null)
+ if (endorseddirsOpt != null) {
path.addDirectories(endorseddirsOpt);
- else
+ } else {
path.addDirectories(System.getProperty("java.endorsed.dirs"), false);
+ }
if (bootclasspathOpt != null) {
path.addFiles(bootclasspathOpt);
@@ -615,8 +647,9 @@
path.addFiles(files, false);
File rt_jar = new File("rt.jar");
for (File file : getPathEntries(files)) {
- if (new File(file.getName()).equals(rt_jar))
+ if (new File(file.getName()).equals(rt_jar)) {
defaultBootClassPathRtJar = file;
+ }
}
}
@@ -625,22 +658,24 @@
// Strictly speaking, standard extensions are not bootstrap
// classes, but we treat them identically, so we'll pretend
// that they are.
- if (extdirsOpt != null)
+ if (extdirsOpt != null) {
path.addDirectories(extdirsOpt);
- else
+ } else {
path.addDirectories(System.getProperty("java.ext.dirs"), false);
+ }
- isDefaultBootClassPath =
- (xbootclasspathPrependOpt == null) &&
- (bootclasspathOpt == null) &&
- (xbootclasspathAppendOpt == null);
+ isDefaultBootClassPath
+ = (xbootclasspathPrependOpt == null)
+ && (bootclasspathOpt == null)
+ && (xbootclasspathAppendOpt == null);
return path;
}
private void lazy() {
- if (searchPath == null)
+ if (searchPath == null) {
searchPath = Collections.unmodifiableCollection(computePath());
+ }
}
}
@@ -661,14 +696,15 @@
new OutputLocationHandler((StandardLocation.NATIVE_HEADER_OUTPUT), Option.H)
};
- for (LocationHandler h: handlers) {
+ for (LocationHandler h : handlers) {
handlersForLocation.put(h.location, h);
- for (Option o: h.options)
+ for (Option o : h.options) {
handlersForOption.put(o, h);
+ }
}
}
- boolean handleOption(Option option, String value) {
+ public boolean handleOption(Option option, String value) {
LocationHandler h = handlersForOption.get(option);
return (h == null ? false : h.handleOption(option, value));
}
@@ -679,8 +715,9 @@
}
File getOutputLocation(Location location) {
- if (!location.isOutputLocation())
+ if (!location.isOutputLocation()) {
throw new IllegalArgumentException();
+ }
LocationHandler h = getHandler(location);
return ((OutputLocationHandler) h).outputDir;
}
@@ -688,10 +725,11 @@
void setLocation(Location location, Iterable<? extends File> files) throws IOException {
LocationHandler h = getHandler(location);
if (h == null) {
- if (location.isOutputLocation())
+ if (location.isOutputLocation()) {
h = new OutputLocationHandler(location);
- else
+ } else {
h = new SimpleLocationHandler(location);
+ }
handlersForLocation.put(location, h);
}
h.setLocation(files);
@@ -699,33 +737,21 @@
protected LocationHandler getHandler(Location location) {
location.getClass(); // null check
- lazy();
return handlersForLocation.get(location);
}
-// TOGO
- protected void lazy() {
- if (!inited) {
- warn = lint.isEnabled(Lint.LintCategory.PATH);
-
- for (LocationHandler h: handlersForLocation.values()) {
- h.update(options);
- }
-
- inited = true;
- }
- }
-
- /** Is this the name of an archive file? */
+ /**
+ * Is this the name of an archive file?
+ */
private boolean isArchive(File file) {
String n = StringUtils.toLowerCase(file.getName());
return fsInfo.isFile(file)
- && (n.endsWith(".jar") || n.endsWith(".zip"));
+ && (n.endsWith(".jar") || n.endsWith(".zip"));
}
/**
- * Utility method for converting a search path string to an array
- * of directory and JAR file URLs.
+ * Utility method for converting a search path string to an array of directory and JAR file
+ * URLs.
*
* Note that this method is called by apt and the DocletInvoker.
*
@@ -747,8 +773,7 @@
}
/**
- * Returns the directory or JAR file URL corresponding to the specified
- * local file name.
+ * Returns the directory or JAR file URL corresponding to the specified local file name.
*
* @param file the File object
* @return the resulting directory or JAR file URL, or null if unknown
diff --git a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 0a58573..bc610a2 100644
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -1611,8 +1611,6 @@
return TypeAnnotationPosition.methodReturn(readTypePath());
case FIELD:
return TypeAnnotationPosition.field(readTypePath());
- case UNKNOWN:
- throw new AssertionError("jvm.ClassReader: UNKNOWN target type should never occur!");
default:
throw new AssertionError("jvm.ClassReader: Unknown target type for position: " + type);
}
diff --git a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index d86644d..5eebcc2 100644
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -768,25 +768,13 @@
ListBuffer<Attribute.TypeCompound> invisibles = new ListBuffer<>();
for (Attribute.TypeCompound tc : typeAnnos) {
- if (tc.hasUnknownPosition()) {
- boolean fixed = tc.tryFixPosition();
-
- // Could we fix it?
- if (!fixed) {
- // This happens for nested types like @A Outer. @B Inner.
- // For method parameters we get the annotation twice! Once with
- // a valid position, once unknown.
- // TODO: find a cleaner solution.
- PrintWriter pw = log.getWriter(Log.WriterKind.ERROR);
- pw.println("ClassWriter: Position UNKNOWN in type annotation: " + tc);
+ Assert.checkNonNull(tc.position);
+ if (tc.position.type.isLocal() != inCode) {
continue;
}
+ if (!tc.position.emitToClassfile()) {
+ continue;
}
-
- if (tc.position.type.isLocal() != inCode)
- continue;
- if (!tc.position.emitToClassfile())
- continue;
switch (types.getRetention(tc)) {
case SOURCE: break;
case CLASS: invisibles.append(tc); break;
@@ -967,8 +955,6 @@
case METHOD_RETURN:
case FIELD:
break;
- case UNKNOWN:
- throw new AssertionError("jvm.ClassWriter: UNKNOWN target type should never occur!");
default:
throw new AssertionError("jvm.ClassWriter: Unknown target type for position: " + p);
}
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 3705077..2ee1489 100644
--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -557,7 +557,6 @@
ListBuffer<Attribute.TypeCompound> fieldTAs = new ListBuffer<>();
ListBuffer<Attribute.TypeCompound> nonfieldTAs = new ListBuffer<>();
for (TypeCompound ta : tas) {
- Assert.check(ta.getPosition().type != TargetType.UNKNOWN);
if (ta.getPosition().type == TargetType.FIELD) {
fieldTAs.add(ta);
} else {
@@ -1931,10 +1930,7 @@
|| code.meth.getKind() == javax.lang.model.element.ElementKind.STATIC_INIT;
for (Attribute.TypeCompound ta : meth.getRawTypeAttributes()) {
- if (ta.hasUnknownPosition())
- ta.tryFixPosition();
-
- if (ta.position.matchesPos(treePos))
+ if (ta.position != null && ta.position.matchesPos(treePos))
ta.position.updatePosOffset(code.cp);
}
@@ -1942,10 +1938,7 @@
return;
for (Attribute.TypeCompound ta : meth.owner.getRawTypeAttributes()) {
- if (ta.hasUnknownPosition())
- ta.tryFixPosition();
-
- if (ta.position.matchesPos(treePos))
+ if (ta.position != null && ta.position.matchesPos(treePos))
ta.position.updatePosOffset(code.cp);
}
@@ -1955,10 +1948,7 @@
continue;
for (Attribute.TypeCompound ta : s.getRawTypeAttributes()) {
- if (ta.hasUnknownPosition())
- ta.tryFixPosition();
-
- if (ta.position.matchesPos(treePos))
+ if (ta.position != null && ta.position.matchesPos(treePos))
ta.position.updatePosOffset(code.cp);
}
}
@@ -2330,8 +2320,8 @@
}
public void visitTypeTest(JCInstanceOf tree) {
- setTypeAnnotationPositions(tree.pos);
genExpr(tree.expr, tree.expr.type).load();
+ setTypeAnnotationPositions(tree.pos);
code.emitop2(instanceof_, makeRef(tree.pos(), tree.clazz.type));
result = items.makeStackItem(syms.booleanType);
}
diff --git a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index ff8ff35..97dfb97 100644
--- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -394,6 +394,7 @@
processPcks = options.isSet("process.packages");
werror = options.isSet(WERROR);
+ // Should this be with other option checking, in Main
if (source.compareTo(Source.DEFAULT) < 0) {
if (options.isUnset(XLINT_CUSTOM, "-" + LintCategory.OPTIONS.option)) {
if (fileManager instanceof BaseFileManager) {
@@ -403,6 +404,7 @@
}
}
+ // Should this be with other option checking, in Main
checkForObsoleteOptions(target);
verboseCompilePolicy = options.isSet("verboseCompilePolicy");
@@ -434,6 +436,7 @@
log.setDiagnosticFormatter(RichDiagnosticFormatter.instance(context));
}
+ // Should this be with other option checking, in Main
private void checkForObsoleteOptions(Target target) {
// Unless lint checking on options is disabled, check for
// obsolete source and target options.
@@ -829,6 +832,10 @@
List<String> classnames,
Iterable<? extends Processor> processors)
{
+ if (!taskListener.isEmpty()) {
+ taskListener.started(new TaskEvent(TaskEvent.Kind.COMPILATION));
+ }
+
if (processors != null && processors.iterator().hasNext())
explicitAnnotationProcessingRequested = true;
// as a JavaCompiler can only be used once, throw an exception if
@@ -902,6 +909,9 @@
printCount("error", errorCount());
printCount("warn", warningCount());
}
+ if (!taskListener.isEmpty()) {
+ taskListener.finished(new TaskEvent(TaskEvent.Kind.COMPILATION));
+ }
close();
if (procEnvImpl != null)
procEnvImpl.close();
diff --git a/src/share/classes/com/sun/tools/javac/main/Main.java b/src/share/classes/com/sun/tools/javac/main/Main.java
index 2c7f2f5..3cb2662 100644
--- a/src/share/classes/com/sun/tools/javac/main/Main.java
+++ b/src/share/classes/com/sun/tools/javac/main/Main.java
@@ -33,8 +33,9 @@
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
+import java.util.Map;
import java.util.Set;
import javax.annotation.processing.Processor;
@@ -56,6 +57,7 @@
import com.sun.tools.javac.util.Log.PrefixKind;
import com.sun.tools.javac.util.Log.WriterKind;
import com.sun.tools.javac.util.ServiceLoader;
+
import static com.sun.tools.javac.main.Option.*;
/** This class provides a command line interface to the javac compiler.
@@ -121,6 +123,13 @@
}
@Override
+ public boolean handleFileManagerOption(Option option, String value) {
+ options.put(option.getText(), value);
+ deferredFileManagerOptions.put(option, value);
+ return true;
+ }
+
+ @Override
public void remove(String name) {
options.remove(name);
}
@@ -172,11 +181,13 @@
/** The list of source files to process
*/
- public Set<File> filenames = null; // XXX sb protected
+ public Set<File> filenames = null; // XXX should be protected or private
/** List of class files names passed on the command line
*/
- public ListBuffer<String> classnames = null; // XXX sb protected
+ protected ListBuffer<String> classnames = null;
+
+ public Map<Option, String> deferredFileManagerOptions; // XXX should be protected or private
/** Report a usage error.
*/
@@ -395,6 +406,7 @@
filenames = new LinkedHashSet<>();
classnames = new ListBuffer<>();
+ deferredFileManagerOptions = new LinkedHashMap<>();
JavaCompiler comp = null;
/*
* TODO: Logic below about what is an acceptable command line
@@ -446,6 +458,11 @@
if (batchMode)
CacheFSInfo.preRegister(context);
+ fileManager = context.get(JavaFileManager.class);
+ if (fileManager instanceof BaseFileManager) {
+ ((BaseFileManager) fileManager).handleOptions(deferredFileManagerOptions);
+ }
+
// FIXME: this code will not be invoked if using JavacTask.parse/analyze/generate
// invoke any available plugins
String plugins = options.get(PLUGIN);
@@ -511,8 +528,6 @@
comp.closeables = comp.closeables.prepend(log.getWriter(WriterKind.NOTICE));
}
- fileManager = context.get(JavaFileManager.class);
-
if (!files.isEmpty()) {
// add filenames to fileObjects
comp = JavaCompiler.instance(context);
diff --git a/src/share/classes/com/sun/tools/javac/main/Option.java b/src/share/classes/com/sun/tools/javac/main/Option.java
index 360d894..a00bb43 100644
--- a/src/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/share/classes/com/sun/tools/javac/main/Option.java
@@ -83,6 +83,7 @@
XLINT_CUSTOM("-Xlint:", EXTENDED, BASIC, ANYOF, getXLintChoices()) {
private static final String LINT_KEY_FORMAT = " %-19s %s";
+ @Override
void help(Log log, OptionKind kind) {
if (this.kind != kind)
return;
@@ -667,6 +668,8 @@
}
}
helper.put(option, arg);
+ if (group == OptionGroup.FILEMANAGER)
+ helper.handleFileManagerOption(this, arg);
return false;
}
diff --git a/src/share/classes/com/sun/tools/javac/main/OptionHelper.java b/src/share/classes/com/sun/tools/javac/main/OptionHelper.java
index 4e65230..cf64792 100644
--- a/src/share/classes/com/sun/tools/javac/main/OptionHelper.java
+++ b/src/share/classes/com/sun/tools/javac/main/OptionHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2014, 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
@@ -50,6 +50,9 @@
/** Remove any prior value for an option. */
public abstract void remove(String name);
+ /** Handle a file manager option. */
+ public abstract boolean handleFileManagerOption(Option option, String value);
+
/** Get access to the Log for the compilation. */
public abstract Log getLog();
@@ -99,6 +102,11 @@
}
@Override
+ public boolean handleFileManagerOption(Option option, String value) {
+ throw new IllegalArgumentException();
+ }
+
+ @Override
void error(String key, Object... args) {
throw new IllegalArgumentException(log.localize(PrefixKind.JAVAC, key, args));
}
diff --git a/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java b/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
index 1ced030..4ca110d 100644
--- a/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
+++ b/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2014, 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
@@ -167,11 +167,6 @@
return getClassLoader(lb.toArray(new URL[lb.size()]));
}
- @Override
- public boolean isDefaultBootClassPath() {
- return locations.isDefaultBootClassPath();
- }
-
// <editor-fold defaultstate="collapsed" desc="Location handling">
public boolean hasLocation(Location location) {
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 9bf9f60..658a97d 100644
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2404,6 +2404,11 @@
static interface methods are not supported in -source {0}\n\
(use -source 8 or higher to enable static interface methods)
+# 0: string
+compiler.err.static.intf.method.invoke.not.supported.in.source=\
+ static interface method invocations are not supported in -source {0}\n\
+ (use -source 8 or higher to enable static interface method invocations)
+
########################################
# Diagnostics for verbose resolution
# used by Resolve (debug only)
diff --git a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 201df78..463d7b8 100644
--- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -135,6 +135,14 @@
}
}
+ public static boolean isReceiverParam(JCTree tree) {
+ if (tree.hasTag(VARDEF)) {
+ return ((JCVariableDecl)tree).nameexpr != null;
+ } else {
+ return false;
+ }
+ }
+
/** Is there a constructor declaration in the given list of trees?
*/
public static boolean hasConstructors(List<JCTree> trees) {
diff --git a/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java b/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
index ed21e97..691b9c6 100644
--- a/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
+++ b/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2014, 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
@@ -26,7 +26,6 @@
package com.sun.tools.javac.util;
import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
@@ -47,6 +46,8 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+
+import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
@@ -64,7 +65,7 @@
* There are no references here to file-system specific objects such as
* java.io.File or java.nio.file.Path.
*/
-public abstract class BaseFileManager {
+public abstract class BaseFileManager implements JavaFileManager {
protected BaseFileManager(Charset charset) {
this.charset = charset;
byteBufferCache = new ByteBufferCache();
@@ -73,12 +74,13 @@
/**
* Set the context for JavacPathFileManager.
+ * @param context the context containing items to be associated with the file manager
*/
public void setContext(Context context) {
log = Log.instance(context);
options = Options.instance(context);
classLoaderClass = options.get("procloader");
- locations.update(log, options, Lint.instance(context), FSInfo.instance(context));
+ locations.update(log, Lint.instance(context), FSInfo.instance(context));
}
protected Locations createLocations() {
@@ -123,14 +125,19 @@
Class<?>[] constrArgTypes = { URL[].class, ClassLoader.class };
Constructor<? extends ClassLoader> constr = loader.getConstructor(constrArgTypes);
return constr.newInstance(urls, thisClassLoader);
- } catch (Throwable t) {
+ } catch (ReflectiveOperationException t) {
// ignore errors loading user-provided class loader, fall through
}
}
return new URLClassLoader(urls, thisClassLoader);
}
+ public boolean isDefaultBootClassPath() {
+ return locations.isDefaultBootClassPath();
+ }
+
// <editor-fold defaultstate="collapsed" desc="Option handling">
+ @Override
public boolean handleOption(String current, Iterator<String> remaining) {
OptionHelper helper = new GrumpyHelper(log) {
@Override
@@ -147,7 +154,13 @@
public void remove(String name) {
options.remove(name);
}
+
+ @Override
+ public boolean handleFileManagerOption(Option option, String value) {
+ return handleOption(option, value);
+ }
};
+
for (Option o: javacFileManagerOptions) {
if (o.matches(current)) {
if (o.hasArg()) {
@@ -159,7 +172,7 @@
if (!o.process(helper, current))
return true;
}
- // operand missing, or process returned false
+ // operand missing, or process returned true
throw new IllegalArgumentException(current);
}
}
@@ -170,6 +183,7 @@
private static final Set<Option> javacFileManagerOptions =
Option.getJavacFileManagerOptions();
+ @Override
public int isSupportedOption(String option) {
for (Option o : javacFileManagerOptions) {
if (o.matches(option))
@@ -178,7 +192,27 @@
return -1;
}
- public abstract boolean isDefaultBootClassPath();
+ /**
+ * Common back end for OptionHelper handleFileManagerOption.
+ * @param option the option whose value to be set
+ * @param value the value for the option
+ * @return true if successful, and false otherwise
+ */
+ public boolean handleOption(Option option, String value) {
+ return locations.handleOption(option, value);
+ }
+
+ /**
+ * Call handleOption for collection of options and corresponding values.
+ * @param map a collection of options and corresponding values
+ * @return true if all the calls are successful
+ */
+ public boolean handleOptions(Map<Option, String> map) {
+ boolean ok = true;
+ for (Map.Entry<Option, String> e: map.entrySet())
+ ok = ok & handleOption(e.getKey(), e.getValue());
+ return ok;
+ }
// </editor-fold>
@@ -205,10 +239,7 @@
CharsetDecoder decoder;
try {
decoder = getDecoder(encodingName, ignoreEncodingErrors);
- } catch (IllegalCharsetNameException e) {
- log.error("unsupported.encoding", encodingName);
- return (CharBuffer)CharBuffer.allocate(1).flip();
- } catch (UnsupportedCharsetException e) {
+ } catch (IllegalCharsetNameException | UnsupportedCharsetException e) {
log.error("unsupported.encoding", encodingName);
return (CharBuffer)CharBuffer.allocate(1).flip();
}
@@ -286,6 +317,9 @@
// <editor-fold defaultstate="collapsed" desc="ByteBuffers">
/**
* Make a byte buffer from an input stream.
+ * @param in the stream
+ * @return a byte buffer containing the contents of the stream
+ * @throws IOException if an error occurred while reading the stream
*/
public ByteBuffer makeByteBuffer(InputStream in)
throws IOException {
diff --git a/src/share/classes/com/sun/tools/javadoc/Start.java b/src/share/classes/com/sun/tools/javadoc/Start.java
index d5cba00..de8f96c 100644
--- a/src/share/classes/com/sun/tools/javadoc/Start.java
+++ b/src/share/classes/com/sun/tools/javadoc/Start.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,18 +32,23 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Map;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import com.sun.javadoc.*;
+import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.main.CommandLine;
+import com.sun.tools.javac.main.Option;
+import com.sun.tools.javac.util.BaseFileManager;
import com.sun.tools.javac.util.ClientCodeException;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Options;
+
import static com.sun.tools.javac.code.Flags.*;
/**
@@ -71,7 +76,7 @@
private static final String standardDocletClassName =
"com.sun.tools.doclets.standard.Standard";
- private long defaultFilter = PUBLIC | PROTECTED;
+ private final long defaultFilter = PUBLIC | PROTECTED;
private final Messager messager;
@@ -324,6 +329,15 @@
javaNames.append(arg);
}
}
+
+ if (fileManager == null) {
+ JavacFileManager.preRegister(context);
+ fileManager = context.get(JavaFileManager.class);
+ }
+ if (fileManager instanceof BaseFileManager) {
+ ((BaseFileManager) fileManager).handleOptions(fileManagerOpts);
+ }
+
compOpts.notifyListeners();
if (javaNames.isEmpty() && subPackages.isEmpty() && isEmpty(fileObjects)) {
diff --git a/src/share/classes/com/sun/tools/javadoc/ToolOption.java b/src/share/classes/com/sun/tools/javadoc/ToolOption.java
index 9473324..d24aa33 100644
--- a/src/share/classes/com/sun/tools/javadoc/ToolOption.java
+++ b/src/share/classes/com/sun/tools/javadoc/ToolOption.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,14 @@
package com.sun.tools.javadoc;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.main.Option;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Options;
-import java.util.StringTokenizer;
/**
@@ -45,42 +49,42 @@
BOOTCLASSPATH("-bootclasspath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setCompilerOpt(opt, arg);
+ helper.setFileManagerOpt(Option.BOOTCLASSPATH, arg);
}
},
CLASSPATH("-classpath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setCompilerOpt(opt, arg);
+ helper.setFileManagerOpt(Option.CLASSPATH, arg);
}
},
CP("-cp", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setCompilerOpt(opt, arg);
+ helper.setFileManagerOpt(Option.CP, arg);
}
},
EXTDIRS("-extdirs", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setCompilerOpt(opt, arg);
+ helper.setFileManagerOpt(Option.EXTDIRS, arg);
}
},
SOURCEPATH("-sourcepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setCompilerOpt(opt, arg);
+ helper.setFileManagerOpt(Option.SOURCEPATH, arg);
}
},
SYSCLASSPATH("-sysclasspath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setCompilerOpt("-bootclasspath", arg);
+ helper.setFileManagerOpt(Option.BOOTCLASSPATH, arg);
}
},
@@ -274,6 +278,9 @@
/** Excluded packages, from -exclude. */
final ListBuffer<String> excludedPackages = new ListBuffer<>();
+ // File manager options
+ final Map<Option, String> fileManagerOpts = new LinkedHashMap<>();
+
/** javac options, set by various options. */
Options compOpts; // = Options.instance(context)
@@ -306,7 +313,7 @@
abstract void usageError(String msg, Object... args);
- protected void addToList(ListBuffer<String> list, String str){
+ void addToList(ListBuffer<String> list, String str){
StringTokenizer st = new StringTokenizer(str, ":");
String current;
while(st.hasMoreTokens()){
@@ -315,18 +322,22 @@
}
}
- protected void setFilter(long filterBits) {
+ void setFilter(long filterBits) {
if (showAccess != null) {
usageError("main.incompatible.access.flags");
}
showAccess = new ModifierFilter(filterBits);
}
- private void setCompilerOpt(String opt, String arg) {
+ void setCompilerOpt(String opt, String arg) {
if (compOpts.get(opt) != null) {
usageError("main.option.already.seen", opt);
}
compOpts.put(opt, arg);
}
+
+ void setFileManagerOpt(Option opt, String arg) {
+ fileManagerOpts.put(opt, arg);
+ }
}
}
diff --git a/test/tools/javac/T6358024.java b/test/tools/javac/T6358024.java
index 1aa5115..d0dd3aa 100644
--- a/test/tools/javac/T6358024.java
+++ b/test/tools/javac/T6358024.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2014, 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
@@ -54,13 +54,13 @@
test(fm, f,
new Option[] { new Option("-d", ".")},
- 7);
+ 8);
test(fm, f,
new Option[] { new XOption("-XprintRounds"),
new Option("-processorpath", "."),
new Option("-processor", self) },
- 12);
+ 13);
}
static void test(JavacFileManager fm, JavaFileObject f, Option[] opts, int expect) throws Throwable {
diff --git a/test/tools/javac/T6358166.java b/test/tools/javac/T6358166.java
index fe887c6..8e669a2 100644
--- a/test/tools/javac/T6358166.java
+++ b/test/tools/javac/T6358166.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2014, 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
@@ -57,12 +57,8 @@
static void test(JavacFileManager fm, JavaFileObject f, String... args) throws Throwable {
Context context = new Context();
- fm.setContext(context);
- Main compilerMain = new Main("javac", new PrintWriter(System.err, true));
- compilerMain.setOptions(Options.instance(context));
- compilerMain.filenames = new LinkedHashSet<File>();
- compilerMain.processArgs(args);
+ Main compilerMain = initCompilerMain(context, fm, args);
JavaCompiler c = JavaCompiler.instance(context);
@@ -76,6 +72,19 @@
throw new AssertionError("elapsed time is suspect: " + msec);
}
+ static Main initCompilerMain(Context context, JavacFileManager fm, String... args) {
+ fm.setContext(context);
+ context.put(JavaFileManager.class, fm);
+
+ Main compilerMain = new Main("javac", new PrintWriter(System.err, true));
+ compilerMain.setOptions(Options.instance(context));
+ compilerMain.filenames = new LinkedHashSet<File>();
+ compilerMain.deferredFileManagerOptions = new LinkedHashMap<>();
+ compilerMain.processArgs(args);
+ fm.handleOptions(compilerMain.deferredFileManagerOptions);
+ return compilerMain;
+ }
+
public boolean process(Set<? extends TypeElement> tes, RoundEnvironment renv) {
return true;
}
diff --git a/test/tools/javac/T6358168.java b/test/tools/javac/T6358168.java
index 9023e9d..be33620 100644
--- a/test/tools/javac/T6358168.java
+++ b/test/tools/javac/T6358168.java
@@ -68,12 +68,9 @@
static void testNoAnnotationProcessing(JavacFileManager fm, JavaFileObject f) throws Throwable {
Context context = new Context();
- fm.setContext(context);
- Main compilerMain = new Main("javac", new PrintWriter(System.err, true));
- compilerMain.setOptions(Options.instance(context));
- compilerMain.filenames = new LinkedHashSet<File>();
- compilerMain.processArgs(new String[] { "-d", "." });
+ String[] args = { "-d", "." };
+ Main compilerMain = initCompilerMain(context, fm, args);
JavaCompiler compiler = JavaCompiler.instance(context);
compiler.compile(List.of(f));
@@ -87,16 +84,14 @@
static void testAnnotationProcessing(JavacFileManager fm, JavaFileObject f) throws Throwable {
Context context = new Context();
- fm.setContext(context);
- Main compilerMain = new Main("javac", new PrintWriter(System.err, true));
- compilerMain.setOptions(Options.instance(context));
- compilerMain.filenames = new LinkedHashSet<File>();
- compilerMain.processArgs(new String[] {
- "-XprintRounds",
- "-processorpath", testClasses,
- "-processor", self,
- "-d", "."});
+ String[] args = {
+ "-XprintRounds",
+ "-processorpath", testClasses,
+ "-processor", self,
+ "-d", "."
+ };
+ Main compilerMain = initCompilerMain(context, fm, args);
JavaCompiler compiler = JavaCompiler.instance(context);
compiler.compile(List.of(f));
@@ -108,6 +103,19 @@
}
}
+ static Main initCompilerMain(Context context, JavacFileManager fm, String... args) {
+ fm.setContext(context);
+ context.put(JavaFileManager.class, fm);
+
+ Main compilerMain = new Main("javac", new PrintWriter(System.err, true));
+ compilerMain.setOptions(Options.instance(context));
+ compilerMain.filenames = new LinkedHashSet<File>();
+ compilerMain.deferredFileManagerOptions = new LinkedHashMap<>();
+ compilerMain.processArgs(args);
+ fm.handleOptions(compilerMain.deferredFileManagerOptions);
+ return compilerMain;
+ }
+
public boolean process(Set<? extends TypeElement> tes, RoundEnvironment renv) {
return true;
}
diff --git a/test/tools/javac/T6395974.java b/test/tools/javac/T6395974.java
index f08cf7d..98d5d65 100644
--- a/test/tools/javac/T6395974.java
+++ b/test/tools/javac/T6395974.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,11 @@
import java.io.*;
import java.util.*;
+
import javax.tools.*;
+
import com.sun.source.util.*;
+import com.sun.source.util.TaskEvent.Kind;
import com.sun.tools.javac.api.*;
@@ -59,16 +62,13 @@
task.setTaskListener(tl);
task.call();
-
- if (tl.event != null)
- throw new AssertionError("Unexpected TaskListener event: " + tl.event);
}
static class MyTaskListener implements TaskListener {
public void started(TaskEvent e) {
- System.err.println("Started: " + e);
- if (event == null)
- event = e;
+ if (e.getKind() != Kind.COMPILATION) {
+ throw new AssertionError("Unexpected TaskListener event: " + e);
+ }
}
public void finished(TaskEvent e) {
}
diff --git a/test/tools/javac/T6403466.out b/test/tools/javac/T6403466.out
index dbbdb54..6a4316e 100644
--- a/test/tools/javac/T6403466.out
+++ b/test/tools/javac/T6403466.out
@@ -1,3 +1,4 @@
+Started TaskEvent[COMPILATION,null,null]
Started TaskEvent[ANNOTATION_PROCESSING,null,null]
Started TaskEvent[PARSE,T6403466.java,null]
Finished TaskEvent[PARSE,T6403466.java,null]
@@ -40,3 +41,4 @@
Finished TaskEvent[ANALYZE,T6403466Wrapper.java,T6403466Wrapper]
Started TaskEvent[GENERATE,T6403466Wrapper.java,T6403466Wrapper]
Finished TaskEvent[GENERATE,T6403466Wrapper.java,T6403466Wrapper]
+Finished TaskEvent[COMPILATION,null,null]
diff --git a/test/tools/javac/annotations/FinalReceiverTest.java b/test/tools/javac/annotations/FinalReceiverTest.java
new file mode 100644
index 0000000..96ef9d9
--- /dev/null
+++ b/test/tools/javac/annotations/FinalReceiverTest.java
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8027886
+ * @summary Receiver parameters must not be final
+ * @compile/fail/ref=FinalReceiverTest.out -XDrawDiagnostics FinalReceiverTest.java
+ */
+
+class FinalReceiverTest {
+ void m() {
+ class Inner {
+ Inner(final FinalReceiverTest FinalReceiverTest.this) {}
+ }
+ }
+}
diff --git a/test/tools/javac/annotations/FinalReceiverTest.out b/test/tools/javac/annotations/FinalReceiverTest.out
new file mode 100644
index 0000000..0aaa964
--- /dev/null
+++ b/test/tools/javac/annotations/FinalReceiverTest.out
@@ -0,0 +1,2 @@
+FinalReceiverTest.java:11:43: compiler.err.mod.not.allowed.here: final
+1 error
diff --git a/test/tools/javac/annotations/LocalInnerReceiverTest.java b/test/tools/javac/annotations/LocalInnerReceiverTest.java
new file mode 100644
index 0000000..c32ec40
--- /dev/null
+++ b/test/tools/javac/annotations/LocalInnerReceiverTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014, 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 8029042
+ * @summary Receiver parameter not supported on local class constructor
+ * @compile LocalInnerReceiverTest.java
+ */
+
+class LocalInnerReceiverTest {
+ void m() {
+ class Inner {
+ Inner(LocalInnerReceiverTest LocalInnerReceiverTest.this) {}
+ }
+ }
+}
diff --git a/test/tools/javac/annotations/typeAnnotations/TargetTypes.java b/test/tools/javac/annotations/typeAnnotations/TargetTypes.java
index 053f4e4..2d42a64 100644
--- a/test/tools/javac/annotations/typeAnnotations/TargetTypes.java
+++ b/test/tools/javac/annotations/typeAnnotations/TargetTypes.java
@@ -35,9 +35,41 @@
* @compile TargetTypes.java
*/
-@Target({TYPE_USE, TYPE_PARAMETER, TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@interface A {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface A {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface B {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface C {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface D {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface E {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface F {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface G {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface H {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface I {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface J {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface K {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface L {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface M {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface N {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface O {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface P {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface Q {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface R {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface S {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface U {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface V {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface W {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface X {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface Y {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface Z {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AA {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AB {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AC {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AD {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AE {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AF {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AG {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AH {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AI {}
+@Target({TYPE_USE, TYPE_PARAMETER, TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface AJ {}
/** wildcard bound */
class T0x1C {
@@ -46,75 +78,75 @@
/** wildcard bound generic/array */
class T0x1D<T> {
- void m0x1D(List<? extends @A List<int[]>> lst) {}
+ void m0x1D(List<? extends @B List<int[]>> lst) {}
}
/** typecast */
class T0x00 {
void m0x00(Long l1) {
- Object l2 = (@A Long) l1;
+ Object l2 = (@C Long) l1;
}
}
/** typecast generic/array */
class T0x01<T> {
void m0x01(List<T> list) {
- List<T> l = (List<@A T>) list;
+ List<T> l = (List<@D T>) list;
}
}
/** instanceof */
class T0x02 {
boolean m0x02(String s) {
- return (s instanceof @A String);
+ return (s instanceof @E String);
}
}
/** object creation (new) */
class T0x04 {
void m0x04() {
- new @A ArrayList<String>();
+ new @F ArrayList<String>();
}
}
/** local variable */
class T0x08 {
void m0x08() {
- @A String s = null;
+ @G String s = null;
}
}
/** method parameter generic/array */
class T0x0D {
- void m0x0D(HashMap<@A Object, List<@A List<@A Class>>> s1) {}
+ void m0x0D(HashMap<@H Object, List<@I List<@J Class>>> s1) {}
}
/** method receiver */
class T0x06 {
- void m0x06(@A T0x06 this) {}
+ void m0x06(@K T0x06 this) {}
}
/** method return type generic/array */
class T0x0B {
- Class<@A Object> m0x0B() { return null; }
+ Class<@L Object> m0x0B() { return null; }
}
/** field generic/array */
class T0x0F {
- HashMap<@A Object, @A Object> c1;
+ HashMap<@M Object, @N Object> c1;
}
/** method type parameter */
class T0x20<T, U> {
- <@A T, @A U> void m0x20() {}
+ <@O T, @P U> void m0x20() {}
}
/** class type parameter */
-class T0x22<@A T, @A U> {
+class T0x22<@Q T, @R U> {
}
/** class type parameter bound */
-class T0x10<T extends @A Object> {
+class T0x10<T extends @S Object> {
}
/** method type parameter bound */
@@ -123,43 +155,43 @@
}
/** class type parameter bound generic/array */
-class T0x11<T extends List<@A T>> {
+class T0x11<T extends List<@U T>> {
}
/** method type parameter bound generic/array */
class T0x13 {
- static <T extends Comparable<@A T>> T m0x13() {
+ static <T extends Comparable<@V T>> T m0x13() {
return null;
}
}
/** class extends/implements generic/array */
-class T0x15<T> extends ArrayList<@A T> {
+class T0x15<T> extends ArrayList<@W T> {
}
/** type test (instanceof) generic/array */
class T0x03<T> {
void m0x03(T typeObj, Object obj) {
- boolean ok = obj instanceof String @A [];
+ boolean ok = obj instanceof String @X [];
}
}
/** object creation (new) generic/array */
class T0x05<T> {
void m0x05() {
- new ArrayList<@A T>();
+ new ArrayList<@Y T>();
}
}
/** local variable generic/array */
class T0x09<T> {
void g() {
- List<@A String> l = null;
+ List<@Z String> l = null;
}
void a() {
- String @A [] as = null;
+ String @AA [] as = null;
}
}
@@ -168,14 +200,14 @@
<T> T0x19() {}
void g() {
- new <List<@A String>> T0x19();
+ new <List<@AB String>> T0x19();
}
}
/** type argument in method call generic/array */
class T0x1B<T> {
void m0x1B() {
- Collections.<T @A []>emptyList();
+ Collections.<T @AC []>emptyList();
}
}
@@ -184,7 +216,7 @@
<T> T0x18() {}
void m() {
- new <@A Integer> T0x18();
+ new <@AD Integer> T0x18();
}
}
@@ -192,15 +224,15 @@
class T0x1A<T,U> {
public static <T, U> T m() { return null; }
static void m0x1A() {
- T0x1A.<@A Integer, @A Short>m();
+ T0x1A.<@AE Integer, @AF Short>m();
}
}
/** class extends/implements */
-class T0x14 extends @A Object implements @A Serializable, @A Cloneable {
+class T0x14 extends @AG Object implements @AH Serializable, @AI Cloneable {
}
/** exception type in throws */
class T0x16 {
- void m0x16() throws @A Exception {}
+ void m0x16() throws @AJ Exception {}
}
diff --git a/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java b/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java
index 6beae3a..d6fa8e7 100644
--- a/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java
+++ b/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileTestHelper.java
@@ -36,8 +36,8 @@
//Makes debugging much easier. Set to 'false' for less output.
public Boolean verbose = true;
- void println(String msg) { if (verbose) System.out.println(msg); }
- void print(String msg) { if (verbose) System.out.print(msg); }
+ void println(String msg) { if (verbose) System.err.println(msg); }
+ void print(String msg) { if (verbose) System.err.print(msg); }
File writeTestFile(String fname, String source) throws IOException {
File f = new File(fname);
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java
new file mode 100644
index 0000000..d100659
--- /dev/null
+++ b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8027262
+ * @summary A class expression cannot be annotated.
+ * @compile/fail/ref=AnnotatedClassExpr.out -XDrawDiagnostics AnnotatedClassExpr.java
+ */
+import java.lang.annotation.*;
+import java.util.List;
+
+class AnnotatedClassExpr {
+ static void main() {
+ Object o1 = @A int.class;
+ }
+}
+
+@Target(ElementType.TYPE_USE)
+@interface A { }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.out b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.out
new file mode 100644
index 0000000..d2d354c
--- /dev/null
+++ b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.out
@@ -0,0 +1,2 @@
+AnnotatedClassExpr.java:12:29: compiler.err.no.annotations.on.dot.class
+1 error
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java
index c7b38cc..b5953d0 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.java
@@ -1,9 +1,8 @@
/*
* @test /nodynamiccopyright/
- * @bug 8006775
+ * @bug 8006775 8027262
* @summary Import clauses cannot use annotations.
* @author Werner Dietl
- * @ignore
* @compile/fail/ref=AnnotatedImport.out -XDrawDiagnostics AnnotatedImport.java
*/
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out
index dbd0d42..91589d9 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out
@@ -1,7 +1,7 @@
-AnnotatedImport.java:9:13: compiler.err.expected: token.identifier
-AnnotatedImport.java:9:14: compiler.err.expected3: class, interface, enum
-AnnotatedImport.java:10:7: compiler.err.expected: token.identifier
-AnnotatedImport.java:10:10: compiler.err.expected: ';'
-AnnotatedImport.java:11:18: compiler.err.expected: token.identifier
-AnnotatedImport.java:11:19: compiler.err.expected3: class, interface, enum
+AnnotatedImport.java:10:13: compiler.err.expected: token.identifier
+AnnotatedImport.java:10:16: compiler.err.expected3: class, interface, enum
+AnnotatedImport.java:11:7: compiler.err.expected: token.identifier
+AnnotatedImport.java:11:11: compiler.err.expected3: class, interface, enum
+AnnotatedImport.java:12:18: compiler.err.expected: token.identifier
+AnnotatedImport.java:12:21: compiler.err.expected3: class, interface, enum
6 errors
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java
index 4122fa1..aed3e2c 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.java
@@ -1,9 +1,8 @@
/*
* @test /nodynamiccopyright/
- * @bug 8006775
+ * @bug 8006775 8027262
* @summary Package declarations cannot use annotations.
* @author Werner Dietl
- * @ignore
* @compile/fail/ref=AnnotatedPackage1.out -XDrawDiagnostics AnnotatedPackage1.java
*/
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out
index 648af19..b2c1770 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out
@@ -1,3 +1,3 @@
AnnotatedPackage1.java:9:14: compiler.err.expected: token.identifier
-AnnotatedPackage1.java:9:16: compiler.err.expected3: class, interface, enum
+AnnotatedPackage1.java:9:17: compiler.err.expected3: class, interface, enum
2 errors
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out
index 574ceb6..600d699 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out
@@ -1,5 +1,5 @@
-CantAnnotatePackages.java:19:14: compiler.err.cant.resolve.location: kindname.class, java, , , (compiler.misc.location: kindname.class, CantAnnotatePackages, null)
-CantAnnotatePackages.java:20:9: compiler.err.cant.resolve.location: kindname.class, lang, , , (compiler.misc.location: kindname.package, java, null)
-CantAnnotatePackages.java:21:14: compiler.err.cant.resolve.location: kindname.class, lang, , , (compiler.misc.location: kindname.package, java, null)
-CantAnnotatePackages.java:14:18: compiler.err.cant.type.annotate.scoping.1: @TA
-4 errors
\ No newline at end of file
+CantAnnotatePackages.java:14:13: compiler.err.cant.type.annotate.scoping.1: @TA
+CantAnnotatePackages.java:19:18: compiler.err.cant.type.annotate.scoping.1: @TA
+CantAnnotatePackages.java:20:19: compiler.err.cant.type.annotate.scoping.1: @TA
+CantAnnotatePackages.java:21:24: compiler.err.cant.type.annotate.scoping.1: @TA
+4 errors
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out
index 638b91d..85118d3 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out
@@ -1,12 +1,14 @@
-CantAnnotateScoping.java:61:9: compiler.err.cant.resolve.location: kindname.class, lang, , , (compiler.misc.location: kindname.package, java, null)
-CantAnnotateScoping.java:66:9: compiler.err.cant.resolve.location: kindname.class, XXX, , , (compiler.misc.location: kindname.package, java, null)
-CantAnnotateScoping.java:70:9: compiler.err.cant.resolve.location: kindname.class, lang, , , (compiler.misc.location: kindname.package, java, null)
+CantAnnotateScoping.java:66:18: compiler.err.doesnt.exist: java.XXX
CantAnnotateScoping.java:38:14: compiler.err.cant.type.annotate.scoping.1: @TA
-CantAnnotateScoping.java:47:18: compiler.err.cant.type.annotate.scoping.1: @TA
-CantAnnotateScoping.java:56:37: compiler.err.cant.type.annotate.scoping: @TA,@TA2
-CantAnnotateScoping.java:40:14: compiler.err.cant.type.annotate.scoping.1: @TA
-CantAnnotateScoping.java:42:34: compiler.err.cant.type.annotate.scoping: @TA,@DA,@TA2
+CantAnnotateScoping.java:40:19: compiler.err.cant.type.annotate.scoping.1: @TA
+CantAnnotateScoping.java:47:13: compiler.err.cant.type.annotate.scoping.1: @TA
+CantAnnotateScoping.java:56:32: compiler.err.cant.type.annotate.scoping: @TA,@TA2
+CantAnnotateScoping.java:61:19: compiler.err.cant.type.annotate.scoping.1: @DA
+CantAnnotateScoping.java:70:19: compiler.err.cant.type.annotate.scoping.1: @TA
+CantAnnotateScoping.java:61:11: compiler.err.annotation.type.not.applicable
+CantAnnotateScoping.java:66:11: compiler.err.annotation.type.not.applicable
+CantAnnotateScoping.java:42:39: compiler.err.cant.type.annotate.scoping: @TA,@DA,@TA2
CantAnnotateScoping.java:42:25: compiler.err.annotation.type.not.applicable
-CantAnnotateScoping.java:44:38: compiler.err.cant.type.annotate.scoping: @TA,@DA
+CantAnnotateScoping.java:44:43: compiler.err.cant.type.annotate.scoping: @TA,@DA
CantAnnotateScoping.java:44:34: compiler.err.annotation.type.not.applicable
-11 errors
+13 errors
\ No newline at end of file
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java
index cf019b1..442c9d5 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.java
@@ -12,14 +12,49 @@
import java.lang.annotation.*;
class Top {
- @Target(ElementType.TYPE_USE)
- @interface TA {}
-
- @Target(ElementType.TYPE_USE)
- @interface TB {}
-
- @Target(ElementType.TYPE_USE)
- @interface TC {}
+ @Target(ElementType.TYPE_USE) @interface TA {}
+ @Target(ElementType.TYPE_USE) @interface TB1 {}
+ @Target(ElementType.TYPE_USE) @interface TB2 {}
+ @Target(ElementType.TYPE_USE) @interface TB3 {}
+ @Target(ElementType.TYPE_USE) @interface TB4 {}
+ @Target(ElementType.TYPE_USE) @interface TB5 {}
+ @Target(ElementType.TYPE_USE) @interface TB6 {}
+ @Target(ElementType.TYPE_USE) @interface TB7 {}
+ @Target(ElementType.TYPE_USE) @interface TB8 {}
+ @Target(ElementType.TYPE_USE) @interface TB9 {}
+ @Target(ElementType.TYPE_USE) @interface TB10 {}
+ @Target(ElementType.TYPE_USE) @interface TB11 {}
+ @Target(ElementType.TYPE_USE) @interface TB12 {}
+ @Target(ElementType.TYPE_USE) @interface TB13 {}
+ @Target(ElementType.TYPE_USE) @interface TB14 {}
+ @Target(ElementType.TYPE_USE) @interface TB15 {}
+ @Target(ElementType.TYPE_USE) @interface TB16 {}
+ @Target(ElementType.TYPE_USE) @interface TB17 {}
+ @Target(ElementType.TYPE_USE) @interface TB18 {}
+ @Target(ElementType.TYPE_USE) @interface TB19 {}
+ @Target(ElementType.TYPE_USE) @interface TB20 {}
+ @Target(ElementType.TYPE_USE) @interface TB21 {}
+ @Target(ElementType.TYPE_USE) @interface TB22 {}
+ @Target(ElementType.TYPE_USE) @interface TB23 {}
+ @Target(ElementType.TYPE_USE) @interface TB24 {}
+ @Target(ElementType.TYPE_USE) @interface TB25 {}
+ @Target(ElementType.TYPE_USE) @interface TB26 {}
+ @Target(ElementType.TYPE_USE) @interface TB27 {}
+ @Target(ElementType.TYPE_USE) @interface TB28 {}
+ @Target(ElementType.TYPE_USE) @interface TB29 {}
+ @Target(ElementType.TYPE_USE) @interface TB30 {}
+ @Target(ElementType.TYPE_USE) @interface TB31 {}
+ @Target(ElementType.TYPE_USE) @interface TB32 {}
+ @Target(ElementType.TYPE_USE) @interface TB33 {}
+ @Target(ElementType.TYPE_USE) @interface TB34 {}
+ @Target(ElementType.TYPE_USE) @interface TB35 {}
+ @Target(ElementType.TYPE_USE) @interface TB36 {}
+ @Target(ElementType.TYPE_USE) @interface TB37 {}
+ @Target(ElementType.TYPE_USE) @interface TB38 {}
+ @Target(ElementType.TYPE_USE) @interface TB39 {}
+ @Target(ElementType.TYPE_USE) @interface TB40 {}
+ @Target(ElementType.TYPE_USE) @interface TB41 {}
+ @Target(ElementType.TYPE_USE) @interface TC {}
class Outer {
class Inner {
@@ -34,63 +69,63 @@
// All combinations are OK
- Top.@TB Outer f1;
- @TB Outer.Inner f1a;
+ Top.@TB1 Outer f1;
+ @TB2 Outer.Inner f1a;
Outer. @TC Inner f1b;
- @TB Outer. @TC Inner f1c;
+ @TB3 Outer. @TC Inner f1c;
- @TA Top. @TB Outer f2;
- @TA Top. @TB Outer.Inner f2a;
+ @TA Top. @TB4 Outer f2;
+ @TA Top. @TB5 Outer.Inner f2a;
@TA Top. Outer. @TC Inner f2b;
- @TA Top. @TB Outer. @TC Inner f2c;
+ @TA Top. @TB6 Outer. @TC Inner f2c;
- @TB Outer f1r() { return null; }
- @TB Outer.Inner f1ra() { return null; }
+ @TB7 Outer f1r() { return null; }
+ @TB8 Outer.Inner f1ra() { return null; }
Outer. @TC Inner f1rb() { return null; }
- @TB Outer. @TC Inner f1rc() { return null; }
+ @TB9 Outer. @TC Inner f1rc() { return null; }
- void f1param(@TB Outer p,
- @TB Outer.Inner p1,
+ void f1param(@TB41 Outer p,
+ @TB10 Outer.Inner p1,
Outer. @TC Inner p2,
- @TB Outer. @TC Inner p3) { }
+ @TB11 Outer. @TC Inner p3) { }
void f1cast(Object o) {
Object l;
- l = (@TB Outer) o;
- l = (@TB Outer.Inner) o;
+ l = (@TB12 Outer) o;
+ l = (@TB13 Outer.Inner) o;
l = (Outer. @TC Inner) o;
- l = (@TB Outer. @TC Inner) o;
+ l = (@TB14 Outer. @TC Inner) o;
}
- List<@TB Outer> g1;
- List<@TB Outer.Inner> g1a;
+ List<@TB15 Outer> g1;
+ List<@TB16 Outer.Inner> g1a;
List<Outer. @TC Inner> g1b;
- List<@TB Outer. @TC Inner> g1c;
+ List<@TB17 Outer. @TC Inner> g1c;
- List<@TA Top. @TB Outer> g2;
- List<@TA Top. @TB Outer.Inner> g2a;
+ List<@TA Top. @TB18 Outer> g2;
+ List<@TA Top. @TB19 Outer.Inner> g2a;
List<@TA Top. Outer. @TC Inner> g2b;
- List<@TA Top. @TB Outer. @TC Inner> g2c;
+ List<@TA Top. @TB20 Outer. @TC Inner> g2c;
- List<@TB Outer> g1r() { return null; }
- List<@TB Outer.Inner> g1ra() { return null; }
+ List<@TB21 Outer> g1r() { return null; }
+ List<@TB22 Outer.Inner> g1ra() { return null; }
List<Outer. @TC Inner> g1rb() { return null; }
- List<@TB Outer. @TC Inner> g1rc() { return null; }
+ List<@TB23 Outer. @TC Inner> g1rc() { return null; }
- void g1param(List<@TB Outer> p,
- List<@TB Outer.Inner> p1,
+ void g1param(List<@TB24 Outer> p,
+ List<@TB25 Outer.Inner> p1,
List<Outer. @TC Inner> p2,
- List<@TB Outer. @TC Inner> p3) { }
+ List<@TB26 Outer. @TC Inner> p3) { }
void g1new(Object o) {
Object l;
- l = new @TB ArrayList<@TB Outer>();
- l = new @TB ArrayList<@TB Outer.Inner>();
- l = new @TB HashMap<String, Outer. @TC Inner>();
- l = new @TB HashMap<String, @TB Outer. Inner>();
- l = new @TB HashMap<String, @TB Outer. @TC Inner>();
- l = new @TB HashMap<String, @TA Top. Outer. @TC Inner>();
- l = new @TB HashMap<String, @TA Top. @TB Outer. Inner>();
- l = new @TB HashMap<String, @TA Top. @TB Outer. @TC Inner>();
+ l = new @TB27 ArrayList<@TB28 Outer>();
+ l = new @TB29 ArrayList<@TB30 Outer.Inner>();
+ l = new @TB31 HashMap<String, Outer. @TC Inner>();
+ l = new @TB32 HashMap<String, @TB33 Outer. Inner>();
+ l = new @TB34 HashMap<String, @TB35 Outer. @TC Inner>();
+ l = new @TB36 HashMap<String, @TA Top. Outer. @TC Inner>();
+ l = new @TB37 HashMap<String, @TA Top. @TB38 Outer. Inner>();
+ l = new @TB39 HashMap<String, @TA Top. @TB40 Outer. @TC Inner>();
}
}
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.out b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.out
index 869059c..b6e5d18 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass2.out
@@ -1,65 +1,72 @@
CantAnnotateStaticClass2.java:44:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass2.java:45:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:52:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:53:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:55:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:56:23: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:57:23: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:58:23: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:60:21: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:61:21: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:62:21: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:64:25: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:65:25: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:66:25: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:52:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:53:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:55:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:56:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:57:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:57:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:58:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:58:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:60:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:61:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:62:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:64:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:65:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:65:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:66:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:66:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass2.java:71:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass2.java:72:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:79:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:80:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:79:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:80:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass2.java:87:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:89:24: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:89:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass2.java:91:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:93:24: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:57:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:58:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:65:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:66:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:120:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:121:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:128:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:129:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:131:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:133:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:134:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:135:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:137:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:138:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:139:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:141:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:142:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:143:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:149:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:150:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:157:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:158:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:165:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:167:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:169:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:171:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:105:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:107:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:112:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:114:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:184:35: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:186:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:187:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:192:35: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:194:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:195:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:199:35: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:200:38: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:201:41: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass2.java:202:44: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:203:44: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass2.java:204:49: compiler.err.cant.type.annotate.scoping: @Top.TA,@Top.TB,@Top.TC
-64 errors
+CantAnnotateStaticClass2.java:93:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:120:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:121:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:128:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:129:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:131:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:133:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:134:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:134:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:135:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:135:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:137:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:138:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:139:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:141:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:142:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:142:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:143:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:143:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:149:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:150:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:157:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:158:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:165:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:167:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:169:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:171:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:105:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:107:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:112:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:114:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:184:40: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:186:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:187:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:192:40: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:194:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:195:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:199:38: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:200:38: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:200:49: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:201:44: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:202:44: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:202:55: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:203:44: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass2.java:203:55: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass2.java:204:52: compiler.err.cant.type.annotate.scoping: @Top.TA,@Top.TB,@Top.TC
+71 errors
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java
index f9d123e..4d94b6f 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.java
@@ -1,9 +1,8 @@
/*
* @test /nodynamiccopyright/
- * @bug 8006733 8006775
+ * @bug 8006733 8006775 8027262
* @summary Ensure behavior for nested types is correct.
* @author Werner Dietl
- * @ignore
* @compile/fail/ref=CantAnnotateStaticClass3.out -XDrawDiagnostics CantAnnotateStaticClass3.java
*/
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.out b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.out
index 1d3cba0..4f2f989 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass3.out
@@ -1,83 +1,92 @@
CantAnnotateStaticClass3.java:44:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass3.java:45:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass3.java:46:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:52:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:53:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:54:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:56:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:57:23: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:58:23: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:59:23: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:61:21: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:62:21: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:63:21: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:65:25: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:66:25: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:67:25: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:52:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:53:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:54:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:56:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:57:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:57:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:58:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:58:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:59:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:59:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:61:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:62:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:63:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:65:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:65:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:66:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:66:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:67:12: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:67:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass3.java:71:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass3.java:72:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass3.java:73:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:79:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:80:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:81:16: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:79:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:80:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:81:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass3.java:84:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:86:24: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:86:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass3.java:88:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:90:24: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:90:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
CantAnnotateStaticClass3.java:92:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:94:24: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:57:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:58:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:59:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:65:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:66:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:67:12: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:99:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:101:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:106:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:108:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:113:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:115:18: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:120:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:121:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:122:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:128:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:129:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:130:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:132:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:134:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:135:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:136:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:138:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:139:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:140:14: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:142:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:143:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:144:17: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:149:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:150:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:151:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:157:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:158:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:159:14: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:162:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:164:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:166:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:168:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:170:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:172:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:177:35: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:179:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:180:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:185:35: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:187:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:188:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:193:35: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:195:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:196:41: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:200:35: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:201:38: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:202:41: compiler.err.cant.type.annotate.scoping.1: @Top.TA
-CantAnnotateStaticClass3.java:203:44: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-CantAnnotateStaticClass3.java:204:44: compiler.err.cant.type.annotate.scoping.1: @Top.TB
-82 errors
\ No newline at end of file
+CantAnnotateStaticClass3.java:94:22: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:120:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:121:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:122:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:128:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:129:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:130:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:132:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:134:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:134:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:135:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:135:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:136:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:136:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:138:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:139:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:140:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:142:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:142:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:143:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:143:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:144:17: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:144:28: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:149:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:150:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:151:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:157:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:158:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:159:19: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:162:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:164:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:166:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:168:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:170:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:172:27: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:99:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:101:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:106:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:108:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:113:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:115:23: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:177:40: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:179:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:180:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:185:40: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:187:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:188:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:193:40: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:195:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:196:46: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:200:38: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:201:38: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:201:49: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:202:44: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:203:44: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:203:55: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+CantAnnotateStaticClass3.java:204:44: compiler.err.cant.type.annotate.scoping.1: @Top.TA
+CantAnnotateStaticClass3.java:204:55: compiler.err.cant.type.annotate.scoping.1: @Top.TB
+91 errors
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.java b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.java
index d33fd24..65029ce 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.java
@@ -10,7 +10,7 @@
Object e1 = new @DA int[5];
Object e2 = new @DA String[42];
Object e3 = new @DA Object();
- Object ok = new @DA Object() { };
+ Object e4 = new @DA Object() { };
}
@interface DA { }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out
index efb6557..325094a 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out
@@ -1,5 +1,5 @@
-DeclarationAnnotation.java:13:21: compiler.err.annotation.type.not.applicable
DeclarationAnnotation.java:10:21: compiler.err.annotation.type.not.applicable
DeclarationAnnotation.java:11:21: compiler.err.annotation.type.not.applicable
DeclarationAnnotation.java:12:21: compiler.err.annotation.type.not.applicable
+DeclarationAnnotation.java:13:21: compiler.err.annotation.type.not.applicable
4 errors
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java
index 4f099e0..0ae45af 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java
@@ -5,10 +5,13 @@
* @author Mahmood Ali
* @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
*/
+import java.lang.annotation.*;
+
class MissingAnnotationValue {
void test() {
String @A [] s;
}
}
+@Target(ElementType.TYPE_USE)
@interface A { int field(); }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out
index 74a7ef7..c6deb98 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:10:12: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:12:12: compiler.err.annotation.missing.default.value: A, field
1 error
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java b/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java
index 5a5c8b6..1acb2ec 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java
@@ -5,10 +5,13 @@
* @author Mahmood Ali
* @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
*/
+import java.lang.annotation.*;
+
class MissingAnnotationValue {
void innermethod() {
class Inner<@A K> { }
}
}
+@Target(ElementType.TYPE_USE)
@interface A { int field(); }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out b/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out
index 637ff4a..9c513dc 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:10:17: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:12:17: compiler.err.annotation.missing.default.value: A, field
1 error
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java b/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java
index 15cf6e9..784474b 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java
@@ -5,10 +5,13 @@
* @author Mahmood Ali
* @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
*/
+import java.lang.annotation.*;
+
class MissingAnnotationValue {
void test() {
String[] a = new String @A [5];
}
}
+@Target(ElementType.TYPE_USE)
@interface A { int field(); }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out b/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out
index 6865348..a8f60fb 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:10:29: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:12:29: compiler.err.annotation.missing.default.value: A, field
1 error
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java b/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java
index 4043ed6..7851d21 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java
@@ -5,8 +5,13 @@
* @author Mahmood Ali
* @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
*/
+import java.lang.annotation.*;
+import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.*;
+
class MissingAnnotationValue {
void test(@A MissingAnnotationValue this) { }
}
+@Target({TYPE_USE})
@interface A { int field(); }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out b/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out
index c833910..3d0ae6b 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:9:13: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:13:13: compiler.err.annotation.missing.default.value: A, field
1 error
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java b/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java
index a6e0030..8daca36 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java
@@ -5,8 +5,11 @@
* @author Mahmood Ali
* @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
*/
+import java.lang.annotation.*;
+
class MissingAnnotationValue<K> {
MissingAnnotationValue<@A String> l;
}
+@Target(ElementType.TYPE_USE)
@interface A { int field(); }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out b/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out
index 749442f..ec12c3d 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:9:26: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:11:26: compiler.err.annotation.missing.default.value: A, field
1 error
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java b/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java
index 39f8bee..0b2b899 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java
@@ -5,7 +5,10 @@
* @author Mahmood Ali
* @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
*/
+import java.lang.annotation.*;
+
class MissingAnnotationValue<@A K> {
}
+@Target(ElementType.TYPE_USE)
@interface A { int field(); }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out b/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out
index acac021..563bf87 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:8:30: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:30: compiler.err.annotation.missing.default.value: A, field
1 error
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java b/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java
index c111c89..4e9a113 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java
@@ -5,8 +5,11 @@
* @author Mahmood Ali
* @compile/fail/ref=MissingAnnotationValue.out -XDrawDiagnostics MissingAnnotationValue.java
*/
+import java.lang.annotation.*;
+
class MissingAnnotationValue<K> {
MissingAnnotationValue<@A ?> l;
}
+@Target(ElementType.TYPE_USE)
@interface A { int field(); }
diff --git a/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out b/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out
index 749442f..ec12c3d 100644
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:9:26: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:11:26: compiler.err.annotation.missing.default.value: A, field
1 error
diff --git a/test/tools/javac/annotations/typeAnnotations/newlocations/AllLocations.java b/test/tools/javac/annotations/typeAnnotations/newlocations/AllLocations.java
new file mode 100644
index 0000000..ed66750
--- /dev/null
+++ b/test/tools/javac/annotations/typeAnnotations/newlocations/AllLocations.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2014, 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 8027262
+ * @summary Stress test for type annotatons
+ * @compile AllLocations.java
+ */
+
+import java.util.function.Function;
+import java.lang.annotation.*;
+import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.*;
+import java.io.*;
+import java.lang.ref.WeakReference;
+
+public class AllLocations {
+
+ public class ParamStream<T> extends FileOutputStream {
+ public ParamStream(File f) throws FileNotFoundException { super(f); }
+ }
+
+ public class Inner<S> {
+ public Inner() {}
+ public <@A T> Inner(@B Object o) {}
+ public <@C T> Object g(Inner<@D S> this, Object @E [] o) {
+ return new @F int @G [5];
+ }
+ }
+
+ public <@H T extends @I Inner<@J ? extends @K String>> AllLocations(Object o) {}
+
+ public @L Object @M [] @N [] arr = new @O Object @P [5] @Q [5];
+
+ public Inner<@R ? extends @S Inner<@T ? extends @U Integer>> inner;
+
+ public Function func(@V AllLocations this) {
+ try (final ParamStream<@W Integer @X []> fs = new ParamStream<@Y Integer @Z []>(new File("testfile"))) {
+ return @AA AllLocations.Inner<@AB String>::<@AC Integer>new;
+ } catch(@AD Exception ex) {
+ return null;
+ }
+ }
+
+ public <@AE T extends @AF Inner<@AG Integer @AH []>> Function func2() {
+ arr[0][0] = new @AI Inner((@AJ Object) arr[0]);
+ return Ext.f((@AK Object) arr[0]) instanceof @AL Inner @AM [] @AN [] ?
+ @AO @AP Ext::<@AQ @AR Integer> f :
+ @AS @AT Ext::<@AU @AV Integer> f;
+ }
+
+ public Object func3(Object @AW [] arr) {
+ Inner<@AX ? extends @AY Inner<@AZ ? extends @BA Integer>> loc;
+ if (arr[0] instanceof @BB Inner @BC [] @BD [])
+ return this.<Inner<@BE Integer @BF []>> func4();
+ else
+ return new <@BG Inner<@BH Integer>> @BI Inner<@BJ Inner<@BK Integer>>(null);
+ }
+
+ public <@BL T extends @BO Inner<@BP Integer @BQ []>>
+ @BR Inner<@BS Inner<@BT String>> func4() {
+ return (@BU Inner<@BV Inner<@BW String>>)
+ new <@BX Inner<@BY Integer>> @BZ Inner<@CA Inner<@CB String>>(null) {};
+ }
+
+ { Inner<@CC ? extends @CD Inner<@CE ? extends @CF Integer>> loc =
+ new @CG Inner<@CH Inner<@CI Integer>>() {};
+ Ext.func(Ext.func(@CJ WeakReference::new));
+ Ext.func(Ext.func(@CK Ext::<@CL Integer>f));
+ Ext.func((@CM Object a) -> { @CN Object b = a; return b; });
+ }
+
+}
+
+class Ext {
+ public static <@CO T> Object f(Object o) {
+ return null;
+ }
+ public static Function func(Function f) { return f; }
+}
+
+
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface A { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface B { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface C { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface D { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface E { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface F { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface G { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface H { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface I { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface J { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface K { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface L { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface M { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface N { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface O { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface P { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface Q { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface R { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface S { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface T { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface U { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface V { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface W { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface X { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface Y { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface Z { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AA { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AB { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AC { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AD { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AE { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AF { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AG { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AH { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AI { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AJ { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AK { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AL { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AM { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AN { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AO { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AP { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AQ { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AR { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AS { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AT { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AU { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AV { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AW { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AX { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AY { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface AZ { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BA { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BB { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BC { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BD { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BE { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BF { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BG { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BH { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BI { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BJ { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BK { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BL { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BM { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BN { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BO { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BP { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BQ { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BR { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BS { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BT { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BU { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BV { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BW { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BX { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BY { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface BZ { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CA { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CB { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CC { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CD { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CE { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CF { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CG { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CH { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CI { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CJ { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CK { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CL { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CM { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CN { }
+@Retention(RUNTIME) @Target({TYPE_USE}) @interface CO { }
diff --git a/test/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java b/test/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java
index bd4acc9..77ab754 100644
--- a/test/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java
+++ b/test/tools/javac/annotations/typeAnnotations/newlocations/Expressions.java
@@ -52,28 +52,40 @@
}
void objectCreationArray() {
- Object a1 = new @A String [] [] { };
- Object a2 = new @A String [1] [];
- Object a3 = new @A String [1] [2];
+ Object a1 = new @C String [] [] { };
+ Object a2 = new @D String [1] [];
+ Object a3 = new @E String [1] [2];
- Object b1 = new @A String @B(0) [] [] { };
- Object b2 = new @A String @B(0) [1] [];
- Object b3 = new @A String @B(0) [1] [2];
+ Object b1 = new @F String @B(1) [] [] { };
+ Object b2 = new @G String @B(2) [1] [];
+ Object b3 = new @H String @B(3) [1] [2];
- Object c1 = new @A String [] @B(0) [] { };
- Object c2 = new @A String [1] @B(0) [];
- Object c3 = new @A String [1] @B(0) [2];
+ Object c1 = new @I String [] @B(4) [] { };
+ Object c2 = new @J String [1] @B(5) [];
+ Object c3 = new @K String [1] @B(6) [2];
- Object d1 = new @A String @B(0) [] @B(0) [] { };
- Object d2 = new @A String @B(0) [1] @B(0) [];
- Object d3 = new @A String @B(0) [1] @B(0) [2];
+ Object d1 = new @L String @B(7) [] @B(8) [] { };
+ Object d2 = new @M String @B(9) [1] @B(10) [];
+ Object d3 = new @N String @B(11) [1] @B(12) [2];
- Object rand = new @A String @B(value = 0) [1] @B(value = 0) [2];
+ Object rand = new @O String @B(value = 13) [1] @B(value = 14) [2];
}
}
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface A { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface C { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface D { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface E { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface F { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface G { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface H { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface I { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface J { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface K { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface L { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface M { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface N { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface O { }
@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@interface A { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@interface B { int value(); }
+ @interface B { int value(); }
diff --git a/test/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java b/test/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java
index 7572b4f..76c98fc 100644
--- a/test/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java
+++ b/test/tools/javac/annotations/typeAnnotations/newlocations/NestedTypes.java
@@ -128,6 +128,7 @@
MyList<Outer . @Cv("Data") Static> f9;
// Illegal:
// MyList<@A Outer . @Cv("Data") Static> f9;
+
}
class Test2 {
diff --git a/test/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java b/test/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java
index 95103ff..c9d719c 100644
--- a/test/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java
+++ b/test/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java
@@ -54,14 +54,6 @@
<T extends Runnable> void accept(@B("m") WithValue this, T r) throws Exception { }
}
-class WithFinal {
- void plain(final @B("m") WithFinal this) { }
- <T> void generic(final @B("m") WithFinal this) { }
- void withException(final @B("m") WithFinal this) throws Exception { }
- String nonVoid(final @B("m") WithFinal this) { return null; }
- <T extends Runnable> void accept(final @B("m") WithFinal this, T r) throws Exception { }
-}
-
class WithBody {
Object f;
diff --git a/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out b/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out
index 2e89277..d914d56 100644
--- a/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out
+++ b/test/tools/javac/annotations/typeAnnotations/newlocations/RepeatingTypeAnnotations.out
@@ -17,12 +17,12 @@
RepeatingTypeAnnotations.java:89:33: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
RepeatingTypeAnnotations.java:93:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
RepeatingTypeAnnotations.java:93:35: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
-RepeatingTypeAnnotations.java:97:34: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
RepeatingTypeAnnotations.java:97:19: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
-RepeatingTypeAnnotations.java:101:26: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:97:34: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
RepeatingTypeAnnotations.java:101:37: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
-RepeatingTypeAnnotations.java:101:72: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:26: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
RepeatingTypeAnnotations.java:101:56: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
+RepeatingTypeAnnotations.java:101:72: compiler.err.duplicate.annotation.missing.container: TA, java.lang.annotation.Repeatable
- compiler.note.unchecked.filename: RepeatingTypeAnnotations.java
- compiler.note.unchecked.recompile
25 errors
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java
index a38839e..8d39967 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java
@@ -25,72 +25,110 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for class extends clauses
* @compile -g Driver.java ReferenceInfoUtil.java ClassExtends.java
* @run main Driver ClassExtends
*/
public class ClassExtends {
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1),
- @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
- })
+ @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1)
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
public String regularClass() {
- return "class Test extends @TA Object implements Cloneable, @TB Runnable {"
+ return "class %TEST_CLASS_NAME% extends @TA Object implements Cloneable, @TB Runnable {"
+ " public void run() { } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
- genericLocation = { 3, 1 })
- })
+ @TADescription(annotation = "RTAs", type = CLASS_EXTENDS, typeIndex = -1)
+ @TADescription(annotation = "RTBs", type = CLASS_EXTENDS, typeIndex = 1)
+ public String regularClassRepeatableAnnotation() {
+ return "class %TEST_CLASS_NAME% extends @RTA @RTA Object implements Cloneable, @RTB @RTB Runnable {"
+ + " public void run() { } }";
+ }
+
+ @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 1 })
public String regularClassExtendsParametrized() {
- return "class Test extends HashMap<@TA String, String> implements Cloneable, Map<String, @TB String>{ } ";
+ return "class %TEST_CLASS_NAME% extends HashMap<@TA String, String> implements Cloneable, Map<String, @TB String>{ } ";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1),
- @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
- })
+ @TADescription(annotation = "RTAs", type = CLASS_EXTENDS, typeIndex = -1,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTBs", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 1 })
+ public String regularClassExtendsParametrizedRepeatableAnnotation() {
+ return "class %TEST_CLASS_NAME% extends HashMap<@RTA @RTA String, String> implements Cloneable, Map<String, @RTB @RTB String>{ } ";
+ }
+
+ @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1)
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
public String abstractClass() {
- return "abstract class Test extends @TA Date implements Cloneable, @TB Runnable {"
+ return "abstract class %TEST_CLASS_NAME% extends @TA Date implements Cloneable, @TB Runnable {"
+ " public void run() { } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
- genericLocation = { 3, 1 })
- })
+ @TADescription(annotation = "RTAs", type = CLASS_EXTENDS, typeIndex = -1)
+ @TADescription(annotation = "RTBs", type = CLASS_EXTENDS, typeIndex = 1)
+ public String abstractClassRepeatableAnnotation() {
+ return "abstract class %TEST_CLASS_NAME% extends @RTA @RTA Date implements Cloneable, @RTB @RTB Runnable {"
+ + " public void run() { } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_EXTENDS, typeIndex = -1,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTBs", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 1 })
public String abstractClassExtendsParametrized() {
- return "abstract class Test extends HashMap<@TA String, String> implements Cloneable, Map<String, @TB String>{ } ";
+ return "abstract class %TEST_CLASS_NAME% extends HashMap<@RTA @RTA String, String> implements Cloneable, Map<String, @RTB @RTB String>{ } ";
}
@TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
public String regularInterface() {
- return "interface Test extends Cloneable, @TB Runnable { }";
+ return "interface %TEST_CLASS_NAME% extends Cloneable, @TB Runnable { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_EXTENDS, typeIndex = 1)
+ public String regularInterfaceRepetableAnnotation() {
+ return "interface %TEST_CLASS_NAME% extends Cloneable, @RTA @RTA Runnable { }";
}
@TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
genericLocation = { 3, 1 })
public String regularInterfaceExtendsParametrized() {
- return "interface Test extends Cloneable, Map<String, @TB String>{ } ";
+ return "interface %TEST_CLASS_NAME% extends Cloneable, Map<String, @TB String>{ } ";
+ }
+
+ @TADescription(annotation = "RTBs", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 1 })
+ public String regularInterfaceExtendsParametrizedRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% extends Cloneable, Map<String, @RTB @RTB String>{ } ";
}
@TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1)
public String regularEnum() {
- return "enum Test implements Cloneable, @TB Runnable { TEST; public void run() { } }";
+ return "enum %TEST_CLASS_NAME% implements Cloneable, @TB Runnable { TEST; public void run() { } }";
+ }
+
+ @TADescription(annotation = "RTBs", type = CLASS_EXTENDS, typeIndex = 1)
+ public String regularEnumRepeatableAnnotation() {
+ return "enum %TEST_CLASS_NAME% implements Cloneable, @RTB @RTB Runnable { TEST; public void run() { } }";
}
@TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1,
genericLocation = { 3, 0 })
public String regularEnumExtendsParametrized() {
return
- "enum Test implements Cloneable, Comparator<@TB String> { TEST; "
+ "enum %TEST_CLASS_NAME% implements Cloneable, Comparator<@TB String> { TEST; "
+ "public int compare(String a, String b) { return 0; }}";
}
+ @TADescription(annotation = "RTBs", type = CLASS_EXTENDS, typeIndex = 1,
+ genericLocation = { 3, 0 })
+ public String regularEnumExtendsParametrizedRepeatableAnnotation() {
+ return
+ "enum %TEST_CLASS_NAME% implements Cloneable, Comparator<@RTB @RTB String> { TEST; "
+ + "public int compare(String a, String b) { return 0; }}";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java
index 123cb05..20885db 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java
@@ -25,134 +25,232 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for class type parameters
* @compile -g Driver.java ReferenceInfoUtil.java ClassTypeParam.java
* @run main Driver ClassTypeParam
*/
public class ClassTypeParam {
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
- public String regularClass() {
- return "class Test<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String regularClass1() {
+ return "class %TEST_CLASS_NAME%<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
public String regularClass2() {
- return "class Test<@TA K extends @TB Date, @TC V extends @TE Cloneable> { }";
+ return "class %TEST_CLASS_NAME%<@TA K extends @TB Date, @TC V extends @TE Cloneable> { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
- })
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
public String regularClassParameterized() {
- return "class Test<K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> { }";
+ return "class %TEST_CLASS_NAME%<K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TG", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TG", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
public String regularClassParameterized2() {
- return "class Test<K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
+ return "class %TEST_CLASS_NAME%<K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
public String abstractClass() {
- return "abstract class Test<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
+ return "abstract class %TEST_CLASS_NAME%<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
public String abstractClassParameterized() {
- return "abstract class Test<K extends @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
+ return "abstract class %TEST_CLASS_NAME%<K extends @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
public String regularInterface() {
- return "interface Test<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
+ return "interface %TEST_CLASS_NAME%<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
- })
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
public String regularInterfaceParameterized() {
- return "interface Test<K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> { }";
+ return "interface %TEST_CLASS_NAME%<K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TG", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TG", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
public String regularInterfaceParameterized2() {
- return "interface Test<K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
+ return "interface %TEST_CLASS_NAME%<K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> { }";
}
@TADescription(annotation = "TA", type = METHOD_RETURN)
public String useInReturn1() {
- return "class Test<T> { @TA T m() { throw new RuntimeException(); } }";
+ return "class %TEST_CLASS_NAME%<T> { @TA T m() { throw new RuntimeException(); } }";
}
@TADescription(annotation = "TA", type = METHOD_RETURN, genericLocation = {3, 0})
public String useInReturn2() {
- return "class Test<T> { Class<@TA T> m() { throw new RuntimeException(); } }";
+ return "class %TEST_CLASS_NAME%<T> { Class<@TA T> m() { throw new RuntimeException(); } }";
}
@TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
paramIndex = 0, genericLocation = {3, 0})
public String useInParam1() {
- return "class Test<T> { void m(Class<@TA T> p) { throw new RuntimeException(); } }";
+ return "class %TEST_CLASS_NAME%<T> { void m(Class<@TA T> p) { throw new RuntimeException(); } }";
}
@TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
paramIndex = 0, genericLocation = {3, 0})
public String useInParam2() {
- return "class Test { void m(Class<@TA Object> p) { throw new RuntimeException(); } }";
+ return "class %TEST_CLASS_NAME% { void m(Class<@TA Object> p) { throw new RuntimeException(); } }";
}
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTDs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String regularClassRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME%<@RTA @RTA K extends @RTB @RTB Date, @RTC @RTC V extends @RTD @RTD Object & @RTE @RTE Cloneable> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String regularClassRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME%<@RTA @RTA K extends @RTB @RTB Date, @RTC @RTC V extends @RTE @RTE Cloneable> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ public String regularClassParameterizedRepeatableAnnotation() {
+ return "class %TEST_CLASS_NAME%<K extends @RTA @RTA Map<String, @RTB @RTB String>," +
+ " V extends @RTC @RTC List<@RTD @RTD List<@RTE @RTE Object>>> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "RTFs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "RTGs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ public String regularClassParameterizedRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME%<K extends @RTG @RTG Object & @RTA @RTA Map<String, @RTB @RTB String>," +
+ " V extends @RTF @RTF Object & @RTC @RTC List<@RTD @RTD List<@RTE @RTE Object>>> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTDs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String abstractClassRepeatableAnnotation() {
+ return "abstract class %TEST_CLASS_NAME%<@RTA @RTA K extends @RTB @RTB Date," +
+ " @RTC @RTC V extends @RTD @RTD Object & @RTE @RTE Cloneable> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "RTFs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ public String abstractClassParameterizedRepeatableAnnotation() {
+ return "abstract class %TEST_CLASS_NAME%<K extends @RTA @RTA Map<String, @RTB @RTB String>," +
+ " V extends @RTF @RTF Object & @RTC @RTC List<@RTD @RTD List<@RTE @RTE Object>>> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTDs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String regularInterfaceRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME%<@RTA @RTA K extends @RTB @RTB Date," +
+ " @RTC @RTC V extends @RTD @RTD Object & @RTE @RTE Cloneable> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ public String regularInterfaceParameterizedRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME%<K extends @RTA @RTA Map<String, @RTB @RTB String>," +
+ " V extends @RTC @RTC List<@RTD @RTD List<@RTE @RTE Object>>> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "RTFs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "RTGs", type = CLASS_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ public String regularInterfaceParameterizedRepeatableAnnotation2() {
+ return "interface %TEST_CLASS_NAME%<K extends @RTG @RTG Object & @RTA @RTA Map<String, @RTB @RTB String>," +
+ " V extends @RTF @RTF Object & @RTC @RTC List<@RTD @RTD List<@RTE @RTE Object>>> { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ public String useInReturnRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME%<T> { @RTA @RTA T m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN, genericLocation = {3, 0})
+ public String useInReturnRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME%<T> { Class<@RTA @RTA T> m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0, genericLocation = {3, 0})
+ public String useInParamRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME%<T> { void m(Class<@RTA @RTA T> p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0, genericLocation = {3, 0})
+ public String useInParamRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME% { void m(Class<@RTA @RTA Object> p) { throw new RuntimeException(); } }";
+ }
+
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java
new file mode 100644
index 0000000..d69a165
--- /dev/null
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java
@@ -0,0 +1,67 @@
+/*
+ * 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
+ * @bug 8042451
+ * @summary Test population of reference info for constructor invocation type argument
+ * @compile -g Driver.java ReferenceInfoUtil.java ConstructorInvocationTypeArgument.java
+ * @run main Driver ConstructorInvocationTypeArgument
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT;
+
+public class ConstructorInvocationTypeArgument {
+
+ @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 4)
+ @TADescription(annotation = "TB", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 0)
+ public String generic1() {
+ return "class %TEST_CLASS_NAME% { <T> %TEST_CLASS_NAME%(int i) { new <@TA T>%TEST_CLASS_NAME%(); }" +
+ " <T> %TEST_CLASS_NAME%() { <@TB String>this(0); } }";
+ }
+
+ @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 0)
+ public String generic2() {
+ return "class Super { <T> Super(int i) { } } " +
+ "class %TEST_CLASS_NAME% extends Super { <T> %TEST_CLASS_NAME%() { <@TA String>super(0); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 4)
+ @TADescription(annotation = "RTBs", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 0)
+ public String genericRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME% { <T> %TEST_CLASS_NAME%(int i) { new <@RTA @RTA T>%TEST_CLASS_NAME%(); }" +
+ " <T> %TEST_CLASS_NAME%() { <@RTB @RTB String>this(0); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 0)
+ public String genericRepeatableAnnotation2() {
+ return "class Super { <T> Super(int i) { } } " +
+ "class %TEST_CLASS_NAME% extends Super { <T> %TEST_CLASS_NAME%() { <@RTA @RTA String>super(0); } }";
+ }
+}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java
index 3106341..78e9aca 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8026791
+ * @bug 8026791 8042451
* @summary Test population of reference info for constructor results
* @compile -g Driver.java ReferenceInfoUtil.java Constructors.java
* @run main Driver Constructors
@@ -33,52 +33,44 @@
public class Constructors {
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN),
- @TADescription(annotation = "TB", type = METHOD_RETURN),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ @TADescription(annotation = "TB", type = METHOD_RETURN)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
public String regularClass() {
- return "class Test { @TA Test() {}" +
- " @TB Test(@TC int b) {} }";
+ return "class %TEST_CLASS_NAME% { @TA %TEST_CLASS_NAME%() {}" +
+ " @TB %TEST_CLASS_NAME%(@TC int b) {} }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN, genericLocation = {1, 0}),
- @TADescription(annotation = "TB", type = METHOD_RETURN, genericLocation = {1, 0}),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
- })
- @TestClass("Test$Inner")
+ @TADescription(annotation = "TA", type = METHOD_RETURN, genericLocation = {1, 0})
+ @TADescription(annotation = "TB", type = METHOD_RETURN, genericLocation = {1, 0})
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String innerClass() {
- return "class Test { class Inner {" +
+ return "class %TEST_CLASS_NAME% { class Inner {" +
" @TA Inner() {}" +
" @TB Inner(@TC int b) {}" +
" } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RECEIVER),
- @TADescription(annotation = "TB", type = METHOD_RETURN, genericLocation = {1, 0}),
- @TADescription(annotation = "TC", type = METHOD_RECEIVER),
- @TADescription(annotation = "TD", type = METHOD_RETURN, genericLocation = {1, 0}),
- @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
- })
- @TestClass("Test$Inner")
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER)
+ @TADescription(annotation = "TB", type = METHOD_RETURN, genericLocation = {1, 0})
+ @TADescription(annotation = "TC", type = METHOD_RECEIVER)
+ @TADescription(annotation = "TD", type = METHOD_RETURN, genericLocation = {1, 0})
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String innerClass2() {
- return "class Test { class Inner {" +
- " @TB Inner(@TA Test Test.this) {}" +
- " @TD Inner(@TC Test Test.this, @TE int b) {}" +
+ return "class %TEST_CLASS_NAME% { class Inner {" +
+ " @TB Inner(@TA %TEST_CLASS_NAME% %TEST_CLASS_NAME%.this) {}" +
+ " @TD Inner(@TC %TEST_CLASS_NAME% %TEST_CLASS_NAME%.this, @TE int b) {}" +
" } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RECEIVER),
- @TADescription(annotation = "TB", type = METHOD_RECEIVER, genericLocation = {1, 0}),
- @TADescription(annotation = "TC", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0}),
- @TADescription(annotation = "TD", type = METHOD_RECEIVER, genericLocation = {1, 0}),
- @TADescription(annotation = "TE", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0}),
- @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER)
+ @TADescription(annotation = "TB", type = METHOD_RECEIVER, genericLocation = {1, 0})
+ @TADescription(annotation = "TC", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0})
+ @TADescription(annotation = "TD", type = METHOD_RECEIVER, genericLocation = {1, 0})
+ @TADescription(annotation = "TE", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0})
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
@TestClass("Outer$Middle$Inner")
public String innerClass3() {
return "class Outer { class Middle { class Inner {" +
@@ -87,24 +79,49 @@
" } } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
- typeIndex = 0, offset = 4),
- @TADescription(annotation = "TB", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
- typeIndex = 0, offset = 0)
- })
- public String generic1() {
- return "class Test { <T> Test(int i) { new <@TA T>Test(); }" +
- " <T> Test() { <@TB String>this(0); } }";
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ public String regularClassRepeatableAnnotation() {
+ return "class %TEST_CLASS_NAME% { @RTA @RTA %TEST_CLASS_NAME%() {}" +
+ " @RTB @RTB %TEST_CLASS_NAME%(@RTC @RTC int b) {} }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
- typeIndex = 0, offset = 0)
- })
- public String generic2() {
- return "class Super { <T> Super(int i) { } } " +
- "class Test extends Super { <T> Test() { <@TA String>super(0); } }";
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN, genericLocation = {1, 0})
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN, genericLocation = {1, 0})
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String innerClassRepeatableAnnotation() {
+ return "class %TEST_CLASS_NAME% { class Inner {" +
+ " @RTA @RTA Inner() {}" +
+ " @RTB @RTB Inner(@RTC @RTC int b) {}" +
+ " } }";
}
+ @TADescription(annotation = "RTAs", type = METHOD_RECEIVER)
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN, genericLocation = {1, 0})
+ @TADescription(annotation = "RTCs", type = METHOD_RECEIVER)
+ @TADescription(annotation = "RTDs", type = METHOD_RETURN, genericLocation = {1, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String innerClassRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME% { class Inner {" +
+ " @RTB @RTB Inner(@RTA @RTA %TEST_CLASS_NAME% %TEST_CLASS_NAME%.this) {}" +
+ " @RTD @RTD Inner(@RTC @RTC %TEST_CLASS_NAME% %TEST_CLASS_NAME%.this, @RTE @RTE int b) {}" +
+ " } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RECEIVER)
+ @TADescription(annotation = "RTBs", type = METHOD_RECEIVER, genericLocation = {1, 0})
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0})
+ @TADescription(annotation = "RTDs", type = METHOD_RECEIVER, genericLocation = {1, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0})
+ @TADescription(annotation = "RTFs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TestClass("Outer$Middle$Inner")
+ public String innerClassRepatableAnnotation3() {
+ return "class Outer { class Middle { class Inner {" +
+ " @RTC @RTC Inner(@RTA @RTA Outer. @RTB @RTB Middle Middle.this) {}" +
+ " @RTE @RTE Inner(@RTD @RTD Middle Outer.Middle.this, @RTF @RTF int b) {}" +
+ " } } }";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java
index 2493edf..b6c6aa4 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Driver.java
@@ -40,51 +40,75 @@
import com.sun.tools.classfile.TypeAnnotation;
import com.sun.tools.classfile.TypeAnnotation.TargetType;
+import static java.lang.String.format;
+
public class Driver {
private static final PrintStream out = System.err;
+ private final Object testObject;
+
+ public Driver(Class<?> clazz) throws IllegalAccessException, InstantiationException {
+ testObject = clazz.newInstance();
+ }
+
public static void main(String[] args) throws Exception {
if (args.length == 0 || args.length > 1)
throw new IllegalArgumentException("Usage: java Driver <test-name>");
String name = args[0];
- Class<?> clazz = Class.forName(name);
- new Driver().runDriver(clazz.newInstance());
+ new Driver(Class.forName(name)).runDriver();
}
- String[][] extraParamsCombinations = new String[][] {
+ private final String[][] extraParamsCombinations = new String[][] {
new String[] { },
new String[] { "-g" },
};
- protected void runDriver(Object object) throws Exception {
+ private final String[] retentionPolicies = {RetentionPolicy.CLASS.toString(), RetentionPolicy.RUNTIME.toString()};
+
+ protected void runDriver() {
int passed = 0, failed = 0;
- Class<?> clazz = object.getClass();
+ Class<?> clazz = testObject.getClass();
out.println("Tests for " + clazz.getName());
// Find methods
for (Method method : clazz.getMethods()) {
- Map<String, TypeAnnotation.Position> expected = expectedOf(method);
- if (expected == null)
- continue;
- if (method.getReturnType() != String.class)
- throw new IllegalArgumentException("Test method needs to return a string: " + method);
- String testClass = testClassOf(method);
+ try {
+ Map<String, TypeAnnotation.Position> expected = expectedOf(method);
+ if (expected == null)
+ continue;
+ if (method.getReturnType() != String.class)
+ throw new IllegalArgumentException("Test method needs to return a string: " + method);
- for (String[] extraParams : extraParamsCombinations) {
- try {
- String compact = (String)method.invoke(object);
- String fullFile = wrap(compact);
- ClassFile cf = compileAndReturn(fullFile, testClass, extraParams);
- List<TypeAnnotation> actual = ReferenceInfoUtil.extendedAnnotationsOf(cf);
- ReferenceInfoUtil.compare(expected, actual, cf);
- out.println("PASSED: " + method.getName());
- ++passed;
- } catch (Throwable e) {
- out.println("FAILED: " + method.getName());
- out.println(" " + e.toString());
- ++failed;
+ String compact = (String) method.invoke(testObject);
+ for (String retentionPolicy : retentionPolicies) {
+ String testClassName = getTestClassName(method, retentionPolicy);
+ String testClass = testClassOf(method, testClassName);
+ String fullFile = wrap(compact, new HashMap<String, String>() {{
+ put("%RETENTION_POLICY%", retentionPolicy);
+ put("%TEST_CLASS_NAME%", testClassName);
+ }});
+ for (String[] extraParams : extraParamsCombinations) {
+ try {
+ ClassFile cf = compileAndReturn(fullFile, testClass, extraParams);
+ List<TypeAnnotation> actual = ReferenceInfoUtil.extendedAnnotationsOf(cf);
+ ReferenceInfoUtil.compare(expected, actual, cf);
+ out.format("PASSED: %s %s%n", testClassName, Arrays.toString(extraParams));
+ ++passed;
+ } catch (Throwable e) {
+ out.format("FAILED: %s %s%n", testClassName, Arrays.toString(extraParams));
+ out.println(fullFile);
+ out.println(" " + e.toString());
+ e.printStackTrace(out);
+ ++failed;
+ }
+ }
}
+ } catch (IllegalAccessException | InvocationTargetException e) {
+ out.println("FAILED: " + method.getName());
+ out.println(" " + e.toString());
+ e.printStackTrace(out);
+ ++failed;
}
}
@@ -106,7 +130,7 @@
return null;
Map<String, TypeAnnotation.Position> result =
- new HashMap<String, TypeAnnotation.Position>();
+ new HashMap<>();
if (ta != null)
result.putAll(expectedOf(ta));
@@ -149,33 +173,42 @@
}
private List<Integer> wrapIntArray(int[] ints) {
- List<Integer> list = new ArrayList<Integer>(ints.length);
+ List<Integer> list = new ArrayList<>(ints.length);
for (int i : ints)
list.add(i);
return list;
}
- private String testClassOf(Method m) {
+ private String getTestClassName(Method m, String retentionPolicy) {
+ return format("%s_%s_%s", testObject.getClass().getSimpleName(),
+ m.getName(), retentionPolicy);
+ }
+
+ private String testClassOf(Method m, String testClassName) {
TestClass tc = m.getAnnotation(TestClass.class);
if (tc != null) {
- return tc.value();
+ return tc.value().replace("%TEST_CLASS_NAME%", testClassName);
} else {
- return "Test";
+ return testClassName;
}
}
private ClassFile compileAndReturn(String fullFile, String testClass, String... extraParams) throws Exception {
- File source = writeTestFile(fullFile);
- File clazzFile = compileTestFile(source, testClass);
+ File source = writeTestFile(fullFile, testClass);
+ File clazzFile = compileTestFile(source, testClass, extraParams);
return ClassFile.read(clazzFile);
}
- protected File writeTestFile(String fullFile) throws IOException {
- File f = new File("Test.java");
- PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
- out.println(fullFile);
- out.close();
- return f;
+ protected File writeTestFile(String fullFile, String testClass) throws IOException {
+ File f = new File(getClassDir(), format("%s.java", testClass));
+ try (PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)))) {
+ out.println(fullFile);
+ return f;
+ }
+ }
+
+ private String getClassDir() {
+ return System.getProperty("test.classes", Driver.class.getResource(".").getPath());
}
protected File compileTestFile(File f, String testClass, String... extraParams) {
@@ -185,20 +218,15 @@
int rc = com.sun.tools.javac.Main.compile(options.toArray(new String[options.size()]));
if (rc != 0)
throw new Error("compilation failed. rc=" + rc);
- String path;
- if (f.getParent() != null) {
- path = f.getParent();
- } else {
- path = "";
- }
-
- return new File(path + testClass + ".class");
+ String path = f.getParent() != null ? f.getParent() : "";
+ return new File(path, format("%s.class", testClass));
}
- private String wrap(String compact) {
+ private String wrap(String compact, Map<String, String> replacements) {
StringBuilder sb = new StringBuilder();
// Automatically import java.util
+ sb.append("\nimport java.io.*;");
sb.append("\nimport java.util.*;");
sb.append("\nimport java.lang.annotation.*;");
@@ -208,7 +236,7 @@
&& !compact.contains("interface")
&& !compact.contains("enum");
if (isSnippet)
- sb.append("class Test {\n");
+ sb.append("class %TEST_CLASS_NAME% {\n");
sb.append(compact);
sb.append("\n");
@@ -224,41 +252,102 @@
}
// create A ... F annotation declarations
- sb.append("\n@interface A {}");
- sb.append("\n@interface B {}");
- sb.append("\n@interface C {}");
- sb.append("\n@interface D {}");
- sb.append("\n@interface E {}");
- sb.append("\n@interface F {}");
+ sb.append("\n@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface A {}");
+ sb.append("\n@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface B {}");
+ sb.append("\n@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface C {}");
+ sb.append("\n@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface D {}");
+ sb.append("\n@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface E {}");
+ sb.append("\n@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface F {}");
// create TA ... TF proper type annotations
sb.append("\n");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TA {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TB {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TC {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TD {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TE {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TF {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TG {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TH {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TI {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TJ {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TK {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TL {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface TM {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ " @Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TA {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TB {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TC {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TD {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TE {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TF {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TG {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TH {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TI {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TJ {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TK {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TL {}");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface TM {}");
- // create RTA, RTAs, RTB, RTBs for repeating type annotations
+ // create RT?, RT?s for repeating type annotations
sb.append("\n");
- sb.append("\n@Repeatable(RTAs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTA {}");
- sb.append("\n@Repeatable(RTBs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTB {}");
+ sb.append("\n@Repeatable(RTAs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTA {}");
+ sb.append("\n@Repeatable(RTBs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTB {}");
+ sb.append("\n@Repeatable(RTCs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTC {}");
+ sb.append("\n@Repeatable(RTDs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTD {}");
+ sb.append("\n@Repeatable(RTEs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTE {}");
+ sb.append("\n@Repeatable(RTFs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTF {}");
+ sb.append("\n@Repeatable(RTGs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTG {}");
+ sb.append("\n@Repeatable(RTHs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTH {}");
+ sb.append("\n@Repeatable(RTIs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTI {}");
+ sb.append("\n@Repeatable(RTJs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTJ {}");
+ sb.append("\n@Repeatable(RTKs.class) @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTK {}");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTAs { RTA[] value(); }");
- sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @interface RTBs { RTB[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTAs { RTA[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTBs { RTB[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTCs { RTC[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTDs { RTD[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTEs { RTE[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTFs { RTF[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTGs { RTG[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTHs { RTH[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTIs { RTI[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTJs { RTJ[] value(); }");
+ sb.append("\n@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})" +
+ "@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface RTKs { RTK[] value(); }");
- sb.append("\n@Target(value={ElementType.TYPE,ElementType.FIELD,ElementType.METHOD,ElementType.PARAMETER,ElementType.CONSTRUCTOR,ElementType.LOCAL_VARIABLE})");
- sb.append("\n@interface Decl {}");
+ sb.append("\n@Target(value={ElementType.TYPE,ElementType.FIELD,ElementType.METHOD," +
+ "ElementType.PARAMETER,ElementType.CONSTRUCTOR,ElementType.LOCAL_VARIABLE})");
+ sb.append("\n@Retention(RetentionPolicy.%RETENTION_POLICY%) @interface Decl {}");
- return sb.toString();
+ return replaceAll(sb.toString(), replacements);
+ }
+
+ private String replaceAll(String src, Map<String, String> replacements) {
+ for (Map.Entry<String, String> entry : replacements.entrySet()) {
+ src = src.replace(entry.getKey(), entry.getValue());
+ }
+ return src;
}
public static final int NOT_SET = -888;
@@ -267,6 +356,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
+@Repeatable(TADescriptions.class)
@interface TADescription {
String annotation();
@@ -296,5 +386,5 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
@interface TestClass {
- String value() default "Test";
+ String value();
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
index f41cff9..d91e92d 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
@@ -25,7 +25,7 @@
/*
* @test
- * @bug 8028576
+ * @bug 8028576 8042451
* @summary Test population of reference info for exception parameters
* @author Werner Dietl
* @compile -g Driver.java ReferenceInfoUtil.java ExceptionParameters.java
@@ -43,11 +43,9 @@
return "void finalException() { try { new Object(); } catch(final @TA Exception e) { } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0),
- @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1),
- @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
- })
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
public String multipleExceptions1() {
return "void multipleExceptions() { " +
"try { new Object(); } catch(@TA Exception e) { }" +
@@ -56,11 +54,9 @@
" }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0),
- @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1),
- @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
- })
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
public String multipleExceptions2() {
return "void multipleExceptions() { " +
" try { new Object(); " +
@@ -71,11 +67,9 @@
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0),
- @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1),
- @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
- })
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
public String multipleExceptions3() {
return "void multipleExceptions() { " +
" try { new Object(); " +
@@ -87,4 +81,48 @@
" }" +
"}";
}
+
+ @TADescription(annotation = "RTAs", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ public String exceptionRepeatableAnnoation() {
+ return "void exception() { try { new Object(); } catch(@RTA @RTA Exception e) { } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "RTBs", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "RTCs", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ public String multipleExceptionsRepeatableAnnotation1() {
+ return "void multipleExceptions() { " +
+ "try { new Object(); } catch(@RTA @RTA Exception e) { }" +
+ "try { new Object(); } catch(@RTB @RTB Exception e) { }" +
+ "try { new Object(); } catch(@RTC @RTC Exception e) { }" +
+ " }";
+ }
+
+ @TADescription(annotation = "RTAs", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "RTBs", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "RTCs", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ public String multipleExceptionsRepeatableAnnotation2() {
+ return "void multipleExceptions() { " +
+ " try { new Object(); " +
+ " try { new Object(); " +
+ " try { new Object(); } catch(@RTA @RTA Exception e) { }" +
+ " } catch(@RTB @RTB Exception e) { }" +
+ " } catch(@RTC @RTC Exception e) { }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "RTBs", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "RTCs", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ public String multipleExceptionsRepeatableAnnotation3() {
+ return "void multipleExceptions() { " +
+ " try { new Object(); " +
+ " } catch(@RTA @RTA Exception e1) { "+
+ " try { new Object(); " +
+ " } catch(@RTB @RTB Exception e2) {" +
+ " try { new Object(); } catch(@RTC @RTC Exception e3) { }" +
+ " }" +
+ " }" +
+ "}";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java
index 6502846..1a531c3 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java
@@ -25,12 +25,12 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for field
* @compile -g Driver.java ReferenceInfoUtil.java Fields.java
* @run main Driver Fields
*/
public class Fields {
-
// field types
@TADescription(annotation = "TA", type = FIELD)
public String fieldAsPrimitive() {
@@ -42,37 +42,31 @@
return "@TA Object test;";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TC", type = FIELD,
- genericLocation = { 3, 1 }),
- @TADescription(annotation = "TD", type = FIELD,
- genericLocation = { 3, 1, 3, 0 })
- })
+ @TADescription(annotation = "TA", type = FIELD)
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
public String fieldAsParametrized() {
return "@TA Map<@TB String, @TC List<@TD String>> test;";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = { 0, 0 }),
- @TADescription(annotation = "TC", type = FIELD,
- genericLocation = { 0, 0, 0, 0 })
- })
+ @TADescription(annotation = "TA", type = FIELD)
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 0, 0 })
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 0, 0, 0, 0 })
public String fieldAsArray() {
return "@TC String @TA [] @TB [] test;";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = { 0, 0 }),
- @TADescription(annotation = "TC", type = FIELD,
- genericLocation = { 0, 0, 0, 0 })
- })
+ @TADescription(annotation = "TA", type = FIELD)
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 0, 0 })
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 0, 0, 0, 0 })
public String fieldAsArrayOld() {
return "@TC String test @TA [] @TB [];";
}
@@ -89,40 +83,108 @@
// Smoke tests
@TADescription(annotation = "TA", type = FIELD)
- public String interfacefieldAsObject() {
- return "interface Test { @TA String test = null; }";
+ public String interfaceFieldAsObject() {
+ return "interface %TEST_CLASS_NAME% { @TA String test = null; }";
}
@TADescription(annotation = "TA", type = FIELD)
- public String abstractfieldAsObject() {
- return "abstract class Test { @TA String test; }";
+ public String abstractFieldAsObject() {
+ return "abstract class %TEST_CLASS_NAME% { @TA String test; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TC", type = FIELD,
- genericLocation = { 3, 1 }),
- @TADescription(annotation = "TD", type = FIELD,
- genericLocation = { 3, 1, 3, 0 })
- })
- public String interfacefieldAsParametrized() {
- return "interface Test { @TA Map<@TB String, @TC List<@TD String>> test = null; }";
+ @TADescription(annotation = "TA", type = FIELD)
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
+ public String interfaceFieldAsParametrized() {
+ return "interface %TEST_CLASS_NAME% { @TA Map<@TB String, @TC List<@TD String>> test = null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TC", type = FIELD,
- genericLocation = { 3, 1 }),
- @TADescription(annotation = "TD", type = FIELD,
- genericLocation = { 3, 1, 3, 0 })
- })
+ @TADescription(annotation = "TA", type = FIELD)
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
public String staticFieldAsParametrized() {
return "static @TA Map<@TB String, @TC List<@TD String>> test;";
}
+ @TADescription(annotation = "RTAs", type = FIELD)
+ public String fieldAsPrimitiveRepeatableAnnotation() {
+ return "@RTA @RTA int test;";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD)
+ public String fieldAsObjectRepeatableAnnotation() {
+ return "@RTA @RTA Object test;";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD)
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTCs", type = FIELD,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "RTDs", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
+ public String fieldAsParametrizedRepeatableAnnotation() {
+ return "@RTA @RTA Map<@RTB @RTB String, @RTC @RTC List<@RTD @RTD String>> test;";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD)
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = { 0, 0 })
+ @TADescription(annotation = "RTCs", type = FIELD,
+ genericLocation = { 0, 0, 0, 0 })
+ public String fieldAsArrayRepeatableAnnotation() {
+ return "@RTC @RTC String @RTA @RTA [] @RTB @RTB [] test;";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD)
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = { 0, 0 })
+ @TADescription(annotation = "RTCs", type = FIELD,
+ genericLocation = { 0, 0, 0, 0 })
+ public String fieldAsArrayOldRepeatableAnnotation() {
+ return "@RTC @RTC String test @RTA @RTA [] @RTB @RTB [];";
+ }
+
+ // Smoke tests
+ @TADescription(annotation = "RTAs", type = FIELD)
+ public String interfaceFieldAsObjectRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { @RTA @RTA String test = null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD)
+ public String abstractFieldAsObjectRepeatableAnnotation() {
+ return "abstract class %TEST_CLASS_NAME% { @RTA @RTA String test; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD)
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTCs", type = FIELD,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "RTDs", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
+ public String interfaceFieldAsParametrizedRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { @RTA @RTA Map<@RTB @RTB String, @RTC @RTC List<@RTD @RTD String>> test = null; }";
+ }
+
+
+ @TADescription(annotation = "RTAs", type = FIELD)
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTCs", type = FIELD,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "RTDs", type = FIELD,
+ genericLocation = { 3, 1, 3, 0 })
+ public String staticFieldAsParametrizedRepeatableAnnotation() {
+ return "static @RTA @RTA Map<@RTB @RTB String, @RTC @RTC List<@RTD @RTD String>> test;";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java
index 7f4c6fd..6d5bfd4 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java
@@ -25,98 +25,89 @@
/*
* @test
+ * @bug 8042451
* @summary Test that the examples from the manual are stored as expected
* @compile -g Driver.java ReferenceInfoUtil.java FromSpecification.java
* @run main Driver FromSpecification
*/
public class FromSpecification {
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0}, paramIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 2, 0}, paramIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 1}, paramIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 2, 0}, paramIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 1}, paramIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
genericLocation = {3, 1, 3, 0}, paramIndex = 0)
- })
public String testSpec1() {
return "void test(@TA Map<@TB ? extends @TC String, @TD List<@TE Object>> a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0}, paramIndex = 0),
- @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
genericLocation = {0, 0, 0, 0, 0, 0}, paramIndex = 0)
- })
public String testSpec2() {
return "void test(@TI String @TF [] @TG [] @TH [] a) { }";
}
// Note first "1, 0" for top-level class Test.
- @TADescriptions({
- @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0, 1, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TL", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TM", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TL", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TM", type = METHOD_FORMAL_PARAMETER,
genericLocation = {1, 0}, paramIndex = 0)
- })
public String testSpec3() {
- return "class Test { class O1 { class O2 { class O3 { class NestedStatic {} } } }" +
+ return "class %TEST_CLASS_NAME% { class O1 { class O2 { class O3 { class NestedStatic {} } } }" +
"void test(@TM O1.@TL O2.@TK O3.@TJ NestedStatic a) { } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0}, paramIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 3, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 3, 0, 0, 0, 0, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 1}, paramIndex = 0),
- @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 3, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 3, 0, 0, 0, 0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 1}, paramIndex = 0)
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
genericLocation = {3, 1, 3, 0}, paramIndex = 0)
- })
public String testSpec4() {
return "void test(@TA Map<@TB Comparable<@TF Object @TC [] @TD [] @TE []>, @TG List<@TH String>> a) { }";
}
// Note first "1, 0" for top-level class Test.
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0, 1, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0, 1, 0, 3, 1}, paramIndex = 0),
- @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0, 1, 0, 3, 1}, paramIndex = 0)
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
genericLocation = {1, 0}, paramIndex = 0)
- })
public String testSpec5() {
- return "class Test { class O1 { class O2<A, B> { class O3 { class Nested<X, Y> {} } } }" +
+ return "class %TEST_CLASS_NAME% { class O1 { class O2<A, B> { class O3 { class Nested<X, Y> {} } } }" +
"void test(@TH O1.@TE O2<@TF String, @TG String>.@TD O3.@TA Nested<@TB String, @TC String> a) { } }";
}
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java
index d42c4f7..bab51f1 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java
@@ -25,7 +25,7 @@
/*
* @test
- * @bug 8013852
+ * @bug 8013852 8042451
* @summary Test population of reference info for instance and class initializers
* @author Werner Dietl
* @compile -g Driver.java ReferenceInfoUtil.java Initializers.java
@@ -33,63 +33,98 @@
*/
public class Initializers {
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = NEW,
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = NEW,
genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
- public String instanceInit1() {
- return "class Test { { Object o = new @TA ArrayList<@TB String>(); } }";
+ public String instanceInit1() {
+ return "class %TEST_CLASS_NAME% { { Object o = new @TA ArrayList<@TB String>(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = NEW,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TD", type = NEW,
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = NEW,
genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
- public String instanceInit2() {
- return "class Test { Object f = new @TA ArrayList<@TB String>(); " +
+ @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TD", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String instanceInit2() {
+ return "class %TEST_CLASS_NAME% { Object f = new @TA ArrayList<@TB String>(); " +
" { Object o = new @TC ArrayList<@TD String>(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = NEW,
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = NEW,
genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
- public String staticInit1() {
- return "class Test { static { Object o = new @TA ArrayList<@TB String>(); } }";
+ public String staticInit1() {
+ return "class %TEST_CLASS_NAME% { static { Object o = new @TA ArrayList<@TB String>(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = NEW,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TD", type = NEW,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TF", type = NEW,
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = NEW,
genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
- public String staticInit2() {
- return "class Test { Object f = new @TA ArrayList<@TB String>(); " +
+ @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TD", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TF", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String staticInit2() {
+ return "class %TEST_CLASS_NAME% { Object f = new @TA ArrayList<@TB String>(); " +
" static Object g = new @TC ArrayList<@TD String>(); " +
" static { Object o = new @TE ArrayList<@TF String>(); } }";
}
- // TODO: test interaction with several constructors, especially non-initial constuctors.
- // I don't think this kind of test is possible here.
-
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST,
- typeIndex = 0, offset = ReferenceInfoUtil.IGNORE_VALUE),
- })
- public String lazyConstantCast1() {
- return "class Test { public static final Object o = (@TA Object) null; }";
+ @TADescription(annotation = "TA", type = CAST,
+ typeIndex = 0, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String lazyConstantCast1() {
+ return "class %TEST_CLASS_NAME% { public static final Object o = (@TA Object) null; }";
}
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String instanceInitRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME% { { Object o = new @RTA @RTA ArrayList<@RTB @RTB String>(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTDs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String instanceInitRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME% { Object f = new @RTA @RTA ArrayList<@RTB @RTB String>(); " +
+ " { Object o = new @RTC @RTC ArrayList<@RTD @RTD String>(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String staticInitRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME% { static { Object o = new @RTA @RTA ArrayList<@RTB @RTB String>(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTDs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTEs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTFs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String staticInitRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME% { Object f = new @RTA @RTA ArrayList<@RTB @RTB String>(); " +
+ " static Object g = new @RTC @RTC ArrayList<@RTD @RTD String>(); " +
+ " static { Object o = new @RTE @RTE ArrayList<@RTF @RTF String>(); } }";
+ }
+
+ // TODO: test interaction with several constructors, especially non-initial constructors.
+ // I don't think this kind of test is possible here.
+
+ @TADescription(annotation = "RTAs", type = CAST,
+ typeIndex = 0, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String lazyConstantCastRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME% { public static final Object o = (@RTA @RTA Object) null; }";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
index ccf8f46..139f08b 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8008077 8029721
+ * @bug 8008077 8029721 8042451 8043974
* @summary Test population of reference info for lambda expressions
* javac crash for annotated parameter type of lambda in a field
* @compile -g Driver.java ReferenceInfoUtil.java Lambda.java
@@ -35,64 +35,58 @@
public class Lambda {
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_REFERENCE,
- offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = METHOD_REFERENCE,
+ @TADescription(annotation = "TA", type = METHOD_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TB", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
public String returnMethodRef1() {
return
"class Lambda {" +
" public String getName() { return \"Lambda!\"; }" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" java.util.function.Function<Lambda, String> lambda() {" +
" return @TA @TB Lambda::getName;" +
" }" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_REFERENCE,
- offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = METHOD_REFERENCE,
+ @TADescription(annotation = "TA", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = METHOD_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TC", type = METHOD_REFERENCE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TC", type = METHOD_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TD", type = METHOD_REFERENCE,
- offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 1 }),
- @TADescription(annotation = "TE", type = METHOD_REFERENCE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TD", type = METHOD_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
genericLocation = { 3, 1 })
- })
+ @TADescription(annotation = "TE", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = { 3, 1})
public String returnMethodRef2() {
return
"class Lambda<S, T> {" +
" public String getName() { return \"Lambda!\"; }" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" java.util.function.Function<Lambda<Integer, Float>, String> lambda() {" +
" return @TA Lambda<@TB @TC Integer, @TD @TE Float>::getName;" +
" }" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "CTA", type = METHOD_REFERENCE,
- offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "CTB", type = METHOD_REFERENCE,
+ @TADescription(annotation = "CTA", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "CTB", type = METHOD_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "CTC", type = METHOD_REFERENCE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "CTC", type = METHOD_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 1 })
- })
+ genericLocation = { 3, 1 })
public String returnMethodRef3() {
return
"class Lambda<S, T> {" +
@@ -114,7 +108,7 @@
" String name();" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" java.util.function.Function<Lambda<Integer, Float>, String> lambda() {" +
" return @CTA(\"x\") Lambda<@CTB(age = 5) Integer, @CTC(name = \"y\") Float>::getName;" +
" }" +
@@ -122,64 +116,58 @@
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE,
- offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE,
+ @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
public String returnConstructorRef1() {
return
"class Lambda {" +
" Lambda() { }" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" Runnable lambda() {" +
" return @TA @TB Lambda::new;" +
" }" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE,
- offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE,
+ @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TC", type = CONSTRUCTOR_REFERENCE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TC", type = CONSTRUCTOR_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TD", type = CONSTRUCTOR_REFERENCE,
- offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 1 }),
- @TADescription(annotation = "TE", type = CONSTRUCTOR_REFERENCE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TD", type = CONSTRUCTOR_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
genericLocation = { 3, 1 })
- })
+ @TADescription(annotation = "TE", type = CONSTRUCTOR_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = { 3, 1 })
public String returnConstructorRef2() {
return
"class Lambda<S, T> {" +
" Lambda() { }" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" Runnable lambda() {" +
" return @TA Lambda<@TB @TC Integer, @TD @TE Float>::new;" +
" }" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "CTA", type = CONSTRUCTOR_REFERENCE,
- offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "CTB", type = CONSTRUCTOR_REFERENCE,
+ @TADescription(annotation = "CTA", type = CONSTRUCTOR_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "CTB", type = CONSTRUCTOR_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "CTC", type = CONSTRUCTOR_REFERENCE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "CTC", type = CONSTRUCTOR_REFERENCE,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = { 3, 1 })
- })
+ genericLocation = { 3, 1 })
public String returnConstructorRef3() {
return
"class Lambda<S, T> {" +
@@ -201,7 +189,7 @@
" String name();" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" Runnable lambda() {" +
" return @CTA(\"x\") Lambda<@CTB(age = 5) Integer, @CTC(name = \"y\") Float>::new;" +
" }" +
@@ -209,14 +197,12 @@
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_REFERENCE_TYPE_ARGUMENT,
+ @TADescription(annotation = "TA", type = METHOD_REFERENCE_TYPE_ARGUMENT,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_REFERENCE_TYPE_ARGUMENT,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_REFERENCE_TYPE_ARGUMENT,
offset = ReferenceInfoUtil.IGNORE_VALUE,
typeIndex = 1)
- })
public String returnMethodRefTA1() {
return
"interface Lambda {" +
@@ -227,21 +213,19 @@
" public <S, T> void generic(S p1, T p2) {}" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" Lambda lambda(LambdaImpl r) {" +
" return r::<@TA Object, @TB Object>generic;" +
" }" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT,
+ @TADescription(annotation = "TA", type = CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT,
offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT,
offset = ReferenceInfoUtil.IGNORE_VALUE,
typeIndex = 1)
- })
public String returnConstructorRefTA2() {
return
"interface Lambda {" +
@@ -253,57 +237,222 @@
" public <S, T> void generic(S p1, T p2) {}" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" Lambda lambda() {" +
" return LambdaImpl::<@TA Object, @TB Object>new;" +
" }" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- paramIndex = 1),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- paramIndex = 1, genericLocation = { 3, 0 }),
- @TADescription(annotation = "TD", type = LOCAL_VARIABLE,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 1)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 1, genericLocation = { 3, 0 })
+ @TADescription(annotation = "TD", type = LOCAL_VARIABLE,
lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
- lvarIndex = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TE", type = CAST,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TE", type = CAST,
offset = ReferenceInfoUtil.IGNORE_VALUE,
typeIndex = 0)
- })
public String returnLambdaExpr1() {
return
"interface LambdaInt {" +
" void lambda(Object p1, List<Object> p2);" +
"}" +
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" LambdaInt getLambda() {" +
" return (@TA Object x, @TB List<@TC Object> y) -> { @TD Object l = null; System.out.println((@TE Object) l); };" +
" }" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- paramIndex = 0)})
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0)
public String lambdaField1() {
return
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" java.util.function.IntUnaryOperator field = (@TA int y) -> 1;" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- paramIndex = 0)})
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0)
public String lambdaField2() {
return
- "class Test {" +
+ "class %TEST_CLASS_NAME% {" +
" static java.util.function.IntUnaryOperator field = (@TA int y) -> 1;" +
"}";
}
+
+ @TADescription(annotation = "RTAs", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnMethodRefRepeatableAnnotation1() {
+ return
+ "class Lambda {" +
+ " public String getName() { return \"Lambda!\"; }" +
+ "}" +
+
+ "class %TEST_CLASS_NAME% {" +
+ " java.util.function.Function<Lambda, String> lambda() {" +
+ " return @RTA @RTA Lambda::getName;" +
+ " }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTCs", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTDs", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "RTEs", type = METHOD_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = { 3, 1})
+ public String returnMethodRefRepeatableAnnotation2() {
+ return
+ "class Lambda<S, T> {" +
+ " public String getName() { return \"Lambda!\"; }" +
+ "}" +
+
+ "class %TEST_CLASS_NAME% {" +
+ " java.util.function.Function<Lambda<Integer, Float>, String> lambda() {" +
+ " return @RTA @RTA Lambda<@RTB @RTB @RTC @RTC Integer, @RTD @RTD @RTE @RTE Float>::getName;" +
+ " }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = CONSTRUCTOR_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnConstructorRefRepeatable1() {
+ return
+ "class Lambda {" +
+ " Lambda() { }" +
+ "}" +
+
+ "class %TEST_CLASS_NAME% {" +
+ " Runnable lambda() {" +
+ " return @RTA @RTA Lambda::new;" +
+ " }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = CONSTRUCTOR_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = CONSTRUCTOR_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTCs", type = CONSTRUCTOR_REFERENCE,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = { 3, 1 })
+ public String returnConstructorRefRepeatable2() {
+ return
+ "class Lambda<S, T> {" +
+ " Lambda() { }" +
+ "}" +
+
+ "class %TEST_CLASS_NAME% {" +
+ " Runnable lambda() {" +
+ " return @RTA @RTA Lambda<@RTB @RTB Integer, @RTC @RTC Float>::new;" +
+ " }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_REFERENCE_TYPE_ARGUMENT,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_REFERENCE_TYPE_ARGUMENT,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 1)
+ public String returnMethodRefTARepeatableAnnotation1() {
+ return
+ "interface Lambda {" +
+ " <S, T> void generic(S p1, T p2);" +
+ "}" +
+
+ "class LambdaImpl implements Lambda {" +
+ " public <S, T> void generic(S p1, T p2) {}" +
+ "}" +
+
+ "class %TEST_CLASS_NAME% {" +
+ " Lambda lambda(LambdaImpl r) {" +
+ " return r::<@RTA @RTA Object, @RTB @RTB Object>generic;" +
+ " }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 1)
+ public String returnConstructorRefTARepeatableAnnotation2() {
+ return
+ "interface Lambda {" +
+ " <S, T> void generic(S p1, T p2);" +
+ "}" +
+
+ "class LambdaImpl implements Lambda {" +
+ " <S, T> LambdaImpl(S p1, T p2) {}" +
+ " public <S, T> void generic(S p1, T p2) {}" +
+ "}" +
+
+ "class %TEST_CLASS_NAME% {" +
+ " Lambda lambda() {" +
+ " return LambdaImpl::<@RTA @RTA Object, @RTB @RTB Object>new;" +
+ " }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 1)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 1, genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTDs", type = LOCAL_VARIABLE,
+ lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTEs", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String returnLambdaExprRepeatableAnnotation1() {
+ return
+ "interface LambdaInt {" +
+ " void lambda(Object p1, List<Object> p2);" +
+ "}" +
+ "class %TEST_CLASS_NAME% {" +
+ " LambdaInt getLambda() {" +
+ " return (@RTA @RTA Object x, @RTB @RTB List<@RTC @RTC Object> y) ->" +
+ " { @RTD @RTD Object l = null; System.out.println((@RTE @RTE Object) l); };" +
+ " }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0)
+ public String lambdaFieldRepeatableAnnotation1() {
+ return
+ "class %TEST_CLASS_NAME% {" +
+ " java.util.function.IntUnaryOperator field = (@RTA @RTA int y) -> 1;" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0)
+ public String lambdaFieldRepeatableAnnotation2() {
+ return
+ "class %TEST_CLASS_NAME% {" +
+ " static java.util.function.IntUnaryOperator field = (@RTA @RTA int y) -> 1;" +
+ "}";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java
new file mode 100644
index 0000000..30dd284
--- /dev/null
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2009, 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 8042451
+ * @summary Test population of reference info for method invocation type arguments
+ * @compile -g Driver.java ReferenceInfoUtil.java MethodInvocationTypeArgument.java
+ * @run main Driver MethodInvocationTypeArgument
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.METHOD_INVOCATION_TYPE_ARGUMENT;
+import static java.lang.System.lineSeparator;
+
+public class MethodInvocationTypeArgument {
+
+ @TADescription(annotation = "TA", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 4)
+ @TADescription(annotation = "TB", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 1, offset = 4)
+ @TADescription(annotation = "TC", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 2, offset = 4)
+ @TADescription(annotation = "TD", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 24)
+ @TADescription(annotation = "TE", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 1, offset = 24)
+ @TADescription(annotation = "TF", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 2, offset = 24)
+ public String genericMethod() {
+ return
+ "public <T1, T2, T3> void function(T1 t1, T2 t2, T3 t3) {}" + lineSeparator() +
+ "{ new %TEST_CLASS_NAME%().<@TA Integer, @TB String, @TC Double>function(0, \"\", 0.0); " + lineSeparator() +
+ " this.<@TD Integer, @TE String, @TF Double>function(0, \"\", 0.0); }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 0)
+ @TADescription(annotation = "TB", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 1, offset = 0)
+ @TADescription(annotation = "TC", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 2, offset = 0)
+ public String genericStaticMethod() {
+ return
+ "public static <T1, T2, T3> void staticFunction(T1 t1, T2 t2, T3 t3) {}" + lineSeparator() +
+ "static { %TEST_CLASS_NAME%.<@TA Integer, @TB String, @TC Double>staticFunction(0, \"\", 0.0); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 4)
+ @TADescription(annotation = "RTBs", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 1, offset = 4)
+ @TADescription(annotation = "RTCs", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 20)
+ @TADescription(annotation = "RTDs", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 1, offset = 20)
+ public String genericMethodRepeatableAnnotation() {
+ return
+ "public <T1, T2> void function(T1 t1, T2 t2) {}" + lineSeparator() +
+ "{ new %TEST_CLASS_NAME%().<@RTA @RTA Integer, @RTB @RTB String>" +
+ "function(0, \"\"); " + lineSeparator() +
+ " this.<@RTC @RTC Integer, @RTD @RTD String>function(0, \"\"); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 0, offset = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 1, offset = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_INVOCATION_TYPE_ARGUMENT,
+ typeIndex = 2, offset = 0)
+ public String genericStaticMethodRepeatableAnnotation() {
+ return
+ "public static <T1, T2, T3> void staticFunction(T1 t1, T2 t2, T3 t3) {}" + lineSeparator() +
+ "static { %TEST_CLASS_NAME%.<@RTA @RTA Integer, @RTB @RTB String, @RTC @RTC Double>staticFunction(0, \"\", 0.0); }";
+ }
+
+}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
index d4cc418..b72e9ce 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
@@ -25,6 +25,7 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for method parameters
* @compile -g Driver.java ReferenceInfoUtil.java MethodParameters.java
* @run main Driver MethodParameters
@@ -41,97 +42,83 @@
return "void test(Object b, @TA Object a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 0 }, paramIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 1 }, paramIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
genericLocation = { 3, 1, 3, 0 }, paramIndex = 0)
- })
public String methodParamAsParametrized() {
return "void test(@TA Map<@TB String, @TC List<@TD String>> a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 0 }, paramIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 0, 2, 0 }, paramIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 1 }, paramIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 1, 3, 0 }, paramIndex = 0),
- @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 1, 3, 0, 2, 0 }, paramIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 1, 3, 0, 2, 0, 3, 0 }, paramIndex = 0),
- @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 1, 3, 0, 2, 0, 3, 0, 2, 0 }, paramIndex = 0),
- @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 1, 3, 0, 2, 0, 3, 1 }, paramIndex = 0),
- @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0, 2, 0 }, paramIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0 }, paramIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0, 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0, 3, 0, 2, 0 }, paramIndex = 0)
+ @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0, 3, 1 }, paramIndex = 0)
+ @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
genericLocation = { 3, 1, 3, 0, 2, 0, 3, 1, 2, 0 }, paramIndex = 0)
- })
public String methodParamAsWildcard() {
return "void test(@TA Map<@TB ? extends @TC String," +
" @TD List<@TE ? extends @TF Map<@TG ? super @TH String," +
" @TI ? extends @TJ Object>>> a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 0, 0 }, paramIndex = 1),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
- })
public String methodParamAsArray() {
return "void test(Object b, @TC String @TA [] @TB [] a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 0, 0 }, paramIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
genericLocation = { 0, 0 }, paramIndex = 1)
- })
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
public String methodParamAsArray2() {
return "void test(Object b, @TA @TB String [] a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 0, 0 }, paramIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 0, 0 }, paramIndex = 1),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
genericLocation = { 0, 0 }, paramIndex = 1)
- })
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
public String methodParamAsArray3() {
return "void test(Object b, @TA @TB @TC String [] a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 0, 0 }, paramIndex = 1),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
- })
public String methodParamAsVararg() {
return "void test(Object b, @TC String @TA [] @TB ... a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 0, 0 }, paramIndex = 1),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
- })
public String methodParamAsFQVararg() {
return "void test(Object b, java.lang.@TC String @TA [] @TB ... a) { }";
}
@@ -148,26 +135,125 @@
// Smoke tests
@TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
- public String interfacemethodParamAsObject() {
- return "interface Test { void test(@TA Object a); }";
+ public String interfaceMethodParamAsObject() {
+ return "interface %TEST_CLASS_NAME% { void test(@TA Object a); }";
}
@TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 2)
- public String abstractmethodParamAsObject() {
- return "abstract class Test { abstract void test(Object b, Object c, @TA Object a); }";
+ public String abstractMethodParamAsObject() {
+ return "abstract class %TEST_CLASS_NAME% { abstract void test(Object b, Object c, @TA Object a); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 0 }, paramIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- genericLocation = { 3, 1 }, paramIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
genericLocation = { 3, 1, 3, 0 }, paramIndex = 0)
- })
- public String interfacemethodParamAsParametrized() {
- return "interface Test { void test(@TA Map<@TB String, @TC List<@TD String>> a); }";
+ public String interfaceMethodParamAsParametrized() {
+ return "interface %TEST_CLASS_NAME% { void test(@TA Map<@TB String, @TC List<@TD String>> a); }";
}
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ public String methodParamAsPrimitiveRepeatableAnnotation() {
+ return "void test(@RTA @RTA int a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 1)
+ public String methodParamAsObjectRepeatableAnnotation() {
+ return "void test(Object b, @RTA @RTA Object a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0)
+ @TADescription(annotation = "RTDs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0 }, paramIndex = 0)
+ public String methodParamAsParametrizedRepeatableAnnotation() {
+ return "void test(@RTA @RTA Map<@RTB @RTB String, @RTC @RTC List<@RTD @RTD String>> a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0, 2, 0 }, paramIndex = 0)
+ @TADescription(annotation = "RTDs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0)
+ @TADescription(annotation = "RTEs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "RTFs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0, 2, 0 }, paramIndex = 0)
+ public String methodParamAsWildcardRepeatableAnnotation() {
+ return "void test(@RTA @RTA Map<@RTB @RTB ? extends @RTC @RTC String," +
+ " @RTD @RTD List<@RTE @RTE ? super @RTF @RTF String>> a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
+ public String methodParamAsArrayRepeatableAnnotation() {
+ return "void test(Object b, @RTC @RTC String @RTA @RTA [] @RTB @RTB [] a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ public String methodParamAsArrayRepeatableAnnotation2() {
+ return "void test(Object b, @RTA @RTA @RTB @RTB String [] a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ public String methodParamAsArrayRepeatableAnnotation3() {
+ return "void test(Object b, @RTA @RTA @RTB @RTB String [] a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
+ public String methodParamAsVarargRepeatableAnnoattion() {
+ return "void test(Object b, @RTC @RTC String @RTA @RTA [] @RTB @RTB ... a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0 }, paramIndex = 1)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
+ public String methodParamAsFQVarargRepeatableAnnotation() {
+ return "void test(Object b, java.lang.@RTC @RTC String @RTA @RTA [] @RTB @RTB ... a) { }";
+ }
+
+ // Smoke tests
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ public String interfaceMethodParamAsObjectRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { void test(@RTA @RTA Object a); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 2)
+ public String abstractMethodParamAsObjectRepeatableAnnotation() {
+ return "abstract class %TEST_CLASS_NAME% { abstract void test(Object b, Object c, @RTA @RTA Object a); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 0 }, paramIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1 }, paramIndex = 0)
+ @TADescription(annotation = "RTDs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = { 3, 1, 3, 0 }, paramIndex = 0)
+ public String interfaceMethodParamAsParametrizedRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { void test(@RTA @RTA Map<@RTB @RTB String, @RTC @RTC List<@RTD @RTD String>> a); }";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java
index 8aefdd3..cab0de4 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java
@@ -25,6 +25,7 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for method receivers
* @compile -g Driver.java ReferenceInfoUtil.java MethodReceivers.java
* @run main Driver MethodReceivers
@@ -33,47 +34,87 @@
@TADescription(annotation = "TA", type = METHOD_RECEIVER)
public String regularMethod() {
- return "class Test { void test(@TA Test this) { } }";
+ return "class %TEST_CLASS_NAME% { void test(@TA %TEST_CLASS_NAME% this) { } }";
}
@TADescription(annotation = "TA", type = METHOD_RECEIVER)
public String abstractMethod() {
- return "abstract class Test { abstract void test(@TA Test this); }";
+ return "abstract class %TEST_CLASS_NAME% { abstract void test(@TA %TEST_CLASS_NAME% this); }";
}
@TADescription(annotation = "TA", type = METHOD_RECEIVER)
public String interfaceMethod() {
- return "interface Test { void test(@TA Test this); }";
+ return "interface %TEST_CLASS_NAME% { void test(@TA %TEST_CLASS_NAME% this); }";
}
@TADescription(annotation = "TA", type = METHOD_RECEIVER)
public String regularWithThrows() {
- return "class Test { void test(@TA Test this) throws Exception { } }";
- }
-
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RECEIVER,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = METHOD_RECEIVER,
- genericLocation = {1, 0})
- })
- @TestClass("TestOuter$TestInner")
- public String nestedtypes1() {
- return "class TestOuter { class TestInner { void test(@TA TestOuter. @TB TestInner this) { } } }";
+ return "class %TEST_CLASS_NAME% { void test(@TA %TEST_CLASS_NAME% this) throws Exception { } }";
}
@TADescription(annotation = "TA", type = METHOD_RECEIVER,
genericLocation = {})
- @TestClass("TestOuter$TestInner")
+ @TADescription(annotation = "TB", type = METHOD_RECEIVER,
+ genericLocation = {1, 0})
+ @TestClass("%TEST_CLASS_NAME%$TestInner")
+ public String nestedtypes1() {
+ return "class %TEST_CLASS_NAME% { class TestInner { void test(@TA %TEST_CLASS_NAME%. @TB TestInner this) { } } }";
+ }
+
+ @TADescription(annotation = "TA", type = METHOD_RECEIVER,
+ genericLocation = {})
+ @TestClass("%TEST_CLASS_NAME%$TestInner")
public String nestedtypes2() {
- return "class TestOuter { class TestInner { void test(@TA TestOuter.TestInner this) { } } }";
+ return "class %TEST_CLASS_NAME% { class TestInner { void test(@TA %TEST_CLASS_NAME%.TestInner this) { } } }";
}
@TADescription(annotation = "TB", type = METHOD_RECEIVER,
genericLocation = {1, 0})
- @TestClass("TestOuter$TestInner")
+ @TestClass("%TEST_CLASS_NAME%$TestInner")
public String nestedtypes3() {
- return "class TestOuter { class TestInner { void test(TestOuter. @TB TestInner this) { } } }";
+ return "class %TEST_CLASS_NAME% { class TestInner { void test(%TEST_CLASS_NAME%. @TB TestInner this) { } } }";
}
+ @TADescription(annotation = "RTAs", type = METHOD_RECEIVER)
+ public String regularMethodRepeatableAnnotation() {
+ return "class %TEST_CLASS_NAME% { void test(@RTA @RTA %TEST_CLASS_NAME% this) { } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RECEIVER)
+ public String abstractMethodRepeatablaAnnotation() {
+ return "abstract class %TEST_CLASS_NAME% { abstract void test(@RTA @RTA %TEST_CLASS_NAME% this); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RECEIVER)
+ public String interfaceMethodRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { void test(@RTA @RTA %TEST_CLASS_NAME% this); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RECEIVER)
+ public String regularWithThrowsRepeatableAnnotation() {
+ return "class %TEST_CLASS_NAME% { void test(@RTA @RTA %TEST_CLASS_NAME% this) throws Exception { } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RECEIVER,
+ genericLocation = {})
+ @TADescription(annotation = "RTBs", type = METHOD_RECEIVER,
+ genericLocation = {1, 0})
+ @TestClass("%TEST_CLASS_NAME%$TestInner")
+ public String nestedtypesRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME% { class TestInner { void test(@RTA @RTA %TEST_CLASS_NAME%. @RTB @RTB TestInner this) { } } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RECEIVER,
+ genericLocation = {})
+ @TestClass("%TEST_CLASS_NAME%$TestInner")
+ public String nestedtypesRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME% { class TestInner { void test(@RTA @RTA %TEST_CLASS_NAME%.TestInner this) { } } }";
+ }
+
+ @TADescription(annotation = "RTBs", type = METHOD_RECEIVER,
+ genericLocation = {1, 0})
+ @TestClass("%TEST_CLASS_NAME%$TestInner")
+ public String nestedtypesRepeatableAnnotation3() {
+ return "class %TEST_CLASS_NAME% { class TestInner { void test(%TEST_CLASS_NAME%. @RTB @RTB TestInner this) { } } }";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java
index e31c632..c3fcd77 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java
@@ -25,6 +25,7 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for method return
* @compile -g Driver.java ReferenceInfoUtil.java MethodReturns.java
* @run main Driver MethodReturns
@@ -42,37 +43,31 @@
return "@TA Object test() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 3, 1 }),
- @TADescription(annotation = "TD", type = METHOD_RETURN,
- genericLocation = { 3, 1, 3, 0 })
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = { 3, 1, 3, 0 })
public String methodReturnAsParametrized() {
return "@TA Map<@TB String, @TC List<@TD String>> test() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 0, 0 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 0, 0, 0, 0 })
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 0, 0 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 0, 0, 0, 0 })
public String methodReturnAsArray() {
return "@TC String @TA [] @TB [] test() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 0, 0 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 0, 0, 0, 0 })
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 0, 0 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 0, 0, 0, 0 })
public String methodReturnAsArrayOld() {
return "@TC String test() @TA [] @TB [] { return null; }";
}
@@ -90,97 +85,206 @@
// Smoke tests
@TADescription(annotation = "TA", type = METHOD_RETURN)
public String interfaceMethodReturnAsObject() {
- return "interface Test { @TA Object test(); }";
+ return "interface %TEST_CLASS_NAME% { @TA Object test(); }";
}
@TADescription(annotation = "TA", type = METHOD_RETURN)
public String abstractMethodReturnAsObject() {
- return "abstract class Test { abstract @TA Object test(); }";
+ return "abstract class %TEST_CLASS_NAME% { abstract @TA Object test(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 3, 1 }),
- @TADescription(annotation = "TD", type = METHOD_RETURN,
- genericLocation = { 3, 1, 3, 0 })
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN)
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = { 3, 1, 3, 0 })
public String interfaceMethodReturnAsParametrized() {
- return "interface Test { @TA Map<@TB String, @TC List<@TD String>> test(); }";
+ return "interface %TEST_CLASS_NAME% { @TA Map<@TB String, @TC List<@TD String>> test(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN,
- genericLocation = { 3, 0 }),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0 }),
- @TADescription(annotation = "TD", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0, 3, 0 }),
- @TADescription(annotation = "TE", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1 }),
- @TADescription(annotation = "TF", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1, 2, 0 })
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 0 })
+ @TADescription(annotation = "TE", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1 })
+ @TADescription(annotation = "TF", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1, 2, 0 })
public String methodReturnAsNestedWildcard() {
return "Set<@TA ? extends @TB GOuter<String, String>. @TC GInner<@TD String, @TE ? super @TF Object>> entrySet() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN,
- genericLocation = { 3, 0, 1, 0, 3, 0 }),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 3, 0, 1, 0, 3, 1 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 3, 0, 1, 0, 3, 1, 2, 0 })
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 0 })
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 1 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 1, 2, 0 })
public String methodReturnAsNestedWildcard2() {
return "class GOuter<X, Y> { class GInner<X, Y> {} } " +
- "class Test<K> { Set<GOuter<String, String>.GInner<@TA K, @TB ? extends @TC Object>> entrySet() { return null; } }";
+ "class %TEST_CLASS_NAME%<K> { Set<GOuter<String, String>.GInner<@TA K, @TB ? extends @TC Object>> entrySet() { return null; } }";
}
- @TADescriptions({
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0 }),
- })
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
public String methodReturnAsNestedWildcard3() {
return "Set<? extends @TB GOuter<String, String>. @TC GInner<String, Object>> entrySet() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0 }),
- })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
public String methodReturnAsNestedWildcard4() {
return "Set<? extends GOuter<String, String>. @TC GInner<String, Object>> entrySet() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0 }),
- })
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
public String methodReturnAsNestedWildcard5() {
return "Set<? extends @TB Outer. @TC Inner> entrySet() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0, 3, 0 }),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1 }),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = { 3, 0, 2, 0, 1, 0 }),
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 0 })
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1 })
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
public String methodReturnAsNestedWildcard6() {
return "Set<? extends GOuter<String, String>. @TC GInner<@TA String, @TB Object>> entrySet() { return null; }";
}
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ public String methodReturnAsPrimitiveRepeatableAnnotation() {
+ return "@RTA @RTA int test() { return 0; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ public String methodReturnAsObjectRepeatableAnnotation() {
+ return "@RTA @RTA Object test() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "RTDs", type = METHOD_RETURN,
+ genericLocation = { 3, 1, 3, 0 })
+ public String methodReturnAsParametrizedRepeatableAnnotation() {
+ return "@RTA @RTA Map<@RTB @RTB String, @RTC @RTC List<@RTD @RTD String>> test() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 0, 0 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 0, 0, 0, 0 })
+ public String methodReturnAsArrayRepeatableAnnotation() {
+ return "@RTC @RTC String @RTA @RTA [] @RTB @RTB [] test() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 0, 0 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 0, 0, 0, 0 })
+ public String methodReturnAsArrayOldRepeatableAnnotation() {
+ return "@RTC @RTC String test() @RTA @RTA [] @RTB @RTB [] { return null; }";
+ }
+
+ // Smoke tests
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ public String interfaceMethodReturnAsObjectRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { @RTA @RTA Object test(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ public String abstractMethodReturnAsObjectRepeatableAnnotation() {
+ return "abstract class %TEST_CLASS_NAME% { abstract @RTA @RTA Object test(); }";
+ }
+
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 3, 1 })
+ @TADescription(annotation = "RTDs", type = METHOD_RETURN,
+ genericLocation = { 3, 1, 3, 0 })
+ public String interfaceMethodReturnAsParametrizedRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { @RTA @RTA Map<@RTB @RTB String, @RTC @RTC List<@RTD @RTD String>> test(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN,
+ genericLocation = { 3, 0 })
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
+ @TADescription(annotation = "RTDs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 0 })
+ @TADescription(annotation = "RTEs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1 })
+ @TADescription(annotation = "RTFs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1, 2, 0 })
+ public String methodReturnAsNestedWildcardRepeatableAnnotation() {
+ return "Set<@RTA @RTA ? extends @RTB @RTB GOuter<String, String>. @RTC @RTC GInner<@RTD @RTD String," +
+ " @RTE @RTE ? super @RTF @RTF Object>> entrySet() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 0 })
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 1 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 1, 0, 3, 1, 2, 0 })
+ public String methodReturnAsNestedWildcardRepeatableAnnotation2() {
+ return "class GOuter<X, Y> { class GInner<X, Y> {} } " +
+ "class %TEST_CLASS_NAME%<K> { Set<GOuter<String, String>.GInner<@RTA @RTA K," +
+ " @RTB @RTB ? extends @RTC @RTC Object>> entrySet() { return null; } }";
+ }
+
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
+ public String methodReturnAsNestedWildcardRepeatableAnnotation3() {
+ return "Set<? extends @RTB @RTB GOuter<String, String>. @RTC @RTC GInner<String, Object>> entrySet() { return null; }";
+ }
+
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
+ public String methodReturnAsNestedWildcardRepeatableAnnotation4() {
+ return "Set<? extends GOuter<String, String>. @RTC @RTC GInner<String, Object>> entrySet() { return null; }";
+ }
+
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
+ public String methodReturnAsNestedWildcardRepeatableAnnotation5() {
+ return "Set<? extends @RTB @RTB Outer. @RTC @RTC Inner> entrySet() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 0 })
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0, 3, 1 })
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = { 3, 0, 2, 0, 1, 0 })
+ public String methodReturnAsNestedWildcardRepeatableAnnotation6() {
+ return "Set<? extends GOuter<String, String>. @RTC @RTC GInner<@RTA @RTA String," +
+ " @RTB @RTB Object>> entrySet() { return null; }";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java
index 2b73c6e..db0f610 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java
@@ -25,53 +25,46 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for method exception clauses
* @compile -g Driver.java ReferenceInfoUtil.java MethodThrows.java
* @run main Driver MethodThrows
*/
public class MethodThrows {
- @TADescriptions({
- @TADescription(annotation = "TA", type = THROWS, typeIndex = 0),
- @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
- })
+ @TADescription(annotation = "TA", type = THROWS, typeIndex = 0)
+ @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
public String regularMethod() {
- return "class Test { void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception { } }";
+ return "class %TEST_CLASS_NAME% { void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception { } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = THROWS, typeIndex = 0),
- @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
- })
+ @TADescription(annotation = "TA", type = THROWS, typeIndex = 0)
+ @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
public String abstractMethod() {
- return "abstract class Test { abstract void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception; }";
+ return "abstract class %TEST_CLASS_NAME% { abstract void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = THROWS, typeIndex = 0),
- @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
- })
+ @TADescription(annotation = "TA", type = THROWS, typeIndex = 0)
+ @TADescription(annotation = "TB", type = THROWS, typeIndex = 2)
public String interfaceMethod() {
- return "interface Test { void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception; }";
+ return "interface %TEST_CLASS_NAME% { void test() throws @TA RuntimeException, IllegalArgumentException, @TB Exception; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = THROWS, typeIndex = 0,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = THROWS, typeIndex = 0,
- genericLocation = {1, 0}),
- @TADescription(annotation = "TC", type = THROWS, typeIndex = 0,
- genericLocation = {1, 0, 1, 0}),
- @TADescription(annotation = "TD", type = THROWS, typeIndex = 1,
- genericLocation = {}),
- @TADescription(annotation = "TE", type = THROWS, typeIndex = 1,
- genericLocation = {1, 0}),
- @TADescription(annotation = "TF", type = THROWS, typeIndex = 1,
- genericLocation = {1, 0, 1, 0})
- })
+ @TADescription(annotation = "TA", type = THROWS, typeIndex = 0,
+ genericLocation = {})
+ @TADescription(annotation = "TB", type = THROWS, typeIndex = 0,
+ genericLocation = {1, 0})
+ @TADescription(annotation = "TC", type = THROWS, typeIndex = 0,
+ genericLocation = {1, 0, 1, 0})
+ @TADescription(annotation = "TD", type = THROWS, typeIndex = 1,
+ genericLocation = {})
+ @TADescription(annotation = "TE", type = THROWS, typeIndex = 1,
+ genericLocation = {1, 0})
+ @TADescription(annotation = "TF", type = THROWS, typeIndex = 1,
+ genericLocation = {1, 0, 1, 0})
public String NestedTypes() {
return "class Outer { class Middle { class Inner1 extends Exception {}" +
" class Inner2 extends Exception{} } }" +
- "class Test { void test() throws @TA Outer.@TB Middle.@TC Inner1, @TD Outer.@TE Middle.@TF Inner2 { } }";
+ "class %TEST_CLASS_NAME% { void test() throws @TA Outer.@TB Middle.@TC Inner1, @TD Outer.@TE Middle.@TF Inner2 { } }";
}
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java
index a48198c..c34f80e 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java
@@ -22,230 +22,387 @@
*/
import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
+import static java.lang.System.lineSeparator;
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for method type parameters
* @compile -g Driver.java ReferenceInfoUtil.java MethodTypeParam.java
* @run main Driver MethodTypeParam
*/
public class MethodTypeParam {
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
public String regularClass() {
return "<@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> void test() { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
public String regularClass2() {
return "<@TA K extends @TB Date, @TC V extends @TE Cloneable> void test() { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
public String regularClassParameterized() {
return "<K extends @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> void test() { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
public String abstractClass() {
- return "abstract class Test { abstract <@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> void test(); }";
+ return "abstract class %TEST_CLASS_NAME% { abstract <@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> void test(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
public String abstractClassParameterized() {
- return "abstract class Test { abstract <K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> void test(); }";
+ return "abstract class %TEST_CLASS_NAME% { abstract <K extends @TG Object & @TA Map<String, @TB String>, V extends @TF Object & @TC List<@TD List<@TE Object>>> void test(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
public String abstractClassParameterized2() {
- return "abstract class Test { abstract <K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> void test(); }";
+ return "abstract class %TEST_CLASS_NAME% { abstract <K extends @TA Map<String, @TB String>, V extends @TC List<@TD List<@TE Object>>> void test(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
public String abstractClassParameterized3() {
- return "abstract class Test { abstract <K extends @TA List<String>, V extends @TB List<Object>> void test(); }";
+ return "abstract class %TEST_CLASS_NAME% { abstract <K extends @TA List<String>, V extends @TB List<Object>> void test(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
public String regularInterface() {
- return "interface Test { <@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> void test(); }";
+ return "interface %TEST_CLASS_NAME% { <@TA K extends @TB Date, @TC V extends @TD Object & @TE Cloneable> void test(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
public String regularInterfaceParameterized() {
- return "interface Test { <@TH K extends @TG Object & @TA Map<String, @TB String>, @TI V extends @TF Object & @TC List<@TD List<@TE Object>>> void test(); }";
+ return "interface %TEST_CLASS_NAME% { <@TH K extends @TG Object & @TA Map<String, @TB String>, @TI V extends @TF Object & @TC List<@TD List<@TE Object>>> void test(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1}),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0}),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
public String regularInterfaceParameterized2() {
- return "interface Test { <@TF K extends @TA Map<String, @TB String>, @TG V extends @TC List<@TD List<@TE Object>>> void test(); }";
+ return "interface %TEST_CLASS_NAME% { <@TF K extends @TA Map<String, @TB String>, @TG V extends @TC List<@TD List<@TE Object>>> void test(); }";
}
@TADescription(annotation = "TA", type = METHOD_RETURN)
public String useInReturn1() {
- return "class Test { <T> @TA T m() { throw new RuntimeException(); } }";
+ return "class %TEST_CLASS_NAME% { <T> @TA T m() { throw new RuntimeException(); } }";
}
@TADescription(annotation = "TA", type = METHOD_RETURN, genericLocation = {3, 0})
public String useInReturn2() {
- return "class Test { <T> Class<@TA T> m() { throw new RuntimeException(); } }";
+ return "class %TEST_CLASS_NAME% { <T> Class<@TA T> m() { throw new RuntimeException(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_RETURN)
- })
- public String useInReturn3() {
- return "class Test { <T extends @TA Object> @TB T m() { throw new RuntimeException(); } }";
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_RETURN)
+ public String useInReturn3() {
+ return "class %TEST_CLASS_NAME% { <T extends @TA Object> @TB T m() { throw new RuntimeException(); } }";
}
@TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
paramIndex = 0, genericLocation = {3, 0})
public String useInParam1() {
- return "class Test { <T> void m(Class<@TA T> p) { throw new RuntimeException(); } }";
+ return "class %TEST_CLASS_NAME% { <T> void m(Class<@TA T> p) { throw new RuntimeException(); } }";
}
@TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
paramIndex = 0, genericLocation = {3, 0})
public String useInParam2() {
- return "class Test { void m(Class<@TA Object> p) { throw new RuntimeException(); } }";
+ return "class %TEST_CLASS_NAME% { void m(Class<@TA Object> p) { throw new RuntimeException(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 2),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 2)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
public String useInParam3() {
return "interface IA {} " +
"interface IB<XB> {} " +
"interface IC<XC> {} " +
- "class Test { <T extends @TA IB<IA> & @TB IC<IA>> void m(@TC T p) { throw new RuntimeException(); } }";
+ "class %TEST_CLASS_NAME% { <T extends @TA IB<IA> & @TB IC<IA>> void m(@TC T p) { throw new RuntimeException(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 1,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {})
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 2,
- genericLocation = {}),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {})
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
paramIndex = 0)
- })
public String useInParam4() {
- return "class Test {" +
+ return "class %TEST_CLASS_NAME% {" +
" interface IA {} " +
" interface IB<XB> {} " +
" interface IC<XC> {} " +
" <T extends @TA IB<IA> & @TB IC<IA>> void m(@TC T p) { throw new RuntimeException(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 0,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {})
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 0,
- genericLocation = {1, 0}),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0})
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 0,
- genericLocation = {1, 0, 3, 0}),
- })
- public String useInParam5() {
- return "class Test {" +
+ genericLocation = {1, 0, 3, 0})
+ public String useInParam5() {
+ return "class %TEST_CLASS_NAME% {" +
" interface IA {} " +
" class CB<XC> {} " +
- " <T extends @TA Test. @TB CB<@TC IA>> void m(T p) { throw new RuntimeException(); } }";
+ " <T extends @TA %TEST_CLASS_NAME%. @TB CB<@TC IA>> void m(T p) { throw new RuntimeException(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER,
- paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER,
+ paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 0,
- genericLocation = {}),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {})
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 0,
- genericLocation = {1, 0, 3, 0}),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0})
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 1,
- genericLocation = {}),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {})
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
paramIndex = 0, boundIndex = 1,
genericLocation = {3, 0})
- })
public String useInParam6() {
- return "class Test {" +
+ return "class %TEST_CLASS_NAME% {" +
" interface IA {} " +
" interface IB<XB> {} " +
" class CC<XC> {} " +
" interface ID<XD> {} " +
- " <@TA T extends @TB Test.CC<@TC IA> & Test. @TD ID<@TE IA>> void m(T p) { throw new RuntimeException(); } }";
+ " <@TA T extends @TB %TEST_CLASS_NAME%.CC<@TC IA> & %TEST_CLASS_NAME%. @TD ID<@TE IA>> void m(T p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String regularClassRepeatableAnnotation() {
+ return "<@RTA @RTA K extends @RTB @RTB Date, @RTC @RTC V extends @RTD @RTD Object & @RTE @RTE Cloneable> void test() { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String regularClassRepeatableAnnotation2() {
+ return "<@RTA @RTA K extends @RTB @RTB Date, @RTC @RTC V extends @RTE @RTE Cloneable> void test() { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "RTFs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ public String regularClassParameterizedRepeatableAnnotation() {
+ return "<K extends @RTA @RTA Map<String, @RTB @RTB String>, V extends @RTF @RTF Object" +
+ " & @RTC @RTC List<@RTD @RTD List<@RTE @RTE Object>>> void test() { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String abstractClassRepeatableAnnotation() {
+ return "abstract class %TEST_CLASS_NAME% { abstract <@RTA @RTA K extends @RTB @RTB Date," +
+ " @RTC @RTC V extends @RTD @RTD Object & @RTE @RTE Cloneable> void test(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTFs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ public String abstractClassParameterizedRepeatableAnnotation() {
+ return "abstract class %TEST_CLASS_NAME% { abstract <K extends @RTE @RTE Object &" +
+ " @RTA @RTA Map<String, @RTB @RTB String>, V extends @RTF @RTF Object &" +
+ " @RTC @RTC List<@RTD @RTD Object>> void test(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0, 3, 0})
+ public String abstractClassParameterizedRepeatableAnnotation2() {
+ return "abstract class %TEST_CLASS_NAME% { abstract <K extends @RTA @RTA Map<String, @RTB @RTB String>," +
+ " V extends @RTC @RTC List<@RTD @RTD List<@RTE @RTE Object>>> void test(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String abstractClassParameterizedRepeatableAnnotation3() {
+ return "abstract class %TEST_CLASS_NAME% { abstract <K extends @RTA @RTA List<String>," +
+ " V extends @RTB @RTB List<Object>> void test(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 0)
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ public String regularInterfaceRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { <@RTA @RTA K extends @RTB @RTB Date," +
+ " @RTC @RTC V extends @RTD @RTD Object & @RTE @RTE Cloneable> void test(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1, genericLocation = {3, 1})
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 1, boundIndex = 1, genericLocation = {3, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER, paramIndex = 1)
+ @TADescription(annotation = "RTFs", type = METHOD_TYPE_PARAMETER, paramIndex = 0)
+ public String regularInterfaceParameterizedRepeatableAnnotation() {
+ return "interface %TEST_CLASS_NAME% { <@RTF @RTF K extends @RTA @RTA Map<String, @RTB @RTB String>," +
+ " @RTE @RTE V extends @RTC @RTC List<@RTD @RTD Object>> void test(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN)
+ public String useInReturnRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME% { <T> @RTA @RTA T m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN, genericLocation = {3, 0})
+ public String useInReturnRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME% { <T> Class<@RTA @RTA T> m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN)
+ public String useInReturnRepeatableAnnotation3() {
+ return "class %TEST_CLASS_NAME% { <T extends @RTA @RTA Object> @RTB @RTB T m() { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0, genericLocation = {3, 0})
+ public String useInParamRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME% { <T> void m(Class<@RTA @RTA T> p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0, genericLocation = {3, 0})
+ public String useInParamRepeatableAnnotation2() {
+ return "class %TEST_CLASS_NAME% { void m(Class<@RTA @RTA Object> p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND, paramIndex = 0, boundIndex = 2)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ public String useInParamRepeatableAnnotation3() {
+ return "interface IA {} " +
+ "interface IB<XB> {} " +
+ "interface IC<XC> {} " +
+ "class %TEST_CLASS_NAME% { <T extends @RTA @RTA IB<IA> & @RTB @RTB IC<IA>>" +
+ " void m(@RTC @RTC T p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1,
+ genericLocation = {})
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 2,
+ genericLocation = {})
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ paramIndex = 0)
+ public String useInParamRepeatableAnnotation4() {
+ return "class %TEST_CLASS_NAME% {" +
+ " interface IA {} " +
+ " interface IB<XB> {} " +
+ " interface IC<XC> {} " +
+ " <T extends @RTA @RTA IB<IA> & @RTB @RTB IC<IA>>" +
+ " void m(@RTC @RTC T p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {})
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {1, 0})
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {1, 0, 3, 0})
+ public String useInParamRepeatableAnnotation5() {
+ return "class %TEST_CLASS_NAME% {" +
+ " interface IA {} " +
+ " class CB<XC> {} " +
+ " <T extends @RTA @RTA %TEST_CLASS_NAME%. @RTB @RTB" +
+ " CB<@RTC @RTC IA>> void m(T p) { throw new RuntimeException(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER,
+ paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {})
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0,
+ genericLocation = {1, 0, 3, 0})
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1,
+ genericLocation = {})
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1,
+ genericLocation = {3, 0})
+ public String useInParamRepeatableAnnotation6() {
+ return "class %TEST_CLASS_NAME% {" +
+ " interface IA {} " +
+ " interface IB<XB> {} " +
+ " class CC<XC> {} " +
+ " interface ID<XD> {} " +
+ " <@RTA @RTA T extends @RTB @RTB %TEST_CLASS_NAME%.CC<@RTC @RTC IA> &" +
+ " %TEST_CLASS_NAME%. @RTD @RTD ID<@RTE @RTE IA>> void m(T p) { throw new RuntimeException(); } }";
}
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java
index 7c16a0d..f791521 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java
@@ -25,7 +25,7 @@
/*
* @test
- * @bug 8006732 8006775
+ * @bug 8006732 8006775 8042451
* @summary Test population of reference info for multicatch exception parameters
* @author Werner Dietl
* @compile -g Driver.java ReferenceInfoUtil.java MultiCatch.java
@@ -33,35 +33,59 @@
*/
public class MultiCatch {
- @TADescriptions({
- @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0),
- @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
- })
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
public String multiCatch1() {
return "void multiCatch1() { " +
"try { new Object(); } catch (@TA NullPointerException | @TB IndexOutOfBoundsException e) { e.toString(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0),
- @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1),
- @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2),
- })
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
public String multiCatch2() {
return "void multiCatch2() { " +
"try { new Object(); } catch (@TA NullPointerException | @TB IndexOutOfBoundsException | @TC IllegalArgumentException e) { e.toString(); } }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 1),
- @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1),
- @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2),
- @TADescription(annotation = "TD", type = EXCEPTION_PARAMETER, exceptionIndex = 2),
- @TADescription(annotation = "TE", type = EXCEPTION_PARAMETER, exceptionIndex = 3),
- })
+ @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ @TADescription(annotation = "TD", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ @TADescription(annotation = "TE", type = EXCEPTION_PARAMETER, exceptionIndex = 3)
public String multiCatch3() {
return "void multiCatch3() { " +
"try { new Object(); } catch (NullPointerException e1) {}" +
"try { new Object(); } catch (@TA @TB NullPointerException | @TC @TD IndexOutOfBoundsException | @TE IllegalArgumentException e2) { e2.toString(); } }";
}
+
+ @TADescription(annotation = "RTAs", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "RTBs", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ public String multiCatchRepeatableAnnotation1() {
+ return "void multiCatch1() { " +
+ "try { new Object(); } catch (@RTA @RTA NullPointerException |" +
+ " @RTB @RTB IndexOutOfBoundsException e) { e.toString(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
+ @TADescription(annotation = "RTBs", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "RTCs", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ public String multiCatchRepeatableAnnotation2() {
+ return "void multiCatch2() { " +
+ "try { new Object(); } catch (@RTA @RTA NullPointerException |" +
+ " @RTB @RTB IndexOutOfBoundsException | @RTC @RTC IllegalArgumentException e) { e.toString(); } }";
+ }
+
+ @TADescription(annotation = "RTAs", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "RTBs", type = EXCEPTION_PARAMETER, exceptionIndex = 1)
+ @TADescription(annotation = "RTCs", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ @TADescription(annotation = "RTDs", type = EXCEPTION_PARAMETER, exceptionIndex = 2)
+ @TADescription(annotation = "RTEs", type = EXCEPTION_PARAMETER, exceptionIndex = 3)
+ public String multiCatchRepeatableAnnotation3() {
+ return "void multiCatch3() { " +
+ "try { new Object(); } catch (NullPointerException e1) {}" +
+ "try { new Object(); } catch (@RTA @RTA @RTB @RTB NullPointerException |" +
+ " @RTC @RTC @RTD @RTD IndexOutOfBoundsException |" +
+ " @RTE @RTE IllegalArgumentException e2) { e2.toString(); } }";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
index 3bd39e5..78d5853 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
@@ -25,6 +25,7 @@
/*
* @test
+ * @bug 8042451 8044009 8044010
* @summary Test population of reference info for nested types
* @compile -g Driver.java ReferenceInfoUtil.java NestedTypes.java
* @run main Driver NestedTypes
@@ -33,22 +34,18 @@
// method parameters
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0}, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
public String testParam1() {
return "void test(@TA Outer.@TB Inner a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 1, 0}, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0)
public String testParam1b() {
return "void test(List<@TA Outer.@TB Inner> a) { }";
}
@@ -63,10 +60,9 @@
return "void test(java.util.@TA Map.Entry a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
genericLocation = {1, 0}, paramIndex = 0)
})
public String testParam1d() {
@@ -79,10 +75,9 @@
return "void test(List<java.util.@TA Map.Entry> a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
genericLocation = {3, 0, 1, 0}, paramIndex = 0)
})
public String testParam1f() {
@@ -96,89 +91,81 @@
return "void test(List<java.util.Map. @TB Entry> a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {1, 0}, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
public String testParam2() {
return "void test(@TA GOuter<String,String>.@TB GInner<String,String> a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 1, 0}, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0)
public String testParam2b() {
return "void test(List<@TA GOuter<String,String>.@TB GInner<String,String>> a) { }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0),
- @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER, paramIndex = 0),
- @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {0, 0}, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0)
+ @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0}, paramIndex = 0)
public String testParam3() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" void test(@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[] a) { }\n" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}, paramIndex = 0),
- @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0),
- @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0),
- @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0}, paramIndex = 0),
- @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
- genericLocation = {3, 0, 0, 0}, paramIndex = 0)
- })
+ @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0)
+ @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0}, paramIndex = 0)
public String testParam4() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" void test(List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]> a) { }\n" +
"}";
}
@@ -186,14 +173,12 @@
// Local variables
- @TADescriptions({
- @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
- genericLocation = {},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
- genericLocation = {1, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
- })
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
public String testLocal1a() {
return "void test() { @TA Outer.@TB Inner a = null; }";
}
@@ -212,104 +197,99 @@
return "void test() { Outer.@TB Inner a = null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
- genericLocation = {},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
- genericLocation = {1, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
- })
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
public String testLocal2() {
return "void test() { @TA GOuter<String,String>.@TB GInner<String,String> a = null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0, 1, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TD", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TE", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TF", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TG", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TH", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TI", type = LOCAL_VARIABLE,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TJ", type = LOCAL_VARIABLE,
- genericLocation = {},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TK", type = LOCAL_VARIABLE,
- genericLocation = {0, 0},
- lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
- })
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TD", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TE", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TF", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TG", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TH", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TI", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TJ", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TK", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
public String testLocal3() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" void test() { @TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[] a = null; }\n" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TD", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TE", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TF", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TG", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TH", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TI", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TJ", type = LOCAL_VARIABLE,
- genericLocation = {3, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1}),
- @TADescription(annotation = "TK", type = LOCAL_VARIABLE,
- genericLocation = {3, 0, 0, 0},
- lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
- })
+
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TD", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TE", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TF", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TG", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TH", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TI", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TJ", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "TK", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
public String testLocal4() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" void test() { List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]> a = null; }\n" +
"}";
}
@@ -317,12 +297,10 @@
// fields
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = {1, 0})
- })
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {})
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {1, 0})
public String testField1a() {
return "@TA Outer.@TB Inner a;";
}
@@ -339,79 +317,73 @@
return "Outer.@TB Inner a;";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = {1, 0})
- })
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {})
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {1, 0})
public String testField2() {
return "@TA GOuter<String,String>.@TB GInner<String,String> a;";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD,
- genericLocation = {0, 0, 0, 0}),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = {0, 0, 0, 0, 1, 0}),
- @TADescription(annotation = "TC", type = FIELD,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TD", type = FIELD,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
- @TADescription(annotation = "TE", type = FIELD,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = FIELD,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
- @TADescription(annotation = "TG", type = FIELD,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}),
- @TADescription(annotation = "TH", type = FIELD,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TI", type = FIELD,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1}),
- @TADescription(annotation = "TJ", type = FIELD),
- @TADescription(annotation = "TK", type = FIELD,
- genericLocation = {0, 0})
- })
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "TE", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "TG", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "TH", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TI", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1})
+ @TADescription(annotation = "TJ", type = FIELD)
+ @TADescription(annotation = "TK", type = FIELD,
+ genericLocation = {0, 0})
public String testField3() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" @TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[] a;\n" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0}),
- @TADescription(annotation = "TB", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}),
- @TADescription(annotation = "TC", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TD", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
- @TADescription(annotation = "TE", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
- @TADescription(annotation = "TG", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}),
- @TADescription(annotation = "TH", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TI", type = FIELD,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1}),
- @TADescription(annotation = "TJ", type = FIELD,
- genericLocation = {3, 0}),
- @TADescription(annotation = "TK", type = FIELD,
- genericLocation = {3, 0, 0, 0})
- })
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "TB", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TD", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "TE", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "TG", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "TH", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TI", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1})
+ @TADescription(annotation = "TJ", type = FIELD,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "TK", type = FIELD,
+ genericLocation = {3, 0, 0, 0})
public String testField4() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]> a;\n" +
"}";
}
@@ -419,121 +391,111 @@
// return types
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = {1, 0})
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {})
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {1, 0})
public String testReturn1() {
return "@TA Outer.@TB Inner test() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = {1, 0})
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {})
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {1, 0})
public String testReturn2() {
return "@TA GOuter<String,String>.@TB GInner<String,String> test() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0}),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0, 1, 0}),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TD", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
- @TADescription(annotation = "TE", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
- @TADescription(annotation = "TG", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}),
- @TADescription(annotation = "TH", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TI", type = METHOD_RETURN,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1}),
- @TADescription(annotation = "TJ", type = METHOD_RETURN),
- @TADescription(annotation = "TK", type = METHOD_RETURN,
- genericLocation = {0, 0})
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "TE", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "TG", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "TH", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TI", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1})
+ @TADescription(annotation = "TJ", type = METHOD_RETURN)
+ @TADescription(annotation = "TK", type = METHOD_RETURN,
+ genericLocation = {0, 0})
public String testReturn3() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" @TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[] test() { return null; }\n" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0}),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TD", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
- @TADescription(annotation = "TE", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0}),
- @TADescription(annotation = "TF", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
- @TADescription(annotation = "TG", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}),
- @TADescription(annotation = "TH", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TI", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1}),
- @TADescription(annotation = "TJ", type = METHOD_RETURN,
- genericLocation = {3, 0}),
- @TADescription(annotation = "TK", type = METHOD_RETURN,
- genericLocation = {3, 0, 0, 0})
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "TE", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "TF", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "TG", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "TH", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TI", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1})
+ @TADescription(annotation = "TJ", type = METHOD_RETURN,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "TK", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0})
public String testReturn4() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]> test() { return null; }\n" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_RETURN,
- genericLocation = {3, 0}),
- @TADescription(annotation = "TB", type = METHOD_RETURN,
- genericLocation = {3, 0, 3, 0}),
- @TADescription(annotation = "TC", type = METHOD_RETURN,
- genericLocation = {3, 0, 3, 1}),
- @TADescription(annotation = "TD", type = METHOD_RETURN,
- genericLocation = {3, 0, 3, 1, 3, 0}),
- @TADescription(annotation = "TE", type = METHOD_RETURN,
- genericLocation = {3, 0, 1, 0}),
- @TADescription(annotation = "TF", type = METHOD_RETURN,
- genericLocation = {3, 0, 1, 0, 3, 0}),
- @TADescription(annotation = "TG", type = METHOD_RETURN,
- genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}),
- @TADescription(annotation = "TH", type = METHOD_RETURN,
- genericLocation = {3, 0, 1, 0, 3, 0, 3, 0}),
- @TADescription(annotation = "TI", type = METHOD_RETURN,
- genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0}),
- @TADescription(annotation = "TJ", type = METHOD_RETURN,
- genericLocation = {3, 0, 1, 0, 1, 0}),
- })
+ @TADescription(annotation = "TA", type = METHOD_RETURN,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "TB", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "TC", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 1})
+ @TADescription(annotation = "TD", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 1, 3, 0})
+ @TADescription(annotation = "TE", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0})
+ @TADescription(annotation = "TF", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "TG", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "TH", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "TI", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "TJ", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 1, 0})
public String testReturn5() {
return "class GOuter<A, B> {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" List<@TA GOuter<@TB String, @TC List<@TD Object>> . @TE GInner<@TF List<@TG Object @TH[] @TI[]>>. @TJ GInner2<String, String>> test() { return null; }\n" +
"}";
}
@@ -541,138 +503,128 @@
// type parameters
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {}, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {}, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0}, paramIndex = 0, boundIndex = 0)
- })
public String testTypeparam1() {
return "<X extends @TA Outer.@TB Inner> X test() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {}, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {}, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0}, paramIndex = 0, boundIndex = 0)
- })
public String testTypeparam2() {
return "<X extends @TA GOuter<String,String>.@TB GInner<String,String>> X test() { return null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {},
- paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0},
- paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0, 3, 0},
- paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
- paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0, 3, 0, 3, 0},
- paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0, 3, 0, 3, 0, 0, 0},
- paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0, 1, 0},
- paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0, 1, 0, 3, 0},
- paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {1, 0, 1, 0, 3, 1},
- paramIndex = 0, boundIndex = 0),
- })
+ paramIndex = 0, boundIndex = 0)
public String testTypeparam3() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" <X extends @TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object>> X test() { return null; }\n" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0, 1, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TJ", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TJ", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0},
- paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TK", type = METHOD_TYPE_PARAMETER_BOUND,
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TK", type = METHOD_TYPE_PARAMETER_BOUND,
genericLocation = {3, 0, 0, 0},
paramIndex = 0, boundIndex = 1)
- })
public String testTypeparam4() {
return "class Outer {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" <X extends List<@TA Outer . @TB GInner<@TC List<@TD Object @TE[] @TF[]>>. @TG GInner2<@TH Integer, @TI Object> @TJ[] @TK[]>> X test() { return null; }\n" +
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 3, 0}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 3, 1}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 3, 1, 3, 0}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 1, 0}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 1, 0, 3, 0}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0, boundIndex = 1),
- @TADescription(annotation = "TJ", type = METHOD_TYPE_PARAMETER_BOUND,
- genericLocation = {3, 0, 1, 0, 1, 0}, paramIndex = 0, boundIndex = 1),
- })
+ @TADescription(annotation = "TA", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TB", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TC", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 1}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TD", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 1, 3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TE", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TF", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TG", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TH", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TI", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "TJ", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 1, 0}, paramIndex = 0, boundIndex = 1)
public String testTypeparam5() {
return "class GOuter<A, B> {\n" +
" class GInner<X> {\n" +
" class GInner2<Y, Z> {}\n" +
"}}\n\n" +
- "class Test {\n" +
+ "class %TEST_CLASS_NAME% {\n" +
" <X extends List<@TA GOuter<@TB String, @TC List<@TD Object>> . @TE GInner<@TF List<@TG Object @TH[] @TI[]>>. @TJ GInner2<String, String>>> X test() { return null; }\n" +
"}";
}
@@ -680,91 +632,89 @@
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0})
public String testUses1a() {
- return "class Test { class Inner {} List<@TA Inner> f; }";
+ return "class %TEST_CLASS_NAME% { class Inner {} List<@TA Inner> f; }";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0})
public String testUses1b() {
- return "class Test { class Inner {} List<@TA Test.Inner> f; }";
+ return "class %TEST_CLASS_NAME% { class Inner {} List<@TA %TEST_CLASS_NAME%.Inner> f; }";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0, 1, 0})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses2a() {
- return "class Test { class Inner { class Inner2{} List<@TA Inner2> f; }}";
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{} List<@TA Inner2> f; }}";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses2b() {
- return "class Test { class Inner { class Inner2{} List<@TA Inner.Inner2> f; }}";
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{} List<@TA Inner.Inner2> f; }}";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0, 1, 0})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses2c() {
- return "class Test { class Inner { class Inner2{} List<Inner.@TA Inner2> f; }}";
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{} List<Inner.@TA Inner2> f; }}";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses2d() {
- return "class Test{ class Inner { class Inner2{} List<@TA Test.Inner.Inner2> f; }}";
+ return "class %TEST_CLASS_NAME%{ class Inner { class Inner2{} List<@TA %TEST_CLASS_NAME%.Inner.Inner2> f; }}";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses2e() {
- return "class Test { class Inner { class Inner2{} List<Test.@TA Inner.Inner2> f; }}";
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{} List<%TEST_CLASS_NAME%.@TA Inner.Inner2> f; }}";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0, 1, 0})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses2f() {
- return "class Test { class Inner { class Inner2{} List<Test.Inner.@TA Inner2> f; }}";
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{} List<%TEST_CLASS_NAME%.Inner.@TA Inner2> f; }}";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0, 1, 0})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses3a() {
- return "class Test { class Inner<A, B> { class Inner2<C, D>{}\n" +
- " List<Test.Inner.@TA Inner2> f; }}";
+ return "class %TEST_CLASS_NAME% { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<%TEST_CLASS_NAME%.Inner.@TA Inner2> f; }}";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses3b() {
- return "class Test { class Inner<A, B> { class Inner2<C, D>{}\n" +
- " List<Test.@TA Inner.Inner2> f; }}";
+ return "class %TEST_CLASS_NAME% { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<%TEST_CLASS_NAME%.@TA Inner.Inner2> f; }}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD,
- genericLocation = {}),
- @TADescription(annotation = "TB", type = FIELD,
+ @TADescription(annotation = "TA", type = FIELD,
+ genericLocation = {})
+ @TADescription(annotation = "TB", type = FIELD,
genericLocation = {3, 0})
- })
public String testUses4() {
- return "class Test { static class TInner {}\n" +
+ return "class %TEST_CLASS_NAME% { static class TInner {}\n" +
" @TA TInner f; \n" +
" List<@TB TInner> g; }";
}
@TADescription(annotation = "TA", type = FIELD,
genericLocation = {3, 0, 1, 0, 3, 1})
- @TestClass("Test$Inner")
+ @TestClass("%TEST_CLASS_NAME%$Inner")
public String testUses3c() {
- return "class Test { class Inner<A, B> { class Inner2<C, D>{}\n" +
- " List<Test.Inner<String, @TA Object>.Inner2<Test, Test>> f; }}";
+ return "class %TEST_CLASS_NAME% { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<%TEST_CLASS_NAME%.Inner<String, @TA Object>.Inner2<%TEST_CLASS_NAME%, %TEST_CLASS_NAME%>> f; }}";
}
@TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex=0)
@@ -778,24 +728,22 @@
return "void testme(List<java.security.@TA ProtectionDomain> protectionDomain) {}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
+ @TADescription(annotation = "TA", type = LOCAL_VARIABLE,
genericLocation = {},
lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
- lvarIndex = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = LOCAL_VARIABLE,
genericLocation = {1, 0},
lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
- lvarIndex = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = LOCAL_VARIABLE,
// Only classes count, not methods.
genericLocation = {1, 0, 1, 0},
lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
- lvarIndex = ReferenceInfoUtil.IGNORE_VALUE),
- })
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE)
@TestClass("Outer$Inner")
public String testMethodNesting1() {
return "class Outer {\n" +
@@ -808,18 +756,16 @@
"}}\n";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW,
+ @TADescription(annotation = "TA", type = NEW,
genericLocation = {},
- offset = 0),
- @TADescription(annotation = "TB", type = NEW,
+ offset = 0)
+ @TADescription(annotation = "TB", type = NEW,
genericLocation = {1, 0},
- offset = 0),
- @TADescription(annotation = "TC", type = NEW,
+ offset = 0)
+ @TADescription(annotation = "TC", type = NEW,
// Only classes count, not methods.
genericLocation = {1, 0, 1, 0},
- offset = 12),
- })
+ offset = 12)
@TestClass("Outer$Inner")
public String testMethodNesting2() {
return "class Outer {\n" +
@@ -832,20 +778,18 @@
"}}\n";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_EXTENDS,
- genericLocation = {}, typeIndex = -1),
- @TADescription(annotation = "TB", type = CLASS_EXTENDS,
- genericLocation = {3, 0}, typeIndex = -1),
- @TADescription(annotation = "TC", type = CLASS_EXTENDS,
- genericLocation = {3, 1}, typeIndex = -1),
- @TADescription(annotation = "TD", type = CLASS_EXTENDS,
- genericLocation = {1, 0}, typeIndex = -1),
- @TADescription(annotation = "TE", type = CLASS_EXTENDS,
- genericLocation = {1, 0, 3, 0}, typeIndex = -1),
- @TADescription(annotation = "TF", type = CLASS_EXTENDS,
+ @TADescription(annotation = "TA", type = CLASS_EXTENDS,
+ genericLocation = {}, typeIndex = -1)
+ @TADescription(annotation = "TB", type = CLASS_EXTENDS,
+ genericLocation = {3, 0}, typeIndex = -1)
+ @TADescription(annotation = "TC", type = CLASS_EXTENDS,
+ genericLocation = {3, 1}, typeIndex = -1)
+ @TADescription(annotation = "TD", type = CLASS_EXTENDS,
+ genericLocation = {1, 0}, typeIndex = -1)
+ @TADescription(annotation = "TE", type = CLASS_EXTENDS,
+ genericLocation = {1, 0, 3, 0}, typeIndex = -1)
+ @TADescription(annotation = "TF", type = CLASS_EXTENDS,
genericLocation = {1, 0, 3, 1}, typeIndex = -1)
- })
@TestClass("GOuter$GInner$Test")
public String testExtends1() {
return "class GOuter<A, B> {\n" +
@@ -855,19 +799,17 @@
"}";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER,
- genericLocation = {}, paramIndex = 0),
- @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND,
- genericLocation = {}, paramIndex = 0, boundIndex = 0),
- @TADescription(annotation = "TC", type = FIELD,
- genericLocation = {}),
- @TADescription(annotation = "TD", type = FIELD,
+ @TADescription(annotation = "TA", type = CLASS_TYPE_PARAMETER,
+ genericLocation = {}, paramIndex = 0)
+ @TADescription(annotation = "TB", type = CLASS_TYPE_PARAMETER_BOUND,
+ genericLocation = {}, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "TC", type = FIELD,
+ genericLocation = {})
+ @TADescription(annotation = "TD", type = FIELD,
genericLocation = {3, 0})
- })
- @TestClass("Test$1Nested")
+ @TestClass("%TEST_CLASS_NAME%$1Nested")
public String testNestedInMethod1() {
- return "class Test {\n" +
+ return "class %TEST_CLASS_NAME% {\n" +
" void foobar() {\n" +
" class Nested<@TA X extends @TB Object> {\n" +
" @TC List<@TD Object> f;\n" +
@@ -875,4 +817,781 @@
" }" +
"}";
}
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
+ public String testParamRepeatableAnnotation1() {
+ return "void test(@RTA @RTA Outer.@RTB @RTB Inner a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0)
+ public String testParamRepeatableAnnotation1b() {
+ return "void test(List<@RTA @RTA Outer.@RTB @RTB Inner> a) { }";
+ }
+
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ public String testParamRepeatableAnnotation1g() {
+ return "void test(List<java.util.Map. @RTB @RTB Entry> a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {}, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {1, 0}, paramIndex = 0)
+ public String testParamRepeatableAnnotation2() {
+ return "void test(@RTA @RTA GOuter<String,String>.@RTB @RTB GInner<String,String> a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0)
+ public String testParamRepeatableAnnotation2b() {
+ return "void test(List<@RTA @RTA GOuter<String,String>.@RTB @RTB GInner<String,String>> a) { }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTDs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTEs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTFs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTGs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTHs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTIs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0)
+ @TADescription(annotation = "RTJs", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
+ @TADescription(annotation = "RTKs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {0, 0}, paramIndex = 0)
+ public String testParamRepeatableAnnotation3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " void test(@RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object" +
+ " @RTE @RTE[] @RTF @RTF[]>>. @RTG @RTG GInner2<@RTH @RTH Integer, @RTI @RTI Object>" +
+ " @RTJ @RTJ[] @RTK @RTK[] a) { }\n" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTDs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTEs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTFs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTGs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTHs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTIs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0)
+ @TADescription(annotation = "RTJs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0}, paramIndex = 0)
+ @TADescription(annotation = "RTKs", type = METHOD_FORMAL_PARAMETER,
+ genericLocation = {3, 0, 0, 0}, paramIndex = 0)
+ public String testParamRepeatableAnnotation4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " void test(List<@RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object" +
+ " @RTE @RTE[] @RTF @RTF[]>>. @RTG @RTG GInner2<@RTH @RTH Integer," +
+ " @RTI @RTI Object> @RTJ @RTJ[] @RTK @RTK[]> a) { }\n" +
+ "}";
+ }
+
+ // Local variables
+
+ @TADescription(annotation = "RTAs", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTBs", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ public String testLocalRepeatableAnnotation1a() {
+ return "void test() { @RTA @RTA Outer.@RTB @RTB Inner a = null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ public String testLocalRepeatableAnnotation1b() {
+ return "void test() { @RTA @RTA Outer.Inner a = null; }";
+ }
+
+ @TADescription(annotation = "RTBs", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ public String testLocalRepeatableAnnotation1c() {
+ return "void test() { Outer.@RTB @RTB Inner a = null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTBs", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ public String testLocalRepeatableAnnotation2() {
+ return "void test() { @RTA @RTA GOuter<String,String>.@RTB @RTB GInner<String,String> a = null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTBs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTCs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTDs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTEs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTFs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTGs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTHs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTIs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTJs", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTKs", type = LOCAL_VARIABLE,
+ genericLocation = {0, 0},
+ lvarOffset = {5}, lvarLength = {1}, lvarIndex = {1})
+ public String testLocalRepeatableAnnotation3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " void test() { @RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object" +
+ " @RTE @RTE[] @RTF @RTF[]>>. @RTG @RTG GInner2<@RTH @RTH Integer, @RTI @RTI Object>" +
+ " @RTJ @RTJ[] @RTK @RTK[] a = null; }\n" +
+ "}";
+ }
+
+
+ @TADescription(annotation = "RTAs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTBs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTCs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTDs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTEs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTFs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTGs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTHs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTIs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTJs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ @TADescription(annotation = "RTKs", type = LOCAL_VARIABLE,
+ genericLocation = {3, 0, 0, 0},
+ lvarOffset = {2}, lvarLength = {1}, lvarIndex = {1})
+ public String testLocalRepeatableAnnotation4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " void test() { List<@RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD" +
+ " Object @RTE @RTE [] @RTF @RTF []>>. @RTG @RTG GInner2<@RTH @RTH" +
+ " Integer, @RTI @RTI Object> @RTJ @RTJ [] @RTK @RTK []> a = null; }\n" +
+ "}";
+ }
+
+
+ // fields
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {})
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = {1, 0})
+ public String testFieldRepeatableAnnotation1a() {
+ return "@RTA @RTA Outer.@RTB @RTB Inner a;";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {})
+ public String testFieldRepeatableAnnotation1b() {
+ return "@RTA @RTA Outer.Inner a;";
+ }
+
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = {1, 0})
+ public String testFieldRepeatableAnnotation1c() {
+ return "Outer.@RTB @RTB Inner a;";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {})
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = {1, 0})
+ public String testFieldRepeatableAnnotation2() {
+ return "@RTA @RTA GOuter<String,String>.@RTB @RTB GInner<String,String> a;";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "RTCs", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTDs", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "RTEs", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "RTFs", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "RTGs", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "RTHs", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTIs", type = FIELD,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1})
+ @TADescription(annotation = "RTJs", type = FIELD)
+ @TADescription(annotation = "RTKs", type = FIELD,
+ genericLocation = {0, 0})
+ public String testFieldRepeatableAnnotation3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " @RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object @RTE @RTE[] @RTF @RTF[]>>." +
+ " @RTG @RTG GInner2<@RTH @RTH Integer, @RTI @RTI Object> @RTJ @RTJ[] @RTK @RTK[] a;\n" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "RTCs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTDs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "RTEs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "RTFs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "RTGs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "RTHs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTIs", type = FIELD,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1})
+ @TADescription(annotation = "RTJs", type = FIELD,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "RTKs", type = FIELD,
+ genericLocation = {3, 0, 0, 0})
+ public String testFieldRepeatableAnnotation4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " List<@RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object" +
+ " @RTE @RTE[] @RTF @RTF[]>>. @RTG @RTG GInner2<@RTH @RTH Integer," +
+ " @RTI @RTI Object> @RTJ @RTJ[] @RTK @RTK[]> a;\n" +
+ "}";
+ }
+
+
+ // return types
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN,
+ genericLocation = {})
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = {1, 0})
+ public String testReturnRepeatableAnnotation1() {
+ return "@RTA @RTA Outer.@RTB @RTB Inner test() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN,
+ genericLocation = {})
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = {1, 0})
+ public String testReturnRepeatableAnnotation2() {
+ return "@RTA @RTA GOuter<String,String>." +
+ "@RTB @RTB GInner<String,String> test() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTDs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "RTFs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "RTGs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "RTHs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTIs", type = METHOD_RETURN,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0, 3, 1})
+ @TADescription(annotation = "RTJs", type = METHOD_RETURN)
+ @TADescription(annotation = "RTKs", type = METHOD_RETURN,
+ genericLocation = {0, 0})
+ public String testReturnRepeatableAnnotation3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " @RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object @RTE @RTE[]" +
+ " @RTF @RTF[]>>. @RTG @RTG GInner2<@RTH @RTH Integer," +
+ " @RTI @RTI Object> @RTJ @RTJ[] @RTK @RTK[] test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTDs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "RTFs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "RTGs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "RTHs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTIs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1})
+ @TADescription(annotation = "RTJs", type = METHOD_RETURN,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "RTKs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 0, 0})
+ public String testReturnRepeatableAnnotation4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " List<@RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object" +
+ " @RTE @RTE[] @RTF @RTF[]>>. @RTG @RTG GInner2<@RTH @RTH Integer," +
+ " @RTI @RTI Object> @RTJ @RTJ[] @RTK @RTK[]> test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_RETURN,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "RTBs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 0})
+ @TADescription(annotation = "RTCs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 1})
+ @TADescription(annotation = "RTDs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 3, 1, 3, 0})
+ @TADescription(annotation = "RTEs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0})
+ @TADescription(annotation = "RTFs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0})
+ @TADescription(annotation = "RTGs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "RTHs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0})
+ @TADescription(annotation = "RTIs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0})
+ @TADescription(annotation = "RTJs", type = METHOD_RETURN,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ public String testReturnRepeatableAnnotation5() {
+ return "class GOuter<A, B> {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " List<@RTA @RTA GOuter<@RTB @RTB String, @RTC @RTC List<@RTD @RTD Object>> ." +
+ " @RTE @RTE GInner<@RTF @RTF List<@RTG @RTG Object @RTH @RTH[] @RTI @RTI[]>>." +
+ " @RTJ @RTJ GInner2<String, String>> test() { return null; }\n" +
+ "}";
+ }
+
+
+ // type parameters
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {}, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0}, paramIndex = 0, boundIndex = 0)
+ public String testTypeparamRepeatableAnnotation1() {
+ return "<X extends @RTA @RTA Outer.@RTB @RTB Inner> X test() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {}, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0}, paramIndex = 0, boundIndex = 0)
+ public String testTypeparamRepeatableAnnotation2() {
+ return "<X extends @RTA @RTA GOuter<String,String>.@RTB @RTB GInner<String,String>> X test() { return null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {},
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0},
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0},
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0, 3, 0},
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTFs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 3, 0, 3, 0, 0, 0},
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTGs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 1, 0},
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTHs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 1, 0, 3, 0},
+ paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTIs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {1, 0, 1, 0, 3, 1},
+ paramIndex = 0, boundIndex = 0)
+ public String testTypeparamRepeatableAnnotation3() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " <X extends @RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object" +
+ " @RTE @RTE[] @RTF @RTF[]>>. @RTG @RTG GInner2<@RTH @RTH Integer," +
+ " @RTI @RTI Object>> X test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTFs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 3, 0, 3, 0, 0, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTGs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTHs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTIs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 3, 1},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTJs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0},
+ paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTKs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 0, 0},
+ paramIndex = 0, boundIndex = 1)
+ public String testTypeparamRepeatableAnnotation4() {
+ return "class Outer {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " <X extends List<@RTA @RTA Outer . @RTB @RTB GInner<@RTC @RTC List<@RTD @RTD Object" +
+ " @RTE @RTE[] @RTF @RTF[]>>. @RTG @RTG GInner2<@RTH @RTH Integer," +
+ " @RTI @RTI Object> @RTJ @RTJ[] @RTK @RTK[]>> X test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTBs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTCs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 1}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTDs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 3, 1, 3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTEs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTFs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTGs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTHs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTIs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 3, 0, 3, 0, 0, 0}, paramIndex = 0, boundIndex = 1)
+ @TADescription(annotation = "RTJs", type = METHOD_TYPE_PARAMETER_BOUND,
+ genericLocation = {3, 0, 1, 0, 1, 0}, paramIndex = 0, boundIndex = 1)
+ public String testTypeparamRepeatableAnnotation5() {
+ return "class GOuter<A, B> {\n" +
+ " class GInner<X> {\n" +
+ " class GInner2<Y, Z> {}\n" +
+ "}}\n\n" +
+ "class %TEST_CLASS_NAME% {\n" +
+ " <X extends List<@RTA @RTA GOuter<@RTB @RTB String, @RTC @RTC List<@RTD @RTD Object>> ." +
+ " @RTE @RTE GInner<@RTF @RTF List<@RTG @RTG Object @RTH @RTH[] @RTI @RTI[]>>." +
+ " @RTJ @RTJ GInner2<String, String>>> X test() { return null; }\n" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0})
+ public String testUsesRepeatableAnnotation1a() {
+ return "class %TEST_CLASS_NAME% { class Inner {} List<@RTA @RTA Inner> f; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0})
+ public String testUsesRepeatableAnnotation1b() {
+ return "class %TEST_CLASS_NAME% { class Inner {} List<@RTA @RTA %TEST_CLASS_NAME%.Inner> f; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation2a() {
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{} List<@RTA @RTA Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation2b() {
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{} List<@RTA @RTA Inner.Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation2c() {
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{} List<Inner.@RTA @RTA Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation2d() {
+ return "class %TEST_CLASS_NAME%{ class Inner { class Inner2{}" +
+ " List<@RTA @RTA %TEST_CLASS_NAME%.Inner.Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation2e() {
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{}" +
+ " List<%TEST_CLASS_NAME%.@RTA @RTA Inner.Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation2f() {
+ return "class %TEST_CLASS_NAME% { class Inner { class Inner2{}" +
+ " List<%TEST_CLASS_NAME%.Inner.@RTA @RTA Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 1, 0})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation3a() {
+ return "class %TEST_CLASS_NAME% { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<%TEST_CLASS_NAME%.Inner.@RTA @RTA Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation3b() {
+ return "class %TEST_CLASS_NAME% { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<%TEST_CLASS_NAME%.@RTA @RTA Inner.Inner2> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {})
+ @TADescription(annotation = "RTBs", type = FIELD,
+ genericLocation = {3, 0})
+ public String testUsesRepeatableAnnotation4() {
+ return "class %TEST_CLASS_NAME% { static class TInner {}\n" +
+ " @RTA @RTA TInner f; \n" +
+ " List<@RTB @RTB TInner> g; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD,
+ genericLocation = {3, 0, 1, 0, 3, 1})
+ @TestClass("%TEST_CLASS_NAME%$Inner")
+ public String testUsesRepeatableAnnotation3c() {
+ return "class %TEST_CLASS_NAME% { class Inner<A, B> { class Inner2<C, D>{}\n" +
+ " List<%TEST_CLASS_NAME%.Inner<String," +
+ " @RTA @RTA Object>.Inner2<%TEST_CLASS_NAME%, %TEST_CLASS_NAME%>> f; }}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex=0)
+ public String testFullyQualifiedRepeatableAnnotation1() {
+ return "void testme(java.security.@RTA @RTA ProtectionDomain protectionDomain) {}";
+ }
+
+ @TADescription(annotation = "RTAs", type = METHOD_FORMAL_PARAMETER, paramIndex=0,
+ genericLocation = {3, 0})
+ public String testFullyQualifiedRepeatableAnnotation2() {
+ return "void testme(List<java.security.@RTA @RTA ProtectionDomain> protectionDomain) {}";
+ }
+
+ @TADescription(annotation = "RTAs", type = LOCAL_VARIABLE,
+ genericLocation = {},
+ lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = LOCAL_VARIABLE,
+ genericLocation = {1, 0},
+ lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = LOCAL_VARIABLE,
+ // Only classes count, not methods.
+ genericLocation = {1, 0, 1, 0},
+ lvarOffset = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarLength = ReferenceInfoUtil.IGNORE_VALUE,
+ lvarIndex = ReferenceInfoUtil.IGNORE_VALUE)
+ @TestClass("Outer$Inner")
+ public String testMethodNestingRepeatableAnnotation1() {
+ return "class Outer {\n" +
+ " class Inner {\n" +
+ " void foo() {\n" +
+ " class MInner {}\n" +
+ " @RTA @RTA Outer . @RTB @RTB Inner l1 = null;\n" +
+ " @RTC @RTC MInner l2 = null;\n" +
+ " }\n" +
+ "}}\n";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW,
+ genericLocation = {},
+ offset = 0)
+ @TADescription(annotation = "RTBs", type = NEW,
+ genericLocation = {1, 0},
+ offset = 0)
+ @TADescription(annotation = "RTCs", type = NEW,
+ // Only classes count, not methods.
+ genericLocation = {1, 0, 1, 0},
+ offset = 12)
+ @TestClass("Outer$Inner")
+ public String testMethodNestingRepeatableAnnotation2() {
+ return "class Outer {\n" +
+ " class Inner {\n" +
+ " void foo() {\n" +
+ " class MInner {}\n" +
+ " Object o1 = new @RTA @RTA Outer . @RTB @RTB Inner();" +
+ " Object o2 = new @RTC @RTC MInner();\n" +
+ " }\n" +
+ "}}\n";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_EXTENDS,
+ genericLocation = {}, typeIndex = -1)
+ @TADescription(annotation = "RTBs", type = CLASS_EXTENDS,
+ genericLocation = {3, 0}, typeIndex = -1)
+ @TADescription(annotation = "RTCs", type = CLASS_EXTENDS,
+ genericLocation = {3, 1}, typeIndex = -1)
+ @TADescription(annotation = "RTDs", type = CLASS_EXTENDS,
+ genericLocation = {1, 0}, typeIndex = -1)
+ @TADescription(annotation = "RTEs", type = CLASS_EXTENDS,
+ genericLocation = {1, 0, 3, 0}, typeIndex = -1)
+ @TADescription(annotation = "RTFs", type = CLASS_EXTENDS,
+ genericLocation = {1, 0, 3, 1}, typeIndex = -1)
+ @TestClass("GOuter$GInner$Test")
+ public String testExtendsRepeatableAnnotation1() {
+ return "class GOuter<A, B> {\n" +
+ " class GInner<X, Y> {\n" +
+ " class Test extends @RTA @RTA GOuter<@RTB @RTB String," +
+ " @RTC @RTC String>.@RTD @RTD GInner<@RTE @RTE String, @RTF @RTF String> {}" +
+ " }" +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = CLASS_TYPE_PARAMETER,
+ genericLocation = {}, paramIndex = 0)
+ @TADescription(annotation = "RTBs", type = CLASS_TYPE_PARAMETER_BOUND,
+ genericLocation = {}, paramIndex = 0, boundIndex = 0)
+ @TADescription(annotation = "RTCs", type = FIELD,
+ genericLocation = {})
+ @TADescription(annotation = "RTDs", type = FIELD,
+ genericLocation = {3, 0})
+ @TestClass("%TEST_CLASS_NAME%$1Nested")
+ public String testNestedInMethodRepeatableAnnotation1() {
+ return "class %TEST_CLASS_NAME% {\n" +
+ " void foobar() {\n" +
+ " class Nested<@RTA @RTA X extends @RTB @RTB Object> {\n" +
+ " @RTC @RTC List<@RTD @RTD Object> f;\n" +
+ " }\n" +
+ " }" +
+ "}";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java
index 30913b1..8bcddc4 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java
@@ -25,6 +25,7 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for new object creations
* @compile -g Driver.java ReferenceInfoUtil.java NewObjects.java
* @run main Driver NewObjects
@@ -36,11 +37,9 @@
return "Object returnObject() { return new @TA String(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = NEW,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String returnObjectGeneric() {
return "Object returnObjectGeneric() { return new @TA ArrayList<@TB String>(); }";
}
@@ -50,13 +49,11 @@
return "void initObject() { Object a = new @TA String(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = NEW,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = NEW,
- genericLocation = { 3, 1 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = NEW,
+ genericLocation = { 3, 1 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String initObjectGeneric() {
return "void initObjectGeneric() { Object a = new @TA HashMap<@TB String, @TC String>(); }";
}
@@ -66,90 +63,182 @@
return "void eqtestObject() { if (null == new @TA String()); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = NEW,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String eqtestObjectGeneric() {
return "void eqtestObjectGeneric() { if (null == new @TA ArrayList<@TB String >()); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0}),
- @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
+ @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String returnNewArray1() {
return "Object returnNewArray1() { return new @TA String @TB[1]; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0, 0, 0}),
- @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0}),
- })
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
public String returnNewArray2() {
return "Object returnNewArray2() { return new @TA String @TB [1] @TC [2]; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0, 0, 0}),
- @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0, 0, 0, 1, 0}),
- @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0}),
- })
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
public String returnNewArray3() {
return "Object returnNewArray3() { return new @TA Outer. @TB Inner @TC [1] @TD [2]; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0, 0, 0}),
- @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0, 0, 0, 1, 0}),
- @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}),
- @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0}),
- })
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
public String returnNewArray4() {
return "Object returnNewArray4() { return new @TA Outer. @TB Middle. @TC MInner @TD [1] @TE [2]; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {3, 0, 0, 0, 0, 0}),
- @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}),
- @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}),
- @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {3, 0}),
- @TADescription(annotation = "TF", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {3, 0, 0, 0}),
- })
+ @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "TF", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0, 0, 0})
public String returnNewArray5() {
return "Object returnNewArray5() { return new @TA ArrayList<@TB Outer. @TC Middle. @TD MInner @TE [] @TF []>(); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0, 0, 0}),
- @TADescription(annotation = "TB", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0, 0, 0, 1, 0}),
- @TADescription(annotation = "TC", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TD", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
- genericLocation = {0, 0}),
- })
+ @TADescription(annotation = "TA", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "TB", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "TC", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TD", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
public String arrayField() {
return "@TA Outer. @TB Inner @TC [] @TD [] f;";
}
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnObjectRepeatableAnnotation() {
+ return "Object returnObject() { return new @RTA @RTA String(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnObjectGenericRepeatableAnnotation() {
+ return "Object returnObjectGeneric() { return new @RTA @RTA ArrayList<@RTB @RTB String>(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initObjectRepeatableAnnotation() {
+ return "void initObject() { Object a = new @RTA @RTA String(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = NEW,
+ genericLocation = { 3, 1 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initObjectGenericRepeatableAnnotation() {
+ return "void initObjectGeneric() { Object a = new @RTA @RTA HashMap<@RTB @RTB String, @RTC @RTC String>(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String eqtestObjectRepeatableAnnotation() {
+ return "void eqtestObject() { if (null == new @RTA @RTA String()); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = NEW,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String eqtestObjectGenericRepeatableAnnotation() {
+ return "void eqtestObjectGeneric() { if (null == new @RTA @RTA ArrayList<@RTB @RTB String >()); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
+ @TADescription(annotation = "RTBs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnNewArrayRepeatableAnnotation1() {
+ return "Object returnNewArray1() { return new @RTA @RTA String @RTB @RTB[1]; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "RTBs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
+ public String returnNewArrayRepeatableAnnotation2() {
+ return "Object returnNewArray2() { return new @RTA @RTA String @RTB @RTB [1] @RTC @RTC [2]; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "RTBs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "RTCs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTDs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
+ public String returnNewArrayRepeatableAnnotation3() {
+ return "Object returnNewArray3() { return new @RTA @RTA Outer. @RTB @RTB Inner @RTC @RTC [1] @RTD @RTD [2]; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "RTBs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "RTCs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "RTDs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTEs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
+ public String returnNewArrayRepeatableAnnotation4() {
+ return "Object returnNewArray4() { return new @RTA @RTA Outer." +
+ " @RTB @RTB Middle. @RTC @RTC MInner @RTD @RTD [1] @RTE @RTE [2]; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0, 0, 0, 0, 0})
+ @TADescription(annotation = "RTCs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "RTDs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0})
+ @TADescription(annotation = "RTEs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "RTFs", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {3, 0, 0, 0})
+ public String returnNewArrayRepeatableAnnotation5() {
+ return "Object returnNewArray5() { return new @RTA @RTA ArrayList<@RTB @RTB Outer." +
+ " @RTC @RTC Middle. @RTD @RTD MInner @RTE @RTE [] @RTF @RTF []>(); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0})
+ @TADescription(annotation = "RTBs", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0, 0, 0, 1, 0})
+ @TADescription(annotation = "RTCs", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTDs", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ genericLocation = {0, 0})
+ public String arrayFieldRepeatableAnnotation() {
+ return "@RTA @RTA Outer. @RTB @RTB Inner @RTC @RTC [] @RTD @RTD [] f;";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java
index 0577c8b..8ed0925 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ReferenceInfoUtil.java
@@ -41,7 +41,7 @@
public static final int IGNORE_VALUE = -321;
public static List<TypeAnnotation> extendedAnnotationsOf(ClassFile cf) {
- List<TypeAnnotation> annos = new ArrayList<TypeAnnotation>();
+ List<TypeAnnotation> annos = new ArrayList<>();
findAnnotations(cf, annos);
return annos;
}
@@ -119,128 +119,6 @@
}
}
- /////////////////// TA Position Builder ///////////////////////
- /* TODO: comment out this dead code. Was this unfinished code that was
- * supposed to be used somewhere? The tests pass without this.
- private static class TAPositionBuilder {
- private TypeAnnotation.Position pos = new TypeAnnotation.Position();
-
- private TAPositionBuilder() { }
-
- public TypeAnnotation.Position build() { return pos; }
-
- public static TAPositionBuilder ofType(TypeAnnotation.TargetType type) {
- TAPositionBuilder builder = new TAPositionBuilder();
- builder.pos.type = type;
- return builder;
- }
-
- public TAPositionBuilder atOffset(int offset) {
- switch (pos.type) {
- // type cast
- case TYPECAST:
- // instanceof
- case INSTANCEOF:
- // new expression
- case NEW:
- pos.offset = offset;
- break;
- default:
- throw new IllegalArgumentException("invalid field for given type: " + pos.type);
- }
- return this;
- }
-
- public TAPositionBuilder atLocalPosition(int offset, int length, int index) {
- switch (pos.type) {
- // local variable
- case LOCAL_VARIABLE:
- pos.lvarOffset = new int[] { offset };
- pos.lvarLength = new int[] { length };
- pos.lvarIndex = new int[] { index };
- break;
- default:
- throw new IllegalArgumentException("invalid field for given type: " + pos.type);
- }
- return this;
- }
-
- public TAPositionBuilder atParameterIndex(int index) {
- switch (pos.type) {
- // type parameters
- case CLASS_TYPE_PARAMETER:
- case METHOD_TYPE_PARAMETER:
- // method parameter
- case METHOD_FORMAL_PARAMETER:
- pos.parameter_index = index;
- break;
- default:
- throw new IllegalArgumentException("invalid field for given type: " + pos.type);
- }
- return this;
- }
-
- public TAPositionBuilder atParamBound(int param, int bound) {
- switch (pos.type) {
- // type parameters bounds
- case CLASS_TYPE_PARAMETER_BOUND:
- case METHOD_TYPE_PARAMETER_BOUND:
- pos.parameter_index = param;
- pos.bound_index = bound;
- break;
- default:
- throw new IllegalArgumentException("invalid field for given type: " + pos.type);
- }
- return this;
- }
-
- public TAPositionBuilder atWildcardPosition(TypeAnnotation.Position pos) {
- switch (pos.type) {
- // wildcards
- case WILDCARD_BOUND:
- pos.wildcard_position = pos;
- break;
- default:
- throw new IllegalArgumentException("invalid field for given type: " + pos.type);
- }
- return this;
- }
-
- public TAPositionBuilder atTypeIndex(int index) {
- switch (pos.type) {
- // class extends or implements clauses
- case CLASS_EXTENDS:
- // throws
- case THROWS:
- pos.type_index = index;
- break;
- default:
- throw new IllegalArgumentException("invalid field for given type: " + pos.type);
- }
- return this;
- }
-
- public TAPositionBuilder atOffsetWithIndex(int offset, int index) {
- switch (pos.type) {
- // method type argument: wasn't specified
- case NEW_TYPE_ARGUMENT:
- case METHOD_TYPE_ARGUMENT:
- pos.offset = offset;
- pos.type_index = index;
- break;
- default:
- throw new IllegalArgumentException("invalid field for given type: " + pos.type);
- }
- return this;
- }
-
- public TAPositionBuilder atGenericLocation(Integer ...loc) {
- pos.location = Arrays.asList(loc);
- pos.type = pos.type.getGenericComplement();
- return this;
- }
- }*/
-
/////////////////////// Equality testing /////////////////////
private static boolean areEquals(int a, int b) {
return a == b || a == IGNORE_VALUE || b == IGNORE_VALUE;
@@ -264,21 +142,18 @@
}
public static boolean areEquals(TypeAnnotation.Position p1, TypeAnnotation.Position p2) {
- if (p1 == p2)
- return true;
- if (p1 == null || p2 == null)
- return false;
+ return p1 == p2 || !(p1 == null || p2 == null) &&
+ p1.type == p2.type &&
+ (p1.location.equals(p2.location)) &&
+ areEquals(p1.offset, p2.offset) &&
+ areEquals(p1.lvarOffset, p2.lvarOffset) &&
+ areEquals(p1.lvarLength, p2.lvarLength) &&
+ areEquals(p1.lvarIndex, p2.lvarIndex) &&
+ areEquals(p1.bound_index, p2.bound_index) &&
+ areEquals(p1.parameter_index, p2.parameter_index) &&
+ areEquals(p1.type_index, p2.type_index) &&
+ areEquals(p1.exception_index, p2.exception_index);
- return ((p1.type == p2.type)
- && (p1.location.equals(p2.location))
- && areEquals(p1.offset, p2.offset)
- && areEquals(p1.lvarOffset, p2.lvarOffset)
- && areEquals(p1.lvarLength, p2.lvarLength)
- && areEquals(p1.lvarIndex, p2.lvarIndex)
- && areEquals(p1.bound_index, p2.bound_index)
- && areEquals(p1.parameter_index, p2.parameter_index)
- && areEquals(p1.type_index, p2.type_index)
- && areEquals(p1.exception_index, p2.exception_index));
}
private static TypeAnnotation findAnnotation(String name, List<TypeAnnotation> annotations, ClassFile cf) throws InvalidIndex, UnexpectedEntry {
@@ -306,9 +181,6 @@
if (actual == null)
throw new ComparisionException("Expected annotation not found: " + aName);
- // TODO: you currently get an exception if the test case does not use all necessary
- // annotation attributes, e.g. forgetting the offset for a local variable.
- // It would be nicer to give an understandable warning instead.
if (!areEquals(expected, actual.position)) {
throw new ComparisionException("Unexpected position for annotation : " + aName +
"\n Expected: " + expected.toString() +
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java
new file mode 100644
index 0000000..b4eae54
--- /dev/null
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java
@@ -0,0 +1,79 @@
+/*
+ * 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
+ * @bug 8042451
+ * @summary Test population of reference info for resource variable
+ * @compile -g Driver.java ReferenceInfoUtil.java ResourceVariable.java
+ * @run main Driver ResourceVariable
+ */
+
+import static com.sun.tools.classfile.TypeAnnotation.TargetType.RESOURCE_VARIABLE;
+import static java.lang.System.lineSeparator;
+
+public class ResourceVariable {
+
+ @TADescription(annotation = "TA", type = RESOURCE_VARIABLE,
+ lvarOffset = {10}, lvarLength = {118}, lvarIndex = {1})
+ @TADescription(annotation = "TB", type = RESOURCE_VARIABLE,
+ lvarOffset = {22}, lvarLength = {35}, lvarIndex = {3})
+ public String testResourceVariable() {
+ return
+ "public void f() throws IOException {" + lineSeparator() +
+ " try (@TA InputStream is1 = new FileInputStream(\"\")) {" + lineSeparator() +
+ " try (@TB InputStream is2 = new FileInputStream(\"\")) {}" + lineSeparator() +
+ " }" + lineSeparator() +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = RESOURCE_VARIABLE,
+ lvarOffset = {10}, lvarLength = {30}, lvarIndex = {1})
+ public String testRepeatedAnnotation1() {
+ return
+ "public void f() throws IOException {" + lineSeparator() +
+ " try (@RTA @RTA InputStream is1 = new FileInputStream(\"\")) {}" + lineSeparator() +
+ "}";
+ }
+
+ @TADescription(annotation = "RTAs", type = RESOURCE_VARIABLE,
+ lvarOffset = {10}, lvarLength = {30}, lvarIndex = {1})
+ public String testRepeatedAnnotation2() {
+ return
+ "public void f() throws IOException {" + lineSeparator() +
+ " try (@RTAs({@RTA, @RTA}) InputStream is1 = new FileInputStream(\"\")) {}" + lineSeparator() +
+ "}";
+ }
+
+ @TADescription(annotation = "TA", type = RESOURCE_VARIABLE,
+ lvarOffset = {10}, lvarLength = {118}, lvarIndex = {1})
+ @TADescription(annotation = "TB", type = RESOURCE_VARIABLE,
+ lvarOffset = {22}, lvarLength = {35}, lvarIndex = {3})
+ public String testSeveralVariablesInTryWithResources() {
+ return
+ "public void f() throws IOException {" + lineSeparator() +
+ " try (@TA InputStream is1 = new FileInputStream(\"\");" + lineSeparator() +
+ " @TB InputStream is2 = new FileInputStream(\"\")) {}" + lineSeparator() +
+ "}";
+ }
+}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
index e8c5798..dd7b567 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
@@ -25,6 +25,7 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for type casts
* @compile -g Driver.java ReferenceInfoUtil.java TypeCasts.java
* @run main Driver TypeCasts
@@ -37,27 +38,23 @@
return "Object returnObject() { return (@TA String)null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TC", type = CAST,
- genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TC", type = CAST,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String returnObjectArray() {
return "Object returnObjectArray() { return (@TC String @TA [] @TB [])null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String returnObjectGeneric() {
return "Object returnObjectGeneric() { return (@TA List<@TB String>)null; }";
}
@@ -68,13 +65,11 @@
return "Object returnPrim() { return (@TA int)0; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String returnPrimArray() {
return "Object returnPrimArray() { return (@TB int @TA [])null; }";
}
@@ -85,24 +80,20 @@
return "void initObject() { Object a = (@TA String)null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String initObjectArray() {
return "void initObjectArray() { Object a = (@TB String @TA [])null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String initObjectGeneric() {
return "void initObjectGeneric() { Object a = (@TA List<@TB String>)null; }";
}
@@ -113,13 +104,11 @@
return "void initPrim() { Object a = (@TA int)0; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String initPrimArray() {
return "void initPrimArray() { Object a = (@TB int @TA [])null; }";
}
@@ -130,24 +119,20 @@
return "void eqtestObject() { if (null == (@TA String)null); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String eqtestObjectArray() {
return "void eqtestObjectArray() { if (null == (@TB String @TA [])null); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String eqtestObjectGeneric() {
return "void eqtestObjectGeneric() { if (null == (@TA List<@TB String >)null); }";
}
@@ -159,42 +144,182 @@
return "void eqtestPrim(int a) { if (0 == (@TA int)a); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
- typeIndex = 0)
- })
+ @TADescription(annotation = "TA", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
public String eqtestPrimArray() {
return "void eqtestPrimArray() { if (null == (@TB int @TA [])null); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST,
- offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1),
- @TADescription(annotation = "TC", type = CAST,
- offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1,
- genericLocation = {3, 0})
- })
+ @TADescription(annotation = "TA", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1)
+ @TADescription(annotation = "TC", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1,
+ genericLocation = {3, 0})
public String intersection1() {
return "void intersection() { Object o = (@TA String & @TB Comparable<@TC String>) null; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = CAST,
- offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 0),
- @TADescription(annotation = "TB", type = CAST,
- offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1),
- @TADescription(annotation = "TC", type = CAST,
- offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1,
- genericLocation = {3, 0}),
- @TADescription(annotation = "TD", type = CAST,
- offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 2),
- })
+ @TADescription(annotation = "TA", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 0)
+ @TADescription(annotation = "TB", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1)
+ @TADescription(annotation = "TC", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "TD", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 2)
public String intersection2() {
return "void intersection() { Object o = (@TA String & @TB Comparable<@TC String> & @TD CharSequence) null; }";
}
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String returnObjectRepeatableAnnotation() {
+ return "Object returnObject() { return (@RTA @RTA String)null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTCs", type = CAST,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String returnObjectArrayRepeatableAnnotation() {
+ return "Object returnObjectArray() { return (@RTC @RTC String @RTA @RTA [] @RTB @RTB [])null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String returnObjectGenericRepeatableAnnotation() {
+ return "Object returnObjectGeneric() { return (@RTA @RTA List<@RTB @RTB String>)null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String returnPrimRepeatableAnnotation() {
+ return "Object returnPrim() { return (@RTA @RTA int)0; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String returnPrimArrayRepeatableAnnotation() {
+ return "Object returnPrimArray() { return (@RTB @RTB int @RTA @RTA [])null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String initObjectRepeatableAnnotation() {
+ return "void initObject() { Object a = (@RTA @RTA String)null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String initObjectArrayRepeatableAnnotation() {
+ return "void initObjectArray() { Object a = (@RTB @RTB String @RTA @RTA [])null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String initObjectGenericRepeatableAnnotation() {
+ return "void initObjectGeneric() { Object a = (@RTA @RTA List<@RTB @RTB String>)null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String initPrimRepeatableAnnotation() {
+ return "void initPrim() { Object a = (@RTA @RTA int)0; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String initPrimArrayRepeatableAnnotation() {
+ return "void initPrimArray() { Object a = (@RTB @RTB int @RTA @RTA [])null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String eqtestObjectRepeatableAnnotation() {
+ return "void eqtestObject() { if (null == (@RTA @RTA String)null); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String eqtestObjectArrayRepeatableAnnotation() {
+ return "void eqtestObjectArray() { if (null == (@RTB @RTB String @RTA @RTA [])null); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String eqtestObjectGenericRepeatableAnnotation() {
+ return "void eqtestObjectGeneric() { if (null == (@RTA @RTA List<@RTB @RTB String >)null); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ // compiler optimizes away compile time constants casts
+ public String eqtestPrimRepeatableAnnotation() {
+ return "void eqtestPrim(int a) { if (0 == (@RTA @RTA int)a); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE,
+ typeIndex = 0)
+ public String eqtestPrimArrayRepeatableAnnotation() {
+ return "void eqtestPrimArray() { if (null == (@RTB @RTB int @RTA @RTA [])null); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1)
+ @TADescription(annotation = "RTCs", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1,
+ genericLocation = {3, 0})
+ public String intersectionRepeatableAnnotation1() {
+ return "void intersection() { Object o = (@RTA @RTA String & @RTB @RTB Comparable<@RTC @RTC String>) null; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 0)
+ @TADescription(annotation = "RTBs", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1)
+ @TADescription(annotation = "RTCs", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 1,
+ genericLocation = {3, 0})
+ @TADescription(annotation = "RTDs", type = CAST,
+ offset = ReferenceInfoUtil.IGNORE_VALUE, typeIndex = 2)
+ public String intersectionRepeatableAnnotation2() {
+ return "void intersection() { Object o = (@RTA @RTA String & @RTB @RTB Comparable<@RTC @RTC String> &" +
+ " @RTD @RTD CharSequence) null; }";
+ }
}
diff --git a/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java b/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java
index 8d26acf..6af89f3 100644
--- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java
+++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java
@@ -25,6 +25,7 @@
/*
* @test
+ * @bug 8042451
* @summary Test population of reference info for class literals
* @compile -g Driver.java ReferenceInfoUtil.java TypeTests.java
* @run main Driver TypeTests
@@ -36,26 +37,22 @@
return "Object returnObject() { return null instanceof @TA String; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = INSTANCEOF,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = INSTANCEOF,
- genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String returnObjectArray() {
return "Object returnObjectArray() { return null instanceof @TC String @TA [] @TB []; }";
}
// no type test for primitives
- @TADescriptions({
- @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = INSTANCEOF,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = INSTANCEOF,
- genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String returnPrimArray() {
return "Object returnPrimArray() { return null instanceof @TC int @TA [] @TB []; }";
}
@@ -68,26 +65,22 @@
return "void initObject() { Object a = null instanceof @TA String; }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = INSTANCEOF,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = INSTANCEOF,
- genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String initObjectArray() {
return "void initObjectArray() { Object a = null instanceof @TC String @TA [] @TB []; }";
}
// no primitive instanceof
- @TADescriptions({
- @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = INSTANCEOF,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = INSTANCEOF,
- genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String initPrimArray() {
return "void initPrimArray() { Object a = null instanceof @TC int @TA [] @TB []; }";
}
@@ -100,26 +93,22 @@
return "void eqtestObject() { if (true == (null instanceof @TA String)); }";
}
- @TADescriptions({
- @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = INSTANCEOF,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = INSTANCEOF,
- genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String eqtestObjectArray() {
return "void eqtestObjectArray() { if (true == (null instanceof @TC String @TA [] @TB [])); }";
}
// no primitives
- @TADescriptions({
- @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TB", type = INSTANCEOF,
- genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE),
- @TADescription(annotation = "TC", type = INSTANCEOF,
- genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
- })
+ @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TB", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "TC", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
public String eqtestPrimArray() {
return "void eqtestPrimArray() { if (true == (null instanceof @TC int @TA [] @TB [])); }";
}
@@ -127,4 +116,72 @@
// no void
// no void array
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnObjectRepeatableAnnotation() {
+ return "Object returnObject() { return null instanceof @RTA @RTA String; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnObjectArrayRepeatableAnnotation() {
+ return "Object returnObjectArray() { return null instanceof @RTC @RTC String @RTA @RTA [] @RTB @RTB []; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String returnPrimArrayRepeatableAnnotation() {
+ return "Object returnPrimArrayRepeatableAnnotation() { return null instanceof @RTC @RTC int @RTA @RTA [] @RTB @RTB []; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initObjectRepeatableAnnotation() {
+ return "void initObject() { Object a = null instanceof @RTA @RTA String; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initObjectArrayRepeatableAnnotation() {
+ return "void initObjectArray() { Object a = null instanceof @RTC @RTC String @RTA @RTA [] @RTB @RTB []; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String initPrimArrayRepeatableAnnotation() {
+ return "void initPrimArray() { Object a = null instanceof @RTC @RTC int @RTA @RTA [] @RTB @RTB []; }";
+ }
+
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String eqtestObjectRepeatableAnnotation() {
+ return "void eqtestObject() { if (true == (null instanceof @RTA @RTA String)); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String eqtestObjectArrayRepeatableAnnotation() {
+ return "void eqtestObjectArray() { if (true == (null instanceof @RTC @RTC String @RTA @RTA [] @RTB @RTB [])); }";
+ }
+
+ @TADescription(annotation = "RTAs", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTBs", type = INSTANCEOF,
+ genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ @TADescription(annotation = "RTCs", type = INSTANCEOF,
+ genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE)
+ public String eqtestPrimArrayRepeatableAnnotation() {
+ return "void eqtestPrimArray() { if (true == (null instanceof @RTC @RTC int @RTA @RTA [] @RTB @RTB [])); }";
+ }
}
diff --git a/test/tools/javac/api/TestSearchPaths.java b/test/tools/javac/api/TestSearchPaths.java
new file mode 100644
index 0000000..4e2a4ff
--- /dev/null
+++ b/test/tools/javac/api/TestSearchPaths.java
@@ -0,0 +1,632 @@
+/*
+ * Copyright (c) 2014, 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 7026941
+ * @summary path options ignored when reusing filemanager across tasks
+ */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
+import static javax.tools.StandardLocation.*;
+
+/**
+ * Test for combinations of using javac command-line options and fileManager setLocation
+ * calls to affect the locations available in the fileManager.
+ *
+ * Using a single Java compiler and file manager, for each of the standard locations,
+ * a series of operations is performed, using either compiler options or setLocation
+ * calls. Each operation includes a compilation, and then a check for the value of
+ * the standard location available in the file manager.
+ *
+ * The operations generate and use unique files to minimize the possibility of false
+ * positive results.
+ */
+public class TestSearchPaths {
+
+ public static void main(String... args) throws Exception {
+ TestSearchPaths t = new TestSearchPaths();
+ t.run();
+ }
+
+ void run() throws Exception {
+ compiler = ToolProvider.getSystemJavaCompiler();
+ fileManager = compiler.getStandardFileManager(null, null, null);
+
+ // basic output path
+ testClassOutput();
+
+ // basic search paths
+ testClassPath();
+ testSourcePath();
+ testPlatformClassPath();
+
+ // annotation processing
+ testAnnotationProcessorPath();
+ testSourceOutput();
+
+ // javah equivalent
+ testNativeHeaderOutput();
+
+ // future-proof: guard against new StandardLocations being added
+ if (!tested.equals(EnumSet.allOf(StandardLocation.class))) {
+ error("not all standard locations have been tested");
+ out.println("not yet tested: " + EnumSet.complementOf(tested));
+ }
+
+ if (errors > 0) {
+ throw new Exception(errors + " errors occurred");
+ }
+ }
+
+ void testClassOutput() throws IOException {
+ String test = "testClassOutput";
+
+ for (int i = 1; i <= 5; i++) {
+ File classes = createDir(test + "/" + i + "/classes");
+ List<String> options;
+ switch (i) {
+ default:
+ options = getOptions("-d", classes.getPath());
+ break;
+
+ case 3:
+ setLocation(CLASS_OUTPUT, classes);
+ options = null;
+ break;
+ }
+ List<JavaFileObject> sources = getSources("class C" + i + " { }");
+ callTask(options, sources);
+ checkPath(CLASS_OUTPUT, Mode.EQUALS, classes);
+ checkFile(CLASS_OUTPUT, "C" + i + ".class");
+ }
+
+ tested.add(CLASS_OUTPUT);
+ }
+
+ void testClassPath() throws IOException {
+ String test = "testClassPath";
+
+ for (int i = 1; i <= 5; i++) {
+ File classes = createDir(test + "/" + i + "/classes");
+ File classpath = new File("testClassOutput/" + i + "/classes");
+ List<String> options;
+ switch (i) {
+ default:
+ options = getOptions("-d", classes.getPath(), "-classpath", classpath.getPath());
+ break;
+
+ case 3:
+ setLocation(CLASS_PATH, classpath);
+ options = getOptions("-d", classes.getPath());
+ break;
+
+ case 4:
+ options = getOptions("-d", classes.getPath(), "-cp", classpath.getPath());
+ break;
+ }
+ List<JavaFileObject> sources = getSources("class D" + i + " { C" + i + " c; }");
+ callTask(options, sources);
+ checkPath(CLASS_PATH, Mode.EQUALS, classpath);
+ checkFile(CLASS_OUTPUT, "D" + i + ".class");
+ }
+
+ tested.add(CLASS_PATH);
+ }
+
+ void testSourcePath() throws IOException {
+ String test = "testSourcePath";
+ setLocation(CLASS_PATH); // empty
+
+ for (int i = 1; i <= 5; i++) {
+ File src = createDir(test + "/" + i + "/src");
+ writeFile(src, "C" + i + ".java", "class C" + i + "{ }");
+ File classes = createDir(test + "/" + i + "/classes");
+ File srcpath = src;
+ List<String> options;
+ switch (i) {
+ default:
+ options = getOptions("-d", classes.getPath(), "-sourcepath", srcpath.getPath());
+ break;
+
+ case 3:
+ setLocation(SOURCE_PATH, srcpath);
+ options = getOptions("-d", classes.getPath());
+ break;
+ }
+ List<JavaFileObject> sources = getSources("class D" + i + " { C" + i + " c; }");
+ callTask(options, sources);
+ checkPath(SOURCE_PATH, Mode.EQUALS, srcpath);
+ checkFile(CLASS_OUTPUT, "D" + i + ".class");
+ }
+
+ tested.add(SOURCE_PATH);
+ }
+
+ void testPlatformClassPath() throws IOException {
+ String test = "testPlatformClassPath";
+
+ List<File> defaultPath = getLocation(PLATFORM_CLASS_PATH);
+ StringBuilder sb = new StringBuilder();
+ for (File f: defaultPath) {
+ if (sb.length() > 0)
+ sb.append(File.pathSeparator);
+ sb.append(f);
+ }
+ String defaultPathString = sb.toString();
+
+ setLocation(CLASS_PATH); // empty
+ setLocation(SOURCE_PATH); // empty
+
+ for (int i = 1; i <= 10; i++) {
+ File classes = createDir(test + "/" + i + "/classes");
+ File testJars = createDir(test + "/" + i + "/testJars");
+ File testClasses = createDir(test + "/" + i + "/testClasses");
+ callTask(getOptions("-d", testClasses.getPath()), getSources("class C" + i + " { }"));
+
+ List<String> options;
+ Mode mode;
+ List<File> match;
+ String reference = "C" + i + " c;";
+
+ File jar;
+
+ switch (i) {
+ case 1:
+ options = getOptions("-d", classes.getPath(), "-Xbootclasspath/p:" + testClasses);
+ mode = Mode.STARTS_WITH;
+ match = Arrays.asList(testClasses);
+ break;
+
+ case 2:
+ // the default values for -extdirs and -endorseddirs come after the bootclasspath;
+ // so to check -Xbootclasspath/a: we specify empty values for those options.
+ options = getOptions("-d", classes.getPath(),
+ "-Xbootclasspath/a:" + testClasses,
+ "-extdirs", "",
+ "-endorseddirs", "");
+ mode = Mode.ENDS_WITH;
+ match = Arrays.asList(testClasses);
+ break;
+
+ case 3:
+ options = getOptions("-d", classes.getPath(), "-Xbootclasspath:" + defaultPathString);
+ mode = Mode.EQUALS;
+ match = defaultPath;
+ reference = "";
+ break;
+
+ case 4:
+ fileManager.setLocation(PLATFORM_CLASS_PATH, null);
+ jar = new File(testJars, "j" + i + ".jar");
+ writeJar(jar, testClasses, "C" + i + ".class");
+ options = getOptions("-d", classes.getPath(), "-endorseddirs", testJars.getPath());
+ mode = Mode.CONTAINS;
+ match = Arrays.asList(jar);
+ break;
+
+ case 5:
+ fileManager.setLocation(PLATFORM_CLASS_PATH, null);
+ jar = new File(testJars, "j" + i + ".jar");
+ writeJar(jar, testClasses, "C" + i + ".class");
+ options = getOptions("-d", classes.getPath(), "-Djava.endorsed.dirs=" + testJars.getPath());
+ mode = Mode.CONTAINS;
+ match = Arrays.asList(jar);
+ break;
+
+ case 6:
+ fileManager.setLocation(PLATFORM_CLASS_PATH, null);
+ jar = new File(testJars, "j" + i + ".jar");
+ writeJar(jar, testClasses, "C" + i + ".class");
+ options = getOptions("-d", classes.getPath(), "-extdirs", testJars.getPath());
+ mode = Mode.CONTAINS;
+ match = Arrays.asList(jar);
+ break;
+
+ case 7:
+ fileManager.setLocation(PLATFORM_CLASS_PATH, null);
+ jar = new File(testJars, "j" + i + ".jar");
+ writeJar(jar, testClasses, "C" + i + ".class");
+ options = getOptions("-d", classes.getPath(), "-Djava.ext.dirs=" + testJars.getPath());
+ mode = Mode.CONTAINS;
+ match = Arrays.asList(jar);
+ break;
+
+ case 8:
+ setLocation(PLATFORM_CLASS_PATH, defaultPath);
+ options = getOptions("-d", classes.getPath());
+ mode = Mode.EQUALS;
+ match = defaultPath;
+ reference = "";
+ break;
+
+ default:
+ options = getOptions("-d", classes.getPath(), "-bootclasspath", defaultPathString);
+ mode = Mode.EQUALS;
+ match = defaultPath;
+ reference = "";
+ break;
+ }
+ List<JavaFileObject> sources = getSources("class D" + i + " { " + reference + " }");
+
+ callTask(options, sources);
+ checkPath(PLATFORM_CLASS_PATH, mode, match);
+ checkFile(CLASS_OUTPUT, "D" + i + ".class");
+ }
+
+ tested.add(PLATFORM_CLASS_PATH);
+ }
+
+ void testAnnotationProcessorPath() throws IOException {
+ String test = "testAnnotationProcessorPath";
+
+ String template =
+ "import java.util.*;\n"
+ + "import javax.annotation.processing.*;\n"
+ + "import javax.lang.model.*;\n"
+ + "import javax.lang.model.element.*;\n"
+ + "@SupportedAnnotationTypes(\"*\")\n"
+ + "public class A%d extends AbstractProcessor {\n"
+ + " public boolean process(Set<? extends TypeElement> annos, RoundEnvironment rEnv) {\n"
+ + " return true;\n"
+ + " }\n"
+ + " public SourceVersion getSupportedSourceVersion() {\n"
+ + " return SourceVersion.latest();\n"
+ + " }\n"
+ + "}";
+
+ for (int i = 1; i <= 5; i++) {
+ File classes = createDir(test + "/" + i + "/classes");
+ File annodir = createDir(test + "/" + i + "/processors");
+ callTask(getOptions("-d", annodir.getPath()), getSources(String.format(template, i)));
+ File annopath = annodir;
+ List<String> options;
+ switch (i) {
+ default:
+ options = getOptions("-d", classes.getPath(),
+ "-processorpath", annopath.getPath(),
+ "-processor", "A" + i);
+ break;
+
+ case 3:
+ setLocation(ANNOTATION_PROCESSOR_PATH, annopath);
+ options = getOptions("-d", classes.getPath(),
+ "-processor", "A" + i);
+ break;
+ }
+ List<JavaFileObject> sources = getSources("class D" + i + " { }");
+ callTask(options, sources);
+ checkPath(ANNOTATION_PROCESSOR_PATH, Mode.EQUALS, annopath);
+ checkFile(CLASS_OUTPUT, "D" + i + ".class");
+ }
+
+ tested.add(ANNOTATION_PROCESSOR_PATH);
+ }
+
+ void testSourceOutput() throws IOException {
+ String test = "testAnnotationProcessorPath";
+
+ String source =
+ "import java.io.*;\n"
+ + "import java.util.*;\n"
+ + "import javax.annotation.processing.*;\n"
+ + "import javax.lang.model.*;\n"
+ + "import javax.lang.model.element.*;\n"
+ + "import javax.tools.*;\n"
+ + "@SupportedOptions(\"name\")\n"
+ + "@SupportedAnnotationTypes(\"*\")\n"
+ + "public class A extends AbstractProcessor {\n"
+ + " int round = 0;\n"
+ + " public boolean process(Set<? extends TypeElement> annos, RoundEnvironment rEnv) {\n"
+ + " if (round++ == 0) try {\n"
+ + " String name = processingEnv.getOptions().get(\"name\");\n"
+ + " JavaFileObject fo = processingEnv.getFiler().createSourceFile(name);\n"
+ + " try (Writer out = fo.openWriter()) {\n"
+ + " out.write(\"class \" + name + \" { }\");\n"
+ + " }\n"
+ + " } catch (IOException e) { throw new Error(e); }\n"
+ + " return true;\n"
+ + " }\n"
+ + " public SourceVersion getSupportedSourceVersion() {\n"
+ + " return SourceVersion.latest();\n"
+ + " }\n"
+ + "}";
+
+ File annodir = createDir(test + "/processors");
+ callTask(getOptions("-d", annodir.getPath()), getSources(source));
+ setLocation(ANNOTATION_PROCESSOR_PATH, annodir);
+
+ for (int i = 1; i <= 5; i++) {
+ File classes = createDir(test + "/" + i + "/classes");
+ File genSrc = createDir(test + "/" + "/genSrc");
+ List<String> options;
+ switch (i) {
+ default:
+ options = getOptions("-d", classes.getPath(),
+ "-processor", "A", "-Aname=G" + i,
+ "-s", genSrc.getPath());
+ break;
+
+ case 3:
+ setLocation(SOURCE_OUTPUT, genSrc);
+ options = getOptions("-d", classes.getPath(),
+ "-processor", "A", "-Aname=G" + i);
+ break;
+ }
+ List<JavaFileObject> sources = getSources("class D" + i + " { }");
+ callTask(options, sources);
+ checkPath(SOURCE_OUTPUT, Mode.EQUALS, genSrc);
+ checkFile(CLASS_OUTPUT, "D" + i + ".class");
+ checkFile(CLASS_OUTPUT, "G" + i + ".class");
+ }
+ tested.add(SOURCE_OUTPUT);
+ }
+
+ void testNativeHeaderOutput() throws IOException {
+ String test = "testNativeHeaderOutput";
+
+ for (int i = 1; i <= 5; i++) {
+ File classes = createDir(test + "/" + i + "/classes");
+ File headers = createDir(test + "/" + i + "/hdrs");
+ List<String> options;
+ switch (i) {
+ default:
+ options = getOptions("-d", classes.getPath(), "-h", headers.getPath());
+ break;
+
+ case 3:
+ setLocation(NATIVE_HEADER_OUTPUT, headers);
+ options = getOptions("-d", classes.getPath());
+ break;
+ }
+ List<JavaFileObject> sources = getSources("class C" + i + " { native void m(); }");
+ callTask(options, sources);
+ checkPath(NATIVE_HEADER_OUTPUT, Mode.EQUALS, headers);
+ checkFile(NATIVE_HEADER_OUTPUT, "C" + i + ".h");
+ }
+
+ tested.add(StandardLocation.NATIVE_HEADER_OUTPUT);
+ }
+
+ List<String> getOptions(String... args) {
+ return Arrays.asList(args);
+ }
+
+ List<JavaFileObject> getSources(String... sources) {
+ List<JavaFileObject> list = new ArrayList<>();
+ for (String s: sources)
+ list.add(getSource(s));
+ return list;
+ }
+
+ JavaFileObject getSource(final String source) {
+ return new SimpleJavaFileObject(getURIFromSource(source), JavaFileObject.Kind.SOURCE) {
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return source;
+ }
+ };
+ }
+
+ void callTask(List<String> options, List<JavaFileObject> files) {
+ out.print("compile: ");
+ if (options != null) {
+ for (String o: options) {
+ if (o.length() > 64) {
+ o = o.substring(0, 32) + "..." + o.substring(o.length() - 32);
+ }
+ out.print(" " + o);
+ }
+ }
+ for (JavaFileObject f: files)
+ out.print(" " + f.getName());
+ out.println();
+ CompilationTask t = compiler.getTask(out, fileManager, null, options, null, files);
+ boolean ok = t.call();
+ if (!ok)
+ error("compilation failed");
+ }
+
+ enum Mode { EQUALS, CONTAINS, STARTS_WITH, ENDS_WITH };
+
+ void checkFile(StandardLocation l, String path) {
+ if (!l.isOutputLocation()) {
+ error("Not an output location: " + l);
+ return;
+ }
+
+ List<File> files = getLocation(l);
+ if (files == null) {
+ error("location is unset: " + l);
+ return;
+ }
+
+ if (files.size() != 1)
+ error("unexpected number of entries on " + l + ": " + files.size());
+
+ File f = new File(files.get(0), path);
+ if (!f.exists())
+ error("file not found: " + f);
+ }
+
+ void checkPath(StandardLocation l, Mode m, File expect) {
+ checkPath(l, m, Arrays.asList(expect));
+ }
+
+ void checkPath(StandardLocation l, Mode m, List<File> expect) {
+ List<File> files = getLocation(l);
+ if (files == null) {
+ error("location is unset: " + l);
+ return;
+ }
+
+ switch (m) {
+ case EQUALS:
+ if (!Objects.equals(files, expect)) {
+ error("location does not match the expected files: " + l);
+ out.println("found: " + files);
+ out.println("expect: " + expect);
+ }
+ break;
+
+ case CONTAINS:
+ int containsIndex = Collections.indexOfSubList(files, expect);
+ if (containsIndex == -1) {
+ error("location does not contain the expected files: " + l);
+ out.println("found: " + files);
+ out.println("expect: " + expect);
+ }
+ break;
+
+ case STARTS_WITH:
+ int startsIndex = Collections.indexOfSubList(files, expect);
+ if (startsIndex != 0) {
+ error("location does not start with the expected files: " + l);
+ out.println("found: " + files);
+ out.println("expect: " + expect);
+ }
+ break;
+
+ case ENDS_WITH:
+ int endsIndex = Collections.lastIndexOfSubList(files, expect);
+ if (endsIndex != files.size() - expect.size()) {
+ error("location does not end with the expected files: " + l);
+ out.println("found: " + files);
+ out.println("expect: " + expect);
+ }
+ break;
+
+ }
+ }
+
+ List<File> getLocation(StandardLocation l) {
+ Iterable<? extends File> iter = fileManager.getLocation(l);
+ if (iter == null)
+ return null;
+ List<File> files = new ArrayList<>();
+ for (File f: iter)
+ files.add(f);
+ return files;
+ }
+
+ void setLocation(StandardLocation l, File... files) throws IOException {
+ fileManager.setLocation(l, Arrays.asList(files));
+ }
+
+ void setLocation(StandardLocation l, List<File> files) throws IOException {
+ fileManager.setLocation(l, files);
+ }
+
+ void writeFile(File dir, String path, String body) throws IOException {
+ try (FileWriter w = new FileWriter(new File(dir, path))) {
+ w.write(body);
+ }
+ }
+
+ void writeJar(File jar, File dir, String... entries) throws IOException {
+ try (JarOutputStream j = new JarOutputStream(Files.newOutputStream(jar.toPath()))) {
+ for (String entry: entries) {
+ j.putNextEntry(new JarEntry(entry));
+ j.write(Files.readAllBytes(dir.toPath().resolve(entry)));
+ }
+ }
+ }
+
+ private static final Pattern packagePattern
+ = Pattern.compile("package\\s+(((?:\\w+\\.)*)(?:\\w+))");
+ private static final Pattern classPattern
+ = Pattern.compile("(?:public\\s+)?(?:class|enum|interface)\\s+(\\w+)");
+
+
+ private static URI getURIFromSource(String source) {
+ String packageName = null;
+
+ Matcher matcher = packagePattern.matcher(source);
+ if (matcher.find()) {
+ packageName = matcher.group(1).replace(".", "/");
+ }
+
+ matcher = classPattern.matcher(source);
+ if (matcher.find()) {
+ String className = matcher.group(1);
+ String path = ((packageName == null) ? "" : packageName + "/") + className + ".java";
+ return URI.create("myfo:///" + path);
+ } else {
+ throw new Error("Could not extract the java class "
+ + "name from the provided source");
+ }
+ }
+
+ File createDir(String path) {
+ File dir = new File(path);
+ dir.mkdirs();
+ return dir;
+ }
+
+ JavaCompiler compiler;
+ StandardJavaFileManager fileManager;
+
+ /**
+ * Map for recording which standard locations have been tested.
+ */
+ EnumSet<StandardLocation> tested = EnumSet.noneOf(StandardLocation.class);
+
+ /**
+ * Logging stream. Used directly with test and for getTask calls.
+ */
+ final PrintWriter out = new PrintWriter(System.err, true);
+
+ /**
+ * Count of errors so far.
+ */
+ int errors;
+
+ void error(String message) {
+ errors++;
+ out.println("Error: " + message);
+ }
+}
diff --git a/test/tools/javac/api/taskListeners/CompileEvent.java b/test/tools/javac/api/taskListeners/CompileEvent.java
new file mode 100644
index 0000000..6225b17
--- /dev/null
+++ b/test/tools/javac/api/taskListeners/CompileEvent.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2014, 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 8033414
+ * @summary Verify that the TaskEvent.COMPILATION is fired properly.
+ * @run main CompileEvent
+ */
+
+import java.io.*;
+import java.util.*;
+
+import javax.tools.*;
+
+import com.sun.source.util.*;
+import com.sun.tools.javac.Main;
+import com.sun.tools.javac.api.BasicJavacTask;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Log.WriterKind;
+
+public class CompileEvent {
+
+ public static void main(String... args) throws IOException {
+ new CompileEvent().run();
+ }
+
+ void run() throws IOException {
+ String testClasses = System.getProperty("test.classes");
+ File pluginRegistration =
+ new File(testClasses + "/META-INF/services/com.sun.source.util.Plugin");
+ pluginRegistration.getParentFile().mkdirs();
+ try (Writer metaInfRegistration = new FileWriter(pluginRegistration)) {
+ metaInfRegistration.write("CompileEvent$PluginImpl");
+ }
+ File test = new File(testClasses + "/Test.java");
+ test.getParentFile().mkdirs();
+ try (Writer testFileWriter = new FileWriter(test)) {
+ testFileWriter.write("public class Test { }");
+ }
+
+ StringWriter out;
+
+ //test events fired to listeners registered from plugins
+ //when starting compiler using Main.compile
+ out = new StringWriter();
+ int mainResult = Main.compile(new String[] {
+ "-Xplugin:compile-event", "-processorpath", testClasses, test.getAbsolutePath()
+ }, new PrintWriter(out, true));
+ if (mainResult != 0)
+ throw new AssertionError("Compilation failed unexpectedly, exit code: " + mainResult);
+ assertOutput(out);
+
+ JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
+ StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
+ Iterable<? extends JavaFileObject> testFileObjects = fm.getJavaFileObjects(test);
+
+ //test events fired to listeners registered from plugins
+ //when starting compiler using JavaCompiler.getTak(...).call
+ List<String> options =
+ Arrays.asList("-Xplugin:compile-event", "-processorpath", testClasses);
+ out = new StringWriter();
+ boolean compResult = comp.getTask(out, null, null, options, null, testFileObjects).call();
+ if (!compResult)
+ throw new AssertionError("Compilation failed unexpectedly.");
+ assertOutput(out);
+ }
+
+ void assertOutput(StringWriter out) {
+ String lineSeparator = System.getProperty("line.separator");
+ if (!out.toString().trim().replace(lineSeparator, "\n").equals(EXPECTED)) {
+ throw new AssertionError("Unexpected events: " + out.toString());
+ }
+ }
+
+ private static final String EXPECTED =
+ "started(COMPILATION)\n" +
+ "started(PARSE:Test.java)\n" +
+ "finished(PARSE:Test.java)\n" +
+ "started(ENTER:Test.java)\n" +
+ "finished(ENTER:Test.java)\n" +
+ "started(ANALYZE:Test.java:Test)\n" +
+ "finished(ANALYZE:Test.java:Test)\n" +
+ "started(GENERATE:Test.java:Test)\n" +
+ "finished(GENERATE:Test.java:Test)\n" +
+ "finished(COMPILATION)";
+
+ private static class TaskListenerImpl implements TaskListener {
+ private final PrintWriter out;
+ public TaskListenerImpl(PrintWriter out) {
+ this.out = out;
+ }
+ @Override public void started(TaskEvent e) {
+ dumpTaskEvent("started", e);
+ }
+ @Override public void finished(TaskEvent e) {
+ dumpTaskEvent("finished", e);
+ }
+ private void dumpTaskEvent(String type, TaskEvent e) {
+ StringBuilder data = new StringBuilder();
+ data.append(type);
+ data.append("(");
+ data.append(e.getKind());
+ if (e.getSourceFile() != null) {
+ data.append(":");
+ data.append(new File(e.getSourceFile().getName()).getName());
+ }
+ if (e.getTypeElement()!= null) {
+ data.append(":");
+ data.append(e.getTypeElement().getQualifiedName());
+ }
+ data.append(")");
+ out.println(data);
+ }
+ }
+
+ public static final class PluginImpl implements Plugin {
+ @Override public String getName() {
+ return "compile-event";
+ }
+ @Override public void init(JavacTask task, String... args) {
+ Context context = ((BasicJavacTask) task).getContext();
+ Log log = Log.instance(context);
+ task.addTaskListener(new TaskListenerImpl(log.getWriter(WriterKind.NOTICE)));
+ }
+ }
+}
diff --git a/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java b/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java
index e102b09..e45aeb1 100644
--- a/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java
+++ b/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, 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
@@ -287,10 +287,16 @@
found = "{}";
break;
case REMOVE_IN_PROCESSOR:
- found = "{PARSE=1:1, ENTER=2:2, ANNOTATION_PROCESSING=1:0, ANNOTATION_PROCESSING_ROUND=2:1}";
+ if (ck == CompileKind.CALL)
+ found = "{PARSE=1:1, ENTER=2:2, ANNOTATION_PROCESSING=1:0, ANNOTATION_PROCESSING_ROUND=2:1, COMPILATION=1:0}";
+ else
+ found = "{PARSE=1:1, ENTER=2:2, ANNOTATION_PROCESSING=1:0, ANNOTATION_PROCESSING_ROUND=2:1}";
break;
case REMOVE_IN_LISTENER:
- found = "{PARSE=1:1, ENTER=3:3, ANALYZE=1:1, GENERATE=1:0, ANNOTATION_PROCESSING=1:1, ANNOTATION_PROCESSING_ROUND=2:2}";
+ if (ck == CompileKind.CALL)
+ found = "{PARSE=1:1, ENTER=3:3, ANALYZE=1:1, GENERATE=1:0, ANNOTATION_PROCESSING=1:1, ANNOTATION_PROCESSING_ROUND=2:2, COMPILATION=1:0}";
+ else
+ found = "{PARSE=1:1, ENTER=3:3, ANALYZE=1:1, GENERATE=1:0, ANNOTATION_PROCESSING=1:1, ANNOTATION_PROCESSING_ROUND=2:2}";
break;
default:
throw new IllegalStateException();
@@ -302,7 +308,10 @@
switch (rk) {
// Remove will fail (too early), so events to end will be recorded
case REMOVE_IN_TASK:
- found = "{ENTER=2:2, ANALYZE=1:1, GENERATE=1:1, ANNOTATION_PROCESSING=0:1, ANNOTATION_PROCESSING_ROUND=1:2}";
+ if (ck == CompileKind.CALL)
+ found = "{ENTER=2:2, ANALYZE=1:1, GENERATE=1:1, ANNOTATION_PROCESSING=0:1, ANNOTATION_PROCESSING_ROUND=1:2, COMPILATION=0:1}";
+ else
+ found = "{ENTER=2:2, ANALYZE=1:1, GENERATE=1:1, ANNOTATION_PROCESSING=0:1, ANNOTATION_PROCESSING_ROUND=1:2}";
break;
case REMOVE_IN_PROCESSOR:
found = "{ENTER=1:1, ANNOTATION_PROCESSING_ROUND=1:1}";
@@ -321,7 +330,10 @@
// Remove will fail (too early, so events to end will be recorded
case REMOVE_IN_TASK:
case REMOVE_IN_PROCESSOR:
- found = "{ANALYZE=0:1, GENERATE=1:1}";
+ if (ck == CompileKind.CALL)
+ found = "{ANALYZE=0:1, GENERATE=1:1, COMPILATION=0:1}";
+ else
+ found = "{ANALYZE=0:1, GENERATE=1:1}";
break;
// Remove will succeed during "GENERATE.finished" event
case REMOVE_IN_LISTENER:
diff --git a/test/tools/javac/diags/ArgTypeCompilerFactory.java b/test/tools/javac/diags/ArgTypeCompilerFactory.java
index f8cab93..b97bf47 100644
--- a/test/tools/javac/diags/ArgTypeCompilerFactory.java
+++ b/test/tools/javac/diags/ArgTypeCompilerFactory.java
@@ -105,14 +105,13 @@
Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjectsFromFiles(files);
- Context c = new Context();
- ArgTypeMessages.preRegister(c);
- ArgTypeJavaCompiler.preRegister(c);
+ Context c = initContext();
JavacTaskImpl t = (JavacTaskImpl) tool.getTask(out, fm, null, opts, null, fos, c);
return t.call();
}
}
+
/**
* Run the test using the standard simple entry point.
*/
@@ -135,10 +134,8 @@
args.add(f.getPath());
Main main = new Main("javac", out);
- Context c = new Context();
+ Context c = initContext();
JavacFileManager.preRegister(c); // can't create it until Log has been set up
- ArgTypeJavaCompiler.preRegister(c);
- ArgTypeMessages.preRegister(c);
Main.Result result = main.compile(args.toArray(new String[args.size()]), c);
return result.isOK();
@@ -161,18 +158,25 @@
for (File f: files)
args.add(f.getPath());
- Context c = new Context();
+ Context c = initContext();
JavacFileManager.preRegister(c); // can't create it until Log has been set up
- ArgTypeJavaCompiler.preRegister(c);
- ArgTypeMessages.preRegister(c);
Main m = new Main("javac", out);
Main.Result result = m.compile(args.toArray(new String[args.size()]), c);
return result.isOK();
}
-
}
+ private static Context initContext() {
+ Context context = new Context();
+ ArgTypeMessages.preRegister(context);
+ Options options = Options.instance(context);
+ options.addListener(() -> {
+ Log log = Log.instance(context);
+ log.setDiagnosticFormatter(new ArgTypeDiagnosticFormatter(options));
+ });
+ return context;
+ }
// <editor-fold defaultstate="collapsed" desc="Custom Javac components">
@@ -228,29 +232,6 @@
}
/**
- * Trivial subtype of JavaCompiler to get access to the protected compilerKey field.
- * The factory is used to ensure that the log is initialized with an instance of
- * ArgTypeDiagnosticFormatter before we create the required JavaCompiler.
- */
- static class ArgTypeJavaCompiler extends JavaCompiler {
- static void preRegister(Context context) {
- context.put(compilerKey, new Context.Factory<JavaCompiler>() {
- public JavaCompiler make(Context c) {
- Log log = Log.instance(c);
- Options options = Options.instance(c);
- log.setDiagnosticFormatter(new ArgTypeDiagnosticFormatter(options));
- return new JavaCompiler(c);
- }
- });
- }
-
- // not used
- private ArgTypeJavaCompiler() {
- super(null);
- }
- }
-
- /**
* Diagnostic formatter which "localizes" a message as a line
* containing a key, and a possibly empty set of descriptive strings for the
* arg types.
diff --git a/test/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java b/test/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java
new file mode 100644
index 0000000..c448c13
--- /dev/null
+++ b/test/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2014, 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.static.intf.method.invoke.not.supported.in.source
+// options: -source 7 -Xlint:-options
+import java.util.stream.Stream;
+
+class StaticIntfMethodInvokeNotSupported {
+ void test() {
+ Stream.empty();
+ }
+}
diff --git a/test/tools/javac/generics/inference/8043725/T8043725.java b/test/tools/javac/generics/inference/8043725/T8043725.java
new file mode 100644
index 0000000..8bd1d03
--- /dev/null
+++ b/test/tools/javac/generics/inference/8043725/T8043725.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2014, 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 8043725
+ * @summary javac fails with StackOverflowException
+ * @compile T8043725.java
+ */
+class T8043725 {
+ <T extends Comparable<T>> T m(T v) {
+ //this will generate two upper bounds, T and Comparable<T'> respectively
+ //causing infinite recursion in lub (because of JLS 18.3.1).
+ return m(v);
+ }
+}
diff --git a/test/tools/javac/generics/wildcards/7034495/T7034495.out b/test/tools/javac/generics/wildcards/7034495/T7034495.out
index 39c6f7f..58aa1f6 100644
--- a/test/tools/javac/generics/wildcards/7034495/T7034495.out
+++ b/test/tools/javac/generics/wildcards/7034495/T7034495.out
@@ -1,2 +1,2 @@
-T7034495.java:40:17: compiler.err.types.incompatible.diff.ret: T7034495.B<?>, T7034495.A<?>, foo()
+T7034495.java:40:17: compiler.err.types.incompatible.diff.ret: T7034495.B<compiler.misc.type.captureof: 1, ?>, T7034495.A<compiler.misc.type.captureof: 2, ?>, foo()
1 error
diff --git a/test/tools/javac/generics/wildcards/T8015101.java b/test/tools/javac/generics/wildcards/T8015101.java
new file mode 100644
index 0000000..02409a5
--- /dev/null
+++ b/test/tools/javac/generics/wildcards/T8015101.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2014, 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 8015101
+ * @summary Mishandling of wildcards in intersection member method check
+ * @compile T8015101.java
+ */
+class T8015101 {
+
+ public static class Bug<X extends Child<?, ?> & Runnable> {
+ }
+
+ interface Parent<C> {
+ public C get();
+ }
+
+ interface Child<C, S extends C> extends Parent<C> {
+ @Override
+ public S get();
+ }
+
+ }
diff --git a/test/tools/javac/lib/DPrinter.java b/test/tools/javac/lib/DPrinter.java
index 72d4fd8..544d21f 100644
--- a/test/tools/javac/lib/DPrinter.java
+++ b/test/tools/javac/lib/DPrinter.java
@@ -21,6 +21,12 @@
* questions.
*/
+/* @test
+ * @bug 8043484
+ * @summary Make sure DPrinter.java compiles
+ * @compile DPrinter.java
+ */
+
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
@@ -403,7 +409,7 @@
printType("type", sym.type, Details.SUMMARY);
printType("erasure", sym.erasure_field, Details.SUMMARY);
sym.accept(symVisitor, null);
- printAnnotations("annotations", sym.getAnnotations(), Details.SUMMARY);
+ printAnnotations("annotations", sym.getMetadata(), Details.SUMMARY);
indent(-1);
}
}
@@ -529,12 +535,16 @@
public class TreeVisitor extends JCTree.Visitor {
@Override
public void visitTopLevel(JCCompilationUnit tree) {
- printList("packageAnnotations", tree.packageAnnotations);
- printTree("pid", tree.pid);
+ printList("packageAnnotations", tree.getPackageAnnotations());
printList("defs", tree.defs);
}
@Override
+ public void visitPackageDef(JCPackageDecl tree) {
+ printTree("pid", tree.pid);
+ }
+
+ @Override
public void visitImport(JCImport tree) {
printTree("qualid", tree.qualid);
}
@@ -945,12 +955,6 @@
* visit method for its superclass.
*/
public class TypeVisitor implements Type.Visitor<Void,Void> {
- public Void visitAnnotatedType(AnnotatedType type, Void ignore) {
- printList("typeAnnotations", type.getAnnotationMirrors());
- printType("underlyingType", type.unannotatedType(), Details.FULL);
- return visitType(type, null);
- }
-
public Void visitArrayType(ArrayType type, Void ignore) {
printType("elemType", type.elemtype, Details.FULL);
return visitType(type, null);
diff --git a/test/tools/javac/processing/6430209/T6430209.java b/test/tools/javac/processing/6430209/T6430209.java
index 9ecc01d..611819a 100644
--- a/test/tools/javac/processing/6430209/T6430209.java
+++ b/test/tools/javac/processing/6430209/T6430209.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@
// run annotation processor b6341534 so we can check diagnostics
// -proc:only -processor b6341534 -cp . ./src/*.java
String testSrc = System.getProperty("test.src", ".");
- String testClasses = System.getProperty("test.classes") + System.getProperty("path.separator") + "../../lib";
+ String testClassPath = System.getProperty("test.class.path");
JavacTool tool = JavacTool.create();
MyDiagListener dl = new MyDiagListener();
StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null);
@@ -64,7 +64,7 @@
new File(testSrc, "test0.java"), new File(testSrc, "test1.java")));
Iterable<String> opts = Arrays.asList("-proc:only",
"-processor", "b6341534",
- "-processorpath", testClasses);
+ "-processorpath", testClassPath);
StringWriter out = new StringWriter();
JavacTask task = tool.getTask(out, fm, dl, opts, null, files);
task.call();
diff --git a/test/tools/javac/processing/model/element/TestAnonClassNames.java b/test/tools/javac/processing/model/element/TestAnonClassNames.java
index 13fe97c..cf112459 100644
--- a/test/tools/javac/processing/model/element/TestAnonClassNames.java
+++ b/test/tools/javac/processing/model/element/TestAnonClassNames.java
@@ -96,9 +96,10 @@
List<String> names = new ArrayList<String>();
for(Class<?> clazz : classes) {
String name = clazz.getName();
- System.out.format("%s is %s%n",
- clazz.getName(),
- clazz.getAnnotation(Nesting.class).value());
+ Nesting annotation = clazz.getAnnotation(Nesting.class);
+ NestingKind expected = annotation == null ?
+ NestingKind.ANONYMOUS : annotation.value();
+ System.out.format("%s is %s%n", name, expected);
testClassName(name);
names.add(name);
}
@@ -186,7 +187,11 @@
typeElt.getKind().toString(),
nestingKind.toString());
- if (typeElt.getAnnotation(Nesting.class).value() != nestingKind) {
+ Nesting annotation = typeElt.getAnnotation(Nesting.class);
+ NestingKind expected = annotation == null ?
+ NestingKind.ANONYMOUS : annotation.value();
+
+ if (expected != nestingKind) {
throw new RuntimeException("Mismatch of expected and reported nesting kind.");
}
}
diff --git a/test/tools/javac/tree/TreePosTest.java b/test/tools/javac/tree/TreePosTest.java
index 8fed3e5..f172321 100644
--- a/test/tools/javac/tree/TreePosTest.java
+++ b/test/tools/javac/tree/TreePosTest.java
@@ -367,7 +367,9 @@
// and because of inconsistent nesting of left and right of
// array declarations:
// e.g. int[][] a = new int[2][];
+ if (!(encl.tag == REFERENCE && self.tag == ANNOTATED_TYPE)) {
check("encl.start <= start", encl, self, encl.start <= self.start);
+ }
check("start <= pos", encl, self, self.start <= self.pos);
if (!( (self.tag == TYPEARRAY ||
isAnnotatedArray(self.tree))
@@ -377,6 +379,8 @@
isAnnotatedArray(encl.tree))
||
encl.tag == ANNOTATED_TYPE && self.tag == SELECT
+ ||
+ encl.tag == REFERENCE && self.tag == ANNOTATED_TYPE
)) {
check("encl.pos <= start || end <= encl.pos",
encl, self, encl.pos <= self.start || self.end <= encl.pos);
diff --git a/test/tools/javac/warnings/6747671/T6747671.out b/test/tools/javac/warnings/6747671/T6747671.out
index 518804d..d3628d2 100644
--- a/test/tools/javac/warnings/6747671/T6747671.out
+++ b/test/tools/javac/warnings/6747671/T6747671.out
@@ -8,5 +8,5 @@
T6747671.java:32:20: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
T6747671.java:33:16: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
T6747671.java:36:9: compiler.warn.raw.class.use: @T6747671.TA T6747671.B, T6747671.B<X>
-T6747671.java:36:27: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:36:27: compiler.warn.raw.class.use: @T6747671.TA T6747671.B, T6747671.B<X>
11 warnings
diff --git a/test/tools/javac/warnings/suppress/T6480588.out b/test/tools/javac/warnings/suppress/T6480588.out
index 6e6f367..6470e0c 100644
--- a/test/tools/javac/warnings/suppress/T6480588.out
+++ b/test/tools/javac/warnings/suppress/T6480588.out
@@ -1,6 +1,6 @@
+T6480588.java:11:2: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
T6480588.java:12:24: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
T6480588.java:12:51: compiler.warn.has.been.deprecated: DeprecatedInterface, compiler.misc.unnamed.package
-T6480588.java:11:2: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
T6480588.java:14:12: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
T6480588.java:14:65: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
T6480588.java:13:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
@@ -12,7 +12,7 @@
T6480588.java:26:5: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
T6480588.java:25:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
T6480588.java:26:33: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:28:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
T6480588.java:29:25: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
T6480588.java:29:52: compiler.warn.has.been.deprecated: DeprecatedInterface, compiler.misc.unnamed.package
-T6480588.java:28:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
-17 warnings
\ No newline at end of file
+17 warnings
diff --git a/test/tools/javac/warnings/suppress/TypeAnnotations.out b/test/tools/javac/warnings/suppress/TypeAnnotations.out
index 52a5484..6d45713 100644
--- a/test/tools/javac/warnings/suppress/TypeAnnotations.out
+++ b/test/tools/javac/warnings/suppress/TypeAnnotations.out
@@ -5,28 +5,20 @@
TypeAnnotations.java:14:13: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:14:44: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:14:33: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:23:29: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:23:18: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:16:14: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:17:58: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:17:14: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:17:58: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:20:10: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:21:54: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:21:10: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:21:54: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:23:18: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:23:29: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:28:14: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:29:58: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:29:14: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:29:58: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:32:10: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:33:54: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:33:10: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:33:54: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:35:46: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:35:35: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:35:21: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:35:10: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:35:35: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
@@ -35,7 +27,6 @@
TypeAnnotations.java:38:6: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:38:43: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:38:32: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-TypeAnnotations.java:38:32: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:42:40: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
TypeAnnotations.java:42:62: compiler.warn.has.been.deprecated: TA, compiler.misc.unnamed.package
-40 warnings
\ No newline at end of file
+31 warnings
diff --git a/test/tools/javap/output/RepeatingTypeAnnotations.java b/test/tools/javap/output/RepeatingTypeAnnotations.java
index f78bf12..a0bc569 100644
--- a/test/tools/javap/output/RepeatingTypeAnnotations.java
+++ b/test/tools/javap/output/RepeatingTypeAnnotations.java
@@ -245,11 +245,11 @@
" @A @A @A String ls = (@B @B @B String) o;",
" }");
verify("RuntimeInvisibleTypeAnnotations",
- "0: #34(#35=[@#36(),@#36(),@#36()]): CAST, offset=4, type_index=0",
- "1: #37(#35=[@#38(),@#38(),@#38()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "0: #34(#35=[@#36(),@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "1: #37(#35=[@#38(),@#38(),@#38()]): CAST, offset=4, type_index=0",
"RuntimeInvisibleTypeAnnotations",
- "0: #37(#35=[@#38(),@#38(),@#38()]): METHOD_FORMAL_PARAMETER, param_index=0",
- "1: #38(): METHOD_FORMAL_PARAMETER, param_index=1");
+ "0: #36(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "1: #34(#35=[@#36(),@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0");
}
}
@@ -261,15 +261,15 @@
" @A @A @B String ls = (@B @A @B String) o;",
" }");
verify("RuntimeInvisibleTypeAnnotations",
- "0: #34(#35=[@#36(),@#36()]): CAST, offset=4, type_index=0",
- "1: #37(): CAST, offset=4, type_index=0",
- "2: #38(#35=[@#37(),@#37()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
- "3: #36(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "0: #34(#35=[@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "1: #37(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "2: #38(#35=[@#37(),@#37()]): CAST, offset=4, type_index=0",
+ "3: #36(): CAST, offset=4, type_index=0",
"RuntimeInvisibleTypeAnnotations",
- "0: #38(#35=[@#37(),@#37()]): METHOD_FORMAL_PARAMETER, param_index=0",
- "1: #36(): METHOD_FORMAL_PARAMETER, param_index=0",
- "2: #37(): METHOD_FORMAL_PARAMETER, param_index=1",
- "3: #36(): METHOD_FORMAL_PARAMETER, param_index=1");
+ "0: #36(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "1: #37(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "2: #34(#35=[@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0",
+ "3: #37(): METHOD_FORMAL_PARAMETER, param_index=0");
}
}
@@ -282,14 +282,14 @@
" }");
verify("RuntimeVisibleTypeAnnotations",
"RuntimeInvisibleTypeAnnotations",
- "0: #34(): CAST, offset=4, type_index=0",
- "1: #35(#36=[@#34(),@#34()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
- "0: #38(#36=[@#39(),@#39()]): CAST, offset=4, type_index=0",
- "1: #39(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
- "0: #35(#36=[@#34(),@#34()]): METHOD_FORMAL_PARAMETER, param_index=0",
- "0: #39(): METHOD_FORMAL_PARAMETER, param_index=0",
- "1: #39(): METHOD_FORMAL_PARAMETER, param_index=1",
- "2: #40(): METHOD_FORMAL_PARAMETER, param_index=1");
+ "0: #34(#35=[@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "1: #36(): CAST, offset=4, type_index=0",
+ "0: #38(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "1: #39(#35=[@#38(),@#38()]): CAST, offset=4, type_index=0",
+ "0: #34(#35=[@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0",
+ "0: #38(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "1: #40(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "2: #38(): METHOD_FORMAL_PARAMETER, param_index=0");
}
}
@@ -301,13 +301,13 @@
" @A @B @C String ls = (@C @A @B String) o;",
" }");
verify("RuntimeVisibleTypeAnnotations",
- "0: #34(): CAST, offset=4, type_index=0",
- "1: #34(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "0: #34(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "1: #34(): CAST, offset=4, type_index=0",
"RuntimeInvisibleTypeAnnotations",
- "0: #36(): CAST, offset=4, type_index=0",
- "1: #37(): CAST, offset=4, type_index=0",
- "2: #36(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
- "3: #37(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "0: #36(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "1: #37(): LOCAL_VARIABLE, {start_pc=10, length=1, index=5}",
+ "2: #36(): CAST, offset=4, type_index=0",
+ "3: #37(): CAST, offset=4, type_index=0",
"0: #34(): METHOD_FORMAL_PARAMETER, param_index=0",
"1: #34(): METHOD_FORMAL_PARAMETER, param_index=1",
"0: #36(): METHOD_FORMAL_PARAMETER, param_index=0",
@@ -325,13 +325,14 @@
" return (@A @A @A String) o;",
" }");
verify("RuntimeInvisibleTypeAnnotations",
- "0: #36(#37=[@#38(),@#38(),@#38()]): CAST, offset=0, type_index=0",
- "1: #39(#37=[@#40(),@#40(),@#40()]): CAST, offset=6, type_index=0",
- "2: #39(#37=[@#40(),@#40(),@#40()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "0: #36(#37=[@#38(),@#38(),@#38()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "1: #39(#37=[@#40(),@#40(),@#40()]): CAST, offset=0, type_index=0",
+ "2: #36(#37=[@#38(),@#38(),@#38()]): CAST, offset=6, type_index=0",
"RuntimeInvisibleTypeAnnotations",
- "0: #39(#37=[@#40(),@#40(),@#40()]): METHOD_RETURN",
- "1: #39(#37=[@#40(),@#40(),@#40()]): METHOD_FORMAL_PARAMETER, param_index=0",
- "2: #40(): METHOD_FORMAL_PARAMETER, param_index=1");
+ "0: #38(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "1: #36(#37=[@#38(),@#38(),@#38()]): METHOD_FORMAL_PARAMETER, param_index=0",
+ "2: #36(#37=[@#38(),@#38(),@#38()]): METHOD_RETURN"
+ );
}
}
@@ -345,19 +346,19 @@
" }");
verify(
"RuntimeInvisibleTypeAnnotations:",
- "0: #36(#37=[@#38(),@#38()]): CAST, offset=0, type_index=0",
- "1: #39(): CAST, offset=0, type_index=0",
- "2: #39(): CAST, offset=6, type_index=0",
- "3: #36(#37=[@#38(),@#38()]): CAST, offset=6, type_index=0",
- "4: #40(#37=[@#39(),@#39()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
- "5: #38(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "0: #36(#37=[@#38(),@#38()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "1: #39(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "2: #40(#37=[@#39(),@#39()]): CAST, offset=0, type_index=0",
+ "3: #38(): CAST, offset=0, type_index=0",
+ "4: #38(): CAST, offset=6, type_index=0",
+ "5: #40(#37=[@#39(),@#39()]): CAST, offset=6, type_index=0",
"RuntimeInvisibleTypeAnnotations:",
- "0: #39(): METHOD_RETURN",
- "1: #36(#37=[@#38(),@#38()]): METHOD_RETURN",
- "2: #40(#37=[@#39(),@#39()]): METHOD_FORMAL_PARAMETER, param_index=0",
- "3: #38(): METHOD_FORMAL_PARAMETER, param_index=0",
- "4: #39(): METHOD_FORMAL_PARAMETER, param_index=1",
- "5: #38(): METHOD_FORMAL_PARAMETER, param_index=1"
+ "0: #38(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "1: #39(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "2: #36(#37=[@#38(),@#38()]): METHOD_FORMAL_PARAMETER, param_index=0",
+ "3: #39(): METHOD_FORMAL_PARAMETER, param_index=0",
+ "4: #38(): METHOD_RETURN",
+ "5: #40(#37=[@#39(),@#39()]): METHOD_RETURN"
);
}
}
@@ -372,21 +373,21 @@
" }");
verify(
"RuntimeVisibleTypeAnnotations:",
- "0: #36(): CAST, offset=0, type_index=0",
- "1: #36(): CAST, offset=6, type_index=0",
- "2: #37(#38=[@#36(),@#36()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "0: #36(#37=[@#38(),@#38()]): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "1: #38(): CAST, offset=0, type_index=0",
+ "2: #38(): CAST, offset=6, type_index=0",
"RuntimeInvisibleTypeAnnotations:",
- "0: #40(#38=[@#41(),@#41()]): CAST, offset=0, type_index=0",
- "1: #42(#38=[@#43(),@#43()]): CAST, offset=6, type_index=0",
- "2: #41(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "0: #40(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "1: #41(#37=[@#40(),@#40()]): CAST, offset=0, type_index=0",
+ "2: #42(#37=[@#43(),@#43()]): CAST, offset=6, type_index=0",
"RuntimeVisibleTypeAnnotations:",
- "0: #36(): METHOD_RETURN",
- "1: #37(#38=[@#36(),@#36()]): METHOD_FORMAL_PARAMETER, param_index=0",
+ "0: #36(#37=[@#38(),@#38()]): METHOD_FORMAL_PARAMETER, param_index=0",
+ "1: #38(): METHOD_RETURN",
"RuntimeInvisibleTypeAnnotations:",
- "0: #40(#38=[@#41(),@#41()]): METHOD_RETURN",
- "1: #41(): METHOD_FORMAL_PARAMETER, param_index=0",
- "2: #41(): METHOD_FORMAL_PARAMETER, param_index=1",
- "3: #43(): METHOD_FORMAL_PARAMETER, param_index=1"
+ "0: #40(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "1: #43(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "2: #40(): METHOD_FORMAL_PARAMETER, param_index=0",
+ "3: #41(#37=[@#40(),@#40()]): METHOD_RETURN"
);
}
}
@@ -401,26 +402,26 @@
" }");
verify(
"RuntimeVisibleTypeAnnotations:",
- "0: #36(): CAST, offset=0, type_index=0",
- "1: #36(): CAST, offset=6, type_index=0",
- "2: #36(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "0: #36(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "1: #36(): CAST, offset=0, type_index=0",
+ "2: #36(): CAST, offset=6, type_index=0",
"RuntimeInvisibleTypeAnnotations:",
- "0: #38(): CAST, offset=0, type_index=0",
- "1: #39(): CAST, offset=0, type_index=0",
- "2: #39(): CAST, offset=6, type_index=0",
- "3: #38(): CAST, offset=6, type_index=0",
- "4: #38(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
- "5: #39(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "0: #38(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "1: #39(): LOCAL_VARIABLE, {start_pc=6, length=5, index=5}",
+ "2: #38(): CAST, offset=0, type_index=0",
+ "3: #39(): CAST, offset=0, type_index=0",
+ "4: #39(): CAST, offset=6, type_index=0",
+ "5: #38(): CAST, offset=6, type_index=0",
"RuntimeVisibleTypeAnnotations:",
- "0: #36(): METHOD_RETURN",
- "1: #36(): METHOD_FORMAL_PARAMETER, param_index=0",
- "2: #36(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "0: #36(): METHOD_FORMAL_PARAMETER, param_index=0",
+ "1: #36(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "2: #36(): METHOD_RETURN",
"RuntimeInvisibleTypeAnnotations:",
- "0: #38(): METHOD_RETURN",
- "1: #39(): METHOD_RETURN",
- "2: #38(): METHOD_FORMAL_PARAMETER, param_index=0",
- "3: #39(): METHOD_FORMAL_PARAMETER, param_index=0",
- "4: #38(): METHOD_FORMAL_PARAMETER, param_index=1"
+ "0: #38(): METHOD_FORMAL_PARAMETER, param_index=0",
+ "1: #39(): METHOD_FORMAL_PARAMETER, param_index=0",
+ "2: #38(): METHOD_FORMAL_PARAMETER, param_index=1",
+ "3: #38(): METHOD_RETURN",
+ "4: #39(): METHOD_RETURN"
);
}
}
