Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/build.xml	Thu Feb 10 16:24:51 2011 -0800
     1.2 +++ b/make/build.xml	Mon Feb 14 16:31:21 2011 -0800
     1.3 @@ -1,6 +1,6 @@
     1.4  <?xml version="1.0" encoding="UTF-8"?>
     1.5  <!--
     1.6 - Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
     1.7 + Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
     1.8   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9  
    1.10   This code is free software; you can redistribute it and/or modify it
    1.11 @@ -331,7 +331,7 @@
    1.12              executable="${dist.bin.dir}/javac"
    1.13              srcdir="test/tools/javac/diags"
    1.14              destdir="${build.dir}/diag-examples/classes"
    1.15 -            includes="Example.java,FileManager.java,HTMLWriter.java,RunExamples.java"
    1.16 +            includes="ArgTypeCompilerFactory.java,Example.java,FileManager.java,HTMLWriter.java,RunExamples.java"
    1.17              sourcepath=""
    1.18              classpath="${dist.lib.dir}/javac.jar"
    1.19              includeAntRuntime="no"

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java	Mon Feb 14 16:31:21 2011 -0800
     2.3 @@ -0,0 +1,95 @@
     2.4 +/*
     2.5 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.  Oracle designates this
    2.11 + * particular file as subject to the "Classpath" exception as provided
    2.12 + * by Oracle in the LICENSE file that accompanied this code.
    2.13 + *
    2.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.17 + * version 2 for more details (a copy is included in the LICENSE file that
    2.18 + * accompanied this code).
    2.19 + *
    2.20 + * You should have received a copy of the GNU General Public License version
    2.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.23 + *
    2.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.25 + * or visit www.oracle.com if you need additional information or have any
    2.26 + * questions.
    2.27 + */
    2.28 +
    2.29 +package com.sun.tools.javac.code;
    2.30 +
    2.31 +import java.util.HashMap;
    2.32 +import java.util.Map;
    2.33 +
    2.34 +import com.sun.tools.javac.util.Assert;
    2.35 +import com.sun.tools.javac.util.Context;
    2.36 +import com.sun.tools.javac.util.ListBuffer;
    2.37 +import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
    2.38 +
    2.39 +/**
    2.40 + *
    2.41 + * <p><b>This is NOT part of any supported API.
    2.42 + * If you write code that depends on this, you do so at your own risk.
    2.43 + * This code and its internal interfaces are subject to change or
    2.44 + * deletion without notice.</b>
    2.45 + */
    2.46 +public class DeferredLintHandler {
    2.47 +    protected static final Context.Key<DeferredLintHandler> deferredLintHandlerKey =
    2.48 +        new Context.Key<DeferredLintHandler>();
    2.49 +
    2.50 +    public static DeferredLintHandler instance(Context context) {
    2.51 +        DeferredLintHandler instance = context.get(deferredLintHandlerKey);
    2.52 +        if (instance == null)
    2.53 +            instance = new DeferredLintHandler(context);
    2.54 +        return instance;
    2.55 +    }
    2.56 +
    2.57 +    protected DeferredLintHandler(Context context) {
    2.58 +        context.put(deferredLintHandlerKey, this);
    2.59 +    }
    2.60 +
    2.61 +    private DeferredLintHandler() {}
    2.62 +
    2.63 +    public interface LintLogger {
    2.64 +        void report();
    2.65 +    }
    2.66 +
    2.67 +    private DiagnosticPosition currentPos;
    2.68 +    private Map<DiagnosticPosition, ListBuffer<LintLogger>> loggersQueue = new HashMap<DiagnosticPosition, ListBuffer<LintLogger>>();
    2.69 +
    2.70 +    public void report(LintLogger logger) {
    2.71 +        ListBuffer<LintLogger> loggers = loggersQueue.get(currentPos);
    2.72 +        Assert.checkNonNull(loggers);
    2.73 +        loggers.append(logger);
    2.74 +    }
    2.75 +
    2.76 +    public void flush(DiagnosticPosition pos) {
    2.77 +        ListBuffer<LintLogger> loggers = loggersQueue.get(pos);
    2.78 +        if (loggers != null) {
    2.79 +            for (LintLogger lintLogger : loggers) {
    2.80 +                lintLogger.report();
    2.81 +            }
    2.82 +            loggersQueue.remove(pos);
    2.83 +        }
    2.84 +    }
    2.85 +
    2.86 +    public DeferredLintHandler setPos(DiagnosticPosition currentPos) {
    2.87 +        this.currentPos = currentPos;
    2.88 +        loggersQueue.put(currentPos, ListBuffer.<LintLogger>lb());
    2.89 +        return this;
    2.90 +    }
    2.91 +
    2.92 +    public static final DeferredLintHandler immediateHandler = new DeferredLintHandler() {
    2.93 +        @Override
    2.94 +        public void report(LintLogger logger) {
    2.95 +            logger.report();
    2.96 +        }
    2.97 +    };
    2.98 +}

     3.1 --- a/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Feb 10 16:24:51 2011 -0800
     3.2 +++ b/src/share/classes/com/sun/tools/javac/code/Flags.java	Mon Feb 14 16:31:21 2011 -0800
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -237,7 +237,7 @@
    3.11  
    3.12      /**
    3.13       * Flag that marks a signature-polymorphic invoke method.
    3.14 -     * (These occur inside java.dyn.MethodHandle.)
    3.15 +     * (These occur inside java.lang.invoke.MethodHandle.)
    3.16       */
    3.17      public static final long POLYMORPHIC_SIGNATURE = 1L<<40;
    3.18  
    3.19 @@ -252,6 +252,11 @@
    3.20       */
    3.21      public static final long EFFECTIVELY_FINAL = 1L<<42;
    3.22  
    3.23 +    /**
    3.24 +     * Flag that marks non-override equivalent methods with the same signature
    3.25 +     */
    3.26 +    public static final long CLASH = 1L<<43;
    3.27 +
    3.28      /** Modifier masks.
    3.29       */
    3.30      public static final int

     4.1 --- a/src/share/classes/com/sun/tools/javac/code/Printer.java	Thu Feb 10 16:24:51 2011 -0800
     4.2 +++ b/src/share/classes/com/sun/tools/javac/code/Printer.java	Mon Feb 14 16:31:21 2011 -0800
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -106,7 +106,7 @@
    4.11      }
    4.12  
    4.13      /**
    4.14 -     * * Get a localized string represenation for all the symbols in the input list.
    4.15 +     * * Get a localized string representation for all the symbols in the input list.
    4.16       *
    4.17       * @param ts symbols to be displayed
    4.18       * @param locale the locale in which the string is to be rendered

     5.1 --- a/src/share/classes/com/sun/tools/javac/code/Scope.java	Thu Feb 10 16:24:51 2011 -0800
     5.2 +++ b/src/share/classes/com/sun/tools/javac/code/Scope.java	Mon Feb 14 16:31:21 2011 -0800
     5.3 @@ -72,49 +72,10 @@
     5.4       */
     5.5      int nelems = 0;
     5.6  
     5.7 -    /** A timestamp - useful to quickly check whether a scope has changed or not
     5.8 -     */
     5.9 -    public ScopeCounter scopeCounter;
    5.10 -
    5.11 -    static ScopeCounter dummyCounter = new ScopeCounter() {
    5.12 -        @Override
    5.13 -        public void inc() {
    5.14 -            //do nothing
    5.15 -        }
    5.16 -    };
    5.17 -
    5.18      /** A list of scopes to be notified if items are to be removed from this scope.
    5.19       */
    5.20      List<Scope> listeners = List.nil();
    5.21  
    5.22 -    public static class ScopeCounter {
    5.23 -        protected static final Context.Key<ScopeCounter> scopeCounterKey =
    5.24 -            new Context.Key<ScopeCounter>();
    5.25 -
    5.26 -        public static ScopeCounter instance(Context context) {
    5.27 -            ScopeCounter instance = context.get(scopeCounterKey);
    5.28 -            if (instance == null)
    5.29 -                instance = new ScopeCounter(context);
    5.30 -            return instance;
    5.31 -        }
    5.32 -
    5.33 -        protected ScopeCounter(Context context) {
    5.34 -            context.put(scopeCounterKey, this);
    5.35 -        }
    5.36 -
    5.37 -        private ScopeCounter() {};
    5.38 -
    5.39 -        private long val = 0;
    5.40 -
    5.41 -        public void inc() {
    5.42 -            val++;
    5.43 -        }
    5.44 -
    5.45 -        public long val() {
    5.46 -            return val;
    5.47 -        }
    5.48 -    }
    5.49 -
    5.50      /** Use as a "not-found" result for lookup.
    5.51       * Also used to mark deleted entries in the table.
    5.52       */
    5.53 @@ -126,35 +87,30 @@
    5.54  
    5.55      /** A value for the empty scope.
    5.56       */
    5.57 -    public static final Scope emptyScope = new Scope(null, null, new Entry[]{}, dummyCounter);
    5.58 +    public static final Scope emptyScope = new Scope(null, null, new Entry[]{});
    5.59  
    5.60      /** Construct a new scope, within scope next, with given owner, using
    5.61       *  given table. The table's length must be an exponent of 2.
    5.62       */
    5.63 -    private Scope(Scope next, Symbol owner, Entry[] table, ScopeCounter scopeCounter) {
    5.64 +    private Scope(Scope next, Symbol owner, Entry[] table) {
    5.65          this.next = next;
    5.66          Assert.check(emptyScope == null || owner != null);
    5.67          this.owner = owner;
    5.68          this.table = table;
    5.69          this.hashMask = table.length - 1;
    5.70 -        this.scopeCounter = scopeCounter;
    5.71      }
    5.72  
    5.73      /** Convenience constructor used for dup and dupUnshared. */
    5.74 -    private Scope(Scope next, Symbol owner, Entry[] table) {
    5.75 -        this(next, owner, table, next.scopeCounter);
    5.76 -        this.nelems = next.nelems;
    5.77 +    private Scope(Scope next, Symbol owner, Entry[] table, int nelems) {
    5.78 +        this(next, owner, table);
    5.79 +        this.nelems = nelems;
    5.80      }
    5.81  
    5.82      /** Construct a new scope, within scope next, with given owner,
    5.83       *  using a fresh table of length INITIAL_SIZE.
    5.84       */
    5.85      public Scope(Symbol owner) {
    5.86 -        this(owner, dummyCounter);
    5.87 -    }
    5.88 -
    5.89 -    protected Scope(Symbol owner, ScopeCounter scopeCounter) {
    5.90 -        this(null, owner, new Entry[INITIAL_SIZE], scopeCounter);
    5.91 +        this(null, owner, new Entry[INITIAL_SIZE]);
    5.92      }
    5.93  
    5.94      /** Construct a fresh scope within this scope, with same owner,
    5.95 @@ -172,7 +128,7 @@
    5.96       *  of fresh tables.
    5.97       */
    5.98      public Scope dup(Symbol newOwner) {
    5.99 -        Scope result = new Scope(this, newOwner, this.table);
   5.100 +        Scope result = new Scope(this, newOwner, this.table, this.nelems);
   5.101          shared++;
   5.102          // System.out.println("====> duping scope " + this.hashCode() + " owned by " + newOwner + " to " + result.hashCode());
   5.103          // new Error().printStackTrace(System.out);
   5.104 @@ -184,7 +140,7 @@
   5.105       *  the table of its outer scope.
   5.106       */
   5.107      public Scope dupUnshared() {
   5.108 -        return new Scope(this, this.owner, this.table.clone());
   5.109 +        return new Scope(this, this.owner, this.table.clone(), this.nelems);
   5.110      }
   5.111  
   5.112      /** Remove all entries of this scope from its table, if shared
   5.113 @@ -263,7 +219,6 @@
   5.114          Entry e = makeEntry(sym, old, elems, s, origin);
   5.115          table[hash] = e;
   5.116          elems = e;
   5.117 -        scopeCounter.inc();
   5.118      }
   5.119  
   5.120      Entry makeEntry(Symbol sym, Entry shadowed, Entry sibling, Scope scope, Scope origin) {
   5.121 @@ -278,8 +233,6 @@
   5.122          Entry e = lookup(sym.name);
   5.123          if (e.scope == null) return;
   5.124  
   5.125 -        scopeCounter.inc();
   5.126 -
   5.127          // remove e from table and shadowed list;
   5.128          int i = getIndex(sym.name);
   5.129          Entry te = table[i];
   5.130 @@ -559,7 +512,7 @@
   5.131          public static final Entry[] emptyTable = new Entry[0];
   5.132  
   5.133          public DelegatedScope(Scope outer) {
   5.134 -            super(outer, outer.owner, emptyTable, outer.scopeCounter);
   5.135 +            super(outer, outer.owner, emptyTable);
   5.136              delegatee = outer;
   5.137          }
   5.138          public Scope dup() {
   5.139 @@ -585,22 +538,10 @@
   5.140          }
   5.141      }
   5.142  
   5.143 -    /** A class scope, for which a scope counter should be provided */
   5.144 -    public static class ClassScope extends Scope {
   5.145 -
   5.146 -        ClassScope(Scope next, Symbol owner, Entry[] table, ScopeCounter scopeCounter) {
   5.147 -            super(next, owner, table, scopeCounter);
   5.148 -        }
   5.149 -
   5.150 -        public ClassScope(Symbol owner, ScopeCounter scopeCounter) {
   5.151 -            super(owner, scopeCounter);
   5.152 -        }
   5.153 -    }
   5.154 -
   5.155      /** An error scope, for which the owner should be an error symbol. */
   5.156      public static class ErrorScope extends Scope {
   5.157          ErrorScope(Scope next, Symbol errSymbol, Entry[] table) {
   5.158 -            super(next, /*owner=*/errSymbol, table, dummyCounter);
   5.159 +            super(next, /*owner=*/errSymbol, table);
   5.160          }
   5.161          public ErrorScope(Symbol errSymbol) {
   5.162              super(errSymbol);

     6.1 --- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Thu Feb 10 16:24:51 2011 -0800
     6.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Mon Feb 14 16:31:21 2011 -0800
     6.3 @@ -729,6 +729,10 @@
     6.4           */
     6.5          public Pool pool;
     6.6  
     6.7 +        /** members closure cache (set by Types.membersClosure)
     6.8 +         */
     6.9 +        Scope membersClosure;
    6.10 +
    6.11          public ClassSymbol(long flags, Name name, Type type, Symbol owner) {
    6.12              super(flags, name, type, owner);
    6.13              this.members_field = null;
    6.14 @@ -961,22 +965,12 @@
    6.15          }
    6.16  
    6.17          public void setLazyConstValue(final Env<AttrContext> env,
    6.18 -                                      final Log log,
    6.19                                        final Attr attr,
    6.20                                        final JCTree.JCExpression initializer)
    6.21          {
    6.22              setData(new Callable<Object>() {
    6.23                  public Object call() {
    6.24 -                    JavaFileObject source = log.useSource(env.toplevel.sourcefile);
    6.25 -                    try {
    6.26 -                        Type itype = attr.attribExpr(initializer, env, type);
    6.27 -                        if (itype.constValue() != null)
    6.28 -                            return attr.coerce(itype, type).constValue();
    6.29 -                        else
    6.30 -                            return null;
    6.31 -                    } finally {
    6.32 -                        log.useSource(source);
    6.33 -                    }
    6.34 +                    return attr.attribLazyConstantValue(env, initializer, type);
    6.35                  }
    6.36              });
    6.37          }
    6.38 @@ -1010,6 +1004,7 @@
    6.39                  try {
    6.40                      data = eval.call();
    6.41                  } catch (Exception ex) {
    6.42 +                    ex.printStackTrace();
    6.43                      throw new AssertionError(ex);
    6.44                  }
    6.45              }
    6.46 @@ -1231,7 +1226,7 @@
    6.47              };
    6.48  
    6.49          public MethodSymbol implementation(TypeSymbol origin, Types types, boolean checkResult, Filter<Symbol> implFilter) {
    6.50 -            MethodSymbol res = types.implementation(this, origin, types, checkResult, implFilter);
    6.51 +            MethodSymbol res = types.implementation(this, origin, checkResult, implFilter);
    6.52              if (res != null)
    6.53                  return res;
    6.54              // if origin is derived from a raw type, we might have missed

     7.1 --- a/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Feb 10 16:24:51 2011 -0800
     7.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symtab.java	Mon Feb 14 16:31:21 2011 -0800
     7.3 @@ -74,7 +74,6 @@
     7.4      public final JCNoType voidType = new JCNoType(TypeTags.VOID);
     7.5  
     7.6      private final Names names;
     7.7 -    private final Scope.ScopeCounter scopeCounter;
     7.8      private final ClassReader reader;
     7.9      private final Target target;
    7.10  
    7.11 @@ -124,7 +123,9 @@
    7.12      public final Type stringBuilderType;
    7.13      public final Type cloneableType;
    7.14      public final Type serializableType;
    7.15 +    public final Type transientMethodHandleType; // transient - 292
    7.16      public final Type methodHandleType;
    7.17 +    public final Type transientPolymorphicSignatureType; // transient - 292
    7.18      public final Type polymorphicSignatureType;
    7.19      public final Type throwableType;
    7.20      public final Type errorType;
    7.21 @@ -341,7 +342,6 @@
    7.22          context.put(symtabKey, this);
    7.23  
    7.24          names = Names.instance(context);
    7.25 -        scopeCounter = Scope.ScopeCounter.instance(context);
    7.26          target = Target.instance(context);
    7.27  
    7.28          // Create the unknown type
    7.29 @@ -388,7 +388,7 @@
    7.30  
    7.31          // Create class to hold all predefined constants and operations.
    7.32          predefClass = new ClassSymbol(PUBLIC|ACYCLIC, names.empty, rootPackage);
    7.33 -        Scope scope = new Scope.ClassScope(predefClass, scopeCounter);
    7.34 +        Scope scope = new Scope(predefClass);
    7.35          predefClass.members_field = scope;
    7.36  
    7.37          // Enter symbols for basic types.
    7.38 @@ -419,8 +419,10 @@
    7.39          cloneableType = enterClass("java.lang.Cloneable");
    7.40          throwableType = enterClass("java.lang.Throwable");
    7.41          serializableType = enterClass("java.io.Serializable");
    7.42 -        methodHandleType = enterClass("java.dyn.MethodHandle");
    7.43 -        polymorphicSignatureType = enterClass("java.dyn.MethodHandle$PolymorphicSignature");
    7.44 +        transientMethodHandleType = enterClass("java.dyn.MethodHandle"); // transient - 292
    7.45 +        methodHandleType = enterClass("java.lang.invoke.MethodHandle");
    7.46 +        transientPolymorphicSignatureType = enterClass("java.dyn.MethodHandle$PolymorphicSignature"); // transient - 292
    7.47 +        polymorphicSignatureType = enterClass("java.lang.invoke.MethodHandle$PolymorphicSignature");
    7.48          errorType = enterClass("java.lang.Error");
    7.49          illegalArgumentExceptionType = enterClass("java.lang.IllegalArgumentException");
    7.50          exceptionType = enterClass("java.lang.Exception");
    7.51 @@ -464,6 +466,7 @@
    7.52  
    7.53          synthesizeEmptyInterfaceIfMissing(cloneableType);
    7.54          synthesizeEmptyInterfaceIfMissing(serializableType);
    7.55 +        synthesizeEmptyInterfaceIfMissing(transientPolymorphicSignatureType); // transient - 292
    7.56          synthesizeEmptyInterfaceIfMissing(polymorphicSignatureType);
    7.57          synthesizeBoxTypeIfMissing(doubleType);
    7.58          synthesizeBoxTypeIfMissing(floatType);
    7.59 @@ -478,7 +481,7 @@
    7.60          proprietarySymbol.completer = null;
    7.61          proprietarySymbol.flags_field = PUBLIC|ACYCLIC|ANNOTATION|INTERFACE;
    7.62          proprietarySymbol.erasure_field = proprietaryType;
    7.63 -        proprietarySymbol.members_field = new Scope.ClassScope(proprietarySymbol, scopeCounter);
    7.64 +        proprietarySymbol.members_field = new Scope(proprietarySymbol);
    7.65          proprietaryType.typarams_field = List.nil();
    7.66          proprietaryType.allparams_field = List.nil();
    7.67          proprietaryType.supertype_field = annotationType;
    7.68 @@ -490,7 +493,7 @@
    7.69          ClassType arrayClassType = (ClassType)arrayClass.type;
    7.70          arrayClassType.supertype_field = objectType;
    7.71          arrayClassType.interfaces_field = List.of(cloneableType, serializableType);
    7.72 -        arrayClass.members_field = new Scope.ClassScope(arrayClass, scopeCounter);
    7.73 +        arrayClass.members_field = new Scope(arrayClass);
    7.74          lengthVar = new VarSymbol(
    7.75              PUBLIC | FINAL,
    7.76              names.length,

     8.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Feb 10 16:24:51 2011 -0800
     8.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Mon Feb 14 16:31:21 2011 -0800
     8.3 @@ -36,6 +36,7 @@
     8.4  import com.sun.tools.javac.code.Lint.LintCategory;
     8.5  import com.sun.tools.javac.comp.Check;
     8.6  
     8.7 +import static com.sun.tools.javac.code.Scope.*;
     8.8  import static com.sun.tools.javac.code.Type.*;
     8.9  import static com.sun.tools.javac.code.TypeTags.*;
    8.10  import static com.sun.tools.javac.code.Symbol.*;
    8.11 @@ -70,7 +71,6 @@
    8.12          new Context.Key<Types>();
    8.13  
    8.14      final Symtab syms;
    8.15 -    final Scope.ScopeCounter scopeCounter;
    8.16      final JavacMessages messages;
    8.17      final Names names;
    8.18      final boolean allowBoxing;
    8.19 @@ -91,7 +91,6 @@
    8.20      protected Types(Context context) {
    8.21          context.put(typesKey, this);
    8.22          syms = Symtab.instance(context);
    8.23 -        scopeCounter = Scope.ScopeCounter.instance(context);
    8.24          names = Names.instance(context);
    8.25          allowBoxing = Source.instance(context).allowBoxing();
    8.26          reader = ClassReader.instance(context);
    8.27 @@ -2024,26 +2023,22 @@
    8.28              final MethodSymbol cachedImpl;
    8.29              final Filter<Symbol> implFilter;
    8.30              final boolean checkResult;
    8.31 -            final Scope.ScopeCounter scopeCounter;
    8.32  
    8.33              public Entry(MethodSymbol cachedImpl,
    8.34                      Filter<Symbol> scopeFilter,
    8.35 -                    boolean checkResult,
    8.36 -                    Scope.ScopeCounter scopeCounter) {
    8.37 +                    boolean checkResult) {
    8.38                  this.cachedImpl = cachedImpl;
    8.39                  this.implFilter = scopeFilter;
    8.40                  this.checkResult = checkResult;
    8.41 -                this.scopeCounter = scopeCounter;
    8.42              }
    8.43  
    8.44 -            boolean matches(Filter<Symbol> scopeFilter, boolean checkResult, Scope.ScopeCounter scopeCounter) {
    8.45 +            boolean matches(Filter<Symbol> scopeFilter, boolean checkResult) {
    8.46                  return this.implFilter == scopeFilter &&
    8.47 -                        this.checkResult == checkResult &&
    8.48 -                        this.scopeCounter.val() >= scopeCounter.val();
    8.49 +                        this.checkResult == checkResult;
    8.50              }
    8.51          }
    8.52  
    8.53 -        MethodSymbol get(MethodSymbol ms, TypeSymbol origin, boolean checkResult, Filter<Symbol> implFilter, Scope.ScopeCounter scopeCounter) {
    8.54 +        MethodSymbol get(MethodSymbol ms, TypeSymbol origin, boolean checkResult, Filter<Symbol> implFilter) {
    8.55              SoftReference<Map<TypeSymbol, Entry>> ref_cache = _map.get(ms);
    8.56              Map<TypeSymbol, Entry> cache = ref_cache != null ? ref_cache.get() : null;
    8.57              if (cache == null) {
    8.58 @@ -2052,9 +2047,9 @@
    8.59              }
    8.60              Entry e = cache.get(origin);
    8.61              if (e == null ||
    8.62 -                    !e.matches(implFilter, checkResult, scopeCounter)) {
    8.63 +                    !e.matches(implFilter, checkResult)) {
    8.64                  MethodSymbol impl = implementationInternal(ms, origin, Types.this, checkResult, implFilter);
    8.65 -                cache.put(origin, new Entry(impl, implFilter, checkResult, scopeCounter));
    8.66 +                cache.put(origin, new Entry(impl, implFilter, checkResult));
    8.67                  return impl;
    8.68              }
    8.69              else {
    8.70 @@ -2081,11 +2076,55 @@
    8.71  
    8.72      private ImplementationCache implCache = new ImplementationCache();
    8.73  
    8.74 -    public MethodSymbol implementation(MethodSymbol ms, TypeSymbol origin, Types types, boolean checkResult, Filter<Symbol> implFilter) {
    8.75 -        return implCache.get(ms, origin, checkResult, implFilter, scopeCounter);
    8.76 +    public MethodSymbol implementation(MethodSymbol ms, TypeSymbol origin, boolean checkResult, Filter<Symbol> implFilter) {
    8.77 +        return implCache.get(ms, origin, checkResult, implFilter);
    8.78      }
    8.79      // </editor-fold>
    8.80  
    8.81 +    // <editor-fold defaultstate="collapsed" desc="compute transitive closure of all members in given site">
    8.82 +    public Scope membersClosure(Type site) {
    8.83 +        return membersClosure.visit(site);
    8.84 +    }
    8.85 +
    8.86 +    UnaryVisitor<Scope> membersClosure = new UnaryVisitor<Scope>() {
    8.87 +
    8.88 +        public Scope visitType(Type t, Void s) {
    8.89 +            return null;
    8.90 +        }
    8.91 +
    8.92 +        @Override
    8.93 +        public Scope visitClassType(ClassType t, Void s) {
    8.94 +            ClassSymbol csym = (ClassSymbol)t.tsym;
    8.95 +            if (csym.membersClosure == null) {
    8.96 +                Scope membersClosure = new Scope(csym);
    8.97 +                for (Type i : interfaces(t)) {
    8.98 +                    enterAll(visit(i), membersClosure);
    8.99 +                }
   8.100 +                enterAll(visit(supertype(t)), membersClosure);
   8.101 +                enterAll(csym.members(), membersClosure);
   8.102 +                csym.membersClosure = membersClosure;
   8.103 +            }
   8.104 +            return csym.membersClosure;
   8.105 +        }
   8.106 +
   8.107 +        @Override
   8.108 +        public Scope visitTypeVar(TypeVar t, Void s) {
   8.109 +            return visit(t.getUpperBound());
   8.110 +        }
   8.111 +
   8.112 +        public void enterAll(Scope s, Scope to) {
   8.113 +            if (s == null) return;
   8.114 +            List<Symbol> syms = List.nil();
   8.115 +            for (Scope.Entry e = s.elems ; e != null ; e = e.sibling) {
   8.116 +                syms = syms.prepend(e.sym);
   8.117 +            }
   8.118 +            for (Symbol sym : syms) {
   8.119 +                to.enter(sym);
   8.120 +            }
   8.121 +        }
   8.122 +    };
   8.123 +    // </editor-fold>
   8.124 +
   8.125      /**
   8.126       * Does t have the same arguments as s?  It is assumed that both
   8.127       * types are (possibly polymorphic) method types.  Monomorphic
   8.128 @@ -2259,6 +2298,13 @@
   8.129  
   8.130          @Override
   8.131          public Type visitForAll(ForAll t, Void ignored) {
   8.132 +            if (Type.containsAny(to, t.tvars)) {
   8.133 +                //perform alpha-renaming of free-variables in 't'
   8.134 +                //if 'to' types contain variables that are free in 't'
   8.135 +                List<Type> freevars = newInstances(t.tvars);
   8.136 +                t = new ForAll(freevars,
   8.137 +                        Types.this.subst(t.qtype, t.tvars, freevars));
   8.138 +            }
   8.139              List<Type> tvars1 = substBounds(t.tvars, from, to);
   8.140              Type qtype1 = subst(t.qtype);
   8.141              if (tvars1 == t.tvars && qtype1 == t.qtype) {

     9.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Feb 10 16:24:51 2011 -0800
     9.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Feb 14 16:31:21 2011 -0800
     9.3 @@ -83,6 +83,7 @@
     9.4      final Types types;
     9.5      final JCDiagnostic.Factory diags;
     9.6      final Annotate annotate;
     9.7 +    final DeferredLintHandler deferredLintHandler;
     9.8  
     9.9      public static Attr instance(Context context) {
    9.10          Attr instance = context.get(attrKey);
    9.11 @@ -108,6 +109,7 @@
    9.12          types = Types.instance(context);
    9.13          diags = JCDiagnostic.Factory.instance(context);
    9.14          annotate = Annotate.instance(context);
    9.15 +        deferredLintHandler = DeferredLintHandler.instance(context);
    9.16  
    9.17          Options options = Options.instance(context);
    9.18  
    9.19 @@ -125,7 +127,6 @@
    9.20          findDiamonds = options.get("findDiamond") != null &&
    9.21                   source.allowDiamond();
    9.22          useBeforeDeclarationWarning = options.isSet("useBeforeDeclarationWarning");
    9.23 -        enableSunApiLintControl = options.isSet("enableSunApiLintControl");
    9.24      }
    9.25  
    9.26      /** Switch: relax some constraints for retrofit mode.
    9.27 @@ -174,12 +175,6 @@
    9.28      boolean useBeforeDeclarationWarning;
    9.29  
    9.30      /**
    9.31 -     * Switch: allow lint infrastructure to control proprietary
    9.32 -     * API warnings.
    9.33 -     */
    9.34 -    boolean enableSunApiLintControl;
    9.35 -
    9.36 -    /**
    9.37       * Switch: allow strings in switch?
    9.38       */
    9.39      boolean allowStringsInSwitch;
    9.40 @@ -581,6 +576,41 @@
    9.41          }
    9.42      }
    9.43  
    9.44 +    /**
    9.45 +     * Attribute a "lazy constant value".
    9.46 +     *  @param env         The env for the const value
    9.47 +     *  @param initializer The initializer for the const value
    9.48 +     *  @param type        The expected type, or null
    9.49 +     *  @see VarSymbol#setlazyConstValue
    9.50 +     */
    9.51 +    public Object attribLazyConstantValue(Env<AttrContext> env,
    9.52 +                                      JCTree.JCExpression initializer,
    9.53 +                                      Type type) {
    9.54 +
    9.55 +        // in case no lint value has been set up for this env, scan up
    9.56 +        // env stack looking for smallest enclosing env for which it is set.
    9.57 +        Env<AttrContext> lintEnv = env;
    9.58 +        while (lintEnv.info.lint == null)
    9.59 +            lintEnv = lintEnv.next;
    9.60 +
    9.61 +        // Having found the enclosing lint value, we can initialize the lint value for this class
    9.62 +        env.info.lint = lintEnv.info.lint.augment(env.info.enclVar.attributes_field, env.info.enclVar.flags());
    9.63 +
    9.64 +        Lint prevLint = chk.setLint(env.info.lint);
    9.65 +        JavaFileObject prevSource = log.useSource(env.toplevel.sourcefile);
    9.66 +
    9.67 +        try {
    9.68 +            Type itype = attribExpr(initializer, env, type);
    9.69 +            if (itype.constValue() != null)
    9.70 +                return coerce(itype, type).constValue();
    9.71 +            else
    9.72 +                return null;
    9.73 +        } finally {
    9.74 +            env.info.lint = prevLint;
    9.75 +            log.useSource(prevSource);
    9.76 +        }
    9.77 +    }
    9.78 +
    9.79      /** Attribute type reference in an `extends' or `implements' clause.
    9.80       *  Supertypes of anonymous inner classes are usually already attributed.
    9.81       *
    9.82 @@ -672,13 +702,18 @@
    9.83          Lint prevLint = chk.setLint(lint);
    9.84          MethodSymbol prevMethod = chk.setMethod(m);
    9.85          try {
    9.86 +            deferredLintHandler.flush(tree.pos());
    9.87              chk.checkDeprecatedAnnotation(tree.pos(), m);
    9.88  
    9.89              attribBounds(tree.typarams);
    9.90  
    9.91              // If we override any other methods, check that we do so properly.
    9.92              // JLS ???
    9.93 -            chk.checkClashes(tree.pos(), env.enclClass.type, m);
    9.94 +            if (m.isStatic()) {
    9.95 +                chk.checkHideClashes(tree.pos(), env.enclClass.type, m);
    9.96 +            } else {
    9.97 +                chk.checkOverrideClashes(tree.pos(), env.enclClass.type, m);
    9.98 +            }
    9.99              chk.checkOverride(tree, m);
   9.100  
   9.101              // Create a new environment with local scope
   9.102 @@ -814,6 +849,7 @@
   9.103  
   9.104          // Check that the variable's declared type is well-formed.
   9.105          chk.validate(tree.vartype, env);
   9.106 +        deferredLintHandler.flush(tree.pos());
   9.107  
   9.108          try {
   9.109              chk.checkDeprecatedAnnotation(tree.pos(), v);
   9.110 @@ -1959,7 +1995,9 @@
   9.111              tree.pos(), tree.getTag() - JCTree.ASGOffset, env,
   9.112              owntype, operand);
   9.113  
   9.114 -        if (operator.kind == MTH) {
   9.115 +        if (operator.kind == MTH &&
   9.116 +                !owntype.isErroneous() &&
   9.117 +                !operand.isErroneous()) {
   9.118              chk.checkOperator(tree.pos(),
   9.119                                (OperatorSymbol)operator,
   9.120                                tree.getTag() - JCTree.ASGOffset,
   9.121 @@ -1984,7 +2022,8 @@
   9.122              rs.resolveUnaryOperator(tree.pos(), tree.getTag(), env, argtype);
   9.123  
   9.124          Type owntype = types.createErrorType(tree.type);
   9.125 -        if (operator.kind == MTH) {
   9.126 +        if (operator.kind == MTH &&
   9.127 +                !argtype.isErroneous()) {
   9.128              owntype = (JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC)
   9.129                  ? tree.arg.type
   9.130                  : operator.type.getReturnType();
   9.131 @@ -2020,7 +2059,9 @@
   9.132              rs.resolveBinaryOperator(tree.pos(), tree.getTag(), env, left, right);
   9.133  
   9.134          Type owntype = types.createErrorType(tree.type);
   9.135 -        if (operator.kind == MTH) {
   9.136 +        if (operator.kind == MTH &&
   9.137 +                !left.isErroneous() &&
   9.138 +                !right.isErroneous()) {
   9.139              owntype = operator.type.getReturnType();
   9.140              int opc = chk.checkOperator(tree.lhs.pos(),
   9.141                                          (OperatorSymbol)operator,
   9.142 @@ -2337,7 +2378,6 @@
   9.143                                   int pkind) {
   9.144              DiagnosticPosition pos = tree.pos();
   9.145              Name name = tree.name;
   9.146 -
   9.147              switch (site.tag) {
   9.148              case PACKAGE:
   9.149                  return rs.access(
   9.150 @@ -2543,17 +2583,10 @@
   9.151              // Test (1): emit a `deprecation' warning if symbol is deprecated.
   9.152              // (for constructors, the error was given when the constructor was
   9.153              // resolved)
   9.154 -            if (sym.name != names.init &&
   9.155 -                (sym.flags() & DEPRECATED) != 0 &&
   9.156 -                (env.info.scope.owner.flags() & DEPRECATED) == 0 &&
   9.157 -                sym.outermostClass() != env.info.scope.owner.outermostClass())
   9.158 -                chk.warnDeprecated(tree.pos(), sym);
   9.159 -
   9.160 -            if ((sym.flags() & PROPRIETARY) != 0) {
   9.161 -                if (enableSunApiLintControl)
   9.162 -                  chk.warnSunApi(tree.pos(), "sun.proprietary", sym);
   9.163 -                else
   9.164 -                  log.strictWarning(tree.pos(), "sun.proprietary", sym);
   9.165 +
   9.166 +            if (sym.name != names.init) {
   9.167 +                chk.checkDeprecated(tree.pos(), env.info.scope.owner, sym);
   9.168 +                chk.checkSunAPI(tree.pos(), sym);
   9.169              }
   9.170  
   9.171              // Test (3): if symbol is a variable, check that its type and
   9.172 @@ -3156,7 +3189,7 @@
   9.173                  if (sym == null ||
   9.174                      sym.kind != VAR ||
   9.175                      ((VarSymbol) sym).getConstValue() == null)
   9.176 -                    log.error(l.head.pos(), "icls.cant.have.static.decl", sym.location());
   9.177 +                    log.error(l.head.pos(), "icls.cant.have.static.decl", c);
   9.178              }
   9.179          }
   9.180  

    10.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Feb 10 16:24:51 2011 -0800
    10.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Mon Feb 14 16:31:21 2011 -0800
    10.3 @@ -68,6 +68,7 @@
    10.4      private final boolean skipAnnotations;
    10.5      private boolean warnOnSyntheticConflicts;
    10.6      private boolean suppressAbortOnBadClassFile;
    10.7 +    private boolean enableSunApiLintControl;
    10.8      private final TreeInfo treeinfo;
    10.9  
   10.10      // The set of lint options currently in effect. It is initialized
   10.11 @@ -109,13 +110,13 @@
   10.12          skipAnnotations = options.isSet("skipAnnotations");
   10.13          warnOnSyntheticConflicts = options.isSet("warnOnSyntheticConflicts");
   10.14          suppressAbortOnBadClassFile = options.isSet("suppressAbortOnBadClassFile");
   10.15 +        enableSunApiLintControl = options.isSet("enableSunApiLintControl");
   10.16  
   10.17          Target target = Target.instance(context);
   10.18          syntheticNameChar = target.syntheticNameChar();
   10.19  
   10.20          boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION);
   10.21          boolean verboseUnchecked = lint.isEnabled(LintCategory.UNCHECKED);
   10.22 -        boolean verboseVarargs = lint.isEnabled(LintCategory.VARARGS);
   10.23          boolean verboseSunApi = lint.isEnabled(LintCategory.SUNAPI);
   10.24          boolean enforceMandatoryWarnings = source.enforceMandatoryWarnings();
   10.25  
   10.26 @@ -123,10 +124,10 @@
   10.27                  enforceMandatoryWarnings, "deprecated", LintCategory.DEPRECATION);
   10.28          uncheckedHandler = new MandatoryWarningHandler(log, verboseUnchecked,
   10.29                  enforceMandatoryWarnings, "unchecked", LintCategory.UNCHECKED);
   10.30 -        unsafeVarargsHandler = new MandatoryWarningHandler(log, verboseVarargs,
   10.31 -                enforceMandatoryWarnings, "varargs", LintCategory.VARARGS);
   10.32          sunApiHandler = new MandatoryWarningHandler(log, verboseSunApi,
   10.33                  enforceMandatoryWarnings, "sunapi", null);
   10.34 +
   10.35 +        deferredLintHandler = DeferredLintHandler.immediateHandler;
   10.36      }
   10.37  
   10.38      /** Switch: generics enabled?
   10.39 @@ -166,14 +167,14 @@
   10.40       */
   10.41      private MandatoryWarningHandler uncheckedHandler;
   10.42  
   10.43 -    /** A handler for messages about unchecked or unsafe vararg method decl.
   10.44 -     */
   10.45 -    private MandatoryWarningHandler unsafeVarargsHandler;
   10.46 -
   10.47      /** A handler for messages about using proprietary API.
   10.48       */
   10.49      private MandatoryWarningHandler sunApiHandler;
   10.50  
   10.51 +    /** A handler for deferred lint warnings.
   10.52 +     */
   10.53 +    private DeferredLintHandler deferredLintHandler;
   10.54 +
   10.55  /* *************************************************************************
   10.56   * Errors and Warnings
   10.57   **************************************************************************/
   10.58 @@ -184,6 +185,12 @@
   10.59          return prev;
   10.60      }
   10.61  
   10.62 +    DeferredLintHandler setDeferredLintHandler(DeferredLintHandler newDeferredLintHandler) {
   10.63 +        DeferredLintHandler prev = deferredLintHandler;
   10.64 +        deferredLintHandler = newDeferredLintHandler;
   10.65 +        return prev;
   10.66 +    }
   10.67 +
   10.68      MethodSymbol setMethod(MethodSymbol newMethod) {
   10.69          MethodSymbol prev = method;
   10.70          method = newMethod;
   10.71 @@ -800,8 +807,9 @@
   10.72                  Type actual = types.subst(args.head,
   10.73                      type.tsym.type.getTypeArguments(),
   10.74                      tvars_buf.toList());
   10.75 -                if (!checkExtends(actual, (TypeVar)tvars.head) &&
   10.76 -                        !tvars.head.getUpperBound().isErroneous()) {
   10.77 +                if (!isTypeArgErroneous(actual) &&
   10.78 +                        !tvars.head.getUpperBound().isErroneous() &&
   10.79 +                        !checkExtends(actual, (TypeVar)tvars.head)) {
   10.80                      return args.head;
   10.81                  }
   10.82                  args = args.tail;
   10.83 @@ -814,14 +822,39 @@
   10.84              for (Type arg : types.capture(type).getTypeArguments()) {
   10.85                  if (arg.tag == TYPEVAR &&
   10.86                          arg.getUpperBound().isErroneous() &&
   10.87 -                        !tvars.head.getUpperBound().isErroneous()) {
   10.88 +                        !tvars.head.getUpperBound().isErroneous() &&
   10.89 +                        !isTypeArgErroneous(args.head)) {
   10.90                      return args.head;
   10.91                  }
   10.92                  tvars = tvars.tail;
   10.93 +                args = args.tail;
   10.94              }
   10.95  
   10.96              return null;
   10.97          }
   10.98 +        //where
   10.99 +        boolean isTypeArgErroneous(Type t) {
  10.100 +            return isTypeArgErroneous.visit(t);
  10.101 +        }
  10.102 +
  10.103 +        Types.UnaryVisitor<Boolean> isTypeArgErroneous = new Types.UnaryVisitor<Boolean>() {
  10.104 +            public Boolean visitType(Type t, Void s) {
  10.105 +                return t.isErroneous();
  10.106 +            }
  10.107 +            @Override
  10.108 +            public Boolean visitTypeVar(TypeVar t, Void s) {
  10.109 +                return visit(t.getUpperBound());
  10.110 +            }
  10.111 +            @Override
  10.112 +            public Boolean visitCapturedType(CapturedType t, Void s) {
  10.113 +                return visit(t.getUpperBound()) ||
  10.114 +                        visit(t.getLowerBound());
  10.115 +            }
  10.116 +            @Override
  10.117 +            public Boolean visitWildcardType(WildcardType t, Void s) {
  10.118 +                return visit(t.type);
  10.119 +            }
  10.120 +        };
  10.121  
  10.122      /** Check that given modifiers are legal for given symbol and
  10.123       *  return modifiers together with any implicit modififiers for that symbol.
  10.124 @@ -1094,6 +1127,7 @@
  10.125                      log.error(tree.pos(), "improperly.formed.type.param.missing");
  10.126              }
  10.127          }
  10.128 +
  10.129          public void visitSelectInternal(JCFieldAccess tree) {
  10.130              if (tree.type.tsym.isStatic() &&
  10.131                  tree.selected.type.isParameterized()) {
  10.132 @@ -1463,11 +1497,8 @@
  10.133          }
  10.134  
  10.135          // Warn if a deprecated method overridden by a non-deprecated one.
  10.136 -        if ((other.flags() & DEPRECATED) != 0
  10.137 -            && (m.flags() & DEPRECATED) == 0
  10.138 -            && m.outermostClass() != other.outermostClass()
  10.139 -            && !isDeprecatedOverrideIgnorable(other, origin)) {
  10.140 -            warnDeprecated(TreeInfo.diagnosticPositionFor(m, tree), other);
  10.141 +        if (!isDeprecatedOverrideIgnorable(other, origin)) {
  10.142 +            checkDeprecated(TreeInfo.diagnosticPositionFor(m, tree), m, other);
  10.143          }
  10.144      }
  10.145      // where
  10.146 @@ -1648,7 +1679,7 @@
  10.147                              "(" + types.memberType(t2, s2).getParameterTypes() + ")");
  10.148                          return s2;
  10.149                      }
  10.150 -                } else if (!checkNameClash((ClassSymbol)site.tsym, s1, s2)) {
  10.151 +                } else if (checkNameClash((ClassSymbol)site.tsym, s1, s2)) {
  10.152                      log.error(pos,
  10.153                              "name.clash.same.erasure.no.override",
  10.154                              s1, s1.location(),
  10.155 @@ -1730,18 +1761,10 @@
  10.156      }
  10.157  
  10.158      private boolean checkNameClash(ClassSymbol origin, Symbol s1, Symbol s2) {
  10.159 -        if (s1.kind == MTH &&
  10.160 -                    s1.isInheritedIn(origin, types) &&
  10.161 -                    (s1.flags() & SYNTHETIC) == 0 &&
  10.162 -                    !s2.isConstructor()) {
  10.163 -            Type er1 = s2.erasure(types);
  10.164 -            Type er2 = s1.erasure(types);
  10.165 -            if (types.isSameTypes(er1.getParameterTypes(),
  10.166 -                    er2.getParameterTypes())) {
  10.167 -                    return false;
  10.168 -            }
  10.169 -        }
  10.170 -        return true;
  10.171 +        ClashFilter cf = new ClashFilter(origin.type);
  10.172 +        return (cf.accepts(s1) &&
  10.173 +                cf.accepts(s2) &&
  10.174 +                types.hasSameArgs(s1.erasure(types), s2.erasure(types)));
  10.175      }
  10.176  
  10.177  
  10.178 @@ -2080,52 +2103,82 @@
  10.179       *  @param site The class whose methods are checked.
  10.180       *  @param sym  The method symbol to be checked.
  10.181       */
  10.182 -    void checkClashes(DiagnosticPosition pos, Type site, Symbol sym) {
  10.183 -        List<Type> supertypes = types.closure(site);
  10.184 -        for (List<Type> l = supertypes; l.nonEmpty(); l = l.tail) {
  10.185 -            for (List<Type> m = supertypes; m.nonEmpty(); m = m.tail) {
  10.186 -                checkClashes(pos, l.head, m.head, site, sym);
  10.187 +    void checkOverrideClashes(DiagnosticPosition pos, Type site, MethodSymbol sym) {
  10.188 +         ClashFilter cf = new ClashFilter(site);
  10.189 +         //for each method m1 that is a member of 'site'...
  10.190 +         for (Scope.Entry e1 = types.membersClosure(site).lookup(sym.name, cf) ;
  10.191 +                e1.scope != null ; e1 = e1.next(cf)) {
  10.192 +            //...find another method m2 that is overridden (directly or indirectly)
  10.193 +            //by method 'sym' in 'site'
  10.194 +            for (Scope.Entry e2 = types.membersClosure(site).lookup(sym.name, cf) ;
  10.195 +                    e2.scope != null ; e2 = e2.next(cf)) {
  10.196 +                if (e1.sym == e2.sym || !sym.overrides(e2.sym, site.tsym, types, false)) continue;
  10.197 +                //if (i) the signature of 'sym' is not a subsignature of m1 (seen as
  10.198 +                //a member of 'site') and (ii) m1 has the same erasure as m2, issue an error
  10.199 +                if (!types.isSubSignature(sym.type, types.memberType(site, e1.sym)) &&
  10.200 +                        types.hasSameArgs(e1.sym.erasure(types), e2.sym.erasure(types))) {
  10.201 +                    sym.flags_field |= CLASH;
  10.202 +                    String key = e2.sym == sym ?
  10.203 +                            "name.clash.same.erasure.no.override" :
  10.204 +                            "name.clash.same.erasure.no.override.1";
  10.205 +                    log.error(pos,
  10.206 +                            key,
  10.207 +                            sym, sym.location(),
  10.208 +                            e1.sym, e1.sym.location(),
  10.209 +                            e2.sym, e2.sym.location());
  10.210 +                    return;
  10.211 +                }
  10.212              }
  10.213          }
  10.214      }
  10.215  
  10.216 -    /** Reports an error whenever 'sym' seen as a member of type 't1' clashes with
  10.217 -     *  some unrelated method defined in 't2'.
  10.218 +    /** Check that all static methods accessible from 'site' are
  10.219 +     *  mutually compatible (JLS 8.4.8).
  10.220 +     *
  10.221 +     *  @param pos  Position to be used for error reporting.
  10.222 +     *  @param site The class whose methods are checked.
  10.223 +     *  @param sym  The method symbol to be checked.
  10.224       */
  10.225 -    private void checkClashes(DiagnosticPosition pos, Type t1, Type t2, Type site, Symbol s1) {
  10.226 +    void checkHideClashes(DiagnosticPosition pos, Type site, MethodSymbol sym) {
  10.227          ClashFilter cf = new ClashFilter(site);
  10.228 -        s1 = ((MethodSymbol)s1).implementedIn(t1.tsym, types);
  10.229 -        if (s1 == null) return;
  10.230 -        Type st1 = types.memberType(site, s1);
  10.231 -        for (Scope.Entry e2 = t2.tsym.members().lookup(s1.name, cf); e2.scope != null; e2 = e2.next(cf)) {
  10.232 -            Symbol s2 = e2.sym;
  10.233 -            if (s1 == s2) continue;
  10.234 -            Type st2 = types.memberType(site, s2);
  10.235 -            if (!types.overrideEquivalent(st1, st2) &&
  10.236 -                    !checkNameClash((ClassSymbol)site.tsym, s1, s2)) {
  10.237 +        //for each method m1 that is a member of 'site'...
  10.238 +        for (Scope.Entry e = types.membersClosure(site).lookup(sym.name, cf) ;
  10.239 +                e.scope != null ; e = e.next(cf)) {
  10.240 +            //if (i) the signature of 'sym' is not a subsignature of m1 (seen as
  10.241 +            //a member of 'site') and (ii) 'sym' has the same erasure as m1, issue an error
  10.242 +            if (!types.isSubSignature(sym.type, types.memberType(site, e.sym)) &&
  10.243 +                    types.hasSameArgs(e.sym.erasure(types), sym.erasure(types))) {
  10.244                  log.error(pos,
  10.245 -                        "name.clash.same.erasure.no.override",
  10.246 -                        s1, s1.location(),
  10.247 -                        s2, s2.location());
  10.248 -            }
  10.249 -        }
  10.250 -    }
  10.251 -    //where
  10.252 -    private class ClashFilter implements Filter<Symbol> {
  10.253 +                        "name.clash.same.erasure.no.hide",
  10.254 +                        sym, sym.location(),
  10.255 +                        e.sym, e.sym.location());
  10.256 +                return;
  10.257 +             }
  10.258 +         }
  10.259 +     }
  10.260  
  10.261 -        Type site;
  10.262 +     //where
  10.263 +     private class ClashFilter implements Filter<Symbol> {
  10.264  
  10.265 -        ClashFilter(Type site) {
  10.266 -            this.site = site;
  10.267 -        }
  10.268 +         Type site;
  10.269  
  10.270 -        public boolean accepts(Symbol s) {
  10.271 -            return s.kind == MTH &&
  10.272 -                    (s.flags() & SYNTHETIC) == 0 &&
  10.273 -                    s.isInheritedIn(site.tsym, types) &&
  10.274 -                    !s.isConstructor();
  10.275 -        }
  10.276 -    }
  10.277 +         ClashFilter(Type site) {
  10.278 +             this.site = site;
  10.279 +         }
  10.280 +
  10.281 +         boolean shouldSkip(Symbol s) {
  10.282 +             return (s.flags() & CLASH) != 0 &&
  10.283 +                s.owner == site.tsym;
  10.284 +         }
  10.285 +
  10.286 +         public boolean accepts(Symbol s) {
  10.287 +             return s.kind == MTH &&
  10.288 +                     (s.flags() & SYNTHETIC) == 0 &&
  10.289 +                     !shouldSkip(s) &&
  10.290 +                     s.isInheritedIn(site.tsym, types) &&
  10.291 +                     !s.isConstructor();
  10.292 +         }
  10.293 +     }
  10.294  
  10.295      /** Report a conflict between a user symbol and a synthetic symbol.
  10.296       */
  10.297 @@ -2410,6 +2463,32 @@
  10.298          }
  10.299      }
  10.300  
  10.301 +    void checkDeprecated(final DiagnosticPosition pos, final Symbol other, final Symbol s) {
  10.302 +        if ((s.flags() & DEPRECATED) != 0 &&
  10.303 +                (other.flags() & DEPRECATED) == 0 &&
  10.304 +                s.outermostClass() != other.outermostClass()) {
  10.305 +            deferredLintHandler.report(new DeferredLintHandler.LintLogger() {
  10.306 +                @Override
  10.307 +                public void report() {
  10.308 +                    warnDeprecated(pos, s);
  10.309 +                }
  10.310 +            });
  10.311 +        };
  10.312 +    }
  10.313 +
  10.314 +    void checkSunAPI(final DiagnosticPosition pos, final Symbol s) {
  10.315 +        if ((s.flags() & PROPRIETARY) != 0) {
  10.316 +            deferredLintHandler.report(new DeferredLintHandler.LintLogger() {
  10.317 +                public void report() {
  10.318 +                    if (enableSunApiLintControl)
  10.319 +                      warnSunApi(pos, "sun.proprietary", s);
  10.320 +                    else
  10.321 +                      log.strictWarning(pos, "sun.proprietary", s);
  10.322 +                }
  10.323 +            });
  10.324 +        }
  10.325 +    }
  10.326 +
  10.327  /* *************************************************************************
  10.328   * Check for recursive annotation elements.
  10.329   **************************************************************************/
  10.330 @@ -2535,9 +2614,9 @@
  10.331                         Type right) {
  10.332          if (operator.opcode == ByteCodes.error) {
  10.333              log.error(pos,
  10.334 -                      "operator.cant.be.applied",
  10.335 +                      "operator.cant.be.applied.1",
  10.336                        treeinfo.operatorName(tag),
  10.337 -                      List.of(left, right));
  10.338 +                      left, right);
  10.339          }
  10.340          return operator.opcode;
  10.341      }
  10.342 @@ -2581,21 +2660,35 @@
  10.343          if (sym.owner.name == names.any) return false;
  10.344          for (Scope.Entry e = s.lookup(sym.name); e.scope == s; e = e.next()) {
  10.345              if (sym != e.sym &&
  10.346 -                sym.kind == e.sym.kind &&
  10.347 -                sym.name != names.error &&
  10.348 -                (sym.kind != MTH || types.hasSameArgs(types.erasure(sym.type), types.erasure(e.sym.type)))) {
  10.349 -                if ((sym.flags() & VARARGS) != (e.sym.flags() & VARARGS))
  10.350 +                    (e.sym.flags() & CLASH) == 0 &&
  10.351 +                    sym.kind == e.sym.kind &&
  10.352 +                    sym.name != names.error &&
  10.353 +                    (sym.kind != MTH || types.hasSameArgs(types.erasure(sym.type), types.erasure(e.sym.type)))) {
  10.354 +                if ((sym.flags() & VARARGS) != (e.sym.flags() & VARARGS)) {
  10.355                      varargsDuplicateError(pos, sym, e.sym);
  10.356 -                else if (sym.kind == MTH && !types.overrideEquivalent(sym.type, e.sym.type))
  10.357 +                    return true;
  10.358 +                } else if (sym.kind == MTH && !hasSameSignature(sym.type, e.sym.type)) {
  10.359                      duplicateErasureError(pos, sym, e.sym);
  10.360 -                else
  10.361 +                    sym.flags_field |= CLASH;
  10.362 +                    return true;
  10.363 +                } else {
  10.364                      duplicateError(pos, e.sym);
  10.365 -                return false;
  10.366 +                    return false;
  10.367 +                }
  10.368              }
  10.369          }
  10.370          return true;
  10.371      }
  10.372      //where
  10.373 +        boolean hasSameSignature(Type mt1, Type mt2) {
  10.374 +            if (mt1.tag == FORALL && mt2.tag == FORALL) {
  10.375 +                ForAll fa1 = (ForAll)mt1;
  10.376 +                ForAll fa2 = (ForAll)mt2;
  10.377 +                mt2 = types.subst(fa2, fa2.tvars, fa1.tvars);
  10.378 +            }
  10.379 +            return types.hasSameArgs(mt1.asMethodType(), mt2.asMethodType());
  10.380 +        }
  10.381 +
  10.382      /** Report duplicate declaration error.
  10.383       */
  10.384      void duplicateErasureError(DiagnosticPosition pos, Symbol sym1, Symbol sym2) {

    11.1 --- a/src/share/classes/com/sun/tools/javac/comp/Enter.java	Thu Feb 10 16:24:51 2011 -0800
    11.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Enter.java	Mon Feb 14 16:31:21 2011 -0800
    11.3 @@ -95,7 +95,6 @@
    11.4  
    11.5      Log log;
    11.6      Symtab syms;
    11.7 -    Scope.ScopeCounter scopeCounter;
    11.8      Check chk;
    11.9      TreeMaker make;
   11.10      ClassReader reader;
   11.11 @@ -123,7 +122,6 @@
   11.12          reader = ClassReader.instance(context);
   11.13          make = TreeMaker.instance(context);
   11.14          syms = Symtab.instance(context);
   11.15 -        scopeCounter = Scope.ScopeCounter.instance(context);
   11.16          chk = Check.instance(context);
   11.17          memberEnter = MemberEnter.instance(context);
   11.18          types = Types.instance(context);
   11.19 @@ -192,7 +190,7 @@
   11.20       */
   11.21      public Env<AttrContext> classEnv(JCClassDecl tree, Env<AttrContext> env) {
   11.22          Env<AttrContext> localEnv =
   11.23 -            env.dup(tree, env.info.dup(new Scope.ClassScope(tree.sym, scopeCounter)));
   11.24 +            env.dup(tree, env.info.dup(new Scope(tree.sym)));
   11.25          localEnv.enclClass = tree;
   11.26          localEnv.outer = env;
   11.27          localEnv.info.isSelfCall = false;
   11.28 @@ -328,7 +326,7 @@
   11.29              c.flatname = names.fromString(tree.packge + "." + name);
   11.30              c.sourcefile = tree.sourcefile;
   11.31              c.completer = null;
   11.32 -            c.members_field = new Scope.ClassScope(c, scopeCounter);
   11.33 +            c.members_field = new Scope(c);
   11.34              tree.packge.package_info = c;
   11.35          }
   11.36          classEnter(tree.defs, topEnv);
   11.37 @@ -396,7 +394,7 @@
   11.38          c.completer = memberEnter;
   11.39          c.flags_field = chk.checkFlags(tree.pos(), tree.mods.flags, c, tree);
   11.40          c.sourcefile = env.toplevel.sourcefile;
   11.41 -        c.members_field = new Scope.ClassScope(c, scopeCounter);
   11.42 +        c.members_field = new Scope(c);
   11.43  
   11.44          ClassType ct = (ClassType)c.type;
   11.45          if (owner.kind != PCK && (c.flags_field & STATIC) == 0) {

    12.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Feb 10 16:24:51 2011 -0800
    12.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Mon Feb 14 16:31:21 2011 -0800
    12.3 @@ -1,5 +1,5 @@
    12.4  /*
    12.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    12.6 + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
    12.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.8   *
    12.9   * This code is free software; you can redistribute it and/or modify it
   12.10 @@ -485,11 +485,8 @@
   12.11                  @Override
   12.12                  public Type inst(List<Type> inferred, Types types) throws NoInstanceException {
   12.13                      List<Type> formals = types.subst(mt2.argtypes, tvars, inferred);
   12.14 -                    if (!rs.argumentsAcceptable(capturedArgs, formals,
   12.15 -                           allowBoxing, useVarargs, warn)) {
   12.16 -                      // inferred method is not applicable
   12.17 -                      throw invalidInstanceException.setMessage("inferred.do.not.conform.to.params", formals, argtypes);
   12.18 -                    }
   12.19 +                    // check that actuals conform to inferred formals
   12.20 +                    checkArgumentsAcceptable(env, capturedArgs, formals, allowBoxing, useVarargs, warn);
   12.21                      // check that inferred bounds conform to their bounds
   12.22                      checkWithinBounds(all_tvars,
   12.23                             types.subst(inferredTypes, tvars, inferred), warn);
   12.24 @@ -500,17 +497,27 @@
   12.25              }};
   12.26              return mt2;
   12.27          }
   12.28 -        else if (!rs.argumentsAcceptable(capturedArgs, mt.getParameterTypes(), allowBoxing, useVarargs, warn)) {
   12.29 -            // inferred method is not applicable
   12.30 -            throw invalidInstanceException.setMessage("inferred.do.not.conform.to.params", mt.getParameterTypes(), argtypes);
   12.31 -        }
   12.32          else {
   12.33 +            // check that actuals conform to inferred formals
   12.34 +            checkArgumentsAcceptable(env, capturedArgs, mt.getParameterTypes(), allowBoxing, useVarargs, warn);
   12.35              // return instantiated version of method type
   12.36              return mt;
   12.37          }
   12.38      }
   12.39      //where
   12.40  
   12.41 +        private void checkArgumentsAcceptable(Env<AttrContext> env, List<Type> actuals, List<Type> formals,
   12.42 +                boolean allowBoxing, boolean useVarargs, Warner warn) {
   12.43 +            try {
   12.44 +                rs.checkRawArgumentsAcceptable(env, actuals, formals,
   12.45 +                       allowBoxing, useVarargs, warn);
   12.46 +            }
   12.47 +            catch (Resolve.InapplicableMethodException ex) {
   12.48 +                // inferred method is not applicable
   12.49 +                throw invalidInstanceException.setMessage(ex.getDiagnostic());
   12.50 +            }
   12.51 +        }
   12.52 +
   12.53          /** Try to instantiate argument type `that' to given type `to'.
   12.54           *  If this fails, try to insantiate `that' to `to' where
   12.55           *  every occurrence of a type variable in `tvars' is replaced

    13.1 --- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Feb 10 16:24:51 2011 -0800
    13.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Mon Feb 14 16:31:21 2011 -0800
    13.3 @@ -68,7 +68,6 @@
    13.4      private Names names;
    13.5      private Log log;
    13.6      private Symtab syms;
    13.7 -    private Scope.ScopeCounter scopeCounter;
    13.8      private Resolve rs;
    13.9      private Check chk;
   13.10      private Attr attr;
   13.11 @@ -91,7 +90,6 @@
   13.12          names = Names.instance(context);
   13.13          log = Log.instance(context);
   13.14          syms = Symtab.instance(context);
   13.15 -        scopeCounter = Scope.ScopeCounter.instance(context);
   13.16          rs = Resolve.instance(context);
   13.17          chk = Check.instance(context);
   13.18          attr = Attr.instance(context);
   13.19 @@ -571,7 +569,7 @@
   13.20          c.flatname = chk.localClassName(c);
   13.21          c.sourcefile = owner.sourcefile;
   13.22          c.completer = null;
   13.23 -        c.members_field = new Scope.ClassScope(c, scopeCounter);
   13.24 +        c.members_field = new Scope(c);
   13.25          c.flags_field = flags;
   13.26          ClassType ctype = (ClassType) c.type;
   13.27          ctype.supertype_field = syms.objectType;

    14.1 --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Thu Feb 10 16:24:51 2011 -0800
    14.2 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Mon Feb 14 16:31:21 2011 -0800
    14.3 @@ -67,7 +67,6 @@
    14.4      private final Check chk;
    14.5      private final Attr attr;
    14.6      private final Symtab syms;
    14.7 -    private final Scope.ScopeCounter scopeCounter;
    14.8      private final TreeMaker make;
    14.9      private final ClassReader reader;
   14.10      private final Todo todo;
   14.11 @@ -75,9 +74,9 @@
   14.12      private final Types types;
   14.13      private final JCDiagnostic.Factory diags;
   14.14      private final Target target;
   14.15 +    private final DeferredLintHandler deferredLintHandler;
   14.16  
   14.17      private final boolean skipAnnotations;
   14.18 -    private final boolean allowSimplifiedVarargs;
   14.19  
   14.20      public static MemberEnter instance(Context context) {
   14.21          MemberEnter instance = context.get(memberEnterKey);
   14.22 @@ -94,7 +93,6 @@
   14.23          chk = Check.instance(context);
   14.24          attr = Attr.instance(context);
   14.25          syms = Symtab.instance(context);
   14.26 -        scopeCounter = Scope.ScopeCounter.instance(context);
   14.27          make = TreeMaker.instance(context);
   14.28          reader = ClassReader.instance(context);
   14.29          todo = Todo.instance(context);
   14.30 @@ -102,10 +100,9 @@
   14.31          types = Types.instance(context);
   14.32          diags = JCDiagnostic.Factory.instance(context);
   14.33          target = Target.instance(context);
   14.34 +        deferredLintHandler = DeferredLintHandler.instance(context);
   14.35          Options options = Options.instance(context);
   14.36          skipAnnotations = options.isSet("skipAnnotations");
   14.37 -        Source source = Source.instance(context);
   14.38 -        allowSimplifiedVarargs = source.allowSimplifiedVarargs();
   14.39      }
   14.40  
   14.41      /** A queue for classes whose members still need to be entered into the
   14.42 @@ -571,10 +568,16 @@
   14.43          tree.sym = m;
   14.44          Env<AttrContext> localEnv = methodEnv(tree, env);
   14.45  
   14.46 -        // Compute the method type
   14.47 -        m.type = signature(tree.typarams, tree.params,
   14.48 -                           tree.restype, tree.thrown,
   14.49 -                           localEnv);
   14.50 +        DeferredLintHandler prevLintHandler =
   14.51 +                chk.setDeferredLintHandler(deferredLintHandler.setPos(tree.pos()));
   14.52 +        try {
   14.53 +            // Compute the method type
   14.54 +            m.type = signature(tree.typarams, tree.params,
   14.55 +                               tree.restype, tree.thrown,
   14.56 +                               localEnv);
   14.57 +        } finally {
   14.58 +            chk.setDeferredLintHandler(prevLintHandler);
   14.59 +        }
   14.60  
   14.61          // Set m.params
   14.62          ListBuffer<VarSymbol> params = new ListBuffer<VarSymbol>();
   14.63 @@ -618,7 +621,14 @@
   14.64              localEnv = env.dup(tree, env.info.dup());
   14.65              localEnv.info.staticLevel++;
   14.66          }
   14.67 -        attr.attribType(tree.vartype, localEnv);
   14.68 +        DeferredLintHandler prevLintHandler =
   14.69 +                chk.setDeferredLintHandler(deferredLintHandler.setPos(tree.pos()));
   14.70 +        try {
   14.71 +            attr.attribType(tree.vartype, localEnv);
   14.72 +        } finally {
   14.73 +            chk.setDeferredLintHandler(prevLintHandler);
   14.74 +        }
   14.75 +
   14.76          if ((tree.mods.flags & VARARGS) != 0) {
   14.77              //if we are entering a varargs parameter, we need to replace its type
   14.78              //(a plain array type) with the more precise VarargsType --- we need
   14.79 @@ -637,7 +647,7 @@
   14.80              if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
   14.81                  Env<AttrContext> initEnv = getInitEnv(tree, env);
   14.82                  initEnv.info.enclVar = v;
   14.83 -                v.setLazyConstValue(initEnv(tree, initEnv), log, attr, tree.init);
   14.84 +                v.setLazyConstValue(initEnv(tree, initEnv), attr, tree.init);
   14.85              }
   14.86          }
   14.87          if (chk.checkUnique(tree.pos(), v, enclScope)) {
   14.88 @@ -775,10 +785,11 @@
   14.89                  && s.owner.kind != MTH
   14.90                  && types.isSameType(c.type, syms.deprecatedType))
   14.91                  s.flags_field |= Flags.DEPRECATED;
   14.92 -            // Internally to java.dyn, a @PolymorphicSignature annotation
   14.93 +            // Internally to java.lang.invoke, a @PolymorphicSignature annotation
   14.94              // acts like a classfile attribute.
   14.95              if (!c.type.isErroneous() &&
   14.96 -                    types.isSameType(c.type, syms.polymorphicSignatureType)) {
   14.97 +                    (types.isSameType(c.type, syms.polymorphicSignatureType) ||
   14.98 +                     types.isSameType(c.type, syms.transientPolymorphicSignatureType))) {
   14.99                  if (!target.hasMethodHandles()) {
  14.100                      // Somebody is compiling JDK7 source code to a JDK6 target.
  14.101                      // Make it an error, since it is unlikely but important.
  14.102 @@ -1010,7 +1021,7 @@
  14.103      }
  14.104  
  14.105      private Env<AttrContext> baseEnv(JCClassDecl tree, Env<AttrContext> env) {
  14.106 -        Scope baseScope = new Scope.ClassScope(tree.sym, scopeCounter);
  14.107 +        Scope baseScope = new Scope(tree.sym);
  14.108          //import already entered local classes into base scope
  14.109          for (Scope.Entry e = env.outer.info.scope.elems ; e != null ; e = e.sibling) {
  14.110              if (e.sym.isLocal()) {

    15.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Feb 10 16:24:51 2011 -0800
    15.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Feb 14 16:31:21 2011 -0800
    15.3 @@ -278,7 +278,7 @@
    15.4              return true;
    15.5          else {
    15.6              Symbol s2 = ((MethodSymbol)sym).implementation(site.tsym, types, true);
    15.7 -            return (s2 == null || s2 == sym ||
    15.8 +            return (s2 == null || s2 == sym || sym.owner == s2.owner ||
    15.9                      s2.isPolymorphicSignatureGeneric() ||
   15.10                      !types.isSubSignature(types.memberType(site, s2), types.memberType(site, sym)));
   15.11          }
   15.12 @@ -331,7 +331,7 @@
   15.13          throws Infer.InferenceException {
   15.14          boolean polymorphicSignature = m.isPolymorphicSignatureGeneric() && allowMethodHandles;
   15.15          if (useVarargs && (m.flags() & VARARGS) == 0)
   15.16 -            throw inapplicableMethodException.setMessage(null);
   15.17 +            throw inapplicableMethodException.setMessage();
   15.18          Type mt = types.memberType(site, m);
   15.19  
   15.20          // tvars is the list of formal type variables for which type arguments
   15.21 @@ -386,7 +386,7 @@
   15.22                                      useVarargs,
   15.23                                      warn);
   15.24  
   15.25 -        checkRawArgumentsAcceptable(argtypes, mt.getParameterTypes(),
   15.26 +        checkRawArgumentsAcceptable(env, argtypes, mt.getParameterTypes(),
   15.27                                  allowBoxing, useVarargs, warn);
   15.28          return mt;
   15.29      }
   15.30 @@ -411,19 +411,21 @@
   15.31  
   15.32      /** Check if a parameter list accepts a list of args.
   15.33       */
   15.34 -    boolean argumentsAcceptable(List<Type> argtypes,
   15.35 +    boolean argumentsAcceptable(Env<AttrContext> env,
   15.36 +                                List<Type> argtypes,
   15.37                                  List<Type> formals,
   15.38                                  boolean allowBoxing,
   15.39                                  boolean useVarargs,
   15.40                                  Warner warn) {
   15.41          try {
   15.42 -            checkRawArgumentsAcceptable(argtypes, formals, allowBoxing, useVarargs, warn);
   15.43 +            checkRawArgumentsAcceptable(env, argtypes, formals, allowBoxing, useVarargs, warn);
   15.44              return true;
   15.45          } catch (InapplicableMethodException ex) {
   15.46              return false;
   15.47          }
   15.48      }
   15.49 -    void checkRawArgumentsAcceptable(List<Type> argtypes,
   15.50 +    void checkRawArgumentsAcceptable(Env<AttrContext> env,
   15.51 +                                List<Type> argtypes,
   15.52                                  List<Type> formals,
   15.53                                  boolean allowBoxing,
   15.54                                  boolean useVarargs,
   15.55 @@ -460,6 +462,14 @@
   15.56                              elt);
   15.57                  argtypes = argtypes.tail;
   15.58              }
   15.59 +            //check varargs element type accessibility
   15.60 +            if (!isAccessible(env, elt)) {
   15.61 +                Symbol location = env.enclClass.sym;
   15.62 +                throw inapplicableMethodException.setMessage("inaccessible.varargs.type",
   15.63 +                            elt,
   15.64 +                            Kinds.kindName(location),
   15.65 +                            location);
   15.66 +            }
   15.67          }
   15.68          return;
   15.69      }
   15.70 @@ -474,6 +484,10 @@
   15.71                  this.diagnostic = null;
   15.72                  this.diags = diags;
   15.73              }
   15.74 +            InapplicableMethodException setMessage() {
   15.75 +                this.diagnostic = null;
   15.76 +                return this;
   15.77 +            }
   15.78              InapplicableMethodException setMessage(String key) {
   15.79                  this.diagnostic = key != null ? diags.fragment(key) : null;
   15.80                  return this;
   15.81 @@ -482,6 +496,10 @@
   15.82                  this.diagnostic = key != null ? diags.fragment(key, args) : null;
   15.83                  return this;
   15.84              }
   15.85 +            InapplicableMethodException setMessage(JCDiagnostic diag) {
   15.86 +                this.diagnostic = diag;
   15.87 +                return this;
   15.88 +            }
   15.89  
   15.90              public JCDiagnostic getDiagnostic() {
   15.91                  return diagnostic;
   15.92 @@ -712,13 +730,14 @@
   15.93                  Type mt1 = types.memberType(site, m1);
   15.94                  Type mt2 = types.memberType(site, m2);
   15.95                  if (!types.overrideEquivalent(mt1, mt2))
   15.96 -                    return new AmbiguityError(m1, m2);
   15.97 +                    return ambiguityError(m1, m2);
   15.98 +
   15.99                  // same signature; select (a) the non-bridge method, or
  15.100                  // (b) the one that overrides the other, or (c) the concrete
  15.101                  // one, or (d) merge both abstract signatures
  15.102 -                if ((m1.flags() & BRIDGE) != (m2.flags() & BRIDGE)) {
  15.103 +                if ((m1.flags() & BRIDGE) != (m2.flags() & BRIDGE))
  15.104                      return ((m1.flags() & BRIDGE) != 0) ? m2 : m1;
  15.105 -                }
  15.106 +
  15.107                  // if one overrides or hides the other, use it
  15.108                  TypeSymbol m1Owner = (TypeSymbol)m1.owner;
  15.109                  TypeSymbol m2Owner = (TypeSymbol)m2.owner;
  15.110 @@ -738,24 +757,24 @@
  15.111                  if (m2Abstract && !m1Abstract) return m1;
  15.112                  // both abstract or both concrete
  15.113                  if (!m1Abstract && !m2Abstract)
  15.114 -                    return new AmbiguityError(m1, m2);
  15.115 +                    return ambiguityError(m1, m2);
  15.116                  // check that both signatures have the same erasure
  15.117                  if (!types.isSameTypes(m1.erasure(types).getParameterTypes(),
  15.118                                         m2.erasure(types).getParameterTypes()))
  15.119 -                    return new AmbiguityError(m1, m2);
  15.120 +                    return ambiguityError(m1, m2);
  15.121                  // both abstract, neither overridden; merge throws clause and result type
  15.122                  Symbol mostSpecific;
  15.123                  Type result2 = mt2.getReturnType();
  15.124                  if (mt2.tag == FORALL)
  15.125                      result2 = types.subst(result2, ((ForAll)mt2).tvars, ((ForAll)mt1).tvars);
  15.126 -                if (types.isSubtype(mt1.getReturnType(), result2)) {
  15.127 +                if (types.isSubtype(mt1.getReturnType(), result2))
  15.128                      mostSpecific = m1;
  15.129 -                } else if (types.isSubtype(result2, mt1.getReturnType())) {
  15.130 +                else if (types.isSubtype(result2, mt1.getReturnType()))
  15.131                      mostSpecific = m2;
  15.132 -                } else {
  15.133 +                else {
  15.134                      // Theoretically, this can't happen, but it is possible
  15.135                      // due to error recovery or mixing incompatible class files
  15.136 -                    return new AmbiguityError(m1, m2);
  15.137 +                    return ambiguityError(m1, m2);
  15.138                  }
  15.139                  MethodSymbol result = new MethodSymbol(
  15.140                          mostSpecific.flags(),
  15.141 @@ -777,7 +796,7 @@
  15.142              }
  15.143              if (m1SignatureMoreSpecific) return m1;
  15.144              if (m2SignatureMoreSpecific) return m2;
  15.145 -            return new AmbiguityError(m1, m2);
  15.146 +            return ambiguityError(m1, m2);
  15.147          case AMBIGUOUS:
  15.148              AmbiguityError e = (AmbiguityError)m2;
  15.149              Symbol err1 = mostSpecific(m1, e.sym, env, site, allowBoxing, useVarargs);
  15.150 @@ -787,9 +806,9 @@
  15.151              if (err1 instanceof AmbiguityError &&
  15.152                  err2 instanceof AmbiguityError &&
  15.153                  ((AmbiguityError)err1).sym == ((AmbiguityError)err2).sym)
  15.154 -                return new AmbiguityError(m1, m2);
  15.155 +                return ambiguityError(m1, m2);
  15.156              else
  15.157 -                return new AmbiguityError(err1, err2);
  15.158 +                return ambiguityError(err1, err2);
  15.159          default:
  15.160              throw new AssertionError();
  15.161          }
  15.162 @@ -844,6 +863,14 @@
  15.163              return to;
  15.164          }
  15.165      }
  15.166 +    //where
  15.167 +    Symbol ambiguityError(Symbol m1, Symbol m2) {
  15.168 +        if (((m1.flags() | m2.flags()) & CLASH) != 0) {
  15.169 +            return (m1.flags() & CLASH) == 0 ? m1 : m2;
  15.170 +        } else {
  15.171 +            return new AmbiguityError(m1, m2);
  15.172 +        }
  15.173 +    }
  15.174  
  15.175      /** Find best qualified method matching given name, type and value
  15.176       *  arguments.
  15.177 @@ -1611,10 +1638,7 @@
  15.178                                  names.init, argtypes,
  15.179                                  typeargtypes, allowBoxing,
  15.180                                  useVarargs, false);
  15.181 -        if ((sym.flags() & DEPRECATED) != 0 &&
  15.182 -            (env.info.scope.owner.flags() & DEPRECATED) == 0 &&
  15.183 -            env.info.scope.owner.outermostClass() != sym.outermostClass())
  15.184 -            chk.warnDeprecated(pos, sym);
  15.185 +        chk.checkDeprecated(pos, env.info.scope.owner, sym);
  15.186          return sym;
  15.187      }
  15.188  
  15.189 @@ -1928,6 +1952,9 @@
  15.190                          key, name, first, second);
  15.191              }
  15.192              boolean hasLocation = false;
  15.193 +            if (location == null) {
  15.194 +                location = site.tsym;
  15.195 +            }
  15.196              if (!location.name.isEmpty()) {
  15.197                  if (location.kind == PCK && !site.tsym.exists()) {
  15.198                      return diags.create(dkind, log.currentSource(), pos,
  15.199 @@ -1945,7 +1972,7 @@
  15.200                  return diags.create(dkind, log.currentSource(), pos,
  15.201                          errKey, kindname, idname, //symbol kindname, name
  15.202                          typeargtypes, argtypes, //type parameters and arguments (if any)
  15.203 -                        getLocationDiag(location)); //location kindname, type
  15.204 +                        getLocationDiag(location, site)); //location kindname, type
  15.205              }
  15.206              else {
  15.207                  return diags.create(dkind, log.currentSource(), pos,
  15.208 @@ -1966,15 +1993,18 @@
  15.209              }
  15.210              return key + suffix;
  15.211          }
  15.212 -        private JCDiagnostic getLocationDiag(Symbol location) {
  15.213 -            boolean isVar = location.kind == VAR;
  15.214 -            String key = isVar ?
  15.215 -                "location.1" :
  15.216 -                "location";
  15.217 -            return diags.fragment(key,
  15.218 +        private JCDiagnostic getLocationDiag(Symbol location, Type site) {
  15.219 +            if (location.kind == VAR) {
  15.220 +                return diags.fragment("location.1",
  15.221                      kindName(location),
  15.222                      location,
  15.223 -                    isVar ? location.type : null);
  15.224 +                    location.type);
  15.225 +            } else {
  15.226 +                return diags.fragment("location",
  15.227 +                    typeKindName(site),
  15.228 +                    site,
  15.229 +                    null);
  15.230 +            }
  15.231          }
  15.232      }
  15.233  
  15.234 @@ -2025,8 +2055,14 @@
  15.235                  return null;
  15.236  
  15.237              if (isOperator(name)) {
  15.238 -                return diags.create(dkind, log.currentSource(),
  15.239 -                        pos, "operator.cant.be.applied", name, argtypes);
  15.240 +                boolean isUnaryOp = argtypes.size() == 1;
  15.241 +                String key = argtypes.size() == 1 ?
  15.242 +                    "operator.cant.be.applied" :
  15.243 +                    "operator.cant.be.applied.1";
  15.244 +                Type first = argtypes.head;
  15.245 +                Type second = !isUnaryOp ? argtypes.tail.head : null;
  15.246 +                return diags.create(dkind, log.currentSource(), pos,
  15.247 +                        key, name, first, second);
  15.248              }
  15.249              else {
  15.250                  Symbol ws = sym.asMemberOf(site, types);

    16.1 --- a/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java	Thu Feb 10 16:24:51 2011 -0800
    16.2 +++ b/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java	Mon Feb 14 16:31:21 2011 -0800
    16.3 @@ -1,5 +1,5 @@
    16.4  /*
    16.5 - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    16.6 + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    16.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.8   *
    16.9   * This code is free software; you can redistribute it and/or modify it
   16.10 @@ -28,10 +28,10 @@
   16.11  import java.io.File;
   16.12  import java.io.IOException;
   16.13  import java.util.List;
   16.14 +import java.util.Map;
   16.15 +import java.util.concurrent.ConcurrentHashMap;
   16.16  
   16.17  import com.sun.tools.javac.util.Context;
   16.18 -import java.util.Map;
   16.19 -import java.util.concurrent.ConcurrentHashMap;
   16.20  
   16.21  /**
   16.22   * Caching implementation of FSInfo.

    17.1 --- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Thu Feb 10 16:24:51 2011 -0800
    17.2 +++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Mon Feb 14 16:31:21 2011 -0800
    17.3 @@ -76,8 +76,6 @@
    17.4   */
    17.5  public class JavacFileManager extends BaseFileManager implements StandardJavaFileManager {
    17.6  
    17.7 -    boolean useZipFileIndex;
    17.8 -
    17.9      public static char[] toArray(CharBuffer buffer) {
   17.10          if (buffer.hasArray())
   17.11              return ((CharBuffer)buffer.compact().flip()).array();
   17.12 @@ -91,6 +89,9 @@
   17.13  
   17.14      private FSInfo fsInfo;
   17.15  
   17.16 +    private boolean useZipFileIndex;
   17.17 +    private ZipFileIndexCache zipFileIndexCache;
   17.18 +
   17.19      private final File uninited = new File("U N I N I T E D");
   17.20  
   17.21      private final Set<JavaFileObject.Kind> sourceOrClass =
   17.22 @@ -163,7 +164,11 @@
   17.23  
   17.24          fsInfo = FSInfo.instance(context);
   17.25  
   17.26 -        useZipFileIndex = System.getProperty("useJavaUtilZip") == null;// TODO: options.get("useJavaUtilZip") == null;
   17.27 +        // retain check for system property for compatibility
   17.28 +        useZipFileIndex = options.isUnset("useJavaUtilZip")
   17.29 +                && System.getProperty("useJavaUtilZip") == null;
   17.30 +        if (useZipFileIndex)
   17.31 +            zipFileIndexCache = ZipFileIndexCache.getSharedInstance();
   17.32  
   17.33          mmappedIO = options.isSet("mmappedIO");
   17.34          ignoreSymbolFile = options.isSet("ignore.symbol.file");
   17.35 @@ -526,7 +531,7 @@
   17.36                      archive = new ZipArchive(this, zdir);
   17.37                  } else {
   17.38                      archive = new ZipFileIndexArchive(this,
   17.39 -                                ZipFileIndex.getZipFileIndex(zipFileName,
   17.40 +                                zipFileIndexCache.getZipFileIndex(zipFileName,
   17.41                                      null,
   17.42                                      usePreindexedCache,
   17.43                                      preindexCacheLocation,
   17.44 @@ -538,7 +543,7 @@
   17.45                  }
   17.46                  else {
   17.47                      archive = new ZipFileIndexArchive(this,
   17.48 -                                ZipFileIndex.getZipFileIndex(zipFileName,
   17.49 +                                zipFileIndexCache.getZipFileIndex(zipFileName,
   17.50                                      symbolFilePrefix,
   17.51                                      usePreindexedCache,
   17.52                                      preindexCacheLocation,

    18.1 --- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Thu Feb 10 16:24:51 2011 -0800
    18.2 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Mon Feb 14 16:31:21 2011 -0800
    18.3 @@ -1,5 +1,5 @@
    18.4  /*
    18.5 - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
    18.6 + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
    18.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.8   *
    18.9   * This code is free software; you can redistribute it and/or modify it
   18.10 @@ -38,11 +38,9 @@
   18.11  import java.util.Collections;
   18.12  import java.util.HashMap;
   18.13  import java.util.HashSet;
   18.14 -import java.util.Iterator;
   18.15  import java.util.List;
   18.16  import java.util.Map;
   18.17  import java.util.Set;
   18.18 -import java.util.concurrent.locks.ReentrantLock;
   18.19  import java.util.zip.DataFormatException;
   18.20  import java.util.zip.Inflater;
   18.21  import java.util.zip.ZipException;
   18.22 @@ -50,24 +48,28 @@
   18.23  import com.sun.tools.javac.file.RelativePath.RelativeDirectory;
   18.24  import com.sun.tools.javac.file.RelativePath.RelativeFile;
   18.25  
   18.26 -/** This class implements building of index of a zip archive and access to it's context.
   18.27 - *  It also uses prebuild index if available. It supports invocations where it will
   18.28 - *  serialize an optimized zip index file to disk.
   18.29 +/**
   18.30 + * This class implements the building of index of a zip archive and access to
   18.31 + * its context. It also uses a prebuilt index if available.
   18.32 + * It supports invocations where it will serialize an optimized zip index file
   18.33 + * to disk.
   18.34   *
   18.35 - *  In oreder to use secondary index file make sure the option "usezipindex" is in the Options object,
   18.36 - *  when JavacFileManager is invoked. (You can pass "-XDusezipindex" on the command line.
   18.37 + * In order to use a secondary index file, set "usezipindex" in the Options
   18.38 + * object when JavacFileManager is invoked. (You can pass "-XDusezipindex" on
   18.39 + * the command line.)
   18.40   *
   18.41 - *  Location where to look for/generate optimized zip index files can be provided using
   18.42 - *  "-XDcachezipindexdir=<directory>". If this flag is not provided, the dfault location is
   18.43 - *  the value of the "java.io.tmpdir" system property.
   18.44 + * Location where to look for/generate optimized zip index files can be
   18.45 + * provided using "-XDcachezipindexdir=<directory>". If this flag is not
   18.46 + * provided, the default location is the value of the "java.io.tmpdir" system
   18.47 + * property.
   18.48   *
   18.49 - *  If key "-XDwritezipindexfiles" is specified, there will be new optimized index file
   18.50 - *  created for each archive, used by the compiler for compilation, at location,
   18.51 - *  specified by "cachezipindexdir" option.
   18.52 + * If "-XDwritezipindexfiles" is specified, there will be new optimized index
   18.53 + * file created for each archive, used by the compiler for compilation, at the
   18.54 + * location specified by the "cachezipindexdir" option.
   18.55   *
   18.56 - * If nonBatchMode option is specified (-XDnonBatchMode) the compiler will use timestamp
   18.57 - * checking to reindex the zip files if it is needed. In batch mode the timestamps are not checked
   18.58 - * and the compiler uses the cached indexes.
   18.59 + * If system property nonBatchMode option is specified the compiler will use
   18.60 + * timestamp checking to reindex the zip files if it is needed. In batch mode
   18.61 + * the timestamps are not checked and the compiler uses the cached indexes.
   18.62   *
   18.63   * <p><b>This is NOT part of any supported API.
   18.64   * If you write code that depends on this, you do so at your own risk.
   18.65 @@ -80,18 +82,18 @@
   18.66  
   18.67      public final static long NOT_MODIFIED = Long.MIN_VALUE;
   18.68  
   18.69 -    private static Map<File, ZipFileIndex> zipFileIndexCache = new HashMap<File, ZipFileIndex>();
   18.70 -    private static ReentrantLock lock = new ReentrantLock();
   18.71  
   18.72      private static boolean NON_BATCH_MODE = System.getProperty("nonBatchMode") != null;// TODO: Use -XD compiler switch for this.
   18.73  
   18.74 -    private Map<RelativeDirectory, DirectoryEntry> directories = Collections.<RelativeDirectory, DirectoryEntry>emptyMap();
   18.75 -    private Set<RelativeDirectory> allDirs = Collections.<RelativeDirectory>emptySet();
   18.76 +    private Map<RelativeDirectory, DirectoryEntry> directories =
   18.77 +            Collections.<RelativeDirectory, DirectoryEntry>emptyMap();
   18.78 +    private Set<RelativeDirectory> allDirs =
   18.79 +            Collections.<RelativeDirectory>emptySet();
   18.80  
   18.81      // ZipFileIndex data entries
   18.82 -    private File zipFile;
   18.83 +    final File zipFile;
   18.84      private Reference<File> absFileRef;
   18.85 -    private long zipFileLastModified = NOT_MODIFIED;
   18.86 +    long zipFileLastModified = NOT_MODIFIED;
   18.87      private RandomAccessFile zipRandomFile;
   18.88      private Entry[] entries;
   18.89  
   18.90 @@ -99,156 +101,24 @@
   18.91      private File zipIndexFile = null;
   18.92      private boolean triedToReadIndex = false;
   18.93      final RelativeDirectory symbolFilePrefix;
   18.94 -    private int symbolFilePrefixLength = 0;
   18.95 +    private final int symbolFilePrefixLength;
   18.96      private boolean hasPopulatedData = false;
   18.97 -    private long lastReferenceTimeStamp = NOT_MODIFIED;
   18.98 +    long lastReferenceTimeStamp = NOT_MODIFIED;
   18.99  
  18.100 -    private boolean usePreindexedCache = false;
  18.101 -    private String preindexedCacheLocation = null;
  18.102 +    private final boolean usePreindexedCache;
  18.103 +    private final String preindexedCacheLocation;
  18.104  
  18.105      private boolean writeIndex = false;
  18.106  
  18.107 -    private Map <String, SoftReference<RelativeDirectory>> relativeDirectoryCache =
  18.108 +    private Map<String, SoftReference<RelativeDirectory>> relativeDirectoryCache =
  18.109              new HashMap<String, SoftReference<RelativeDirectory>>();
  18.110  
  18.111 -    /**
  18.112 -     * Returns a list of all ZipFileIndex entries
  18.113 -     *
  18.114 -     * @return A list of ZipFileIndex entries, or an empty list
  18.115 -     */
  18.116 -    public static List<ZipFileIndex> getZipFileIndexes() {
  18.117 -        return getZipFileIndexes(false);
  18.118 +
  18.119 +    public synchronized boolean isOpen() {
  18.120 +        return (zipRandomFile != null);
  18.121      }
  18.122  
  18.123 -    /**
  18.124 -     * Returns a list of all ZipFileIndex entries
  18.125 -     *
  18.126 -     * @param openedOnly If true it returns a list of only opened ZipFileIndex entries, otherwise
  18.127 -     *                   all ZipFileEntry(s) are included into the list.
  18.128 -     * @return A list of ZipFileIndex entries, or an empty list
  18.129 -     */
  18.130 -    public static List<ZipFileIndex> getZipFileIndexes(boolean openedOnly) {
  18.131 -        List<ZipFileIndex> zipFileIndexes = new ArrayList<ZipFileIndex>();
  18.132 -        lock.lock();
  18.133 -        try {
  18.134 -            zipFileIndexes.addAll(zipFileIndexCache.values());
  18.135 -
  18.136 -            if (openedOnly) {
  18.137 -                for(ZipFileIndex elem : zipFileIndexes) {
  18.138 -                    if (!elem.isOpen()) {
  18.139 -                        zipFileIndexes.remove(elem);
  18.140 -                    }
  18.141 -                }
  18.142 -            }
  18.143 -        }
  18.144 -        finally {
  18.145 -            lock.unlock();
  18.146 -        }
  18.147 -        return zipFileIndexes;
  18.148 -    }
  18.149 -
  18.150 -    public boolean isOpen() {
  18.151 -        lock.lock();
  18.152 -        try {
  18.153 -            return zipRandomFile != null;
  18.154 -        }
  18.155 -        finally {
  18.156 -            lock.unlock();
  18.157 -        }
  18.158 -    }
  18.159 -
  18.160 -    public static ZipFileIndex getZipFileIndex(File zipFile,
  18.161 -            RelativeDirectory symbolFilePrefix,
  18.162 -            boolean useCache, String cacheLocation,
  18.163 -            boolean writeIndex) throws IOException {
  18.164 -        ZipFileIndex zi = null;
  18.165 -        lock.lock();
  18.166 -        try {
  18.167 -            zi = getExistingZipIndex(zipFile);
  18.168 -
  18.169 -            if (zi == null || (zi != null && zipFile.lastModified() != zi.zipFileLastModified)) {
  18.170 -                zi = new ZipFileIndex(zipFile, symbolFilePrefix, writeIndex,
  18.171 -                        useCache, cacheLocation);
  18.172 -                zipFileIndexCache.put(zipFile, zi);
  18.173 -            }
  18.174 -        }
  18.175 -        finally {
  18.176 -            lock.unlock();
  18.177 -        }
  18.178 -        return zi;
  18.179 -    }
  18.180 -
  18.181 -    public static ZipFileIndex getExistingZipIndex(File zipFile) {
  18.182 -        lock.lock();
  18.183 -        try {
  18.184 -            return zipFileIndexCache.get(zipFile);
  18.185 -        }
  18.186 -        finally {
  18.187 -            lock.unlock();
  18.188 -        }
  18.189 -    }
  18.190 -
  18.191 -    public static void clearCache() {
  18.192 -        lock.lock();
  18.193 -        try {
  18.194 -            zipFileIndexCache.clear();
  18.195 -        }
  18.196 -        finally {
  18.197 -            lock.unlock();
  18.198 -        }
  18.199 -    }
  18.200 -
  18.201 -    public static void clearCache(long timeNotUsed) {
  18.202 -        lock.lock();
  18.203 -        try {
  18.204 -            Iterator<File> cachedFileIterator = zipFileIndexCache.keySet().iterator();
  18.205 -            while (cachedFileIterator.hasNext()) {
  18.206 -                File cachedFile = cachedFileIterator.next();
  18.207 -                ZipFileIndex cachedZipIndex = zipFileIndexCache.get(cachedFile);
  18.208 -                if (cachedZipIndex != null) {
  18.209 -                    long timeToTest = cachedZipIndex.lastReferenceTimeStamp + timeNotUsed;
  18.210 -                    if (timeToTest < cachedZipIndex.lastReferenceTimeStamp || // Overflow...
  18.211 -                            System.currentTimeMillis() > timeToTest) {
  18.212 -                        zipFileIndexCache.remove(cachedFile);
  18.213 -                    }
  18.214 -                }
  18.215 -            }
  18.216 -        }
  18.217 -        finally {
  18.218 -            lock.unlock();
  18.219 -        }
  18.220 -    }
  18.221 -
  18.222 -    public static void removeFromCache(File file) {
  18.223 -        lock.lock();
  18.224 -        try {
  18.225 -            zipFileIndexCache.remove(file);
  18.226 -        }
  18.227 -        finally {
  18.228 -            lock.unlock();
  18.229 -        }
  18.230 -    }
  18.231 -
  18.232 -    /** Sets already opened list of ZipFileIndexes from an outside client
  18.233 -      * of the compiler. This functionality should be used in a non-batch clients of the compiler.
  18.234 -      */
  18.235 -    public static void setOpenedIndexes(List<ZipFileIndex>indexes) throws IllegalStateException {
  18.236 -        lock.lock();
  18.237 -        try {
  18.238 -            if (zipFileIndexCache.isEmpty()) {
  18.239 -                throw new IllegalStateException("Setting opened indexes should be called only when the ZipFileCache is empty. Call JavacFileManager.flush() before calling this method.");
  18.240 -            }
  18.241 -
  18.242 -            for (ZipFileIndex zfi : indexes) {
  18.243 -                zipFileIndexCache.put(zfi.zipFile, zfi);
  18.244 -            }
  18.245 -        }
  18.246 -        finally {
  18.247 -            lock.unlock();
  18.248 -        }
  18.249 -    }
  18.250 -
  18.251 -    private ZipFileIndex(File zipFile, RelativeDirectory symbolFilePrefix, boolean writeIndex,
  18.252 +    ZipFileIndex(File zipFile, RelativeDirectory symbolFilePrefix, boolean writeIndex,
  18.253              boolean useCache, String cacheLocation) throws IOException {
  18.254          this.zipFile = zipFile;
  18.255          this.symbolFilePrefix = symbolFilePrefix;
  18.256 @@ -266,19 +136,22 @@
  18.257          checkIndex();
  18.258      }
  18.259  
  18.260 +    @Override
  18.261      public String toString() {
  18.262          return "ZipFileIndex[" + zipFile + "]";
  18.263      }
  18.264  
  18.265      // Just in case...
  18.266 -    protected void finalize() {
  18.267 +    @Override
  18.268 +    protected void finalize() throws Throwable {
  18.269          closeFile();
  18.270 +        super.finalize();
  18.271      }
  18.272  
  18.273      private boolean isUpToDate() {
  18.274 -        if (zipFile != null &&
  18.275 -                ((!NON_BATCH_MODE) || zipFileLastModified == zipFile.lastModified()) &&
  18.276 -                hasPopulatedData) {
  18.277 +        if (zipFile != null
  18.278 +                && ((!NON_BATCH_MODE) || zipFileLastModified == zipFile.lastModified())
  18.279 +                && hasPopulatedData) {
  18.280              return true;
  18.281          }
  18.282  
  18.283 @@ -339,15 +212,9 @@
  18.284          allDirs = Collections.<RelativeDirectory>emptySet();
  18.285      }
  18.286  
  18.287 -    public void close() {
  18.288 -        lock.lock();
  18.289 -        try {
  18.290 -            writeIndex();
  18.291 -            closeFile();
  18.292 -        }
  18.293 -        finally {
  18.294 -            lock.unlock();
  18.295 -        }
  18.296 +    public synchronized void close() {
  18.297 +        writeIndex();
  18.298 +        closeFile();
  18.299      }
  18.300  
  18.301      private void closeFile() {
  18.302 @@ -361,29 +228,24 @@
  18.303      }
  18.304  
  18.305      /**
  18.306 -     * Returns the ZipFileIndexEntry for an absolute path, if there is one.
  18.307 +     * Returns the ZipFileIndexEntry for a path, if there is one.
  18.308       */
  18.309 -    Entry getZipIndexEntry(RelativePath path) {
  18.310 -        lock.lock();
  18.311 +    synchronized Entry getZipIndexEntry(RelativePath path) {
  18.312          try {
  18.313              checkIndex();
  18.314              DirectoryEntry de = directories.get(path.dirname());
  18.315              String lookFor = path.basename();
  18.316 -            return de == null ? null : de.getEntry(lookFor);
  18.317 +            return (de == null) ? null : de.getEntry(lookFor);
  18.318          }
  18.319          catch (IOException e) {
  18.320              return null;
  18.321          }
  18.322 -        finally {
  18.323 -            lock.unlock();
  18.324 -        }
  18.325      }
  18.326  
  18.327      /**
  18.328 -     * Returns a javac List of filenames within an absolute path in the ZipFileIndex.
  18.329 +     * Returns a javac List of filenames within a directory in the ZipFileIndex.
  18.330       */
  18.331 -    public com.sun.tools.javac.util.List<String> getFiles(RelativeDirectory path) {
  18.332 -        lock.lock();
  18.333 +    public synchronized com.sun.tools.javac.util.List<String> getFiles(RelativeDirectory path) {
  18.334          try {
  18.335              checkIndex();
  18.336  
  18.337 @@ -398,13 +260,9 @@
  18.338          catch (IOException e) {
  18.339              return com.sun.tools.javac.util.List.<String>nil();
  18.340          }
  18.341 -        finally {
  18.342 -            lock.unlock();
  18.343 -        }
  18.344      }
  18.345  
  18.346 -    public List<String> getDirectories(RelativeDirectory path) {
  18.347 -        lock.lock();
  18.348 +    public synchronized List<String> getDirectories(RelativeDirectory path) {
  18.349          try {
  18.350              checkIndex();
  18.351  
  18.352 @@ -420,13 +278,9 @@
  18.353          catch (IOException e) {
  18.354              return com.sun.tools.javac.util.List.<String>nil();
  18.355          }
  18.356 -        finally {
  18.357 -            lock.unlock();
  18.358 -        }
  18.359      }
  18.360  
  18.361 -    public Set<RelativeDirectory> getAllDirectories() {
  18.362 -        lock.lock();
  18.363 +    public synchronized Set<RelativeDirectory> getAllDirectories() {
  18.364          try {
  18.365              checkIndex();
  18.366              if (allDirs == Collections.EMPTY_SET) {
  18.367 @@ -438,9 +292,6 @@
  18.368          catch (IOException e) {
  18.369              return Collections.<RelativeDirectory>emptySet();
  18.370          }
  18.371 -        finally {
  18.372 -            lock.unlock();
  18.373 -        }
  18.374      }
  18.375  
  18.376      /**
  18.377 @@ -450,8 +301,7 @@
  18.378       * @param path A path within the zip.
  18.379       * @return True if the path is a file or dir, false otherwise.
  18.380       */
  18.381 -    public boolean contains(RelativePath path) {
  18.382 -        lock.lock();
  18.383 +    public synchronized boolean contains(RelativePath path) {
  18.384          try {
  18.385              checkIndex();
  18.386              return getZipIndexEntry(path) != null;
  18.387 @@ -459,114 +309,69 @@
  18.388          catch (IOException e) {
  18.389              return false;
  18.390          }
  18.391 -        finally {
  18.392 -            lock.unlock();
  18.393 +    }
  18.394 +
  18.395 +    public synchronized boolean isDirectory(RelativePath path) throws IOException {
  18.396 +        // The top level in a zip file is always a directory.
  18.397 +        if (path.getPath().length() == 0) {
  18.398 +            lastReferenceTimeStamp = System.currentTimeMillis();
  18.399 +            return true;
  18.400 +        }
  18.401 +
  18.402 +        checkIndex();
  18.403 +        return directories.get(path) != null;
  18.404 +    }
  18.405 +
  18.406 +    public synchronized long getLastModified(RelativeFile path) throws IOException {
  18.407 +        Entry entry = getZipIndexEntry(path);
  18.408 +        if (entry == null)
  18.409 +            throw new FileNotFoundException();
  18.410 +        return entry.getLastModified();
  18.411 +    }
  18.412 +
  18.413 +    public synchronized int length(RelativeFile path) throws IOException {
  18.414 +        Entry entry = getZipIndexEntry(path);
  18.415 +        if (entry == null)
  18.416 +            throw new FileNotFoundException();
  18.417 +
  18.418 +        if (entry.isDir) {
  18.419 +            return 0;
  18.420 +        }
  18.421 +
  18.422 +        byte[] header = getHeader(entry);
  18.423 +        // entry is not compressed?
  18.424 +        if (get2ByteLittleEndian(header, 8) == 0) {
  18.425 +            return entry.compressedSize;
  18.426 +        } else {
  18.427 +            return entry.size;
  18.428          }
  18.429      }
  18.430  
  18.431 -    public boolean isDirectory(RelativePath path) throws IOException {
  18.432 -        lock.lock();
  18.433 -        try {
  18.434 -            // The top level in a zip file is always a directory.
  18.435 -            if (path.getPath().length() == 0) {
  18.436 -                lastReferenceTimeStamp = System.currentTimeMillis();
  18.437 -                return true;
  18.438 -            }
  18.439 -
  18.440 -            checkIndex();
  18.441 -            return directories.get(path) != null;
  18.442 -        }
  18.443 -        finally {
  18.444 -            lock.unlock();
  18.445 -        }
  18.446 +    public synchronized byte[] read(RelativeFile path) throws IOException {
  18.447 +        Entry entry = getZipIndexEntry(path);
  18.448 +        if (entry == null)
  18.449 +            throw new FileNotFoundException("Path not found in ZIP: " + path.path);
  18.450 +        return read(entry);
  18.451      }
  18.452  
  18.453 -    public long getLastModified(RelativeFile path) throws IOException {
  18.454 -        lock.lock();
  18.455 -        try {
  18.456 -            Entry entry = getZipIndexEntry(path);
  18.457 -            if (entry == null)
  18.458 -                throw new FileNotFoundException();
  18.459 -            return entry.getLastModified();
  18.460 -        }
  18.461 -        finally {
  18.462 -            lock.unlock();
  18.463 -        }
  18.464 +    synchronized byte[] read(Entry entry) throws IOException {
  18.465 +        openFile();
  18.466 +        byte[] result = readBytes(entry);
  18.467 +        closeFile();
  18.468 +        return result;
  18.469      }
  18.470  
  18.471 -    public int length(RelativeFile path) throws IOException {
  18.472 -        lock.lock();
  18.473 -        try {
  18.474 -            Entry entry = getZipIndexEntry(path);
  18.475 -            if (entry == null)
  18.476 -                throw new FileNotFoundException();
  18.477 -
  18.478 -            if (entry.isDir) {
  18.479 -                return 0;
  18.480 -            }
  18.481 -
  18.482 -            byte[] header = getHeader(entry);
  18.483 -            // entry is not compressed?
  18.484 -            if (get2ByteLittleEndian(header, 8) == 0) {
  18.485 -                return entry.compressedSize;
  18.486 -            } else {
  18.487 -                return entry.size;
  18.488 -            }
  18.489 -        }
  18.490 -        finally {
  18.491 -            lock.unlock();
  18.492 -        }
  18.493 +    public synchronized int read(RelativeFile path, byte[] buffer) throws IOException {
  18.494 +        Entry entry = getZipIndexEntry(path);
  18.495 +        if (entry == null)
  18.496 +            throw new FileNotFoundException();
  18.497 +        return read(entry, buffer);
  18.498      }
  18.499  
  18.500 -    public byte[] read(RelativeFile path) throws IOException {
  18.501 -        lock.lock();
  18.502 -        try {
  18.503 -            Entry entry = getZipIndexEntry(path);
  18.504 -            if (entry == null)
  18.505 -                throw new FileNotFoundException("Path not found in ZIP: " + path.path);
  18.506 -            return read(entry);
  18.507 -        }
  18.508 -        finally {
  18.509 -            lock.unlock();
  18.510 -        }
  18.511 -    }
  18.512 -
  18.513 -    byte[] read(Entry entry) throws IOException {
  18.514 -        lock.lock();
  18.515 -        try {
  18.516 -            openFile();
  18.517 -            byte[] result = readBytes(entry);
  18.518 -            closeFile();
  18.519 -            return result;
  18.520 -        }
  18.521 -        finally {
  18.522 -            lock.unlock();
  18.523 -        }
  18.524 -    }
  18.525 -
  18.526 -    public int read(RelativeFile path, byte[] buffer) throws IOException {
  18.527 -        lock.lock();
  18.528 -        try {
  18.529 -            Entry entry = getZipIndexEntry(path);
  18.530 -            if (entry == null)
  18.531 -                throw new FileNotFoundException();
  18.532 -            return read(entry, buffer);
  18.533 -        }
  18.534 -        finally {
  18.535 -            lock.unlock();
  18.536 -        }
  18.537 -    }
  18.538 -
  18.539 -    int read(Entry entry, byte[] buffer)
  18.540 +    synchronized int read(Entry entry, byte[] buffer)
  18.541              throws IOException {
  18.542 -        lock.lock();
  18.543 -        try {
  18.544 -            int result = readBytes(entry, buffer);
  18.545 -            return result;
  18.546 -        }
  18.547 -        finally {
  18.548 -            lock.unlock();
  18.549 -        }
  18.550 +        int result = readBytes(entry, buffer);
  18.551 +        return  result;
  18.552      }
  18.553  
  18.554      private byte[] readBytes(Entry entry) throws IOException {
  18.555 @@ -638,21 +443,20 @@
  18.556    /*
  18.557     * Inflate using the java.util.zip.Inflater class
  18.558     */
  18.559 -    private static Inflater inflater;
  18.560 +    private SoftReference<Inflater> inflaterRef;
  18.561      private int inflate(byte[] src, byte[] dest) {
  18.562 +        Inflater inflater = (inflaterRef == null ? null : inflaterRef.get());
  18.563  
  18.564          // construct the inflater object or reuse an existing one
  18.565          if (inflater == null)
  18.566 -            inflater = new Inflater(true);
  18.567 +            inflaterRef = new SoftReference<Inflater>(inflater = new Inflater(true));
  18.568  
  18.569 -        synchronized (inflater) {
  18.570 -            inflater.reset();
  18.571 -            inflater.setInput(src);
  18.572 -            try {
  18.573 -                return inflater.inflate(dest);
  18.574 -            } catch (DataFormatException ex) {
  18.575 -                return -1;
  18.576 -            }
  18.577 +        inflater.reset();
  18.578 +        inflater.setInput(src);
  18.579 +        try {
  18.580 +            return inflater.inflate(dest);
  18.581 +        } catch (DataFormatException ex) {
  18.582 +            return -1;
  18.583          }
  18.584      }
  18.585  
  18.586 @@ -855,14 +659,10 @@
  18.587       * @return long
  18.588       */
  18.589      public long getZipFileLastModified() throws IOException {
  18.590 -        lock.lock();
  18.591 -        try {
  18.592 +        synchronized (this) {
  18.593              checkIndex();
  18.594              return zipFileLastModified;
  18.595          }
  18.596 -        finally {
  18.597 -            lock.unlock();
  18.598 -        }
  18.599      }
  18.600  
  18.601      /** ------------------------------------------------------------------------
  18.602 @@ -1028,8 +828,7 @@
  18.603          }
  18.604  
  18.605          boolean ret = false;
  18.606 -        lock.lock();
  18.607 -        try {
  18.608 +        synchronized (this) {
  18.609              triedToReadIndex = true;
  18.610              RandomAccessFile raf = null;
  18.611              try {
  18.612 @@ -1071,9 +870,6 @@
  18.613                  readFromIndex = true;
  18.614              }
  18.615          }
  18.616 -        finally {
  18.617 -            lock.unlock();
  18.618 -        }
  18.619  
  18.620          return ret;
  18.621      }
  18.622 @@ -1144,8 +940,8 @@
  18.623                  raf.seek(currFP);
  18.624  
  18.625                  // Now write each of the files in the DirectoryEntry
  18.626 -                List<Entry> entries = de.getEntriesAsCollection();
  18.627 -                for (Entry zfie : entries) {
  18.628 +                List<Entry> list = de.getEntriesAsCollection();
  18.629 +                for (Entry zfie : list) {
  18.630                      // Write the name bytes
  18.631                      byte [] zfieNameBytes = zfie.name.getBytes("UTF-8");
  18.632                      int zfieNameBytesLen = zfieNameBytes.length;
  18.633 @@ -1191,13 +987,9 @@
  18.634      }
  18.635  
  18.636      public boolean writeZipIndex() {
  18.637 -        lock.lock();
  18.638 -        try {
  18.639 +        synchronized (this) {
  18.640              return writeIndex();
  18.641          }
  18.642 -        finally {
  18.643 -            lock.unlock();
  18.644 -        }
  18.645      }
  18.646  
  18.647      private File getIndexFile() {
  18.648 @@ -1328,7 +1120,7 @@
  18.649              return hash;
  18.650          }
  18.651  
  18.652 -
  18.653 +        @Override
  18.654          public String toString() {
  18.655              return isDir ? ("Dir:" + dir + " : " + name) :
  18.656                  (dir + ":" + name);

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java	Mon Feb 14 16:31:21 2011 -0800
    19.3 @@ -0,0 +1,149 @@
    19.4 +/*
    19.5 + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
    19.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.7 + *
    19.8 + * This code is free software; you can redistribute it and/or modify it
    19.9 + * under the terms of the GNU General Public License version 2 only, as
   19.10 + * published by the Free Software Foundation.  Oracle designates this
   19.11 + * particular file as subject to the "Classpath" exception as provided
   19.12 + * by Oracle in the LICENSE file that accompanied this code.
   19.13 + *
   19.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   19.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   19.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   19.17 + * version 2 for more details (a copy is included in the LICENSE file that
   19.18 + * accompanied this code).
   19.19 + *
   19.20 + * You should have received a copy of the GNU General Public License version
   19.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   19.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   19.23 + *
   19.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   19.25 + * or visit www.oracle.com if you need additional information or have any
   19.26 + * questions.
   19.27 + */
   19.28 +
   19.29 +package com.sun.tools.javac.file;
   19.30 +
   19.31 +import com.sun.tools.javac.file.RelativePath.RelativeDirectory;
   19.32 +import com.sun.tools.javac.util.Context;
   19.33 +import java.io.File;
   19.34 +import java.io.IOException;
   19.35 +import java.util.ArrayList;
   19.36 +import java.util.HashMap;
   19.37 +import java.util.Iterator;
   19.38 +import java.util.List;
   19.39 +import java.util.Map;
   19.40 +
   19.41 +
   19.42 +/** A cache for ZipFileIndex objects. */
   19.43 +public class ZipFileIndexCache {
   19.44 +
   19.45 +    private final Map<File, ZipFileIndex> map =
   19.46 +            new HashMap<File, ZipFileIndex>();
   19.47 +
   19.48 +    /** Get a shared instance of the cache. */
   19.49 +    private static ZipFileIndexCache sharedInstance;
   19.50 +    public synchronized static ZipFileIndexCache getSharedInstance() {
   19.51 +        if (sharedInstance == null)
   19.52 +            sharedInstance = new ZipFileIndexCache();
   19.53 +        return sharedInstance;
   19.54 +    }
   19.55 +
   19.56 +    /** Get a context-specific instance of a cache. */
   19.57 +    public static ZipFileIndexCache instance(Context context) {
   19.58 +        ZipFileIndexCache instance = context.get(ZipFileIndexCache.class);
   19.59 +        if (instance == null)
   19.60 +            context.put(ZipFileIndexCache.class, instance = new ZipFileIndexCache());
   19.61 +        return instance;
   19.62 +    }
   19.63 +
   19.64 +    /**
   19.65 +     * Returns a list of all ZipFileIndex entries
   19.66 +     *
   19.67 +     * @return A list of ZipFileIndex entries, or an empty list
   19.68 +     */
   19.69 +    public List<ZipFileIndex> getZipFileIndexes() {
   19.70 +        return getZipFileIndexes(false);
   19.71 +    }
   19.72 +
   19.73 +    /**
   19.74 +     * Returns a list of all ZipFileIndex entries
   19.75 +     *
   19.76 +     * @param openedOnly If true it returns a list of only opened ZipFileIndex entries, otherwise
   19.77 +     *                   all ZipFileEntry(s) are included into the list.
   19.78 +     * @return A list of ZipFileIndex entries, or an empty list
   19.79 +     */
   19.80 +    public synchronized List<ZipFileIndex> getZipFileIndexes(boolean openedOnly) {
   19.81 +        List<ZipFileIndex> zipFileIndexes = new ArrayList<ZipFileIndex>();
   19.82 +
   19.83 +        zipFileIndexes.addAll(map.values());
   19.84 +
   19.85 +        if (openedOnly) {
   19.86 +            for(ZipFileIndex elem : zipFileIndexes) {
   19.87 +                if (!elem.isOpen()) {
   19.88 +                    zipFileIndexes.remove(elem);
   19.89 +                }
   19.90 +            }
   19.91 +        }
   19.92 +
   19.93 +        return zipFileIndexes;
   19.94 +    }
   19.95 +
   19.96 +    public synchronized ZipFileIndex getZipFileIndex(File zipFile,
   19.97 +            RelativeDirectory symbolFilePrefix,
   19.98 +            boolean useCache, String cacheLocation,
   19.99 +            boolean writeIndex) throws IOException {
  19.100 +        ZipFileIndex zi = getExistingZipIndex(zipFile);
  19.101 +
  19.102 +        if (zi == null || (zi != null && zipFile.lastModified() != zi.zipFileLastModified)) {
  19.103 +            zi = new ZipFileIndex(zipFile, symbolFilePrefix, writeIndex,
  19.104 +                    useCache, cacheLocation);
  19.105 +            map.put(zipFile, zi);
  19.106 +        }
  19.107 +        return zi;
  19.108 +    }
  19.109 +
  19.110 +    public synchronized ZipFileIndex getExistingZipIndex(File zipFile) {
  19.111 +        return map.get(zipFile);
  19.112 +    }
  19.113 +
  19.114 +    public synchronized void clearCache() {
  19.115 +        map.clear();
  19.116 +    }
  19.117 +
  19.118 +    public synchronized void clearCache(long timeNotUsed) {
  19.119 +        Iterator<File> cachedFileIterator = map.keySet().iterator();
  19.120 +        while (cachedFileIterator.hasNext()) {
  19.121 +            File cachedFile = cachedFileIterator.next();
  19.122 +            ZipFileIndex cachedZipIndex = map.get(cachedFile);
  19.123 +            if (cachedZipIndex != null) {
  19.124 +                long timeToTest = cachedZipIndex.lastReferenceTimeStamp + timeNotUsed;
  19.125 +                if (timeToTest < cachedZipIndex.lastReferenceTimeStamp || // Overflow...
  19.126 +                        System.currentTimeMillis() > timeToTest) {
  19.127 +                    map.remove(cachedFile);
  19.128 +                }
  19.129 +            }
  19.130 +        }
  19.131 +    }
  19.132 +
  19.133 +    public synchronized void removeFromCache(File file) {
  19.134 +        map.remove(file);
  19.135 +    }
  19.136 +
  19.137 +    /** Sets already opened list of ZipFileIndexes from an outside client
  19.138 +      * of the compiler. This functionality should be used in a non-batch clients of the compiler.
  19.139 +      */
  19.140 +    public synchronized void setOpenedIndexes(List<ZipFileIndex>indexes) throws IllegalStateException {
  19.141 +        if (map.isEmpty()) {
  19.142 +            String msg =
  19.143 +                    "Setting opened indexes should be called only when the ZipFileCache is empty. "
  19.144 +                    + "Call JavacFileManager.flush() before calling this method.";
  19.145 +            throw new IllegalStateException(msg);
  19.146 +        }
  19.147 +
  19.148 +        for (ZipFileIndex zfi : indexes) {
  19.149 +            map.put(zfi.zipFile, zfi);
  19.150 +        }
  19.151 +    }
  19.152 +}

    20.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Feb 10 16:24:51 2011 -0800
    20.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Mon Feb 14 16:31:21 2011 -0800
    20.3 @@ -138,9 +138,6 @@
    20.4      /** The symbol table. */
    20.5      Symtab syms;
    20.6  
    20.7 -    /** The scope counter */
    20.8 -    Scope.ScopeCounter scopeCounter;
    20.9 -
   20.10      Types types;
   20.11  
   20.12      /** The name table. */
   20.13 @@ -264,7 +261,6 @@
   20.14  
   20.15          names = Names.instance(context);
   20.16          syms = Symtab.instance(context);
   20.17 -        scopeCounter = Scope.ScopeCounter.instance(context);
   20.18          types = Types.instance(context);
   20.19          fileManager = context.get(JavaFileManager.class);
   20.20          if (fileManager == null)
   20.21 @@ -1321,7 +1317,9 @@
   20.22                      sym.flags_field |= PROPRIETARY;
   20.23                  else
   20.24                      proxies.append(proxy);
   20.25 -                if (majorVersion >= V51.major && proxy.type.tsym == syms.polymorphicSignatureType.tsym) {
   20.26 +                if (majorVersion >= V51.major &&
   20.27 +                        (proxy.type.tsym == syms.polymorphicSignatureType.tsym ||
   20.28 +                         proxy.type.tsym == syms.transientPolymorphicSignatureType.tsym)) {
   20.29                      sym.flags_field |= POLYMORPHIC_SIGNATURE;
   20.30                  }
   20.31              }
   20.32 @@ -1879,7 +1877,7 @@
   20.33          ClassType ct = (ClassType)c.type;
   20.34  
   20.35          // allocate scope for members
   20.36 -        c.members_field = new Scope.ClassScope(c, scopeCounter);
   20.37 +        c.members_field = new Scope(c);
   20.38  
   20.39          // prepare type variable table
   20.40          typevars = typevars.dup(currentOwner);

    21.1 --- a/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Thu Feb 10 16:24:51 2011 -0800
    21.2 +++ b/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Mon Feb 14 16:31:21 2011 -0800
    21.3 @@ -39,7 +39,6 @@
    21.4  import java.nio.file.FileVisitResult;
    21.5  import java.nio.file.Path;
    21.6  import java.nio.file.SimpleFileVisitor;
    21.7 -import java.nio.file.attribute.Attributes;
    21.8  import java.nio.file.attribute.BasicFileAttributes;
    21.9  import java.util.ArrayList;
   21.10  import java.util.Arrays;
   21.11 @@ -223,9 +222,7 @@
   21.12          Path path = pathIter.next();
   21.13          if (pathIter.hasNext())
   21.14              throw new IllegalArgumentException("path too long for directory");
   21.15 -        if (!path.exists())
   21.16 -            throw new FileNotFoundException(path + ": does not exist");
   21.17 -        else if (!isDirectory(path))
   21.18 +        if (!isDirectory(path))
   21.19              throw new IOException(path + ": not a directory");
   21.20      }
   21.21  
   21.22 @@ -326,7 +323,7 @@
   21.23      private void list(Path path, String packageName, final Set<Kind> kinds,
   21.24              boolean recurse, final ListBuffer<JavaFileObject> results)
   21.25              throws IOException {
   21.26 -        if (!path.exists())
   21.27 +        if (!Files.exists(path))
   21.28              return;
   21.29  
   21.30          final Path pathDir;
   21.31 @@ -341,7 +338,7 @@
   21.32          String sep = path.getFileSystem().getSeparator();
   21.33          Path packageDir = packageName.isEmpty() ? pathDir
   21.34                  : pathDir.resolve(packageName.replace(".", sep));
   21.35 -        if (!packageDir.exists())
   21.36 +        if (!Files.exists(packageDir))
   21.37              return;
   21.38  
   21.39  /* Alternate impl of list, superceded by use of Files.walkFileTree */
   21.40 @@ -353,7 +350,7 @@
   21.41  //            DirectoryStream<Path> ds = dir.newDirectoryStream();
   21.42  //            try {
   21.43  //                for (Path p: ds) {
   21.44 -//                    String name = p.getName().toString();
   21.45 +//                    String name = p.getFileName().toString();
   21.46  //                    if (isDirectory(p)) {
   21.47  //                        if (recurse && SourceVersion.isIdentifier(name)) {
   21.48  //                            queue.add(p);
   21.49 @@ -376,7 +373,7 @@
   21.50                  new SimpleFileVisitor<Path>() {
   21.51              @Override
   21.52              public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
   21.53 -                Path name = dir.getName();
   21.54 +                Path name = dir.getFileName();
   21.55                  if (name == null || SourceVersion.isIdentifier(name.toString())) // JSR 292?
   21.56                      return FileVisitResult.CONTINUE;
   21.57                  else
   21.58 @@ -385,7 +382,7 @@
   21.59  
   21.60              @Override
   21.61              public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
   21.62 -                if (attrs.isRegularFile() && kinds.contains(getKind(file.getName().toString()))) {
   21.63 +                if (attrs.isRegularFile() && kinds.contains(getKind(file.getFileName().toString()))) {
   21.64                      JavaFileObject fe =
   21.65                          PathFileObject.createDirectoryPathFileObject(
   21.66                              JavacPathFileManager.this, file, pathDir);
   21.67 @@ -431,13 +428,13 @@
   21.68          for (Path p: getLocation(location)) {
   21.69              if (isDirectory(p)) {
   21.70                  Path f = resolve(p, relativePath);
   21.71 -                if (f.exists())
   21.72 +                if (Files.exists(f))
   21.73                      return PathFileObject.createDirectoryPathFileObject(this, f, p);
   21.74              } else {
   21.75                  FileSystem fs = getFileSystem(p);
   21.76                  if (fs != null) {
   21.77                      Path file = getPath(fs, relativePath);
   21.78 -                    if (file.exists())
   21.79 +                    if (Files.exists(file))
   21.80                          return PathFileObject.createJarPathFileObject(this, file);
   21.81                  }
   21.82              }
   21.83 @@ -504,7 +501,7 @@
   21.84      private FileSystem getFileSystem(Path p) throws IOException {
   21.85          FileSystem fs = fileSystems.get(p);
   21.86          if (fs == null) {
   21.87 -            fs = FileSystems.newFileSystem(p, Collections.<String,Void>emptyMap(), null);
   21.88 +            fs = FileSystems.newFileSystem(p, null);
   21.89              fileSystems.put(p, fs);
   21.90          }
   21.91          return fs;
   21.92 @@ -530,7 +527,7 @@
   21.93      }
   21.94  
   21.95      private static boolean isDirectory(Path path) throws IOException {
   21.96 -        BasicFileAttributes attrs = Attributes.readBasicFileAttributes(path);
   21.97 +        BasicFileAttributes attrs = Files.readAttributes(path, BasicFileAttributes.class);
   21.98          return attrs.isDirectory();
   21.99      }
  21.100  

    22.1 --- a/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java	Thu Feb 10 16:24:51 2011 -0800
    22.2 +++ b/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java	Mon Feb 14 16:31:21 2011 -0800
    22.3 @@ -38,7 +38,6 @@
    22.4  import java.nio.charset.CharsetDecoder;
    22.5  import java.nio.file.Files;
    22.6  import java.nio.file.Path;
    22.7 -import java.nio.file.attribute.Attributes;
    22.8  import java.nio.file.attribute.BasicFileAttributes;
    22.9  import javax.lang.model.element.Modifier;
   22.10  import javax.lang.model.element.NestingKind;
   22.11 @@ -153,7 +152,7 @@
   22.12  
   22.13      @Override
   22.14      public Kind getKind() {
   22.15 -        return BaseFileManager.getKind(path.getName().toString());
   22.16 +        return BaseFileManager.getKind(path.getFileName().toString());
   22.17      }
   22.18  
   22.19      @Override
   22.20 @@ -164,14 +163,14 @@
   22.21              return false;
   22.22          }
   22.23          String sn = simpleName + kind.extension;
   22.24 -        String pn = path.getName().toString();
   22.25 +        String pn = path.getFileName().toString();
   22.26          if (pn.equals(sn)) {
   22.27              return true;
   22.28          }
   22.29          if (pn.equalsIgnoreCase(sn)) {
   22.30              try {
   22.31                  // allow for Windows
   22.32 -                return path.toRealPath(false).getName().toString().equals(sn);
   22.33 +                return path.toRealPath(false).getFileName().toString().equals(sn);
   22.34              } catch (IOException e) {
   22.35              }
   22.36          }
   22.37 @@ -200,13 +199,13 @@
   22.38  
   22.39      @Override
   22.40      public InputStream openInputStream() throws IOException {
   22.41 -        return path.newInputStream();
   22.42 +        return Files.newInputStream(path);
   22.43      }
   22.44  
   22.45      @Override
   22.46      public OutputStream openOutputStream() throws IOException {
   22.47          ensureParentDirectoriesExist();
   22.48 -        return path.newOutputStream();
   22.49 +        return Files.newOutputStream(path);
   22.50      }
   22.51  
   22.52      @Override
   22.53 @@ -242,14 +241,13 @@
   22.54      @Override
   22.55      public Writer openWriter() throws IOException {
   22.56          ensureParentDirectoriesExist();
   22.57 -        return new OutputStreamWriter(path.newOutputStream(), fileManager.getEncodingName());
   22.58 +        return new OutputStreamWriter(Files.newOutputStream(path), fileManager.getEncodingName());
   22.59      }
   22.60  
   22.61      @Override
   22.62      public long getLastModified() {
   22.63          try {
   22.64 -            BasicFileAttributes attrs = Attributes.readBasicFileAttributes(path);
   22.65 -            return attrs.lastModifiedTime().toMillis();
   22.66 +            return Files.getLastModifiedTime(path).toMillis();
   22.67          } catch (IOException e) {
   22.68              return -1;
   22.69          }
   22.70 @@ -258,7 +256,7 @@
   22.71      @Override
   22.72      public boolean delete() {
   22.73          try {
   22.74 -            path.delete();
   22.75 +            Files.delete(path);
   22.76              return true;
   22.77          } catch (IOException e) {
   22.78              return false;
   22.79 @@ -267,7 +265,7 @@
   22.80  
   22.81      public boolean isSameFile(PathFileObject other) {
   22.82          try {
   22.83 -            return path.isSameFile(other.path);
   22.84 +            return Files.isSameFile(path, other.path);
   22.85          } catch (IOException e) {
   22.86              return false;
   22.87          }
   22.88 @@ -296,8 +294,7 @@
   22.89  
   22.90      private long size() {
   22.91          try {
   22.92 -            BasicFileAttributes attrs = Attributes.readBasicFileAttributes(path);
   22.93 -            return attrs.size();
   22.94 +            return Files.size(path);
   22.95          } catch (IOException e) {
   22.96              return -1;
   22.97          }

    23.1 --- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Thu Feb 10 16:24:51 2011 -0800
    23.2 +++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Mon Feb 14 16:31:21 2011 -0800
    23.3 @@ -142,7 +142,7 @@
    23.4       */
    23.5      boolean allowAnnotations;
    23.6  
    23.7 -    /** Switch: should we recognize automatic resource management?
    23.8 +    /** Switch: should we recognize try-with-resources?
    23.9       */
   23.10      boolean allowTWR;
   23.11  
   23.12 @@ -1639,7 +1639,7 @@
   23.13       *     | WHILE ParExpression Statement
   23.14       *     | DO Statement WHILE ParExpression ";"
   23.15       *     | TRY Block ( Catches | [Catches] FinallyPart )
   23.16 -     *     | TRY "(" ResourceSpecification ")" Block [Catches] [FinallyPart]
   23.17 +     *     | TRY "(" ResourceSpecification ";"opt ")" Block [Catches] [FinallyPart]
   23.18       *     | SWITCH ParExpression "{" SwitchBlockStatementGroups "}"
   23.19       *     | SYNCHRONIZED ParExpression Block
   23.20       *     | RETURN [Expression] ";"
   23.21 @@ -2182,31 +2182,24 @@
   23.22          ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
   23.23          defs.append(resource());
   23.24          while (S.token() == SEMI) {
   23.25 -            // All but last of multiple declarators subsume a semicolon
   23.26 +            // All but last of multiple declarators must subsume a semicolon
   23.27              storeEnd(defs.elems.last(), S.endPos());
   23.28 +            int semiColonPos = S.pos();
   23.29              S.nextToken();
   23.30 +            if (S.token() == RPAREN) { // Optional trailing semicolon
   23.31 +                                       // after last resource
   23.32 +                break;
   23.33 +            }
   23.34              defs.append(resource());
   23.35          }
   23.36          return defs.toList();
   23.37      }
   23.38  
   23.39 -    /** Resource =
   23.40 -     *    VariableModifiers Type VariableDeclaratorId = Expression
   23.41 -     *  | Expression
   23.42 +    /** Resource = VariableModifiersOpt Type VariableDeclaratorId = Expression
   23.43       */
   23.44      JCTree resource() {
   23.45 -        int pos = S.pos();
   23.46 -        if (S.token() == FINAL || S.token() == MONKEYS_AT) {
   23.47 -            return variableDeclaratorRest(pos, optFinal(0), parseType(),
   23.48 -                                          ident(), true, null);
   23.49 -        } else {
   23.50 -            JCExpression t = term(EXPR | TYPE);
   23.51 -            if ((lastmode & TYPE) != 0 && S.token() == IDENTIFIER)
   23.52 -                return variableDeclaratorRest(pos, toP(F.at(pos).Modifiers(Flags.FINAL)), t,
   23.53 -                                              ident(), true, null);
   23.54 -            else
   23.55 -                return t;
   23.56 -        }
   23.57 +        return variableDeclaratorRest(S.pos(), optFinal(Flags.FINAL),
   23.58 +                                      parseType(), ident(), true, null);
   23.59      }
   23.60  
   23.61      /** CompilationUnit = [ { "@" Annotation } PACKAGE Qualident ";"] {ImportDeclaration} {TypeDeclaration}

    24.1 --- a/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Thu Feb 10 16:24:51 2011 -0800
    24.2 +++ b/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Mon Feb 14 16:31:21 2011 -0800
    24.3 @@ -138,7 +138,7 @@
    24.4          source = fac.source;
    24.5          allowBinaryLiterals = source.allowBinaryLiterals();
    24.6          allowHexFloats = source.allowHexFloats();
    24.7 -        allowUnderscoresInLiterals = source.allowBinaryLiterals();
    24.8 +        allowUnderscoresInLiterals = source.allowUnderscoresInLiterals();
    24.9      }
   24.10  
   24.11      private static final boolean hexFloatsWork = hexFloatsWork();

    25.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Feb 10 16:24:51 2011 -0800
    25.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Mon Feb 14 16:31:21 2011 -0800
    25.3 @@ -23,258 +23,437 @@
    25.4  # questions.
    25.5  #
    25.6  
    25.7 +# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
    25.8 +# are preceded by a stylized comment describing the type of the corresponding
    25.9 +# values.
   25.10 +# The types currently in use are
   25.11 +#
   25.12 +# boolean           true or false
   25.13 +# file name         the name of an input file; e.g.   MyFile.java
   25.14 +# message segment   a sub-message; see compiler.misc.*
   25.15 +# modifier          a Java modifier; e.g. public, private, protected
   25.16 +# name              a name, typically a Java identifier
   25.17 +# number            an integer
   25.18 +# option name       the name of a command line option
   25.19 +# source version    a source version number, such as 1.5, 1.6, 1.7
   25.20 +# string            a general string
   25.21 +# symbol            the name of a declared type
   25.22 +# symbol kind       a description of the kind of a declaration; see compiler.misc.kindname.*
   25.23 +# token             the name of a non-terminal in source code; see compiler.misc.token.*
   25.24 +# type              a Java type; e.g. int, X, X<T>
   25.25 +# unused            the value is not used in this message
   25.26 +#
   25.27 +# list of X         a comma-separated list of items; e.g. list of type
   25.28 +# X or Y            alternation; e.g. message segment or type
   25.29 +# set of X          a comma-separated collection of items; e.g. set of modifier
   25.30 +#
   25.31 +# These may be composed: e.g.   list of type or message segment
   25.32 +#
   25.33 +# These comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
   25.34 +# using info derived from the collected set of examples in test/tools/javac/diags/examples.
   25.35 +# MessageInfo can also be run as a standalone utility providing more facilities
   25.36 +# for manipulating this file. For more details, see MessageInfo.java.
   25.37 +
   25.38  ##
   25.39  ## errors
   25.40  ##
   25.41  
   25.42 +# 0: symbol
   25.43  compiler.err.abstract.cant.be.instantiated=\
   25.44      {0} is abstract; cannot be instantiated
   25.45 +
   25.46  compiler.err.abstract.meth.cant.have.body=\
   25.47      abstract methods cannot have a body
   25.48 +
   25.49  compiler.err.already.annotated=\
   25.50      {0} {1} has already been annotated
   25.51 +
   25.52 +# 0: symbol, 1: symbol
   25.53  compiler.err.already.defined=\
   25.54      {0} is already defined in {1}
   25.55 +
   25.56 +# 0: string
   25.57  compiler.err.already.defined.single.import=\
   25.58      {0} is already defined in a single-type import
   25.59 +
   25.60 +# 0: string
   25.61  compiler.err.already.defined.static.single.import=\
   25.62      {0} is already defined in a static single-type import
   25.63 +
   25.64  compiler.err.already.defined.this.unit=\
   25.65      {0} is already defined in this compilation unit
   25.66 +
   25.67 +# 0: type, 1: list of name
   25.68  compiler.err.annotation.missing.default.value=\
   25.69      annotation {0} is missing value for the attribute {1}
   25.70 +
   25.71 +# 0: type, 1: list of name
   25.72  compiler.err.annotation.missing.default.value.1=\
   25.73      annotation {0} is missing values for attributes {1}
   25.74 +
   25.75 +# 0: type
   25.76  compiler.err.annotation.not.valid.for.type=\
   25.77      annotation not valid for a value of type {0}
   25.78 +
   25.79  compiler.err.annotation.type.not.applicable=\
   25.80      annotation type not applicable to this kind of declaration
   25.81 +
   25.82  compiler.err.annotation.value.must.be.annotation=\
   25.83      annotation value must be an annotation
   25.84 +
   25.85  compiler.err.annotation.value.must.be.class.literal=\
   25.86      annotation value must be a class literal
   25.87 +
   25.88  compiler.err.annotation.value.must.be.name.value=\
   25.89      annotation values must be of the form ''name=value''
   25.90 +
   25.91  compiler.err.annotation.value.not.allowable.type=\
   25.92      annotation value not of an allowable type
   25.93 +
   25.94  compiler.err.anon.class.impl.intf.no.args=\
   25.95      anonymous class implements interface; cannot have arguments
   25.96 +
   25.97  compiler.err.anon.class.impl.intf.no.typeargs=\
   25.98      anonymous class implements interface; cannot have type arguments
   25.99 +
  25.100  compiler.err.anon.class.impl.intf.no.qual.for.new=\
  25.101      anonymous class implements interface; cannot have qualifier for new
  25.102 +
  25.103 +# 0: symbol, 1: symbol, 2: symbol
  25.104  compiler.err.array.and.varargs=\
  25.105      cannot declare both {0} and {1} in {2}
  25.106 +
  25.107  compiler.err.array.dimension.missing=\
  25.108      array dimension missing
  25.109 +
  25.110 +# 0: type
  25.111  compiler.err.array.req.but.found=\
  25.112      array required, but {0} found
  25.113  
  25.114  compiler.err.assignment.from.super-bound=\
  25.115      assigning from wildcard {0}
  25.116 +
  25.117  compiler.err.assignment.to.extends-bound=\
  25.118      assigning to wildcard {0}
  25.119 +
  25.120  compiler.err.attribute.value.must.be.constant=\
  25.121      attribute value must be constant
  25.122  
  25.123  compiler.err.break.outside.switch.loop=\
  25.124      break outside switch or loop
  25.125  
  25.126 +# 0: name
  25.127  compiler.err.call.must.be.first.stmt.in.ctor=\
  25.128      call to {0} must be first statement in constructor
  25.129 +
  25.130  compiler.err.cant.apply.symbol=\
  25.131      {0} {1} in {4} {5} cannot be applied to given types\n\
  25.132      required: {2}\n\
  25.133      found: {3}
  25.134 +
  25.135 +# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
  25.136  compiler.err.cant.apply.symbol.1=\
  25.137      {0} {1} in {4} {5} cannot be applied to given types;\n\
  25.138      required: {2}\n\
  25.139      found: {3}\n\
  25.140      reason: {6}
  25.141 +
  25.142 +# 0: symbol kind, 1: name, 2: list of type
  25.143  compiler.err.cant.apply.symbols=\
  25.144      no suitable {0} found for {1}({2})
  25.145 +
  25.146 +# 0: symbol
  25.147  compiler.err.cant.assign.val.to.final.var=\
  25.148      cannot assign a value to final variable {0}
  25.149 +
  25.150 +# 0: type
  25.151  compiler.err.cant.deref=\
  25.152      {0} cannot be dereferenced
  25.153 +
  25.154  compiler.err.cant.extend.intf.annotation=\
  25.155      ''extends'' not allowed for @interfaces
  25.156 +
  25.157 +# 0: symbol
  25.158  compiler.err.cant.inherit.from.final=\
  25.159      cannot inherit from final {0}
  25.160 +
  25.161 +# 0: symbol
  25.162  compiler.err.cant.ref.before.ctor.called=\
  25.163      cannot reference {0} before supertype constructor has been called
  25.164 +
  25.165  compiler.err.cant.ret.val.from.meth.decl.void=\
  25.166      cannot return a value from method whose result type is void
  25.167 +
  25.168  compiler.err.cant.select.static.class.from.param.type=\
  25.169      cannot select a static class from a parameterized type
  25.170 +
  25.171 +# 0: symbol, 1: string, 2: string
  25.172  compiler.err.cant.inherit.diff.arg=\
  25.173      {0} cannot be inherited with different arguments: <{1}> and <{2}>
  25.174 +
  25.175  compiler.err.catch.without.try=\
  25.176      ''catch'' without ''try''
  25.177 +
  25.178 +# 0: symbol kind, 1: symbol
  25.179  compiler.err.clash.with.pkg.of.same.name=\
  25.180      {0} {1} clashes with package of same name
  25.181 +
  25.182  compiler.err.const.expr.req=\
  25.183      constant expression required
  25.184 +
  25.185  compiler.err.cont.outside.loop=\
  25.186      continue outside of loop
  25.187 +
  25.188 +# 0: symbol
  25.189  compiler.err.cyclic.inheritance=\
  25.190      cyclic inheritance involving {0}
  25.191 +
  25.192  compiler.err.cyclic.annotation.element=\
  25.193      cyclic annotation element type
  25.194 +
  25.195 +# 0: unused
  25.196  compiler.err.call.to.super.not.allowed.in.enum.ctor=\
  25.197      call to super not allowed in enum constructor
  25.198 +
  25.199 +# 0: type
  25.200  compiler.err.no.superclass=\
  25.201      {0} has no superclass
  25.202  
  25.203  compiler.err.wrong.target.for.polymorphic.signature.definition=\
  25.204      MethodHandle API building requires -target 7 runtimes or better; current is -target {0}
  25.205  
  25.206 +# 0: symbol, 1: type, 2: symbol, 3: type, 4: unused
  25.207  compiler.err.concrete.inheritance.conflict=\
  25.208      methods {0} from {1} and {2} from {3} are inherited with the same signature
  25.209  
  25.210  compiler.err.default.allowed.in.intf.annotation.member=\
  25.211      default value only allowed in an @interface member
  25.212 +
  25.213 +# 0: symbol
  25.214  compiler.err.doesnt.exist=\
  25.215      package {0} does not exist
  25.216 +
  25.217  compiler.err.duplicate.annotation=\
  25.218      duplicate annotation
  25.219 +
  25.220 +# 0: name, 1: type
  25.221  compiler.err.duplicate.annotation.member.value=\
  25.222      duplicate annotation member value {0} in {1}
  25.223 +
  25.224 +# 0: name
  25.225  compiler.err.duplicate.class=\
  25.226      duplicate class: {0}
  25.227 +
  25.228  compiler.err.duplicate.case.label=\
  25.229      duplicate case label
  25.230 +
  25.231  compiler.err.duplicate.default.label=\
  25.232      duplicate default label
  25.233  
  25.234  compiler.err.else.without.if=\
  25.235      ''else'' without ''if''
  25.236 +
  25.237  compiler.err.empty.char.lit=\
  25.238      empty character literal
  25.239 +
  25.240 +# 0: symbol
  25.241  compiler.err.encl.class.required=\
  25.242      an enclosing instance that contains {0} is required
  25.243 +
  25.244  compiler.err.enum.annotation.must.be.enum.constant=\
  25.245      an enum annotation value must be an enum constant
  25.246  
  25.247  compiler.err.enum.cant.be.instantiated=\
  25.248      enum types may not be instantiated
  25.249 +
  25.250  compiler.err.enum.label.must.be.unqualified.enum=\
  25.251      an enum switch case label must be the unqualified name of an enumeration constant
  25.252 +
  25.253  compiler.err.enum.no.subclassing=\
  25.254      classes cannot directly extend java.lang.Enum
  25.255 +
  25.256  compiler.err.enum.types.not.extensible=\
  25.257      enum types are not extensible
  25.258 +
  25.259  compiler.err.enum.no.finalize=\
  25.260      enums cannot have finalize methods
  25.261 +
  25.262 +# 0: file name, 1: string
  25.263  compiler.err.error.reading.file=\
  25.264      error reading {0}; {1}
  25.265 +
  25.266 +# 0: type
  25.267  compiler.err.except.already.caught=\
  25.268      exception {0} has already been caught
  25.269 +
  25.270 +# 0: type
  25.271  compiler.err.except.never.thrown.in.try=\
  25.272      exception {0} is never thrown in body of corresponding try statement
  25.273  
  25.274 +# 0: symbol
  25.275  compiler.err.final.parameter.may.not.be.assigned=\
  25.276      final parameter {0} may not be assigned
  25.277 +
  25.278 +# 0: symbol
  25.279  compiler.err.try.resource.may.not.be.assigned=\
  25.280      auto-closeable resource {0} may not be assigned
  25.281 +
  25.282 +# 0: symbol
  25.283  compiler.err.multicatch.parameter.may.not.be.assigned=\
  25.284      multi-catch parameter {0} may not be assigned
  25.285 +
  25.286  compiler.err.finally.without.try=\
  25.287      ''finally'' without ''try''
  25.288 +
  25.289 +# 0: type, 1: message segment
  25.290  compiler.err.foreach.not.applicable.to.type=\
  25.291      for-each not applicable to expression type\n\
  25.292      required: {1}\n\
  25.293      found:    {0}
  25.294 +
  25.295  compiler.err.fp.number.too.large=\
  25.296      floating point number too large
  25.297 +
  25.298  compiler.err.fp.number.too.small=\
  25.299      floating point number too small
  25.300  
  25.301  compiler.err.generic.array.creation=\
  25.302      generic array creation
  25.303 +
  25.304  compiler.err.generic.throwable=\
  25.305      a generic class may not extend java.lang.Throwable
  25.306  
  25.307 +# 0: symbol
  25.308  compiler.err.icls.cant.have.static.decl=\
  25.309      Illegal static declaration in inner class {0}\n\
  25.310      modifier \''static\'' is only allowed in constant variable declarations
  25.311 +
  25.312 +# 0: string
  25.313  compiler.err.illegal.char=\
  25.314      illegal character: \\{0}
  25.315 +
  25.316  compiler.err.illegal.char.for.encoding=\
  25.317      unmappable character for encoding {0}
  25.318 +
  25.319 +# 0: set of modifier, 1: set of modifier
  25.320  compiler.err.illegal.combination.of.modifiers=\
  25.321      illegal combination of modifiers: {0} and {1}
  25.322 +
  25.323  compiler.err.illegal.enum.static.ref=\
  25.324      illegal reference to static field from initializer
  25.325 +
  25.326  compiler.err.illegal.esc.char=\
  25.327      illegal escape character
  25.328 +
  25.329  compiler.err.illegal.forward.ref=\
  25.330      illegal forward reference
  25.331 +
  25.332 +# 0: symbol
  25.333  compiler.warn.forward.ref=\
  25.334      reference to variable ''{0}'' before it has been initialized
  25.335 +
  25.336  compiler.err.illegal.self.ref=\
  25.337      self-reference in initializer
  25.338 +
  25.339 +# 0: symbol
  25.340  compiler.warn.self.ref=\
  25.341      self-reference in initializer of variable ''{0}''
  25.342 +
  25.343  compiler.err.illegal.generic.type.for.instof=\
  25.344      illegal generic type for instanceof
  25.345 +
  25.346 +# 0: type
  25.347  compiler.err.illegal.initializer.for.type=\
  25.348      illegal initializer for {0}
  25.349 +
  25.350  compiler.err.illegal.line.end.in.char.lit=\
  25.351      illegal line end in character literal
  25.352 +
  25.353  compiler.err.illegal.nonascii.digit=\
  25.354      illegal non-ASCII digit
  25.355 +
  25.356  compiler.err.illegal.underscore=\
  25.357      illegal underscore
  25.358 +
  25.359 +# 0: symbol
  25.360  compiler.err.illegal.qual.not.icls=\
  25.361      illegal qualifier; {0} is not an inner class
  25.362 +
  25.363  compiler.err.illegal.start.of.expr=\
  25.364      illegal start of expression
  25.365 +
  25.366  compiler.err.illegal.start.of.type=\
  25.367      illegal start of type
  25.368 +
  25.369  compiler.err.illegal.unicode.esc=\
  25.370      illegal unicode escape
  25.371 +
  25.372 +# 0: symbol
  25.373  compiler.err.import.requires.canonical=\
  25.374      import requires canonical name for {0}
  25.375 +
  25.376  compiler.err.improperly.formed.type.param.missing=\
  25.377      improperly formed type, some parameters are missing
  25.378 +
  25.379  compiler.err.improperly.formed.type.inner.raw.param=\
  25.380      improperly formed type, type arguments given on a raw type
  25.381 +
  25.382 +# 0: type, 1: type
  25.383  compiler.err.incomparable.types=\
  25.384      incomparable types: {0} and {1}
  25.385 +
  25.386 +# 0: number
  25.387  compiler.err.int.number.too.large=\
  25.388      integer number too large: {0}
  25.389 +
  25.390  compiler.err.internal.error.cant.instantiate=\
  25.391      internal error; cannot instantiate {0} at {1} to ({2})
  25.392 +
  25.393  compiler.err.intf.annotation.members.cant.have.params=\
  25.394      @interface members may not have parameters
  25.395 +
  25.396  compiler.err.intf.annotation.cant.have.type.params=\
  25.397      @interface may not have type parameters
  25.398 +
  25.399  compiler.err.intf.annotation.members.cant.have.type.params=\
  25.400      @interface members may not have type parameters
  25.401 +
  25.402 +# 0: symbol, 1: type
  25.403  compiler.err.intf.annotation.member.clash=\
  25.404      @interface member clashes with method ''{0}'' in {1}
  25.405 +
  25.406  compiler.err.intf.expected.here=\
  25.407      interface expected here
  25.408 +
  25.409  compiler.err.intf.meth.cant.have.body=\
  25.410      interface methods cannot have body
  25.411 +
  25.412  compiler.err.invalid.annotation.member.type=\
  25.413      invalid type for annotation member
  25.414 +
  25.415  compiler.err.invalid.binary.number=\
  25.416      binary numbers must contain at least one binary digit
  25.417 +
  25.418  compiler.err.invalid.hex.number=\
  25.419      hexadecimal numbers must contain at least one hexadecimal digit
  25.420 +
  25.421  compiler.err.invalid.meth.decl.ret.type.req=\
  25.422      invalid method declaration; return type required
  25.423 +
  25.424  compiler.err.varargs.and.old.array.syntax=\
  25.425      legacy array notation not allowed on variable-arity parameter
  25.426  
  25.427 +# 0: name
  25.428  compiler.err.label.already.in.use=\
  25.429      label {0} already in use
  25.430 +
  25.431 +# 0: symbol
  25.432  compiler.err.local.var.accessed.from.icls.needs.final=\
  25.433      local variable {0} is accessed from within inner class; needs to be declared final
  25.434 +
  25.435  compiler.err.local.enum=\
  25.436      enum types must not be local
  25.437 +
  25.438  compiler.err.cannot.create.array.with.type.arguments=\
  25.439      cannot create array with type arguments
  25.440  
  25.441 @@ -285,79 +464,131 @@
  25.442  #
  25.443  compiler.err.limit.code=\
  25.444      code too large
  25.445 +
  25.446  compiler.err.limit.code.too.large.for.try.stmt=\
  25.447      code too large for try statement
  25.448 +
  25.449  compiler.err.limit.dimensions=\
  25.450      array type has too many dimensions
  25.451 +
  25.452  compiler.err.limit.locals=\
  25.453      too many local variables
  25.454 +
  25.455  compiler.err.limit.parameters=\
  25.456      too many parameters
  25.457 +
  25.458  compiler.err.limit.pool=\
  25.459      too many constants
  25.460 +
  25.461  compiler.err.limit.pool.in.class=\
  25.462      too many constants in class {0}
  25.463 +
  25.464  compiler.err.limit.stack=\
  25.465      code requires too much stack
  25.466 +
  25.467  compiler.err.limit.string=\
  25.468      constant string too long
  25.469 +
  25.470  compiler.err.limit.string.overflow=\
  25.471      UTF8 representation for string \"{0}...\" is too long for the constant pool
  25.472  
  25.473  compiler.err.malformed.fp.lit=\
  25.474      malformed floating point literal
  25.475 +
  25.476  compiler.err.method.does.not.override.superclass=\
  25.477      method does not override or implement a method from a supertype
  25.478 +
  25.479  compiler.err.missing.meth.body.or.decl.abstract=\
  25.480      missing method body, or declare abstract
  25.481 +
  25.482  compiler.err.missing.ret.stmt=\
  25.483      missing return statement
  25.484 +
  25.485  compiler.err.missing.ret.val=\
  25.486      missing return value
  25.487 +
  25.488 +# 0: set of modifier
  25.489  compiler.err.mod.not.allowed.here=\
  25.490      modifier {0} not allowed here
  25.491 +
  25.492  compiler.err.intf.not.allowed.here=\
  25.493      interface not allowed here
  25.494 +
  25.495  compiler.err.enums.must.be.static=\
  25.496      enum declarations allowed only in static contexts
  25.497  
  25.498 +# 0: symbol, 1: symbol
  25.499  compiler.err.name.clash.same.erasure=\
  25.500      name clash: {0} and {1} have the same erasure
  25.501 +
  25.502 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol, 4: unused, 5: unused
  25.503  compiler.err.name.clash.same.erasure.no.override=\
  25.504      name clash: {0} in {1} and {2} in {3} have the same erasure, yet neither overrides the other
  25.505 +
  25.506 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol, 4: symbol, 5: symbol
  25.507 +compiler.err.name.clash.same.erasure.no.override.1=\
  25.508 +    name clash: {0} in {1} overrides a method whose erasure is the same as another method, yet neither overrides the other\n\
  25.509 +    first method:  {2} in {3}\n\
  25.510 +    second method: {4} in {5}
  25.511 +
  25.512 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
  25.513 +compiler.err.name.clash.same.erasure.no.hide=\
  25.514 +    name clash: {0} in {1} and {2} in {3} have the same erasure, yet neither hides the other
  25.515 +
  25.516  compiler.err.name.reserved.for.internal.use=\
  25.517      {0} is reserved for internal use
  25.518 +
  25.519  compiler.err.native.meth.cant.have.body=\
  25.520      native methods cannot have a body
  25.521 +
  25.522 +# 0: type, 1: type
  25.523  compiler.err.neither.conditional.subtype=\
  25.524 -incompatible types for ?: neither is a subtype of the other\n\
  25.525 -second operand: {0}\n\
  25.526 -third operand : {1}
  25.527 +    incompatible types for ?: neither is a subtype of the other\n\
  25.528 +    second operand: {0}\n\
  25.529 +    third operand : {1}
  25.530 +
  25.531  compiler.err.new.not.allowed.in.annotation=\
  25.532      ''new'' not allowed in an annotation
  25.533 +
  25.534  compiler.err.no.annotation.member=\
  25.535      no annotation member {0} in {1}
  25.536 +
  25.537  compiler.err.no.encl.instance.of.type.in.scope=\
  25.538      no enclosing instance of type {0} is in scope
  25.539 +
  25.540  compiler.err.no.intf.expected.here=\
  25.541      no interface expected here
  25.542 +
  25.543  compiler.err.no.match.entry=\
  25.544      {0} has no match in entry in {1}; required {2}
  25.545 +
  25.546  compiler.err.not.annotation.type=\
  25.547      {0} is not an annotation type
  25.548 +
  25.549 +# 0: symbol, 1: symbol
  25.550  compiler.err.not.def.access.class.intf.cant.access=\
  25.551      {0} in {1} is defined in an inaccessible class or interface
  25.552 +
  25.553 +# 0: symbol, 1: symbol
  25.554  compiler.err.not.def.public.cant.access=\
  25.555      {0} is not public in {1}; cannot be accessed from outside package
  25.556 +
  25.557 +# 0: name
  25.558  compiler.err.not.loop.label=\
  25.559      not a loop label: {0}
  25.560 +
  25.561  compiler.err.not.stmt=\
  25.562      not a statement
  25.563 +
  25.564 +# 0: symbol
  25.565  compiler.err.not.encl.class=\
  25.566      not an enclosing class: {0}
  25.567  
  25.568 +# 0: name, 1: type, 2: unused
  25.569  compiler.err.operator.cant.be.applied=\
  25.570      bad operand type {1} for unary operator ''{0}''
  25.571 +
  25.572 +# 0: name, 1: type, 2: type
  25.573  compiler.err.operator.cant.be.applied.1=\
  25.574      bad operand types for binary operator ''{0}''\n\
  25.575      first type:  {1}\n\
  25.576 @@ -365,6 +596,8 @@
  25.577  
  25.578  compiler.err.pkg.annotations.sb.in.package-info.java=\
  25.579      package annotations should be in file package-info.java
  25.580 +
  25.581 +# 0: symbol
  25.582  compiler.err.pkg.clashes.with.class.of.same.name=\
  25.583      package {0} clashes with class of same name
  25.584  
  25.585 @@ -374,18 +607,21 @@
  25.586  # Errors related to annotation processing
  25.587  
  25.588  compiler.err.proc.cant.access=\
  25.589 -cannot access {0}\n\
  25.590 -{1}\n\
  25.591 -Consult the following stack trace for details.\n\
  25.592 -{2}
  25.593 -
  25.594 +    cannot access {0}\n\
  25.595 +    {1}\n\
  25.596 +    Consult the following stack trace for details.\n\
  25.597 +    {2}
  25.598 +
  25.599 +# 0: string
  25.600  compiler.err.proc.cant.find.class=\
  25.601      Could not find class file for ''{0}''.
  25.602  
  25.603  # Print a client-generated error message; assumed to be localized, no translation required
  25.604 +# 0: string
  25.605  compiler.err.proc.messager=\
  25.606      {0}
  25.607  
  25.608 +# 0: list of string
  25.609  compiler.err.proc.no.explicit.annotation.processing.requested=\
  25.610      Class names, ''{0}'', are only accepted if annotation processing is explicitly requested
  25.611  
  25.612 @@ -396,15 +632,18 @@
  25.613  compiler.err.proc.processor.bad.option.name=\
  25.614      Bad option name ''{0}'' provided by processor ''{1}''
  25.615  
  25.616 +# 0: string
  25.617  compiler.err.proc.processor.cant.instantiate=\
  25.618      Could not instantiate an instance of processor ''{0}''
  25.619  
  25.620  compiler.err.proc.processor.constructor.error=\
  25.621      Exception thrown while constructing Processor object: {0}
  25.622  
  25.623 +# 0: string
  25.624  compiler.err.proc.processor.not.found=\
  25.625      Annotation processor ''{0}'' not found
  25.626  
  25.627 +# 0: string
  25.628  compiler.err.proc.processor.wrong.type=\
  25.629      Annotation processor ''{0}'' does not implement javax.annotation.processing.Processor
  25.630  
  25.631 @@ -417,127 +656,201 @@
  25.632  compiler.err.proc.cant.create.loader=\
  25.633      Could not create class loader for annotation processors: {0}
  25.634  
  25.635 +# 0: unused
  25.636  compiler.err.qualified.new.of.static.class=\
  25.637      qualified new of static class
  25.638  
  25.639  compiler.err.recursive.ctor.invocation=\
  25.640      recursive constructor invocation
  25.641 +
  25.642 +# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
  25.643  compiler.err.ref.ambiguous=\
  25.644      reference to {0} is ambiguous, both {1} {2} in {3} and {4} {5} in {6} match
  25.645 +
  25.646  compiler.err.repeated.annotation.target=\
  25.647      repeated annotation target
  25.648 +
  25.649  compiler.err.repeated.interface=\
  25.650      repeated interface
  25.651 +
  25.652  compiler.err.repeated.modifier=\
  25.653      repeated modifier
  25.654 +
  25.655 +# 0: symbol, 1: set of modifier, 2: symbol
  25.656  compiler.err.report.access=\
  25.657      {0} has {1} access in {2}
  25.658 +
  25.659  compiler.err.ret.outside.meth=\
  25.660      return outside method
  25.661  
  25.662  compiler.err.signature.doesnt.match.supertype=\
  25.663      signature does not match {0}; incompatible supertype
  25.664 +
  25.665  compiler.err.signature.doesnt.match.intf=\
  25.666      signature does not match {0}; incompatible interfaces
  25.667 +
  25.668 +# 0: symbol, 1: symbol, 2: symbol
  25.669  compiler.err.does.not.override.abstract=\
  25.670      {0} is not abstract and does not override abstract method {1} in {2}
  25.671 +
  25.672  compiler.err.source.cant.overwrite.input.file=\
  25.673      error writing source; cannot overwrite input file {0}
  25.674 +
  25.675  compiler.err.stack.sim.error=\
  25.676      Internal error: stack sim error on {0}
  25.677 +
  25.678  compiler.err.static.imp.only.classes.and.interfaces=\
  25.679      static import only from classes and interfaces
  25.680 +
  25.681  compiler.err.string.const.req=\
  25.682      constant string expression required
  25.683 +
  25.684 +# 0: symbol, 1: symbol
  25.685  compiler.err.synthetic.name.conflict=\
  25.686      the symbol {0} conflicts with a compiler-synthesized symbol in {1}
  25.687 +
  25.688 +# 0: symbol, 1: symbol
  25.689  compiler.warn.synthetic.name.conflict=\
  25.690      the symbol {0} conflicts with a compiler-synthesized symbol in {1}
  25.691  
  25.692  compiler.err.throws.not.allowed.in.intf.annotation=\
  25.693      throws clause not allowed in @interface members
  25.694 +
  25.695  compiler.err.try.without.catch.or.finally=\
  25.696      ''try'' without ''catch'' or ''finally''
  25.697 +
  25.698  compiler.err.try.without.catch.finally.or.resource.decls=\
  25.699      ''try'' without ''catch'', ''finally'' or resource declarations
  25.700 +
  25.701 +# 0: symbol
  25.702  compiler.err.type.doesnt.take.params=\
  25.703      type {0} does not take parameters
  25.704 +
  25.705  compiler.err.type.var.cant.be.deref=\
  25.706      cannot select from a type variable
  25.707 +
  25.708  compiler.err.type.var.may.not.be.followed.by.other.bounds=\
  25.709      a type variable may not be followed by other bounds
  25.710 +
  25.711  compiler.err.type.var.more.than.once=\
  25.712      type variable {0} occurs more than once in result type of {1}; cannot be left uninstantiated
  25.713 +
  25.714  compiler.err.type.var.more.than.once.in.result=\
  25.715      type variable {0} occurs more than once in type of {1}; cannot be left uninstantiated
  25.716 +
  25.717 +# 0: type, 1: type, 2: string
  25.718  compiler.err.types.incompatible.diff.ret=\
  25.719      types {0} and {1} are incompatible; both define {2}, but with unrelated return types
  25.720  
  25.721  compiler.err.unclosed.char.lit=\
  25.722      unclosed character literal
  25.723 +
  25.724  compiler.err.unclosed.comment=\
  25.725      unclosed comment
  25.726 +
  25.727  compiler.err.unclosed.str.lit=\
  25.728      unclosed string literal
  25.729 +
  25.730  compiler.err.unknown.enum.constant=\
  25.731      in class file {0}: unknown enum constant {1}.{2}
  25.732 +
  25.733 +# 0: name
  25.734  compiler.err.unsupported.encoding=\
  25.735      unsupported encoding: {0}
  25.736 +
  25.737  compiler.err.io.exception=\
  25.738      error reading source file: {0}
  25.739 +
  25.740 +# 0: name
  25.741  compiler.err.undef.label=\
  25.742      undefined label: {0}
  25.743 +
  25.744  compiler.err.undetermined.type=\
  25.745      cannot infer type arguments for {0}
  25.746 +
  25.747 +# 0: type, 1: message segment
  25.748  compiler.err.undetermined.type.1=\
  25.749      cannot infer type arguments for {0};\n\
  25.750      reason: {1}
  25.751 +
  25.752 +# 0: list of type, 1: message segment
  25.753  compiler.err.invalid.inferred.types=\
  25.754      invalid inferred types for {0}; {1}
  25.755 +
  25.756 +# 0: message segment, 1: unused
  25.757  compiler.err.cant.apply.diamond=\
  25.758      cannot infer type arguments for {0}
  25.759 +
  25.760 +# 0: message segment, 1: message segment
  25.761  compiler.err.cant.apply.diamond.1=\
  25.762      cannot infer type arguments for {0};\n\
  25.763      reason: {1}
  25.764 +
  25.765  compiler.err.unreachable.stmt=\
  25.766      unreachable statement
  25.767 +
  25.768  compiler.err.initializer.must.be.able.to.complete.normally=\
  25.769      initializer must be able to complete normally
  25.770 +
  25.771 +# 0: type
  25.772  compiler.err.unreported.exception.need.to.catch.or.throw=\
  25.773      unreported exception {0}; must be caught or declared to be thrown
  25.774 +
  25.775 +# 0: type
  25.776  compiler.err.unreported.exception.default.constructor=\
  25.777      unreported exception {0} in default constructor
  25.778 +
  25.779  compiler.err.unsupported.cross.fp.lit=\
  25.780      hexadecimal floating-point literals are not supported on this VM
  25.781 +
  25.782  compiler.err.void.not.allowed.here=\
  25.783      ''void'' type not allowed here
  25.784  
  25.785 +# 0: string
  25.786  compiler.err.wrong.number.type.args=\
  25.787      wrong number of type arguments; required {0}
  25.788  
  25.789 +# 0: symbol
  25.790  compiler.err.var.might.already.be.assigned=\
  25.791      variable {0} might already have been assigned
  25.792 +
  25.793 +# 0: symbol
  25.794  compiler.err.var.might.not.have.been.initialized=\
  25.795      variable {0} might not have been initialized
  25.796 +
  25.797 +# 0: symbol
  25.798  compiler.err.var.might.be.assigned.in.loop=\
  25.799      variable {0} might be assigned in loop
  25.800  
  25.801 +# 0: symbol, 1: message segment
  25.802  compiler.err.varargs.invalid.trustme.anno=\
  25.803      Invalid {0} annotation. {1}
  25.804 +
  25.805 +# 0: type
  25.806  compiler.misc.varargs.trustme.on.reifiable.varargs=\
  25.807      Varargs element type {0} is reifiable.
  25.808 +
  25.809 +# 0: symbol
  25.810  compiler.misc.varargs.trustme.on.non.varargs.meth=\
  25.811      Method {0} is not a varargs method.
  25.812 +
  25.813 +# 0: symbol
  25.814  compiler.misc.varargs.trustme.on.virtual.varargs=\
  25.815      Instance method {0} is not final.
  25.816  
  25.817 +# 0: type, 1: kind, 2: symbol
  25.818 +compiler.misc.inaccessible.varargs.type=\
  25.819 +    formal varargs element type {0} is not accessible from {1} {2}
  25.820 +
  25.821  # In the following string, {1} will always be the detail message from
  25.822  # java.io.IOException.
  25.823 +# 0: symbol, 1: string
  25.824  compiler.err.class.cant.write=\
  25.825      error while writing {0}: {1}
  25.826  
  25.827  # In the following string, {0} is the name of the class in the Java source.
  25.828  # It really should be used two times..
  25.829 +# 0: name
  25.830  compiler.err.class.public.should.be.in.file=\
  25.831      class {0} is public, should be declared in a file named {0}.java
  25.832  
  25.833 @@ -556,12 +869,16 @@
  25.834  
  25.835  compiler.misc.fatal.err.no.java.lang=\
  25.836      Fatal Error: Unable to find package java.lang in classpath or bootclasspath
  25.837 +
  25.838  compiler.misc.fatal.err.cant.locate.meth=\
  25.839      Fatal Error: Unable to find method {0}
  25.840 +
  25.841  compiler.misc.fatal.err.cant.locate.field=\
  25.842      Fatal Error: Unable to find field {0}
  25.843 +
  25.844  compiler.misc.fatal.err.cant.locate.ctor=\
  25.845      Fatal Error: Unable to find constructor for {0}
  25.846 +
  25.847  compiler.misc.fatal.err.cant.close.loader=\
  25.848      Fatal Error: Cannot close class loader for annotation processors
  25.849  
  25.850 @@ -573,10 +890,15 @@
  25.851  
  25.852  compiler.misc.source.unavailable=\
  25.853      (source unavailable)
  25.854 +
  25.855  compiler.misc.base.membership=\
  25.856      all your base class are belong to us
  25.857 +
  25.858 +# 0: string, 1: string, 2: boolean
  25.859  compiler.misc.x.print.processor.info=\
  25.860      Processor {0} matches {1} and returns {2}.
  25.861 +
  25.862 +# 0: number, 1: string, 2: set of symbol, 3: boolean
  25.863  compiler.misc.x.print.rounds=\
  25.864      Round {0}:\n\tinput files: {1}\n\tannotations: {2}\n\tlast round: {3}
  25.865  
  25.866 @@ -587,61 +909,84 @@
  25.867  compiler.note.note=\
  25.868      Note:\u0020
  25.869  
  25.870 +# 0: file name
  25.871  compiler.note.deprecated.filename=\
  25.872      {0} uses or overrides a deprecated API.
  25.873 +
  25.874  compiler.note.deprecated.plural=\
  25.875      Some input files use or override a deprecated API.
  25.876 +
  25.877  # The following string may appear after one of the above deprecation
  25.878  # messages.
  25.879  compiler.note.deprecated.recompile=\
  25.880      Recompile with -Xlint:deprecation for details.
  25.881  
  25.882 +# 0: file name
  25.883  compiler.note.deprecated.filename.additional=\
  25.884      {0} has additional uses or overrides of a deprecated API.
  25.885 +
  25.886  compiler.note.deprecated.plural.additional=\
  25.887      Some input files additionally use or override a deprecated API.
  25.888  
  25.889 +# 0: file name
  25.890  compiler.note.unchecked.filename=\
  25.891      {0} uses unchecked or unsafe operations.
  25.892 +
  25.893  compiler.note.unchecked.plural=\
  25.894      Some input files use unchecked or unsafe operations.
  25.895 +
  25.896  # The following string may appear after one of the above deprecation
  25.897  # messages.
  25.898  compiler.note.unchecked.recompile=\
  25.899      Recompile with -Xlint:unchecked for details.
  25.900  
  25.901 +# 0: file name
  25.902  compiler.note.unchecked.filename.additional=\
  25.903      {0} has additional unchecked or unsafe operations.
  25.904 +
  25.905  compiler.note.unchecked.plural.additional=\
  25.906      Some input files additionally use unchecked or unsafe operations.
  25.907  
  25.908 +# 0: file name
  25.909  compiler.note.sunapi.filename=\
  25.910      {0} uses internal proprietary API that may be removed in a future release.
  25.911 +
  25.912  compiler.note.sunapi.plural=\
  25.913      Some input files use internal proprietary API that may be removed in a future release.
  25.914 +
  25.915  # The following string may appear after one of the above sunapi messages.
  25.916  compiler.note.sunapi.recompile=\
  25.917      Recompile with -Xlint:sunapi for details.
  25.918  
  25.919 +# 0: file name
  25.920  compiler.note.sunapi.filename.additional=\
  25.921      {0} uses additional internal proprietary API that may be removed in a future release.
  25.922 +
  25.923  compiler.note.sunapi.plural.additional=\
  25.924      Some input files additionally use internal proprietary API that may be removed in a future release.
  25.925  
  25.926  # Notes related to annotation processing
  25.927  
  25.928  # Print a client-generated note; assumed to be localized, no translation required
  25.929 +# 0: string
  25.930  compiler.note.proc.messager=\
  25.931      {0}
  25.932  
  25.933  #####
  25.934  
  25.935 +# 0: number
  25.936  compiler.misc.count.error=\
  25.937      {0} error
  25.938 +
  25.939 +# 0: number
  25.940  compiler.misc.count.error.plural=\
  25.941      {0} errors
  25.942 +
  25.943 +# 0: number
  25.944  compiler.misc.count.warn=\
  25.945      {0} warning
  25.946 +
  25.947 +# 0: number
  25.948  compiler.misc.count.warn.plural=\
  25.949      {0} warnings
  25.950  
  25.951 @@ -650,38 +995,53 @@
  25.952  
  25.953  ## extra output when using -verbose (JavaCompiler)
  25.954  
  25.955 +# 0: symbol
  25.956  compiler.misc.verbose.checking.attribution=\
  25.957      [checking {0}]
  25.958 +
  25.959 +# 0: string
  25.960  compiler.misc.verbose.parsing.done=\
  25.961      [parsing completed {0}ms]
  25.962 +
  25.963 +# 0: file name
  25.964  compiler.misc.verbose.parsing.started=\
  25.965      [parsing started {0}]
  25.966 +
  25.967 +# 0: string
  25.968  compiler.misc.verbose.total=\
  25.969      [total {0}ms]
  25.970 +
  25.971 +# 0: file name
  25.972  compiler.misc.verbose.wrote.file=\
  25.973      [wrote {0}]
  25.974  
  25.975  ## extra output when using -verbose (Retro)
  25.976  compiler.misc.verbose.retro=\
  25.977      [retrofitting {0}]
  25.978 +
  25.979  compiler.misc.verbose.retro.with=\
  25.980      \tretrofitting {0} with {1}
  25.981 +
  25.982  compiler.misc.verbose.retro.with.list=\
  25.983      \tretrofitting {0} with type parameters {1}, supertype {2}, interfaces {3}
  25.984  
  25.985  ## extra output when using -verbose (code/ClassReader)
  25.986 +# 0: string
  25.987  compiler.misc.verbose.loading=\
  25.988      [loading {0}]
  25.989  
  25.990 +# 0: string
  25.991  compiler.misc.verbose.sourcepath=\
  25.992      [search path for source files: {0}]
  25.993  
  25.994 +# 0: string
  25.995  compiler.misc.verbose.classpath=\
  25.996      [search path for class files: {0}]
  25.997  
  25.998  ## extra output when using -checkclassfile (code/ClassReader)
  25.999  compiler.misc.ccf.found.later.version=\
 25.1000      class file has later version than expected: {0}
 25.1001 +
 25.1002  compiler.misc.ccf.unrecognized.attribute=\
 25.1003      unrecognized attribute: {0}
 25.1004  
 25.1005 @@ -701,103 +1061,135 @@
 25.1006  
 25.1007  ## Warning messages may also include the following prefix to identify a
 25.1008  ## lint option
 25.1009 +# 0: option name
 25.1010  compiler.warn.lintOption=\
 25.1011      [{0}]\u0020
 25.1012  
 25.1013 +# 0: symbol
 25.1014  compiler.warn.constant.SVUID=\
 25.1015      serialVersionUID must be constant in class {0}
 25.1016  
 25.1017 +# 0: file name
 25.1018  compiler.warn.dir.path.element.not.found=\
 25.1019      bad path element "{0}": no such directory
 25.1020  
 25.1021  compiler.warn.finally.cannot.complete=\
 25.1022      finally clause cannot complete normally
 25.1023  
 25.1024 +# 0: symbol, 1: symbol
 25.1025  compiler.warn.has.been.deprecated=\
 25.1026      {0} in {1} has been deprecated
 25.1027  
 25.1028 +# 0: symbol
 25.1029  compiler.warn.sun.proprietary=\
 25.1030      {0} is internal proprietary API and may be removed in a future release
 25.1031  
 25.1032  compiler.warn.illegal.char.for.encoding=\
 25.1033      unmappable character for encoding {0}
 25.1034  
 25.1035 +# 0: symbol
 25.1036  compiler.warn.improper.SVUID=\
 25.1037      serialVersionUID must be declared static final in class {0}
 25.1038  
 25.1039 +# 0: type, 1: type
 25.1040  compiler.warn.inexact.non-varargs.call=\
 25.1041 -non-varargs call of varargs method with inexact argument type for last parameter;\n\
 25.1042 -cast to {0} for a varargs call\n\
 25.1043 -cast to {1} for a non-varargs call and to suppress this warning
 25.1044 -
 25.1045 +    non-varargs call of varargs method with inexact argument type for last parameter;\n\
 25.1046 +    cast to {0} for a varargs call\n\
 25.1047 +    cast to {1} for a non-varargs call and to suppress this warning
 25.1048 +
 25.1049 +# 0: symbol
 25.1050  compiler.warn.long.SVUID=\
 25.1051      serialVersionUID must be of type long in class {0}
 25.1052  
 25.1053 +# 0: symbol
 25.1054  compiler.warn.missing.SVUID=\
 25.1055      serializable class {0} has no definition of serialVersionUID
 25.1056  
 25.1057 +# 0: message segment
 25.1058  compiler.warn.override.varargs.missing=\
 25.1059      {0}; overridden method has no ''...''
 25.1060 +
 25.1061 +# 0: message segment
 25.1062  compiler.warn.override.varargs.extra=\
 25.1063      {0}; overriding method is missing ''...''
 25.1064 +
 25.1065  compiler.warn.override.bridge=\
 25.1066      {0}; overridden method is a bridge method
 25.1067  
 25.1068 +# 0: symbol
 25.1069  compiler.warn.pkg-info.already.seen=\
 25.1070      a package-info.java file has already been seen for package {0}
 25.1071  
 25.1072 +# 0: file name
 25.1073  compiler.warn.path.element.not.found=\
 25.1074      bad path element "{0}": no such file or directory
 25.1075  
 25.1076  compiler.warn.possible.fall-through.into.case=\
 25.1077      possible fall-through into case
 25.1078  
 25.1079 +# 0: type
 25.1080  compiler.warn.redundant.cast=\
 25.1081      redundant cast to {0}
 25.1082  
 25.1083 +# 0: number
 25.1084  compiler.warn.position.overflow=\
 25.1085      Position encoding overflows at line {0}
 25.1086  
 25.1087 +# 0: file name, 1: number, 2: number
 25.1088  compiler.warn.big.major.version=\
 25.1089      {0}: major version {1} is newer than {2}, the highest major version supported by this compiler.\n\
 25.1090      It is recommended that the compiler be upgraded.
 25.1091  
 25.1092 +# 0: symbol kind, 1: symbol
 25.1093  compiler.warn.static.not.qualified.by.type=\
 25.1094      static {0} should be qualified by type name, {1}, instead of by an expression
 25.1095  
 25.1096 +# 0: string
 25.1097  compiler.warn.source.no.bootclasspath=\
 25.1098      bootstrap class path not set in conjunction with -source {0}
 25.1099  
 25.1100 +# 0: name, 1: number, 2: number, 3: number, 4: number
 25.1101  compiler.warn.future.attr=\
 25.1102      {0} attribute introduced in version {1}.{2} class files is ignored in version {3}.{4} class files
 25.1103  
 25.1104  # Warnings related to annotation processing
 25.1105 +# 0: name
 25.1106  compiler.warn.proc.package.does.not.exist=\
 25.1107      package {0} does not exist
 25.1108 +
 25.1109 +# 0: name
 25.1110  compiler.warn.proc.file.reopening=\
 25.1111      Attempt to create a file for ''{0}'' multiple times
 25.1112  
 25.1113 +# 0: name
 25.1114  compiler.warn.proc.type.already.exists=\
 25.1115      A file for type ''{0}'' already exists on the sourcepath or classpath
 25.1116  
 25.1117 +# 0: name
 25.1118  compiler.warn.proc.type.recreate=\
 25.1119      Attempt to create a file for type ''{0}'' multiple times
 25.1120  
 25.1121 +# 0: string
 25.1122  compiler.warn.proc.illegal.file.name=\
 25.1123      Cannot create file for illegal name ''{0}''.
 25.1124  
 25.1125 +# 0: string, 1: string
 25.1126  compiler.warn.proc.suspicious.class.name=\
 25.1127      Creating file for a type whose name ends in {1}: ''{0}''
 25.1128  
 25.1129 +# 0: name
 25.1130  compiler.warn.proc.file.create.last.round=\
 25.1131      File for type ''{0}'' created in the last round will not be subject to annotation processing.
 25.1132  
 25.1133 +# 0: string, 1: string
 25.1134  compiler.warn.proc.malformed.supported.string=\
 25.1135      Malformed string ''{0}'' for a supported annotation type returned by processor ''{1}''
 25.1136  
 25.1137 +# 0: set of string
 25.1138  compiler.warn.proc.annotations.without.processors=\
 25.1139      No processor claimed any of these annotations: {0}
 25.1140  
 25.1141 +# 0: source version, 1: string, 2: string
 25.1142  compiler.warn.proc.processor.incompatible.source.version=\
 25.1143      Supported source version ''{0}'' from annotation processor ''{1}'' less than -source ''{2}''
 25.1144  
 25.1145 @@ -805,46 +1197,62 @@
 25.1146      Annotation processing without compilation requested but no processors were found.
 25.1147  
 25.1148  compiler.warn.proc.use.implicit=\
 25.1149 -Implicitly compiled files were not subject to annotation processing.\n\
 25.1150 -Use -implicit to specify a policy for implicit compilation.
 25.1151 +    Implicitly compiled files were not subject to annotation processing.\n\
 25.1152 +    Use -implicit to specify a policy for implicit compilation.
 25.1153  
 25.1154  compiler.warn.proc.use.proc.or.implicit=\
 25.1155 -Implicitly compiled files were not subject to annotation processing.\n\
 25.1156 -Use -proc:none to disable annotation processing or -implicit to specify a policy for implicit compilation.
 25.1157 +    Implicitly compiled files were not subject to annotation processing.\n\
 25.1158 +    Use -proc:none to disable annotation processing or -implicit to specify a policy for implicit compilation.
 25.1159  
 25.1160  # Print a client-generated warning; assumed to be localized, no translation required
 25.1161 +# 0: string
 25.1162  compiler.warn.proc.messager=\
 25.1163      {0}
 25.1164  
 25.1165 +# 0: set of name
 25.1166  compiler.warn.proc.unclosed.type.files=\
 25.1167      Unclosed files for the types ''{0}''; these types will not undergo annotation processing
 25.1168  
 25.1169 +# 0: string
 25.1170  compiler.warn.proc.unmatched.processor.options=\
 25.1171      The following options were not recognized by any processor: ''{0}''
 25.1172  
 25.1173  compiler.warn.try.explicit.close.call=\
 25.1174      explicit call to close() on an auto-closeable resource
 25.1175 +
 25.1176 +# 0: symbol
 25.1177  compiler.warn.try.resource.not.referenced=\
 25.1178      auto-closeable resource {0} is never referenced in body of corresponding try statement
 25.1179 +
 25.1180  compiler.warn.unchecked.assign=\
 25.1181      unchecked assignment: {0} to {1}
 25.1182 +
 25.1183 +# 0: symbol, 1: type
 25.1184  compiler.warn.unchecked.assign.to.var=\
 25.1185      unchecked assignment to variable {0} as member of raw type {1}
 25.1186 +
 25.1187 +# 0: symbol, 1: type
 25.1188  compiler.warn.unchecked.call.mbr.of.raw.type=\
 25.1189      unchecked call to {0} as a member of the raw type {1}
 25.1190 +
 25.1191  compiler.warn.unchecked.cast.to.type=\
 25.1192      unchecked cast to type {0}
 25.1193 +
 25.1194 +# 0: symbol kind, 1: name, 2: list of type, 3: list of type, 4: symbol kind, 5: symbol
 25.1195  compiler.warn.unchecked.meth.invocation.applied=\
 25.1196      unchecked method invocation: {0} {1} in {4} {5} is applied to given types\n\
 25.1197      required: {2}\n\
 25.1198      found: {3}
 25.1199  
 25.1200 +# 0: type
 25.1201  compiler.warn.unchecked.generic.array.creation=\
 25.1202      unchecked generic array creation for varargs parameter of type {0}
 25.1203  
 25.1204 +# 0: type
 25.1205  compiler.warn.unchecked.varargs.non.reifiable.type=\
 25.1206      Possible heap pollution from parameterized vararg type {0}
 25.1207  
 25.1208 +# 0: symbol
 25.1209  compiler.warn.varargs.unsafe.use.varargs.param=\
 25.1210      Varargs method could cause heap pollution from non-reifiable varargs parameter {0}
 25.1211  
 25.1212 @@ -869,17 +1277,22 @@
 25.1213  compiler.warn.annotation.method.not.found.reason=\
 25.1214      Cannot find annotation method ''{1}()'' in type ''{0}'': {2}
 25.1215  
 25.1216 +# 0: type, 1: type
 25.1217  compiler.warn.raw.class.use=\
 25.1218      found raw type: {0}\n\
 25.1219      missing type arguments for generic class {1}
 25.1220  
 25.1221 +# 0: unused, 1: unused
 25.1222  compiler.warn.diamond.redundant.args=\
 25.1223      redundant type arguments in new expression (use diamond operator instead).
 25.1224 +
 25.1225 +# 0: type, 1: type
 25.1226  compiler.warn.diamond.redundant.args.1=\
 25.1227      redundant type arguments in new expression (use diamond operator instead).\n\
 25.1228      explicit: {0}\n\
 25.1229      inferred: {1}
 25.1230  
 25.1231 +# 0: symbol, 1: message segment
 25.1232  compiler.warn.varargs.redundant.trustme.anno=\
 25.1233      Redundant {0} annotation. {1}
 25.1234  
 25.1235 @@ -889,20 +1302,28 @@
 25.1236  ## be named as JLS3 calls them when translated to the appropriate language.
 25.1237  compiler.misc.token.identifier=\
 25.1238      <identifier>
 25.1239 +
 25.1240  compiler.misc.token.character=\
 25.1241      <character>
 25.1242 +
 25.1243  compiler.misc.token.string=\
 25.1244      <string>
 25.1245 +
 25.1246  compiler.misc.token.integer=\
 25.1247      <integer>
 25.1248 +
 25.1249  compiler.misc.token.long-integer=\
 25.1250      <long integer>
 25.1251 +
 25.1252  compiler.misc.token.float=\
 25.1253      <float>
 25.1254 +
 25.1255  compiler.misc.token.double=\
 25.1256      <double>
 25.1257 +
 25.1258  compiler.misc.token.bad-symbol=\
 25.1259      <bad symbol>
 25.1260 +
 25.1261  compiler.misc.token.end-of-input=\
 25.1262      <end of input>
 25.1263  
 25.1264 @@ -915,10 +1336,15 @@
 25.1265  ## 6. an operator (JLS3.12)
 25.1266  ##
 25.1267  ## This is the only place these tokens will be used.
 25.1268 +# 0: token
 25.1269  compiler.err.expected=\
 25.1270      {0} expected
 25.1271 +
 25.1272 +# 0: token, 1: token
 25.1273  compiler.err.expected2=\
 25.1274      {0} or {1} expected
 25.1275 +
 25.1276 +# 0: token, 1: token, 2: token
 25.1277  compiler.err.expected3=\
 25.1278      {0}, {1}, or {2} expected
 25.1279  
 25.1280 @@ -930,12 +1356,15 @@
 25.1281      ''.class'' expected
 25.1282  
 25.1283  ## The argument to this string will always be either 'case' or 'default'.
 25.1284 +# 0: token
 25.1285  compiler.err.orphaned=\
 25.1286      orphaned {0}
 25.1287  
 25.1288 +# 0: name
 25.1289  compiler.misc.anonymous.class=\
 25.1290      <anonymous {0}>
 25.1291  
 25.1292 +# 0: name, 1: type
 25.1293  compiler.misc.type.captureof=\
 25.1294      capture#{0} of {1}
 25.1295  
 25.1296 @@ -950,54 +1379,73 @@
 25.1297  
 25.1298  #####
 25.1299  
 25.1300 +# 0: symbol, 1: message segment
 25.1301  compiler.err.cant.access=\
 25.1302 -cannot access {0}\n\
 25.1303 -{1}
 25.1304 +    cannot access {0}\n\
 25.1305 +    {1}
 25.1306  
 25.1307  compiler.misc.bad.class.file.header=\
 25.1308 -bad class file: {0}\n\
 25.1309 -{1}\n\
 25.1310 -Please remove or make sure it appears in the correct subdirectory of the classpath.
 25.1311 +    bad class file: {0}\n\
 25.1312 +    {1}\n\
 25.1313 +    Please remove or make sure it appears in the correct subdirectory of the classpath.
 25.1314 +
 25.1315 +# 0: file name, 1: message segment
 25.1316  compiler.misc.bad.source.file.header=\
 25.1317 -bad source file: {0}\n\
 25.1318 -{1}\n\
 25.1319 -Please remove or make sure it appears in the correct subdirectory of the sourcepath.
 25.1320 +    bad source file: {0}\n\
 25.1321 +    {1}\n\
 25.1322 +    Please remove or make sure it appears in the correct subdirectory of the sourcepath.
 25.1323  
 25.1324  ## The following are all possible strings for the second argument ({1}) of the
 25.1325  ## above strings.
 25.1326  compiler.misc.bad.class.signature=\
 25.1327      bad class signature: {0}
 25.1328 +
 25.1329  compiler.misc.bad.enclosing.method=\
 25.1330      bad enclosing method attribute: {0}
 25.1331 +
 25.1332  compiler.misc.bad.runtime.invisible.param.annotations=\
 25.1333      bad RuntimeInvisibleParameterAnnotations attribute: {0}
 25.1334 +
 25.1335  compiler.misc.bad.const.pool.tag=\
 25.1336      bad constant pool tag: {0}
 25.1337 +
 25.1338  compiler.misc.bad.const.pool.tag.at=\
 25.1339      bad constant pool tag: {0} at {1}
 25.1340 +
 25.1341  compiler.misc.bad.signature=\
 25.1342      bad signature: {0}
 25.1343 +
 25.1344  compiler.misc.class.file.wrong.class=\
 25.1345      class file contains wrong class: {0}
 25.1346 +
 25.1347  compiler.misc.class.file.not.found=\
 25.1348      class file for {0} not found
 25.1349 +
 25.1350 +# 0: name
 25.1351  compiler.misc.file.doesnt.contain.class=\
 25.1352      file does not contain class {0}
 25.1353 +
 25.1354  compiler.misc.file.does.not.contain.package=\
 25.1355      file does not contain package {0}
 25.1356 +
 25.1357  compiler.misc.illegal.start.of.class.file=\
 25.1358      illegal start of class file
 25.1359 +
 25.1360  compiler.misc.unable.to.access.file=\
 25.1361      unable to access file: {0}
 25.1362 +
 25.1363  compiler.misc.unicode.str.not.supported=\
 25.1364      unicode string in class file not supported
 25.1365 +
 25.1366  compiler.misc.undecl.type.var=\
 25.1367      undeclared type variable: {0}
 25.1368 +
 25.1369  compiler.misc.wrong.version=\
 25.1370      class file has wrong version {0}.{1}, should be {2}.{3}
 25.1371  
 25.1372  #####
 25.1373  
 25.1374 +# 0: type, 1: type or symbol
 25.1375  compiler.err.not.within.bounds=\
 25.1376      type argument {0} is not within bounds of type-variable {1}
 25.1377  
 25.1378 @@ -1008,32 +1456,41 @@
 25.1379  
 25.1380  #####
 25.1381  
 25.1382 +# 0: message segment, 1: type, 2: type
 25.1383  compiler.err.prob.found.req=\
 25.1384 -{0}\n\
 25.1385 -required: {2}\n\
 25.1386 -found:    {1}
 25.1387 +    {0}\n\
 25.1388 +    required: {2}\n\
 25.1389 +    found:    {1}
 25.1390 +
 25.1391 +# 0: message segment, 1: type, 2: type
 25.1392  compiler.warn.prob.found.req=\
 25.1393 -{0}\n\
 25.1394 -required: {2}\n\
 25.1395 -found:    {1}
 25.1396 +    {0}\n\
 25.1397 +    required: {2}\n\
 25.1398 +    found:    {1}
 25.1399 +
 25.1400  compiler.err.prob.found.req.1=\
 25.1401 -{0} {3}\n\
 25.1402 -required: {2}\n\
 25.1403 -found:    {1}
 25.1404 +    {0} {3}\n\
 25.1405 +    required: {2}\n\
 25.1406 +    found:    {1}
 25.1407  
 25.1408  ## The following are all possible strings for the first argument ({0}) of the
 25.1409  ## above strings.
 25.1410  compiler.misc.incompatible.types=\
 25.1411      incompatible types
 25.1412 +
 25.1413 +# 0: message segment
 25.1414  compiler.misc.incompatible.types.1=\
 25.1415      incompatible types; {0}
 25.1416 +
 25.1417  compiler.misc.inconvertible.types=\
 25.1418      inconvertible types
 25.1419 +
 25.1420  compiler.misc.possible.loss.of.precision=\
 25.1421      possible loss of precision
 25.1422  
 25.1423  compiler.misc.unchecked.assign=\
 25.1424      unchecked conversion
 25.1425 +
 25.1426  # compiler.misc.storecheck=\
 25.1427  #     assignment might cause later store checks to fail
 25.1428  # compiler.misc.unchecked=\
 25.1429 @@ -1043,8 +1500,10 @@
 25.1430  
 25.1431  compiler.misc.assignment.from.super-bound=\
 25.1432      assignment from super-bound type {0}
 25.1433 +
 25.1434  compiler.misc.assignment.to.extends-bound=\
 25.1435      assignment to extends-bound type {0}
 25.1436 +
 25.1437  # compiler.err.star.expected=\
 25.1438  #     ''*'' expected
 25.1439  # compiler.err.no.elem.type=\
 25.1440 @@ -1055,23 +1514,30 @@
 25.1441  
 25.1442  #####
 25.1443  
 25.1444 +# 0: message segment or type, 1: message segment
 25.1445  compiler.err.type.found.req=\
 25.1446 -unexpected type\n\
 25.1447 -required: {1}\n\
 25.1448 -found:    {0}
 25.1449 +    unexpected type\n\
 25.1450 +    required: {1}\n\
 25.1451 +    found:    {0}
 25.1452  
 25.1453  ## The following are all possible strings for the first argument ({0}) of the
 25.1454  ## above string.
 25.1455  compiler.misc.type.req.class=\
 25.1456      class
 25.1457 +
 25.1458  compiler.misc.type.req.class.array=\
 25.1459      class or array
 25.1460 +
 25.1461  compiler.misc.type.req.array.or.iterable=\
 25.1462      array or java.lang.Iterable
 25.1463 +
 25.1464  compiler.misc.type.req.ref=\
 25.1465      reference
 25.1466 +
 25.1467  compiler.misc.type.req.exact=\
 25.1468      class or interface without bounds
 25.1469 +
 25.1470 +# 0: type
 25.1471  compiler.misc.type.parameter=\
 25.1472      type parameter {0}
 25.1473  
 25.1474 @@ -1081,87 +1547,114 @@
 25.1475  ## diagnostics whose key ends in ".1"
 25.1476  compiler.misc.undetermined.type=\
 25.1477      undetermined type
 25.1478 +
 25.1479  compiler.misc.type.variable.has.undetermined.type=\
 25.1480      type variable {0} has undetermined type
 25.1481 +
 25.1482 +# 0: type, 1: list of type
 25.1483  compiler.misc.no.unique.maximal.instance.exists=\
 25.1484      no unique maximal instance exists for type variable {0} with upper bounds {1}
 25.1485 +
 25.1486  compiler.misc.no.unique.minimal.instance.exists=\
 25.1487      no unique minimal instance exists for type variable {0} with lower bounds {1}
 25.1488 +
 25.1489 +# 0: list of type, 1: type, 2: type
 25.1490  compiler.misc.infer.no.conforming.instance.exists=\
 25.1491      no instance(s) of type variable(s) {0} exist so that {1} conforms to {2}
 25.1492 +
 25.1493 +# 0: list of type, 1: type, 2: type
 25.1494  compiler.misc.infer.no.conforming.assignment.exists=\
 25.1495      no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to formal parameter type {2}
 25.1496 +
 25.1497  compiler.misc.infer.arg.length.mismatch=\
 25.1498      cannot instantiate from arguments because actual and formal argument lists differ in length
 25.1499 +
 25.1500 +# 0: type, 1: list of type
 25.1501  compiler.misc.inferred.do.not.conform.to.bounds=\
 25.1502      inferred type does not conform to declared bound(s)\n\
 25.1503      inferred: {0}\n\
 25.1504      bound(s): {1}
 25.1505 -compiler.misc.inferred.do.not.conform.to.params=\
 25.1506 -    actual arguments do not conform to inferred formal arguments\n\
 25.1507 -    required: {0}\n\
 25.1508 -    found: {1}
 25.1509 +
 25.1510 +# 0: symbol
 25.1511  compiler.misc.diamond=\
 25.1512      {0}<>
 25.1513 +
 25.1514 +# 0: list of type, 1: message segment
 25.1515  compiler.misc.diamond.invalid.arg=\
 25.1516      type argument {0} inferred for {1} is not allowed in this context
 25.1517 +
 25.1518 +# 0: list of type, 1: message segment
 25.1519  compiler.misc.diamond.invalid.args=\
 25.1520      type arguments {0} inferred for {1} are not allowed in this context
 25.1521  
 25.1522 +# 0: type, 1: list of type
 25.1523  compiler.misc.explicit.param.do.not.conform.to.bounds=\
 25.1524      explicit type argument {0} does not conform to declared bound(s) {1}
 25.1525  
 25.1526  compiler.misc.arg.length.mismatch=\
 25.1527      actual and formal argument lists differ in length
 25.1528 +
 25.1529 +# 0: type, 1: type
 25.1530  compiler.misc.no.conforming.assignment.exists=\
 25.1531      actual argument {0} cannot be converted to {1} by method invocation conversion
 25.1532 +
 25.1533 +# 0: type, 1: type
 25.1534  compiler.misc.varargs.argument.mismatch=\
 25.1535      argument type {0} does not conform to vararg element type {1}
 25.1536 +
 25.1537  #####
 25.1538  
 25.1539  ## The first argument ({0}) is a "kindname".
 25.1540 +# 0: symbol kind, 1: symbol, 2: symbol
 25.1541  compiler.err.abstract.cant.be.accessed.directly=\
 25.1542      abstract {0} {1} in {2} cannot be accessed directly
 25.1543  
 25.1544  ## The first argument ({0}) is a "kindname".
 25.1545 +# 0: symbol kind, 1: symbol
 25.1546  compiler.err.non-static.cant.be.ref=\
 25.1547      non-static {0} {1} cannot be referenced from a static context
 25.1548  
 25.1549  ## Both arguments ({0}, {1}) are "kindname"s.  {0} is a comma-separated list
 25.1550  ## of kindnames (the list should be identical to that provided in source.
 25.1551  compiler.err.unexpected.type=\
 25.1552 -unexpected type\n\
 25.1553 -required: {0}\n\
 25.1554 -found:    {1}
 25.1555 +    unexpected type\n\
 25.1556 +    required: {0}\n\
 25.1557 +    found:    {1}
 25.1558  
 25.1559  ## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
 25.1560  ## The second argument {1} is the non-resolved symbol
 25.1561  ## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
 25.1562  ## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
 25.1563 +# 0: symbol kind, 1: name, 2: unused, 3: unused
 25.1564  compiler.err.cant.resolve=\
 25.1565      cannot find symbol\n\
 25.1566      symbol: {0} {1}
 25.1567  
 25.1568 +# 0: symbol kind, 1: name, 2: unused, 3: list of type
 25.1569  compiler.err.cant.resolve.args=\
 25.1570      cannot find symbol\n\
 25.1571      symbol: {0} {1}({3})
 25.1572  
 25.1573 +# 0: symbol kind, 1: name, 2: list of type, 3: list of type
 25.1574  compiler.err.cant.resolve.args.params=\
 25.1575      cannot find symbol\n\
 25.1576      symbol: {0} <{2}>{1}({3})
 25.1577  
 25.1578  ## arguments from {0} to {3} have the same meaning as above
 25.1579  ## The fifth argument {4} is a location subdiagnostic (see below)
 25.1580 +# 0: symbol kind, 1: name, 2: unused, 3: unused, 4: message segment
 25.1581  compiler.err.cant.resolve.location=\
 25.1582      cannot find symbol\n\
 25.1583      symbol:   {0} {1}\n\
 25.1584      location: {4}
 25.1585  
 25.1586 +# 0: symbol kind, 1: name, 2: unused, 3: list of type, 4: message segment
 25.1587  compiler.err.cant.resolve.location.args=\
 25.1588      cannot find symbol\n\
 25.1589      symbol:   {0} {1}({3})\n\
 25.1590      location: {4}
 25.1591  
 25.1592 +# 0: symbol kind, 1: name, 2: list of type, 3: list, 4: message segment
 25.1593  compiler.err.cant.resolve.location.args.params=\
 25.1594      cannot find symbol\n\
 25.1595      symbol:   {0} <{2}>{1}({3})\n\
 25.1596 @@ -1172,8 +1665,11 @@
 25.1597  ## The second argument {1} is the location name
 25.1598  ## The third argument {2} is the location type (only when {1} is a variable name)
 25.1599  
 25.1600 +# 0: symbol kind, 1: symbol, 2: unused
 25.1601  compiler.misc.location=\
 25.1602      {0} {1}
 25.1603 +
 25.1604 +# 0: symbol kind, 1: symbol, 2: type
 25.1605  compiler.misc.location.1=\
 25.1606      {0} {1} of type {2}
 25.1607  
 25.1608 @@ -1184,85 +1680,124 @@
 25.1609  #     static member
 25.1610  compiler.misc.kindname.annotation=\
 25.1611      @interface
 25.1612 +
 25.1613  compiler.misc.kindname.constructor=\
 25.1614      constructor
 25.1615 +
 25.1616  compiler.misc.kindname.enum=\
 25.1617      enum
 25.1618 +
 25.1619  compiler.misc.kindname.interface=\
 25.1620      interface
 25.1621 +
 25.1622  compiler.misc.kindname.static=\
 25.1623      static
 25.1624 +
 25.1625  compiler.misc.kindname.type.variable=\
 25.1626      type variable
 25.1627 +
 25.1628  compiler.misc.kindname.type.variable.bound=\
 25.1629      bound of type variable
 25.1630 +
 25.1631  compiler.misc.kindname.variable=\
 25.1632      variable
 25.1633 +
 25.1634  compiler.misc.kindname.value=\
 25.1635      value
 25.1636 +
 25.1637  compiler.misc.kindname.method=\
 25.1638      method
 25.1639 +
 25.1640  compiler.misc.kindname.class=\
 25.1641      class
 25.1642 +
 25.1643  compiler.misc.kindname.package=\
 25.1644      package
 25.1645 +
 25.1646  #####
 25.1647  
 25.1648  compiler.misc.no.args=\
 25.1649      no arguments
 25.1650  
 25.1651 +# 0: message segment
 25.1652  compiler.err.override.static=\
 25.1653      {0}\n\
 25.1654      overriding method is static
 25.1655 +
 25.1656 +# 0: message segment, 1: set of modifier
 25.1657  compiler.err.override.meth=\
 25.1658      {0}\n\
 25.1659      overridden method is {1}
 25.1660  
 25.1661 +# 0: message segment, 1: type
 25.1662  compiler.err.override.meth.doesnt.throw=\
 25.1663      {0}\n\
 25.1664      overridden method does not throw {1}
 25.1665  
 25.1666  # In the following string {1} is a space separated list of Java Keywords, as
 25.1667  # they would have been declared in the source code
 25.1668 +# 0: message segment, 1: set of modifier
 25.1669  compiler.err.override.weaker.access=\
 25.1670      {0}\n\
 25.1671      attempting to assign weaker access privileges; was {1}
 25.1672  
 25.1673 +# 0: message segment, 1: type, 2: type
 25.1674  compiler.err.override.incompatible.ret=\
 25.1675      {0}\n\
 25.1676      return type {1} is not compatible with {2}
 25.1677  
 25.1678 +# 0: message segment, 1: type, 2: type
 25.1679  compiler.warn.override.unchecked.ret=\
 25.1680      {0}\n\
 25.1681      return type requires unchecked conversion from {1} to {2}
 25.1682  
 25.1683 +# 0: message segment, 1: type
 25.1684  compiler.warn.override.unchecked.thrown=\
 25.1685      {0}\n\
 25.1686      overridden method does not throw {1}
 25.1687  
 25.1688  ## The following are all possible strings for the first argument ({0}) of the
 25.1689  ## above strings.
 25.1690 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1691  compiler.misc.cant.override=\
 25.1692      {0} in {1} cannot override {2} in {3}
 25.1693 +
 25.1694 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1695  compiler.misc.cant.implement=\
 25.1696      {0} in {1} cannot implement {2} in {3}
 25.1697 +
 25.1698 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1699  compiler.misc.clashes.with=\
 25.1700      {0} in {1} clashes with {2} in {3}
 25.1701 +
 25.1702 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1703  compiler.misc.unchecked.override=\
 25.1704      {0} in {1} overrides {2} in {3}
 25.1705 +
 25.1706 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1707  compiler.misc.unchecked.implement=\
 25.1708      {0} in {1} implements {2} in {3}
 25.1709 +
 25.1710 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1711  compiler.misc.unchecked.clash.with=\
 25.1712      {0} in {1} overrides {2} in {3}
 25.1713 +
 25.1714 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1715  compiler.misc.varargs.override=\
 25.1716      {0} in {1} overrides {2} in {3}
 25.1717 +
 25.1718 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1719  compiler.misc.varargs.implement=\
 25.1720      {0} in {1} implements {2} in {3}
 25.1721 +
 25.1722 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
 25.1723  compiler.misc.varargs.clash.with=\
 25.1724      {0} in {1} overrides {2} in {3}
 25.1725 +
 25.1726  compiler.misc.non.denotable.type=\
 25.1727      Non-denotable type {0} not allowed here
 25.1728  
 25.1729 +# 0: symbol kind, 1: symbol, 2: symbol, 3: message segment
 25.1730  compiler.misc.inapplicable.method=\
 25.1731      {0} {1}.{2} is not applicable\n\
 25.1732      ({3})
 25.1733 @@ -1270,77 +1805,90 @@
 25.1734  ########################################
 25.1735  # Diagnostics for language feature changes
 25.1736  ########################################
 25.1737 +# 0: string
 25.1738  compiler.err.unsupported.fp.lit=\
 25.1739      hexadecimal floating point literals are not supported in -source {0}\n\
 25.1740 -(use -source 5 or higher to enable hexadecimal floating point literals)
 25.1741 -
 25.1742 +    (use -source 5 or higher to enable hexadecimal floating point literals)
 25.1743 +
 25.1744 +# 0: string
 25.1745  compiler.err.unsupported.binary.lit=\
 25.1746      binary literals are not supported in -source {0}\n\
 25.1747 -(use -source 7 or higher to enable binary literals)
 25.1748 -
 25.1749 +    (use -source 7 or higher to enable binary literals)
 25.1750 +
 25.1751 +# 0: string
 25.1752  compiler.err.unsupported.underscore.lit=\
 25.1753      underscores in literals are not supported in -source {0}\n\
 25.1754 -(use -source 7 or higher to enable underscores in literals)
 25.1755 -
 25.1756 +    (use -source 7 or higher to enable underscores in literals)
 25.1757 +
 25.1758 +# 0: string
 25.1759  compiler.err.try.with.resources.not.supported.in.source=\
 25.1760      try-with-resources is not supported in -source {0}\n\
 25.1761 -(use -source 7 or higher to enable try-with-resources)
 25.1762 +    (use -source 7 or higher to enable try-with-resources)
 25.1763  
 25.1764  compiler.warn.enum.as.identifier=\
 25.1765      as of release 5, ''enum'' is a keyword, and may not be used as an identifier\n\
 25.1766 -(use -source 5 or higher to use ''enum'' as a keyword)
 25.1767 +    (use -source 5 or higher to use ''enum'' as a keyword)
 25.1768  
 25.1769  compiler.warn.assert.as.identifier=\
 25.1770      as of release 1.4, ''assert'' is a keyword, and may not be used as an identifier\n\
 25.1771 -(use -source 1.4 or higher to use ''assert'' as a keyword)
 25.1772 +    (use -source 1.4 or higher to use ''assert'' as a keyword)
 25.1773  
 25.1774  compiler.err.enum.as.identifier=\
 25.1775      as of release 5, ''enum'' is a keyword, and may not be used as an identifier\n\
 25.1776 -(use -source 1.4 or lower to use ''enum'' as an identifier)
 25.1777 +    (use -source 1.4 or lower to use ''enum'' as an identifier)
 25.1778  
 25.1779  compiler.err.assert.as.identifier=\
 25.1780      as of release 1.4, ''assert'' is a keyword, and may not be used as an identifier\n\
 25.1781 -(use -source 1.3 or lower to use ''assert'' as an identifier)
 25.1782 -
 25.1783 +    (use -source 1.3 or lower to use ''assert'' as an identifier)
 25.1784 +
 25.1785 +# 0: string
 25.1786  compiler.err.generics.not.supported.in.source=\
 25.1787      generics are not supported in -source {0}\n\
 25.1788 -(use -source 5 or higher to enable generics)
 25.1789 -
 25.1790 +    (use -source 5 or higher to enable generics)
 25.1791 +
 25.1792 +# 0: string
 25.1793  compiler.err.varargs.not.supported.in.source=\
 25.1794      variable-arity methods are not supported in -source {0}\n\
 25.1795 -(use -source 5 or higher to enable variable-arity methods)
 25.1796 -
 25.1797 +    (use -source 5 or higher to enable variable-arity methods)
 25.1798 +
 25.1799 +# 0: string
 25.1800  compiler.err.annotations.not.supported.in.source=\
 25.1801      annotations are not supported in -source {0}\n\
 25.1802 -(use -source 5 or higher to enable annotations)
 25.1803 +    (use -source 5 or higher to enable annotations)
 25.1804  
 25.1805  #308 compiler.err.type.annotations.not.supported.in.source=\
 25.1806  #308     type annotations are not supported in -source {0}\n\
 25.1807  #308 (use -source 7 or higher to enable type annotations)
 25.1808  
 25.1809 +# 0: string
 25.1810  compiler.err.foreach.not.supported.in.source=\
 25.1811      for-each loops are not supported in -source {0}\n\
 25.1812 -(use -source 5 or higher to enable for-each loops)
 25.1813 -
 25.1814 +    (use -source 5 or higher to enable for-each loops)
 25.1815 +
 25.1816 +# 0: string
 25.1817  compiler.err.static.import.not.supported.in.source=\
 25.1818      static import declarations are not supported in -source {0}\n\
 25.1819 -(use -source 5 or higher to enable static import declarations)
 25.1820 -
 25.1821 +    (use -source 5 or higher to enable static import declarations)
 25.1822 +
 25.1823 +# 0: string
 25.1824  compiler.err.enums.not.supported.in.source=\
 25.1825      enums are not supported in -source {0}\n\
 25.1826 -(use -source 5 or higher to enable enums)
 25.1827 -
 25.1828 +    (use -source 5 or higher to enable enums)
 25.1829 +
 25.1830 +# 0: string
 25.1831  compiler.err.diamond.not.supported.in.source=\
 25.1832      diamond operator is not supported in -source {0}\n\
 25.1833 -(use -source 7 or higher to enable diamond operator)
 25.1834 -
 25.1835 +    (use -source 7 or higher to enable diamond operator)
 25.1836 +
 25.1837 +# 0: string
 25.1838  compiler.err.multicatch.not.supported.in.source=\
 25.1839      multi-catch statement is not supported in -source {0}\n\
 25.1840 -(use -source 7 or higher to enable multi-catch statement)
 25.1841 -
 25.1842 +    (use -source 7 or higher to enable multi-catch statement)
 25.1843 +
 25.1844 +# 0: string
 25.1845  compiler.err.string.switch.not.supported.in.source=\
 25.1846      strings in switch are not supported in -source {0}\n\
 25.1847 -(use -source 7 or higher to enable strings in switch)
 25.1848 +    (use -source 7 or higher to enable strings in switch)
 25.1849  
 25.1850  ########################################
 25.1851  # Diagnostics for where clause implementation
 25.1852 @@ -1351,29 +1899,35 @@
 25.1853      <null>
 25.1854  
 25.1855  # X#n (where n is an int id) is disambiguated tvar name
 25.1856 +# 0: name, 1: number
 25.1857  compiler.misc.type.var=\
 25.1858      {0}#{1}
 25.1859  
 25.1860  # CAP#n (where n is an int id) is an abbreviation for 'captured type'
 25.1861 +# 0: number
 25.1862  compiler.misc.captured.type=\
 25.1863      CAP#{0}
 25.1864  
 25.1865  # <INT#n> (where n is an int id) is an abbreviation for 'intersection type'
 25.1866 +# 0: number
 25.1867  compiler.misc.intersection.type=\
 25.1868      INT#{0}
 25.1869  
 25.1870  # where clause for captured type: contains upper ('extends {1}') and lower
 25.1871  # ('super {2}') bound along with the wildcard that generated this captured type ({3})
 25.1872 +# 0: type, 1: type, 2: type, 3: type
 25.1873  compiler.misc.where.captured=\
 25.1874      {0} extends {1} super: {2} from capture of {3}
 25.1875  
 25.1876  # compact where clause for captured type: contains upper ('extends {1}') along
 25.1877  # with the wildcard that generated this captured type ({3})
 25.1878 +# 0: type, 1: type, 2: unused, 3: type
 25.1879  compiler.misc.where.captured.1=\
 25.1880      {0} extends {1} from capture of {3}
 25.1881  
 25.1882  # where clause for type variable: contains upper bound(s) ('extends {1}') along with
 25.1883  # the kindname ({2}) and location ({3}) in which the typevar has been declared
 25.1884 +# 0: type, 1: list of type, 2: symbol kind, 3: symbol
 25.1885  compiler.misc.where.typevar=\
 25.1886      {0} extends {1} declared in {2} {3}
 25.1887  
 25.1888 @@ -1384,20 +1938,30 @@
 25.1889  
 25.1890  # where clause for type variable: contains all the upper bound(s) ('extends {1}')
 25.1891  # of this intersection type
 25.1892 +# 0: type, 1: list of type
 25.1893  compiler.misc.where.intersection=\
 25.1894      {0} extends {1}
 25.1895  
 25.1896  ### Where clause headers ###
 25.1897  compiler.misc.where.description.captured=\
 25.1898      where {0} is a fresh type-variable:
 25.1899 +
 25.1900 +# 0: set of type
 25.1901  compiler.misc.where.description.typevar=\
 25.1902      where {0} is a type-variable:
 25.1903 +
 25.1904 +# 0: set of type
 25.1905  compiler.misc.where.description.intersection=\
 25.1906      where {0} is an intersection type:
 25.1907 +
 25.1908 +# 0: set of type
 25.1909  compiler.misc.where.description.captured.1=\
 25.1910      where {0} are fresh type-variables:
 25.1911 +
 25.1912 +# 0: set of type
 25.1913  compiler.misc.where.description.typevar.1=\
 25.1914      where {0} are type-variables:
 25.1915 +
 25.1916  compiler.misc.where.description.intersection.1=\
 25.1917      where {0} are intersection types:
 25.1918