Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/code/Source.java	Mon Aug 24 22:28:37 2009 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Source.java	Fri Aug 28 16:54:10 2009 -0700
     1.3 @@ -122,6 +122,9 @@
     1.4      public boolean allowGenerics() {
     1.5          return compareTo(JDK1_5) >= 0;
     1.6      }
     1.7 +    public boolean allowDiamond() {
     1.8 +        return compareTo(JDK1_7) >= 0;
     1.9 +    }
    1.10      public boolean allowEnums() {
    1.11          return compareTo(JDK1_5) >= 0;
    1.12      }

     2.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Aug 24 22:28:37 2009 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Fri Aug 28 16:54:10 2009 -0700
     2.3 @@ -195,6 +195,21 @@
     2.4          return owntype;
     2.5      }
     2.6  
     2.7 +    Type checkReturn(JCTree tree, Type owntype, int ownkind, int pkind, Type pt) {
     2.8 +        if (owntype.tag != ERROR && pt.tag != METHOD && pt.tag != FORALL) {
     2.9 +            if ((ownkind & ~pkind) == 0) {
    2.10 +                owntype = chk.checkReturnType(tree.pos(), owntype, pt);
    2.11 +            } else {
    2.12 +                log.error(tree.pos(), "unexpected.type",
    2.13 +                          kindNames(pkind),
    2.14 +                          kindName(ownkind));
    2.15 +                owntype = types.createErrorType(owntype);
    2.16 +            }
    2.17 +        }
    2.18 +        tree.type = owntype;
    2.19 +        return owntype;
    2.20 +    }
    2.21 +
    2.22      /** Is given blank final variable assignable, i.e. in a scope where it
    2.23       *  may be assigned to even though it is final?
    2.24       *  @param v      The blank final variable.
    2.25 @@ -413,7 +428,14 @@
    2.26      /** Derived visitor method: attribute a type tree.
    2.27       */
    2.28      Type attribType(JCTree tree, Env<AttrContext> env) {
    2.29 -        Type result = attribTree(tree, env, TYP, Type.noType);
    2.30 +        Type result = attribType(tree, env, Type.noType);
    2.31 +        return result;
    2.32 +    }
    2.33 +
    2.34 +    /** Derived visitor method: attribute a type tree.
    2.35 +     */
    2.36 +    Type attribType(JCTree tree, Env<AttrContext> env, Type pt) {
    2.37 +        Type result = attribTree(tree, env, TYP, pt);
    2.38          return result;
    2.39      }
    2.40  
    2.41 @@ -1357,7 +1379,7 @@
    2.42  
    2.43              // Check that value of resulting type is admissible in the
    2.44              // current context.  Also, capture the return type
    2.45 -            result = check(tree, capture(restype), VAL, pkind, pt);
    2.46 +            result = checkReturn(tree, capture(restype), VAL, pkind, pt);
    2.47          }
    2.48          chk.validate(tree.typeargs, localEnv);
    2.49      }
    2.50 @@ -1432,9 +1454,9 @@
    2.51  
    2.52          // Attribute clazz expression and store
    2.53          // symbol + type back into the attributed tree.
    2.54 -        Type clazztype = chk.checkClassType(
    2.55 -            tree.clazz.pos(), attribType(clazz, env), true);
    2.56 +        Type clazztype = attribType(clazz, env);
    2.57          chk.validate(clazz, localEnv);
    2.58 +        clazztype = chk.checkNewClassType(clazz.pos(), clazztype, true, pt);
    2.59          if (tree.encl != null) {
    2.60              // We have to work in this case to store
    2.61              // symbol + type back into the attributed tree.
    2.62 @@ -1539,7 +1561,9 @@
    2.63                  //       ...
    2.64                  //     }
    2.65                  if (Resolve.isStatic(env)) cdef.mods.flags |= STATIC;
    2.66 -
    2.67 +                clazz = TreeInfo.isDiamond(tree) ?
    2.68 +                    make.Type(clazztype)
    2.69 +                    : clazz;
    2.70                  if (clazztype.tsym.isInterface()) {
    2.71                      cdef.implementing = List.of(clazz);
    2.72                  } else {
    2.73 @@ -2522,7 +2546,7 @@
    2.74          if (clazztype.tag == CLASS) {
    2.75              List<Type> formals = clazztype.tsym.type.getTypeArguments();
    2.76  
    2.77 -            if (actuals.length() == formals.length()) {
    2.78 +            if (actuals.length() == formals.length() || actuals.isEmpty()) {
    2.79                  List<Type> a = actuals;
    2.80                  List<Type> f = formals;
    2.81                  while (a.nonEmpty()) {
    2.82 @@ -2548,7 +2572,18 @@
    2.83                          clazzOuter = site;
    2.84                      }
    2.85                  }
    2.86 -                owntype = new ClassType(clazzOuter, actuals, clazztype.tsym);
    2.87 +                if (actuals.nonEmpty()) {
    2.88 +                    owntype = new ClassType(clazzOuter, actuals, clazztype.tsym);
    2.89 +                }
    2.90 +                else if (TreeInfo.isDiamond(tree)) {
    2.91 +                    //a type apply with no explicit type arguments - diamond operator
    2.92 +                    //the result type is a forall F where F's tvars are the type-variables
    2.93 +                    //that will be inferred when F is checked against the expected type
    2.94 +                    List<Type> ftvars = clazztype.tsym.type.getTypeArguments();
    2.95 +                    List<Type> new_tvars = types.newInstances(ftvars);
    2.96 +                    clazztype = new ClassType(clazzOuter, new_tvars, clazztype.tsym);
    2.97 +                    owntype = new ForAll(new_tvars, clazztype);
    2.98 +                }
    2.99              } else {
   2.100                  if (formals.length() != 0) {
   2.101                      log.error(tree.pos(), "wrong.number.type.args",

     3.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Mon Aug 24 22:28:37 2009 -0700
     3.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Fri Aug 28 16:54:10 2009 -0700
     3.3 @@ -362,8 +362,6 @@
     3.4      Type checkType(DiagnosticPosition pos, Type found, Type req) {
     3.5          if (req.tag == ERROR)
     3.6              return req;
     3.7 -        if (found.tag == FORALL)
     3.8 -            return instantiatePoly(pos, (ForAll)found, req, convertWarner(pos, found, req));
     3.9          if (req.tag == NONE)
    3.10              return found;
    3.11          if (types.isAssignable(found, req, convertWarner(pos, found, req)))
    3.12 @@ -381,11 +379,38 @@
    3.13          return typeError(pos, diags.fragment("incompatible.types"), found, req);
    3.14      }
    3.15  
    3.16 +    Type checkReturnType(DiagnosticPosition pos, Type found, Type req) {
    3.17 +        if (found.tag == FORALL) {
    3.18 +            try {
    3.19 +                return instantiatePoly(pos, (ForAll) found, req, convertWarner(pos, found, req));
    3.20 +            } catch (Infer.NoInstanceException ex) {
    3.21 +                if (ex.isAmbiguous) {
    3.22 +                    JCDiagnostic d = ex.getDiagnostic();
    3.23 +                    log.error(pos,
    3.24 +                            "undetermined.type" + (d != null ? ".1" : ""),
    3.25 +                            found, d);
    3.26 +                    return types.createErrorType(req);
    3.27 +                } else {
    3.28 +                    JCDiagnostic d = ex.getDiagnostic();
    3.29 +                    return typeError(pos,
    3.30 +                            diags.fragment("incompatible.types" + (d != null ? ".1" : ""), d),
    3.31 +                            found, req);
    3.32 +                }
    3.33 +            } catch (Infer.InvalidInstanceException ex) {
    3.34 +                JCDiagnostic d = ex.getDiagnostic();
    3.35 +                log.error(pos, "invalid.inferred.types", ((ForAll)found).tvars, d);
    3.36 +                return types.createErrorType(req);
    3.37 +            }
    3.38 +        } else {
    3.39 +            return checkType(pos, found, req);
    3.40 +        }
    3.41 +    }
    3.42 +
    3.43      /** Instantiate polymorphic type to some prototype, unless
    3.44       *  prototype is `anyPoly' in which case polymorphic type
    3.45       *  is returned unchanged.
    3.46       */
    3.47 -    Type instantiatePoly(DiagnosticPosition pos, ForAll t, Type pt, Warner warn) {
    3.48 +    Type instantiatePoly(DiagnosticPosition pos, ForAll t, Type pt, Warner warn) throws Infer.NoInstanceException {
    3.49          if (pt == Infer.anyPoly && complexInference) {
    3.50              return t;
    3.51          } else if (pt == Infer.anyPoly || pt.tag == NONE) {
    3.52 @@ -394,28 +419,9 @@
    3.53          } else if (pt.tag == ERROR) {
    3.54              return pt;
    3.55          } else {
    3.56 -            try {
    3.57 -                return infer.instantiateExpr(t, pt, warn);
    3.58 -            } catch (Infer.NoInstanceException ex) {
    3.59 -                if (ex.isAmbiguous) {
    3.60 -                    JCDiagnostic d = ex.getDiagnostic();
    3.61 -                    log.error(pos,
    3.62 -                              "undetermined.type" + (d!=null ? ".1" : ""),
    3.63 -                              t, d);
    3.64 -                    return types.createErrorType(pt);
    3.65 -                } else {
    3.66 -                    JCDiagnostic d = ex.getDiagnostic();
    3.67 -                    return typeError(pos,
    3.68 -                                     diags.fragment("incompatible.types" + (d!=null ? ".1" : ""), d),
    3.69 -                                     t, pt);
    3.70 -                }
    3.71 -            } catch (Infer.InvalidInstanceException ex) {
    3.72 -                JCDiagnostic d = ex.getDiagnostic();
    3.73 -                log.error(pos, "invalid.inferred.types", t.tvars, d);
    3.74 -                return types.createErrorType(pt);
    3.75 -            }
    3.76 +            return infer.instantiateExpr(t, pt, warn);
    3.77          }
    3.78 -    }
    3.79 +     }
    3.80  
    3.81      /** Check that a given type can be cast to a given target type.
    3.82       *  Return the result of the cast.
    3.83 @@ -538,6 +544,29 @@
    3.84          return t;
    3.85      }
    3.86  
    3.87 +    /** Check that type is a valid type for a new expression. If the type contains
    3.88 +     * some uninferred type variables, instantiate them exploiting the expected
    3.89 +     * type.
    3.90 +     *
    3.91 +     *  @param pos           Position to be used for error reporting.
    3.92 +     *  @param t             The type to be checked.
    3.93 +     *  @param noBounds    True if type bounds are illegal here.
    3.94 +     *  @param pt          Expected type (used with diamond operator)
    3.95 +     */
    3.96 +    Type checkNewClassType(DiagnosticPosition pos, Type t, boolean noBounds, Type pt) {
    3.97 +        if (t.tag == FORALL) {
    3.98 +            try {
    3.99 +                t = instantiatePoly(pos, (ForAll)t, pt, Warner.noWarnings);
   3.100 +            }
   3.101 +            catch (Infer.NoInstanceException ex) {
   3.102 +                JCDiagnostic d = ex.getDiagnostic();
   3.103 +                log.error(pos, "cant.apply.diamond", t.getTypeArguments(), d);
   3.104 +                return types.createErrorType(pt);
   3.105 +            }
   3.106 +        }
   3.107 +        return checkClassType(pos, t, noBounds);
   3.108 +    }
   3.109 +
   3.110      /** Check that type is a reifiable class, interface or array type.
   3.111       *  @param pos           Position to be used for error reporting.
   3.112       *  @param t             The type to be checked.
   3.113 @@ -890,7 +919,8 @@
   3.114                  }
   3.115  
   3.116                  checkCapture(tree);
   3.117 -
   3.118 +            }
   3.119 +            if (tree.type.tag == CLASS || tree.type.tag == FORALL) {
   3.120                  // Check that this type is either fully parameterized, or
   3.121                  // not parameterized at all.
   3.122                  if (tree.type.getEnclosingType().isRaw())

     4.1 --- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Mon Aug 24 22:28:37 2009 -0700
     4.2 +++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Fri Aug 28 16:54:10 2009 -0700
     4.3 @@ -131,6 +131,7 @@
     4.4          this.allowForeach = source.allowForeach();
     4.5          this.allowStaticImport = source.allowStaticImport();
     4.6          this.allowAnnotations = source.allowAnnotations();
     4.7 +        this.allowDiamond = source.allowDiamond();
     4.8          this.allowTypeAnnotations = source.allowTypeAnnotations();
     4.9          this.keepDocComments = keepDocComments;
    4.10          if (keepDocComments)
    4.11 @@ -148,6 +149,10 @@
    4.12       */
    4.13      boolean allowGenerics;
    4.14  
    4.15 +    /** Switch: Should diamond operator be recognized?
    4.16 +     */
    4.17 +    boolean allowDiamond;
    4.18 +
    4.19      /** Switch: Should varargs be recognized?
    4.20       */
    4.21      boolean allowVarargs;
    4.22 @@ -194,6 +199,7 @@
    4.23      static final int TYPE = 2;
    4.24      static final int NOPARAMS = 4;
    4.25      static final int TYPEARG = 8;
    4.26 +    static final int DIAMOND = 16;
    4.27  
    4.28      /** The current mode.
    4.29       */
    4.30 @@ -1326,6 +1332,11 @@
    4.31          ListBuffer<JCExpression> args = lb();
    4.32          if (S.token() == LT) {
    4.33              S.nextToken();
    4.34 +            if (S.token() == GT && (mode & DIAMOND) != 0) {
    4.35 +                checkDiamond();
    4.36 +                S.nextToken();
    4.37 +                return List.nil();
    4.38 +            }
    4.39              args.append(((mode & EXPR) == 0) ? typeArgument() : parseType());
    4.40              while (S.token() == COMMA) {
    4.41                  S.nextToken();
    4.42 @@ -1497,7 +1508,7 @@
    4.43              t = F.AnnotatedType(newAnnotations, t);
    4.44  
    4.45          int oldmode = mode;
    4.46 -        mode = TYPE;
    4.47 +        mode = TYPE | DIAMOND;
    4.48          if (S.token() == LT) {
    4.49              checkGenerics();
    4.50              t = typeArguments(t);
    4.51 @@ -1547,8 +1558,11 @@
    4.52      JCExpression innerCreator(int newpos, List<JCExpression> typeArgs, JCExpression encl) {
    4.53          JCExpression t = toP(F.at(S.pos()).Ident(ident()));
    4.54          if (S.token() == LT) {
    4.55 +            int oldmode = mode;
    4.56 +            mode |= DIAMOND;
    4.57              checkGenerics();
    4.58              t = typeArguments(t);
    4.59 +            mode = oldmode;
    4.60          }
    4.61          return classCreatorRest(newpos, encl, typeArgs, t);
    4.62      }
    4.63 @@ -3099,6 +3113,12 @@
    4.64          }
    4.65      }
    4.66  
    4.67 +    void checkDiamond() {
    4.68 +        if (!allowDiamond) {
    4.69 +            log.error(S.pos(), "diamond.not.supported.in.source", source.name);
    4.70 +            allowDiamond = true;
    4.71 +        }
    4.72 +    }
    4.73      void checkGenerics() {
    4.74          if (!allowGenerics) {
    4.75              log.error(S.pos(), "generics.not.supported.in.source", source.name);

     5.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Mon Aug 24 22:28:37 2009 -0700
     5.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Fri Aug 28 16:54:10 2009 -0700
     5.3 @@ -287,11 +287,12 @@
     5.4          // The to-be-wrapped iterator.
     5.5          private Iterator<?> iterator;
     5.6          private Log log;
     5.7 +        private Class<?> loaderClass;
     5.8 +        private boolean jusl;
     5.9 +        private Object loader;
    5.10  
    5.11          ServiceIterator(ClassLoader classLoader, Log log) {
    5.12 -            Class<?> loaderClass;
    5.13              String loadMethodName;
    5.14 -            boolean jusl;
    5.15  
    5.16              this.log = log;
    5.17              try {
    5.18 @@ -324,6 +325,7 @@
    5.19                  // For java.util.ServiceLoader, we have to call another
    5.20                  // method to get the iterator.
    5.21                  if (jusl) {
    5.22 +                    loader = result; // Store ServiceLoader to call reload later
    5.23                      Method m = loaderClass.getMethod("iterator");
    5.24                      result = m.invoke(result); // serviceLoader.iterator();
    5.25                  }
    5.26 @@ -365,6 +367,18 @@
    5.27          public void remove() {
    5.28              throw new UnsupportedOperationException();
    5.29          }
    5.30 +
    5.31 +        public void close() {
    5.32 +            if (jusl) {
    5.33 +                try {
    5.34 +                    // Call java.util.ServiceLoader.reload
    5.35 +                    Method reloadMethod = loaderClass.getMethod("reload");
    5.36 +                    reloadMethod.invoke(loader);
    5.37 +                } catch(Exception e) {
    5.38 +                    ; // Ignore problems during a call to reload.
    5.39 +                }
    5.40 +            }
    5.41 +        }
    5.42      }
    5.43  
    5.44  
    5.45 @@ -552,7 +566,7 @@
    5.46       * been discoverd so far as well as the means to discover more, if
    5.47       * necessary.  A single iterator should be used per round of
    5.48       * annotation processing.  The iterator first visits already
    5.49 -     * discovered processors then fails over to the service provided
    5.50 +     * discovered processors then fails over to the service provider
    5.51       * mechanism if additional queries are made.
    5.52       */
    5.53      class DiscoveredProcessors implements Iterable<ProcessorState> {
    5.54 @@ -624,6 +638,16 @@
    5.55              this.processorIterator = processorIterator;
    5.56              this.procStateList = new ArrayList<ProcessorState>();
    5.57          }
    5.58 +
    5.59 +        /**
    5.60 +         * Free jar files, etc. if using a service loader.
    5.61 +         */
    5.62 +        public void close() {
    5.63 +            if (processorIterator != null &&
    5.64 +                processorIterator instanceof ServiceIterator) {
    5.65 +                ((ServiceIterator) processorIterator).close();
    5.66 +            }
    5.67 +        }
    5.68      }
    5.69  
    5.70      private void discoverAndRunProcs(Context context,
    5.71 @@ -910,7 +934,7 @@
    5.72          * second to last round; errorRaised() gives the error status
    5.73          * of the last round.
    5.74          */
    5.75 -       errorStatus = errorStatus || messager.errorRaised();
    5.76 +        errorStatus = errorStatus || messager.errorRaised();
    5.77  
    5.78  
    5.79          // Free resources
    5.80 @@ -1023,6 +1047,8 @@
    5.81       */
    5.82      public void close() throws IOException {
    5.83          filer.close();
    5.84 +        if (discoveredProcs != null) // Make calling close idempotent
    5.85 +            discoveredProcs.close();
    5.86          discoveredProcs = null;
    5.87          if (processorClassLoader != null && processorClassLoader instanceof Closeable)
    5.88              ((Closeable) processorClassLoader).close();

     6.1 --- a/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Mon Aug 24 22:28:37 2009 -0700
     6.2 +++ b/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Fri Aug 28 16:54:10 2009 -0700
     6.3 @@ -48,7 +48,8 @@
     6.4   * deletion without notice.</b>
     6.5   */
     6.6  @SupportedAnnotationTypes("*")
     6.7 -@SupportedSourceVersion(SourceVersion.RELEASE_6)
     6.8 +// TODO: Change to version 7 based visitors when available
     6.9 +@SupportedSourceVersion(SourceVersion.RELEASE_7)
    6.10  public class PrintingProcessor extends AbstractProcessor {
    6.11      PrintWriter writer;
    6.12  
    6.13 @@ -374,6 +375,7 @@
    6.14                  for(TypeParameterElement tpe: typeParams) {
    6.15                      if (!first)
    6.16                          writer.print(", ");
    6.17 +                    printAnnotationsInline(tpe);
    6.18                      writer.print(tpe.toString());
    6.19                      first = false;
    6.20                  }

     7.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Mon Aug 24 22:28:37 2009 -0700
     7.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Fri Aug 28 16:54:10 2009 -0700
     7.3 @@ -1073,6 +1073,10 @@
     7.4      symbol:   {0} <{2}>{1}({3})\n\
     7.5      location: {4} {5}
     7.6  
     7.7 +compiler.err.cant.apply.diamond=\
     7.8 +    diamond operator cannot infer types for {0};\n\
     7.9 +    reason: {1}
    7.10 +
    7.11  ## The following are all possible string for "kindname".
    7.12  ## They should be called whatever the JLS calls them after it been translated
    7.13  ## to the appropriate language.
    7.14 @@ -1205,6 +1209,10 @@
    7.15      enums are not supported in -source {0}\n\
    7.16  (use -source 5 or higher to enable enums)
    7.17  
    7.18 +compiler.err.diamond.not.supported.in.source=\
    7.19 +    diamond operator is not supported in -source {0}\n\
    7.20 +(use -source 7 or higher to enable diamond operator)
    7.21 +
    7.22  ########################################
    7.23  # Diagnostics for where clause implementation
    7.24  # used by the RichDiagnosticFormatter.

     8.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Mon Aug 24 22:28:37 2009 -0700
     8.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Fri Aug 28 16:54:10 2009 -0700
     8.3 @@ -204,6 +204,15 @@
     8.4          return (JCMethodInvocation)exec.expr;
     8.5      }
     8.6  
     8.7 +    /** Return true if a tree represents a diamond new expr. */
     8.8 +    public static boolean isDiamond(JCTree tree) {
     8.9 +        switch(tree.getTag()) {
    8.10 +            case JCTree.TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
    8.11 +            case JCTree.NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
    8.12 +            default: return false;
    8.13 +        }
    8.14 +    }
    8.15 +
    8.16      /** Return true if a tree represents the null literal. */
    8.17      public static boolean isNull(JCTree tree) {
    8.18          if (tree.getTag() != JCTree.LITERAL)

     9.1 --- a/test/com/sun/javadoc/lib/JavadocTester.java	Mon Aug 24 22:28:37 2009 -0700
     9.2 +++ b/test/com/sun/javadoc/lib/JavadocTester.java	Fri Aug 28 16:54:10 2009 -0700
     9.3 @@ -124,6 +124,14 @@
     9.4      private static int javadocRunNum = 0;
     9.5  
     9.6      /**
     9.7 +     * Whether or not to match newlines exactly.
     9.8 +     * Set this value to false if the match strings
     9.9 +     * contain text from javadoc comments containing
    9.10 +     * non-platform newlines.
    9.11 +     */
    9.12 +    protected boolean exactNewlineMatch = true;
    9.13 +
    9.14 +    /**
    9.15       * Construct a JavadocTester.
    9.16       */
    9.17      public JavadocTester() {
    9.18 @@ -419,15 +427,22 @@
    9.19      /**
    9.20       * Search for the string in the given file and return true
    9.21       * if the string was found.
    9.22 +     * If exactNewlineMatch is false, newlines will be normalized
    9.23 +     * before the comparison.
    9.24       *
    9.25       * @param fileString    the contents of the file to search through
    9.26       * @param stringToFind  the string to search for
    9.27       * @return              true if the string was found
    9.28       */
    9.29      private boolean findString(String fileString, String stringToFind) {
    9.30 -        return fileString.indexOf(stringToFind) >= 0;
    9.31 +        if (exactNewlineMatch) {
    9.32 +            return fileString.indexOf(stringToFind) >= 0;
    9.33 +        } else {
    9.34 +            return fileString.replace(NL, "\n").indexOf(stringToFind.replace(NL, "\n")) >= 0;
    9.35 +        }
    9.36      }
    9.37  
    9.38 +
    9.39      /**
    9.40       * Return the standard output.
    9.41       * @return the standard output

    10.1 --- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Mon Aug 24 22:28:37 2009 -0700
    10.2 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Fri Aug 28 16:54:10 2009 -0700
    10.3 @@ -351,6 +351,7 @@
    10.4       */
    10.5      public static void main(String[] args) {
    10.6          TestHtmlDefinitionListTag tester = new TestHtmlDefinitionListTag();
    10.7 +        tester.exactNewlineMatch = false;
    10.8          run(tester, ARGS1, TEST_ALL, NEGATED_TEST);
    10.9          run(tester, ARGS1, TEST_CMNT_DEPR, NEGATED_TEST);
   10.10          run(tester, ARGS2, TEST_ALL, NEGATED_TEST);

    11.1 --- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Mon Aug 24 22:28:37 2009 -0700
    11.2 +++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Fri Aug 28 16:54:10 2009 -0700
    11.3 @@ -128,6 +128,7 @@
    11.4       */
    11.5      public static void main(String[] args) {
    11.6          TestSerializedFormDeprecationInfo tester = new TestSerializedFormDeprecationInfo();
    11.7 +        tester.exactNewlineMatch = false;
    11.8          run(tester, ARGS1, TEST_CMNT_DEPR, TEST_NOCMNT);
    11.9          run(tester, ARGS2, TEST_NOCMNT, TEST_CMNT_DEPR);
   11.10          run(tester, ARGS3, TEST_NODEPR, TEST_NOCMNT_NODEPR);

    12.1 --- a/test/tools/apt/Basics/apt.sh	Mon Aug 24 22:28:37 2009 -0700
    12.2 +++ b/test/tools/apt/Basics/apt.sh	Fri Aug 28 16:54:10 2009 -0700
    12.3 @@ -33,12 +33,11 @@
    12.4  
    12.5  OS=`uname -s`;
    12.6  case "${OS}" in
    12.7 -        Windows* | CYGWIN* )
    12.8 -                SEP=";"
    12.9 +        CYGWIN* )
   12.10 +                DIFFOPTS="--strip-trailing-cr"
   12.11          ;;
   12.12  
   12.13  	* )
   12.14 -	SEP=":"
   12.15  	;;
   12.16  esac
   12.17  
   12.18 @@ -94,7 +93,7 @@
   12.19  do
   12.20  	printf "%s\n" "Testing annotations on source file ${i}"
   12.21  	${APT} @options ${i} 2> result.txt
   12.22 -	diff ${TESTSRC}/golden.txt result.txt
   12.23 +	diff ${DIFFOPTS} ${TESTSRC}/golden.txt result.txt
   12.24  
   12.25  	RESULT=$?
   12.26  	case "$RESULT" in
   12.27 @@ -109,7 +108,7 @@
   12.28  	CLASS=`basename ${i} .java`
   12.29  	printf "%s\n" "Testing annotations on class file ${CLASS}"
   12.30  	${APT} @options1 ${CLASS} 2> result2.txt
   12.31 -	diff ${TESTSRC}/golden.txt result2.txt
   12.32 +	diff ${DIFFOPTS} ${TESTSRC}/golden.txt result2.txt
   12.33  
   12.34  	RESULT=$?
   12.35  	case "$RESULT" in

    13.1 --- a/test/tools/apt/Basics/print.sh	Mon Aug 24 22:28:37 2009 -0700
    13.2 +++ b/test/tools/apt/Basics/print.sh	Fri Aug 28 16:54:10 2009 -0700
    13.3 @@ -32,12 +32,11 @@
    13.4  
    13.5  OS=`uname -s`;
    13.6  case "${OS}" in
    13.7 -        Windows* | CYGWIN* )
    13.8 -                SEP=";"
    13.9 +        CYGWIN* )
   13.10 +                DIFFOPTS="--strip-trailing-cr"
   13.11          ;;
   13.12  
   13.13  	* )
   13.14 -	SEP=":"
   13.15  	;;
   13.16  esac
   13.17  
   13.18 @@ -88,7 +87,7 @@
   13.19  # check for mutliple methods and no static initializer
   13.20  
   13.21  ${APT} -XclassesAsDecls -cp ${TESTCLASSES} -print Aggregate > aggregate.txt
   13.22 -diff aggregate.txt ${TESTSRC}/goldenAggregate.txt
   13.23 +diff ${DIFFOPTS} aggregate.txt ${TESTSRC}/goldenAggregate.txt
   13.24  
   13.25  RESULT=$?
   13.26  case "$RESULT" in

    14.1 --- a/test/tools/apt/Compile/compile.sh	Mon Aug 24 22:28:37 2009 -0700
    14.2 +++ b/test/tools/apt/Compile/compile.sh	Fri Aug 28 16:54:10 2009 -0700
    14.3 @@ -57,7 +57,12 @@
    14.4  
    14.5  OS=`uname -s`;
    14.6  case "${OS}" in
    14.7 -        Windows* | CYGWIN* )
    14.8 +        Windows* )
    14.9 +                SEP=";"
   14.10 +        ;;
   14.11 +
   14.12 +        CYGWIN* )
   14.13 +		DIFFOPTS="--strip-trailing-cr"
   14.14                  SEP=";"
   14.15          ;;
   14.16  
   14.17 @@ -150,7 +155,7 @@
   14.18  
   14.19  TestNoFile "HelloWorld.class"
   14.20  
   14.21 -diff output ${TESTSRC}/golden.txt
   14.22 +diff ${DIFFOPTS} output ${TESTSRC}/golden.txt
   14.23  
   14.24  RESULT=$?
   14.25  case "$RESULT" in
   14.26 @@ -180,7 +185,7 @@
   14.27  printf "%s\n" "HelloAnnotation.java"        >> options3
   14.28  ${APT} @options3 2> output
   14.29  
   14.30 -diff output ${TESTSRC}/goldenWarn.txt
   14.31 +diff ${DIFFOPTS} output ${TESTSRC}/goldenWarn.txt
   14.32  
   14.33  RESULT=$?
   14.34  case "$RESULT" in
   14.35 @@ -485,7 +490,7 @@
   14.36  printf "%s\n" "${TESTSRC}/Dummy1.java" >> options8
   14.37  ${APT} @options8 > multiRoundOutput 2> multiRoundError
   14.38  
   14.39 -diff multiRoundOutput  ${TESTSRC}/goldenFactory.txt
   14.40 +diff ${DIFFOPTS} multiRoundOutput  ${TESTSRC}/goldenFactory.txt
   14.41  
   14.42  RESULT=$?
   14.43  case "$RESULT" in

    15.1 --- a/test/tools/javac/4846262/Test.sh	Mon Aug 24 22:28:37 2009 -0700
    15.2 +++ b/test/tools/javac/4846262/Test.sh	Fri Aug 28 16:54:10 2009 -0700
    15.3 @@ -45,13 +45,13 @@
    15.4  OS=`uname -s`
    15.5  case "$OS" in
    15.6    SunOS | Linux )
    15.7 -    NULL=/dev/null
    15.8 -    PS=":"
    15.9      FS="/"
   15.10      ;;
   15.11 +  CYGWIN* )
   15.12 +    FS="/"
   15.13 +    DIFFOPTS="--strip-trailing-cr"
   15.14 +    ;;
   15.15    Windows* )
   15.16 -    NULL=NUL
   15.17 -    PS=";"
   15.18      FS="\\"
   15.19      ;;
   15.20    * )
   15.21 @@ -68,7 +68,7 @@
   15.22  
   15.23  "${TESTJAVA}${FS}bin${FS}native2ascii" ${TESTTOOLVMOPTS} -encoding IBM1047 Test.tmp Test.out
   15.24  
   15.25 -diff -c "${TESTSRC}${FS}Test.out" Test.out
   15.26 +diff ${DIFFOPTS} -c "${TESTSRC}${FS}Test.out" Test.out
   15.27  result=$?
   15.28  
   15.29  if [ $result -eq o ]

    16.1 --- a/test/tools/javac/6302184/T6302184.sh	Mon Aug 24 22:28:37 2009 -0700
    16.2 +++ b/test/tools/javac/6302184/T6302184.sh	Fri Aug 28 16:54:10 2009 -0700
    16.3 @@ -42,13 +42,13 @@
    16.4  OS=`uname -s`
    16.5  case "$OS" in
    16.6    SunOS | Linux )
    16.7 -    NULL=/dev/null
    16.8 -    PS=":"
    16.9      FS="/"
   16.10      ;;
   16.11 +  CYGWIN* )
   16.12 +    FS="/"
   16.13 +    DIFFOPTS="--strip-trailing-cr"
   16.14 +    ;;
   16.15    Windows* )
   16.16 -    NULL=NUL
   16.17 -    PS=";"
   16.18      FS="\\"
   16.19      ;;
   16.20    * )
   16.21 @@ -57,8 +57,8 @@
   16.22      ;;
   16.23  esac
   16.24  
   16.25 -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1 > ${NULL}
   16.26 -diff -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
   16.27 +"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1
   16.28 +diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
   16.29  result=$?
   16.30  
   16.31  

    17.1 --- a/test/tools/javac/6521805/T6521805a.java	Mon Aug 24 22:28:37 2009 -0700
    17.2 +++ b/test/tools/javac/6521805/T6521805a.java	Fri Aug 28 16:54:10 2009 -0700
    17.3 @@ -1,28 +1,5 @@
    17.4  /*
    17.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    17.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.7 - *
    17.8 - * This code is free software; you can redistribute it and/or modify it
    17.9 - * under the terms of the GNU General Public License version 2 only, as
   17.10 - * published by the Free Software Foundation.
   17.11 - *
   17.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   17.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   17.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   17.15 - * version 2 for more details (a copy is included in the LICENSE file that
   17.16 - * accompanied this code).
   17.17 - *
   17.18 - * You should have received a copy of the GNU General Public License version
   17.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   17.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   17.21 - *
   17.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   17.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   17.24 - * have any questions.
   17.25 - */
   17.26 -
   17.27 -/*
   17.28 - * @test
   17.29 + * @test /nodynamiccopyright/
   17.30   * @bug 6521805
   17.31   * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
   17.32   * @author mcimadamore

    18.1 --- a/test/tools/javac/6521805/T6521805a_1.out	Mon Aug 24 22:28:37 2009 -0700
    18.2 +++ b/test/tools/javac/6521805/T6521805a_1.out	Fri Aug 28 16:54:10 2009 -0700
    18.3 @@ -1,2 +1,2 @@
    18.4 -T6521805a.java:40:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
    18.5 +T6521805a.java:17:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
    18.6  1 error

    19.1 --- a/test/tools/javac/6521805/T6521805a_2.out	Mon Aug 24 22:28:37 2009 -0700
    19.2 +++ b/test/tools/javac/6521805/T6521805a_2.out	Fri Aug 28 16:54:10 2009 -0700
    19.3 @@ -1,2 +1,2 @@
    19.4 -T6521805a.java:40:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
    19.5 +T6521805a.java:17:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
    19.6  1 warning

    20.1 --- a/test/tools/javac/6521805/T6521805d.java	Mon Aug 24 22:28:37 2009 -0700
    20.2 +++ b/test/tools/javac/6521805/T6521805d.java	Fri Aug 28 16:54:10 2009 -0700
    20.3 @@ -1,28 +1,5 @@
    20.4  /*
    20.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    20.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.7 - *
    20.8 - * This code is free software; you can redistribute it and/or modify it
    20.9 - * under the terms of the GNU General Public License version 2 only, as
   20.10 - * published by the Free Software Foundation.
   20.11 - *
   20.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   20.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   20.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   20.15 - * version 2 for more details (a copy is included in the LICENSE file that
   20.16 - * accompanied this code).
   20.17 - *
   20.18 - * You should have received a copy of the GNU General Public License version
   20.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   20.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   20.21 - *
   20.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   20.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   20.24 - * have any questions.
   20.25 - */
   20.26 -
   20.27 -/*
   20.28 - * @test
   20.29 + * @test /nodynamiccopyright/
   20.30   * @bug 6521805
   20.31   * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
   20.32   * @author mcimadamore

    21.1 --- a/test/tools/javac/6521805/T6521805d.out	Mon Aug 24 22:28:37 2009 -0700
    21.2 +++ b/test/tools/javac/6521805/T6521805d.out	Fri Aug 28 16:54:10 2009 -0700
    21.3 @@ -1,2 +1,2 @@
    21.4 -T6521805d.java:41:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
    21.5 +T6521805d.java:18:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
    21.6  1 error

    22.1 --- a/test/tools/javac/6717241/T6717241a.java	Mon Aug 24 22:28:37 2009 -0700
    22.2 +++ b/test/tools/javac/6717241/T6717241a.java	Fri Aug 28 16:54:10 2009 -0700
    22.3 @@ -1,28 +1,5 @@
    22.4 -/*
    22.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    22.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.7 - *
    22.8 - * This code is free software; you can redistribute it and/or modify it
    22.9 - * under the terms of the GNU General Public License version 2 only, as
   22.10 - * published by the Free Software Foundation.
   22.11 - *
   22.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   22.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   22.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   22.15 - * version 2 for more details (a copy is included in the LICENSE file that
   22.16 - * accompanied this code).
   22.17 - *
   22.18 - * You should have received a copy of the GNU General Public License version
   22.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   22.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   22.21 - *
   22.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   22.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   22.24 - * have any questions.
   22.25 - */
   22.26 -
   22.27  /**
   22.28 - * @test
   22.29 + * @test /nodynamiccopyright/
   22.30   * @bug     6717241
   22.31   * @summary some diagnostic argument is prematurely converted into a String object
   22.32   * @author  Maurizio Cimadamore

    23.1 --- a/test/tools/javac/6717241/T6717241a.out	Mon Aug 24 22:28:37 2009 -0700
    23.2 +++ b/test/tools/javac/6717241/T6717241a.out	Fri Aug 28 16:54:10 2009 -0700
    23.3 @@ -1,4 +1,4 @@
    23.4 -T6717241a.java:36:21: compiler.err.cant.resolve: kindname.variable, v, , 
    23.5 -T6717241a.java:38:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
    23.6 -T6717241a.java:40:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
    23.7 +T6717241a.java:13:21: compiler.err.cant.resolve: kindname.variable, v, , 
    23.8 +T6717241a.java:15:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
    23.9 +T6717241a.java:17:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
   23.10  3 errors

    24.1 --- a/test/tools/javac/6717241/T6717241b.java	Mon Aug 24 22:28:37 2009 -0700
    24.2 +++ b/test/tools/javac/6717241/T6717241b.java	Fri Aug 28 16:54:10 2009 -0700
    24.3 @@ -1,28 +1,5 @@
    24.4 -/*
    24.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    24.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.7 - *
    24.8 - * This code is free software; you can redistribute it and/or modify it
    24.9 - * under the terms of the GNU General Public License version 2 only, as
   24.10 - * published by the Free Software Foundation.
   24.11 - *
   24.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   24.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   24.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   24.15 - * version 2 for more details (a copy is included in the LICENSE file that
   24.16 - * accompanied this code).
   24.17 - *
   24.18 - * You should have received a copy of the GNU General Public License version
   24.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   24.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   24.21 - *
   24.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   24.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   24.24 - * have any questions.
   24.25 - */
   24.26 -
   24.27  /**
   24.28 - * @test
   24.29 + * @test /nodynamiccopyright/
   24.30   * @bug     6717241
   24.31   * @summary some diagnostic argument is prematurely converted into a String object
   24.32   * @author  Maurizio Cimadamore

    25.1 --- a/test/tools/javac/6717241/T6717241b.out	Mon Aug 24 22:28:37 2009 -0700
    25.2 +++ b/test/tools/javac/6717241/T6717241b.out	Fri Aug 28 16:54:10 2009 -0700
    25.3 @@ -1,4 +1,4 @@
    25.4 -T6717241b.java:35:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
    25.5 -T6717241b.java:37:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
    25.6 -T6717241b.java:39:18: compiler.err.cant.resolve.location.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String, kindname.class, T6717241b
    25.7 +T6717241b.java:12:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
    25.8 +T6717241b.java:14:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
    25.9 +T6717241b.java:16:18: compiler.err.cant.resolve.location.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String, kindname.class, T6717241b
   25.10  3 errors

    26.1 --- a/test/tools/javac/6734819/T6734819c.java	Mon Aug 24 22:28:37 2009 -0700
    26.2 +++ b/test/tools/javac/6734819/T6734819c.java	Fri Aug 28 16:54:10 2009 -0700
    26.3 @@ -1,28 +1,5 @@
    26.4  /*
    26.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    26.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.7 - *
    26.8 - * This code is free software; you can redistribute it and/or modify it
    26.9 - * under the terms of the GNU General Public License version 2 only, as
   26.10 - * published by the Free Software Foundation.
   26.11 - *
   26.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   26.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   26.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   26.15 - * version 2 for more details (a copy is included in the LICENSE file that
   26.16 - * accompanied this code).
   26.17 - *
   26.18 - * You should have received a copy of the GNU General Public License version
   26.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   26.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   26.21 - *
   26.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   26.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   26.24 - * have any questions.
   26.25 - */
   26.26 -
   26.27 -/*
   26.28 - * @test
   26.29 + * @test /nodynamiccopyright/
   26.30   * @bug 6734819
   26.31   * @summary Javac performs flows analysis on already translated classes
   26.32   * @author Maurizio Cimadamore

    27.1 --- a/test/tools/javac/6734819/T6734819c.out	Mon Aug 24 22:28:37 2009 -0700
    27.2 +++ b/test/tools/javac/6734819/T6734819c.out	Fri Aug 28 16:54:10 2009 -0700
    27.3 @@ -4,5 +4,5 @@
    27.4  [flow W]
    27.5  [attribute Z]
    27.6  [flow Z]
    27.7 -T6734819c.java:38:11: compiler.err.unreachable.stmt
    27.8 +T6734819c.java:15:11: compiler.err.unreachable.stmt
    27.9  1 error

    28.1 --- a/test/tools/javac/6758789/T6758789a.java	Mon Aug 24 22:28:37 2009 -0700
    28.2 +++ b/test/tools/javac/6758789/T6758789a.java	Fri Aug 28 16:54:10 2009 -0700
    28.3 @@ -1,28 +1,5 @@
    28.4  /*
    28.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    28.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.7 - *
    28.8 - * This code is free software; you can redistribute it and/or modify it
    28.9 - * under the terms of the GNU General Public License version 2 only, as
   28.10 - * published by the Free Software Foundation.
   28.11 - *
   28.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   28.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   28.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   28.15 - * version 2 for more details (a copy is included in the LICENSE file that
   28.16 - * accompanied this code).
   28.17 - *
   28.18 - * You should have received a copy of the GNU General Public License version
   28.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   28.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   28.21 - *
   28.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   28.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   28.24 - * have any questions.
   28.25 - */
   28.26 -
   28.27 -/*
   28.28 - * @test
   28.29 + * @test /nodynamiccopyright/
   28.30   * @bug 6758789
   28.31   * @summary 6758789: Some method resolution diagnostic should be improved
   28.32   * @author Maurizio Cimadamore

    29.1 --- a/test/tools/javac/6758789/T6758789a.out	Mon Aug 24 22:28:37 2009 -0700
    29.2 +++ b/test/tools/javac/6758789/T6758789a.out	Fri Aug 28 16:54:10 2009 -0700
    29.3 @@ -1,3 +1,3 @@
    29.4 -T6758789a.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
    29.5 -T6758789a.java:38:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
    29.6 -2 errors
    29.7 \ No newline at end of file
    29.8 +T6758789a.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
    29.9 +T6758789a.java:15:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
   29.10 +2 errors

    30.1 --- a/test/tools/javac/6758789/T6758789b.java	Mon Aug 24 22:28:37 2009 -0700
    30.2 +++ b/test/tools/javac/6758789/T6758789b.java	Fri Aug 28 16:54:10 2009 -0700
    30.3 @@ -1,28 +1,5 @@
    30.4  /*
    30.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    30.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.7 - *
    30.8 - * This code is free software; you can redistribute it and/or modify it
    30.9 - * under the terms of the GNU General Public License version 2 only, as
   30.10 - * published by the Free Software Foundation.
   30.11 - *
   30.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   30.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   30.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   30.15 - * version 2 for more details (a copy is included in the LICENSE file that
   30.16 - * accompanied this code).
   30.17 - *
   30.18 - * You should have received a copy of the GNU General Public License version
   30.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   30.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   30.21 - *
   30.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   30.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   30.24 - * have any questions.
   30.25 - */
   30.26 -
   30.27 -/*
   30.28 - * @test
   30.29 + * @test /nodynamiccopyright/
   30.30   * @bug 6758789
   30.31   * @summary 6758789: Some method resolution diagnostic should be improved
   30.32   * @author Maurizio Cimadamore

    31.1 --- a/test/tools/javac/6758789/T6758789b.out	Mon Aug 24 22:28:37 2009 -0700
    31.2 +++ b/test/tools/javac/6758789/T6758789b.out	Fri Aug 28 16:54:10 2009 -0700
    31.3 @@ -1,5 +1,5 @@
    31.4 -T6758789b.java:39:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
    31.5 -T6758789b.java:39:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
    31.6 +T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
    31.7 +T6758789b.java:16:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
    31.8  - compiler.err.warnings.and.werror
    31.9  1 error
   31.10  2 warnings

    32.1 --- a/test/tools/javac/6840059/T6840059.java	Mon Aug 24 22:28:37 2009 -0700
    32.2 +++ b/test/tools/javac/6840059/T6840059.java	Fri Aug 28 16:54:10 2009 -0700
    32.3 @@ -1,28 +1,5 @@
    32.4  /*
    32.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    32.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.7 - *
    32.8 - * This code is free software; you can redistribute it and/or modify it
    32.9 - * under the terms of the GNU General Public License version 2 only, as
   32.10 - * published by the Free Software Foundation.
   32.11 - *
   32.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   32.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   32.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   32.15 - * version 2 for more details (a copy is included in the LICENSE file that
   32.16 - * accompanied this code).
   32.17 - *
   32.18 - * You should have received a copy of the GNU General Public License version
   32.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   32.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   32.21 - *
   32.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   32.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   32.24 - * have any questions.
   32.25 - */
   32.26 -
   32.27 -/*
   32.28 - * @test
   32.29 + * @test /nodynamiccopyright/
   32.30   * @bug 6840059
   32.31   * @summary 6758789: Some method resolution diagnostic should be improved
   32.32   * @author Maurizio Cimadamore

    33.1 --- a/test/tools/javac/6840059/T6840059.out	Mon Aug 24 22:28:37 2009 -0700
    33.2 +++ b/test/tools/javac/6840059/T6840059.out	Fri Aug 28 16:54:10 2009 -0700
    33.3 @@ -1,3 +1,3 @@
    33.4 -T6840059.java:38:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
    33.5 -T6840059.java:38:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
    33.6 +T6840059.java:15:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
    33.7 +T6840059.java:15:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
    33.8  2 errors

    34.1 --- a/test/tools/javac/ClassPathTest/ClassPathTest.sh	Mon Aug 24 22:28:37 2009 -0700
    34.2 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh	Fri Aug 28 16:54:10 2009 -0700
    34.3 @@ -56,14 +56,10 @@
    34.4  # set platform-dependent variables
    34.5  OS=`uname -s`
    34.6  case "$OS" in
    34.7 -  SunOS | Linux )
    34.8 -    NULL=/dev/null
    34.9 -    PS=":"
   34.10 +  SunOS | Linux | CYGWIN* )
   34.11      FS="/"
   34.12      ;;
   34.13    Windows* )
   34.14 -    NULL=NUL
   34.15 -    PS=";"
   34.16      FS="\\"
   34.17      ;;
   34.18    * )

    35.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a.java	Mon Aug 24 22:28:37 2009 -0700
    35.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a.java	Fri Aug 28 16:54:10 2009 -0700
    35.3 @@ -1,28 +1,5 @@
    35.4 -/*
    35.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    35.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.7 - *
    35.8 - * This code is free software; you can redistribute it and/or modify it
    35.9 - * under the terms of the GNU General Public License version 2 only, as
   35.10 - * published by the Free Software Foundation.
   35.11 - *
   35.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   35.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   35.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   35.15 - * version 2 for more details (a copy is included in the LICENSE file that
   35.16 - * accompanied this code).
   35.17 - *
   35.18 - * You should have received a copy of the GNU General Public License version
   35.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   35.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   35.21 - *
   35.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   35.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   35.24 - * have any questions.
   35.25 - */
   35.26 -
   35.27  /**
   35.28 - * @test
   35.29 + * @test /nodynamiccopyright/
   35.30   * @bug     6722234
   35.31   * @summary javac diagnostics need better integration with the type-system
   35.32   * @author  mcimadamore

    36.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Mon Aug 24 22:28:37 2009 -0700
    36.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Fri Aug 28 16:54:10 2009 -0700
    36.3 @@ -1,2 +1,2 @@
    36.4 -T6722234a.java:35:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
    36.5 +T6722234a.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
    36.6  1 error

    37.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Mon Aug 24 22:28:37 2009 -0700
    37.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Fri Aug 28 16:54:10 2009 -0700
    37.3 @@ -1,3 +1,3 @@
    37.4 -T6722234a.java:35:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
    37.5 +T6722234a.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
    37.6  - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T6722234a),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, java.lang.Integer, kindname.method, <compiler.misc.type.var: T, 2>test(compiler.misc.type.var: T, 2))}
    37.7  1 error

    38.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234b.java	Mon Aug 24 22:28:37 2009 -0700
    38.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b.java	Fri Aug 28 16:54:10 2009 -0700
    38.3 @@ -1,28 +1,5 @@
    38.4 -/*
    38.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    38.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    38.7 - *
    38.8 - * This code is free software; you can redistribute it and/or modify it
    38.9 - * under the terms of the GNU General Public License version 2 only, as
   38.10 - * published by the Free Software Foundation.
   38.11 - *
   38.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   38.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   38.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   38.15 - * version 2 for more details (a copy is included in the LICENSE file that
   38.16 - * accompanied this code).
   38.17 - *
   38.18 - * You should have received a copy of the GNU General Public License version
   38.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   38.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   38.21 - *
   38.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   38.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   38.24 - * have any questions.
   38.25 - */
   38.26 -
   38.27  /**
   38.28 - * @test
   38.29 + * @test /nodynamiccopyright/
   38.30   * @bug     6722234
   38.31   * @summary javac diagnostics need better integration with the type-system
   38.32   * @author  mcimadamore

    39.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234b_1.out	Mon Aug 24 22:28:37 2009 -0700
    39.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b_1.out	Fri Aug 28 16:54:10 2009 -0700
    39.3 @@ -1,2 +1,2 @@
    39.4 -T6722234b.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.type.captureof: 1, ? extends T6722234b>,List<compiler.misc.type.captureof: 2, ? extends T6722234b>, kindname.class, T6722234b, null
    39.5 +T6722234b.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.type.captureof: 1, ? extends T6722234b>,List<compiler.misc.type.captureof: 2, ? extends T6722234b>, kindname.class, T6722234b, null
    39.6  1 error

    40.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234b_2.out	Mon Aug 24 22:28:37 2009 -0700
    40.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b_2.out	Fri Aug 28 16:54:10 2009 -0700
    40.3 @@ -1,4 +1,4 @@
    40.4 -T6722234b.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.captured.type: 1>,List<compiler.misc.captured.type: 2>, kindname.class, T6722234b, null
    40.5 +T6722234b.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.captured.type: 1>,List<compiler.misc.captured.type: 2>, kindname.class, T6722234b, null
    40.6  - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, Object, kindname.method, <T>m(List<T>,List<T>))}
    40.7  - compiler.misc.where.description.captured.1: compiler.misc.captured.type: 1,compiler.misc.captured.type: 2,{(compiler.misc.where.captured.1: compiler.misc.captured.type: 1, T6722234b, compiler.misc.type.null, ? extends T6722234b),(compiler.misc.where.captured.1: compiler.misc.captured.type: 2, T6722234b, compiler.misc.type.null, ? extends T6722234b)}
    40.8  1 error

    41.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234c.java	Mon Aug 24 22:28:37 2009 -0700
    41.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234c.java	Fri Aug 28 16:54:10 2009 -0700
    41.3 @@ -1,28 +1,5 @@
    41.4 -/*
    41.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    41.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    41.7 - *
    41.8 - * This code is free software; you can redistribute it and/or modify it
    41.9 - * under the terms of the GNU General Public License version 2 only, as
   41.10 - * published by the Free Software Foundation.
   41.11 - *
   41.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   41.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   41.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   41.15 - * version 2 for more details (a copy is included in the LICENSE file that
   41.16 - * accompanied this code).
   41.17 - *
   41.18 - * You should have received a copy of the GNU General Public License version
   41.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   41.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   41.21 - *
   41.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   41.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   41.24 - * have any questions.
   41.25 - */
   41.26 -
   41.27  /**
   41.28 - * @test
   41.29 + * @test /nodynamiccopyright/
   41.30   * @bug     6722234
   41.31   * @summary javac diagnostics need better integration with the type-system
   41.32   * @author  mcimadamore

    42.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234c.out	Mon Aug 24 22:28:37 2009 -0700
    42.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234c.out	Fri Aug 28 16:54:10 2009 -0700
    42.3 @@ -1,2 +1,2 @@
    42.4 -T6722234c.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
    42.5 +T6722234c.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
    42.6  1 error

    43.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d.java	Mon Aug 24 22:28:37 2009 -0700
    43.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d.java	Fri Aug 28 16:54:10 2009 -0700
    43.3 @@ -1,28 +1,5 @@
    43.4 -/*
    43.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    43.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    43.7 - *
    43.8 - * This code is free software; you can redistribute it and/or modify it
    43.9 - * under the terms of the GNU General Public License version 2 only, as
   43.10 - * published by the Free Software Foundation.
   43.11 - *
   43.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   43.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   43.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   43.15 - * version 2 for more details (a copy is included in the LICENSE file that
   43.16 - * accompanied this code).
   43.17 - *
   43.18 - * You should have received a copy of the GNU General Public License version
   43.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   43.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   43.21 - *
   43.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   43.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   43.24 - * have any questions.
   43.25 - */
   43.26 -
   43.27  /**
   43.28 - * @test
   43.29 + * @test /nodynamiccopyright/
   43.30   * @bug     6722234
   43.31   * @summary javac diagnostics need better integration with the type-system
   43.32   * @author  mcimadamore

    44.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Mon Aug 24 22:28:37 2009 -0700
    44.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Fri Aug 28 16:54:10 2009 -0700
    44.3 @@ -1,3 +1,3 @@
    44.4 -T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    44.5 +T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    44.6  - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, java.lang.Object,T6722234d.I1,T6722234d.I2)}
    44.7  1 error

    45.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Mon Aug 24 22:28:37 2009 -0700
    45.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Fri Aug 28 16:54:10 2009 -0700
    45.3 @@ -1,3 +1,3 @@
    45.4 -T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    45.5 +T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    45.6  - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, Object,I1,I2)}
    45.7  1 error

    46.1 --- a/test/tools/javac/Diagnostics/6799605/T6799605.java	Mon Aug 24 22:28:37 2009 -0700
    46.2 +++ b/test/tools/javac/Diagnostics/6799605/T6799605.java	Fri Aug 28 16:54:10 2009 -0700
    46.3 @@ -1,28 +1,5 @@
    46.4 -/*
    46.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    46.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    46.7 - *
    46.8 - * This code is free software; you can redistribute it and/or modify it
    46.9 - * under the terms of the GNU General Public License version 2 only, as
   46.10 - * published by the Free Software Foundation.
   46.11 - *
   46.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   46.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   46.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   46.15 - * version 2 for more details (a copy is included in the LICENSE file that
   46.16 - * accompanied this code).
   46.17 - *
   46.18 - * You should have received a copy of the GNU General Public License version
   46.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   46.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   46.21 - *
   46.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   46.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   46.24 - * have any questions.
   46.25 - */
   46.26 -
   46.27  /**
   46.28 - * @test
   46.29 + * @test /nodynamiccopyright/
   46.30   * @bug     6799605
   46.31   * @summary Basic/Raw formatters should use type/symbol printer instead of toString()
   46.32   * @author  mcimadamore

    47.1 --- a/test/tools/javac/Diagnostics/6799605/T6799605.out	Mon Aug 24 22:28:37 2009 -0700
    47.2 +++ b/test/tools/javac/Diagnostics/6799605/T6799605.out	Fri Aug 28 16:54:10 2009 -0700
    47.3 @@ -1,4 +1,4 @@
    47.4 -T6799605.java:40:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
    47.5 -T6799605.java:41:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>, kindname.class, T6799605<X>
    47.6 -T6799605.java:42:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>, kindname.class, T6799605<X>
    47.7 +T6799605.java:17:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
    47.8 +T6799605.java:18:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>, kindname.class, T6799605<X>
    47.9 +T6799605.java:19:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>, kindname.class, T6799605<X>
   47.10  3 errors

    48.1 --- a/test/tools/javac/Diagnostics/6860795/T6860795.java	Mon Aug 24 22:28:37 2009 -0700
    48.2 +++ b/test/tools/javac/Diagnostics/6860795/T6860795.java	Fri Aug 28 16:54:10 2009 -0700
    48.3 @@ -1,28 +1,5 @@
    48.4 -/*
    48.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    48.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    48.7 - *
    48.8 - * This code is free software; you can redistribute it and/or modify it
    48.9 - * under the terms of the GNU General Public License version 2 only, as
   48.10 - * published by the Free Software Foundation.
   48.11 - *
   48.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   48.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   48.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   48.15 - * version 2 for more details (a copy is included in the LICENSE file that
   48.16 - * accompanied this code).
   48.17 - *
   48.18 - * You should have received a copy of the GNU General Public License version
   48.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   48.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   48.21 - *
   48.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   48.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   48.24 - * have any questions.
   48.25 - */
   48.26 -
   48.27  /**
   48.28 - * @test
   48.29 + * @test /nodynamiccopyright/
   48.30   * @bug     6860795
   48.31   * @summary NullPointerException when compiling a negative java source
   48.32   * @author  mcimadamore

    49.1 --- a/test/tools/javac/Diagnostics/6860795/T6860795.out	Mon Aug 24 22:28:37 2009 -0700
    49.2 +++ b/test/tools/javac/Diagnostics/6860795/T6860795.out	Fri Aug 28 16:54:10 2009 -0700
    49.3 @@ -1,2 +1,2 @@
    49.4 -T6860795.java:33:27: compiler.err.already.defined: x, foo
    49.5 +T6860795.java:10:27: compiler.err.already.defined: x, foo
    49.6  1 error

    50.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608a.java	Mon Aug 24 22:28:37 2009 -0700
    50.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608a.java	Fri Aug 28 16:54:10 2009 -0700
    50.3 @@ -1,28 +1,5 @@
    50.4 -/*
    50.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    50.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    50.7 - *
    50.8 - * This code is free software; you can redistribute it and/or modify it
    50.9 - * under the terms of the GNU General Public License version 2 only, as
   50.10 - * published by the Free Software Foundation.
   50.11 - *
   50.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   50.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   50.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   50.15 - * version 2 for more details (a copy is included in the LICENSE file that
   50.16 - * accompanied this code).
   50.17 - *
   50.18 - * You should have received a copy of the GNU General Public License version
   50.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   50.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   50.21 - *
   50.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   50.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   50.24 - * have any questions.
   50.25 - */
   50.26 -
   50.27  /**
   50.28 - * @test
   50.29 + * @test /nodynamiccopyright/
   50.30   * @bug     6862608
   50.31   * @summary rich diagnostic sometimes contain wrong type variable numbering
   50.32   * @author  mcimadamore

    51.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608a.out	Mon Aug 24 22:28:37 2009 -0700
    51.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608a.out	Fri Aug 28 16:54:10 2009 -0700
    51.3 @@ -1,3 +1,3 @@
    51.4 -T6862608a.java:42:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
    51.5 +T6862608a.java:19:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
    51.6  - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, java.lang.Object, kindname.method, <T>compound(java.lang.Iterable<? extends java.util.Comparator<? super T>>))}
    51.7  1 error

    52.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608b.java	Mon Aug 24 22:28:37 2009 -0700
    52.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608b.java	Fri Aug 28 16:54:10 2009 -0700
    52.3 @@ -1,28 +1,5 @@
    52.4 -/*
    52.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    52.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    52.7 - *
    52.8 - * This code is free software; you can redistribute it and/or modify it
    52.9 - * under the terms of the GNU General Public License version 2 only, as
   52.10 - * published by the Free Software Foundation.
   52.11 - *
   52.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   52.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   52.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   52.15 - * version 2 for more details (a copy is included in the LICENSE file that
   52.16 - * accompanied this code).
   52.17 - *
   52.18 - * You should have received a copy of the GNU General Public License version
   52.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   52.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   52.21 - *
   52.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   52.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   52.24 - * have any questions.
   52.25 - */
   52.26 -
   52.27  /**
   52.28 - * @test
   52.29 + * @test /nodynamiccopyright/
   52.30   * @bug     6862608
   52.31   * @summary rich diagnostic sometimes contain wrong type variable numbering
   52.32   * @author  mcimadamore

    53.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608b.out	Mon Aug 24 22:28:37 2009 -0700
    53.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608b.out	Fri Aug 28 16:54:10 2009 -0700
    53.3 @@ -1,3 +1,3 @@
    53.4 -T6862608b.java:34:7: compiler.err.cant.apply.symbol: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, null
    53.5 +T6862608b.java:11:7: compiler.err.cant.apply.symbol: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, null
    53.6  - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,compiler.misc.type.var: S, 1,compiler.misc.type.var: S, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T66862608b),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, compiler.misc.type.var: S, 1, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 1, java.lang.Object, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 2, java.lang.Object, kindname.class, T66862608b)}
    53.7  1 error

    54.1 --- a/test/tools/javac/Diagnostics/6864382/T6864382.java	Mon Aug 24 22:28:37 2009 -0700
    54.2 +++ b/test/tools/javac/Diagnostics/6864382/T6864382.java	Fri Aug 28 16:54:10 2009 -0700
    54.3 @@ -1,28 +1,5 @@
    54.4 -/*
    54.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    54.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    54.7 - *
    54.8 - * This code is free software; you can redistribute it and/or modify it
    54.9 - * under the terms of the GNU General Public License version 2 only, as
   54.10 - * published by the Free Software Foundation.
   54.11 - *
   54.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   54.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   54.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   54.15 - * version 2 for more details (a copy is included in the LICENSE file that
   54.16 - * accompanied this code).
   54.17 - *
   54.18 - * You should have received a copy of the GNU General Public License version
   54.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   54.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   54.21 - *
   54.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   54.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   54.24 - * have any questions.
   54.25 - */
   54.26 -
   54.27  /**
   54.28 - * @test
   54.29 + * @test /nodynamiccopyright/
   54.30   * @bug     6864382
   54.31   * @summary NullPointerException when compiling a negative java source
   54.32   * @author  mcimadamore

    55.1 --- a/test/tools/javac/Diagnostics/6864382/T6864382.out	Mon Aug 24 22:28:37 2009 -0700
    55.2 +++ b/test/tools/javac/Diagnostics/6864382/T6864382.out	Fri Aug 28 16:54:10 2009 -0700
    55.3 @@ -1,2 +1,2 @@
    55.4 -T6864382.java:32:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
    55.5 +T6864382.java:9:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
    55.6  1 error

    56.1 --- a/test/tools/javac/ExtDirs/ExtDirs.sh	Mon Aug 24 22:28:37 2009 -0700
    56.2 +++ b/test/tools/javac/ExtDirs/ExtDirs.sh	Fri Aug 28 16:54:10 2009 -0700
    56.3 @@ -55,12 +55,14 @@
    56.4  OS=`uname -s`
    56.5  case "$OS" in
    56.6    SunOS | Linux )
    56.7 -    NULL=/dev/null
    56.8      PS=":"
    56.9      FS="/"
   56.10      ;;
   56.11 +  CYGWIN* )
   56.12 +    PS=";" # native PS, not Cygwin PS
   56.13 +    FS="/"
   56.14 +    ;;
   56.15    Windows* )
   56.16 -    NULL=NUL
   56.17      PS=";"
   56.18      FS="\\"
   56.19      ;;

    57.1 --- a/test/tools/javac/OverrideChecks/6199153/T6199153.java	Mon Aug 24 22:28:37 2009 -0700
    57.2 +++ b/test/tools/javac/OverrideChecks/6199153/T6199153.java	Fri Aug 28 16:54:10 2009 -0700
    57.3 @@ -1,28 +1,5 @@
    57.4 -/*
    57.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    57.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    57.7 - *
    57.8 - * This code is free software; you can redistribute it and/or modify it
    57.9 - * under the terms of the GNU General Public License version 2 only, as
   57.10 - * published by the Free Software Foundation.
   57.11 - *
   57.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   57.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   57.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   57.15 - * version 2 for more details (a copy is included in the LICENSE file that
   57.16 - * accompanied this code).
   57.17 - *
   57.18 - * You should have received a copy of the GNU General Public License version
   57.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   57.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   57.21 - *
   57.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   57.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   57.24 - * have any questions.
   57.25 - */
   57.26 -
   57.27  /**
   57.28 - * @test
   57.29 + * @test /nodynamiccopyright/
   57.30   * @bug 6199153
   57.31   * @summary Generic throws and overriding
   57.32   * @author  mcimadamore

    58.1 --- a/test/tools/javac/OverrideChecks/6199153/T6199153.out	Mon Aug 24 22:28:37 2009 -0700
    58.2 +++ b/test/tools/javac/OverrideChecks/6199153/T6199153.out	Fri Aug 28 16:54:10 2009 -0700
    58.3 @@ -1,4 +1,4 @@
    58.4 -T6199153.java:41:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
    58.5 +T6199153.java:18:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
    58.6  - compiler.err.warnings.and.werror
    58.7  1 error
    58.8  1 warning

    59.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189a.java	Mon Aug 24 22:28:37 2009 -0700
    59.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.java	Fri Aug 28 16:54:10 2009 -0700
    59.3 @@ -1,28 +1,5 @@
    59.4  /*
    59.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    59.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    59.7 - *
    59.8 - * This code is free software; you can redistribute it and/or modify it
    59.9 - * under the terms of the GNU General Public License version 2 only, as
   59.10 - * published by the Free Software Foundation.
   59.11 - *
   59.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   59.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   59.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   59.15 - * version 2 for more details (a copy is included in the LICENSE file that
   59.16 - * accompanied this code).
   59.17 - *
   59.18 - * You should have received a copy of the GNU General Public License version
   59.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   59.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   59.21 - *
   59.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   59.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   59.24 - * have any questions.
   59.25 - */
   59.26 -
   59.27 -/*
   59.28 - * @test
   59.29 + * @test /nodynamiccopyright/
   59.30   * @bug     6400189
   59.31   * @summary raw types and inference
   59.32   * @author  mcimadamore

    60.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Mon Aug 24 22:28:37 2009 -0700
    60.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Fri Aug 28 16:54:10 2009 -0700
    60.3 @@ -1,4 +1,4 @@
    60.4 -T6400189a.java:37:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
    60.5 -T6400189a.java:37:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
    60.6 +T6400189a.java:14:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
    60.7 +T6400189a.java:14:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
    60.8  1 error
    60.9  1 warning

    61.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189b.java	Mon Aug 24 22:28:37 2009 -0700
    61.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.java	Fri Aug 28 16:54:10 2009 -0700
    61.3 @@ -1,28 +1,5 @@
    61.4  /*
    61.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    61.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    61.7 - *
    61.8 - * This code is free software; you can redistribute it and/or modify it
    61.9 - * under the terms of the GNU General Public License version 2 only, as
   61.10 - * published by the Free Software Foundation.
   61.11 - *
   61.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   61.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   61.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   61.15 - * version 2 for more details (a copy is included in the LICENSE file that
   61.16 - * accompanied this code).
   61.17 - *
   61.18 - * You should have received a copy of the GNU General Public License version
   61.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   61.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   61.21 - *
   61.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   61.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   61.24 - * have any questions.
   61.25 - */
   61.26 -
   61.27 -/*
   61.28 - * @test
   61.29 + * @test /nodynamiccopyright/
   61.30   * @bug     6400189
   61.31   * @summary raw types and inference
   61.32   * @author  mcimadamore

    62.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Mon Aug 24 22:28:37 2009 -0700
    62.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Fri Aug 28 16:54:10 2009 -0700
    62.3 @@ -1,4 +1,4 @@
    62.4 -T6400189b.java:47:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
    62.5 -T6400189b.java:47:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
    62.6 +T6400189b.java:24:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
    62.7 +T6400189b.java:24:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
    62.8  1 error
    62.9  1 warning

    63.1 --- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Mon Aug 24 22:28:37 2009 -0700
    63.2 +++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Fri Aug 28 16:54:10 2009 -0700
    63.3 @@ -53,12 +53,14 @@
    63.4  OS=`uname -s`
    63.5  case "$OS" in
    63.6    SunOS | Linux )
    63.7 -    NULL=/dev/null
    63.8      PS=":"
    63.9      FS="/"
   63.10      ;;
   63.11 +  CYGWIN* ) 
   63.12 +    PS=";" # native PS, not Cygwin PS
   63.13 +    FS="/"
   63.14 +    ;;
   63.15    Windows* )
   63.16 -    NULL=NUL
   63.17      PS=";"
   63.18      FS="\\"
   63.19      ;;

    64.1 --- a/test/tools/javac/cast/6467183/T6467183a.java	Mon Aug 24 22:28:37 2009 -0700
    64.2 +++ b/test/tools/javac/cast/6467183/T6467183a.java	Fri Aug 28 16:54:10 2009 -0700
    64.3 @@ -1,28 +1,5 @@
    64.4  /*
    64.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    64.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    64.7 - *
    64.8 - * This code is free software; you can redistribute it and/or modify it
    64.9 - * under the terms of the GNU General Public License version 2 only, as
   64.10 - * published by the Free Software Foundation.
   64.11 - *
   64.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   64.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   64.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   64.15 - * version 2 for more details (a copy is included in the LICENSE file that
   64.16 - * accompanied this code).
   64.17 - *
   64.18 - * You should have received a copy of the GNU General Public License version
   64.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   64.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   64.21 - *
   64.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   64.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   64.24 - * have any questions.
   64.25 - */
   64.26 -
   64.27 -/*
   64.28 - * @test
   64.29 + * @test /nodynamiccopyright/
   64.30   * @author mcimadamore
   64.31   * @bug     6467183
   64.32   * @summary

    65.1 --- a/test/tools/javac/cast/6467183/T6467183a.out	Mon Aug 24 22:28:37 2009 -0700
    65.2 +++ b/test/tools/javac/cast/6467183/T6467183a.out	Fri Aug 28 16:54:10 2009 -0700
    65.3 @@ -1,6 +1,6 @@
    65.4 -T6467183a.java:39:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
    65.5 -T6467183a.java:47:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Number>
    65.6 -T6467183a.java:51:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Integer>
    65.7 +T6467183a.java:16:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
    65.8 +T6467183a.java:24:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Number>
    65.9 +T6467183a.java:28:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Integer>
   65.10  - compiler.err.warnings.and.werror
   65.11  1 error
   65.12  3 warnings

    66.1 --- a/test/tools/javac/cast/6557182/T6557182.java	Mon Aug 24 22:28:37 2009 -0700
    66.2 +++ b/test/tools/javac/cast/6557182/T6557182.java	Fri Aug 28 16:54:10 2009 -0700
    66.3 @@ -1,28 +1,5 @@
    66.4  /*
    66.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    66.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66.7 - *
    66.8 - * This code is free software; you can redistribute it and/or modify it
    66.9 - * under the terms of the GNU General Public License version 2 only, as
   66.10 - * published by the Free Software Foundation.
   66.11 - *
   66.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   66.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   66.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   66.15 - * version 2 for more details (a copy is included in the LICENSE file that
   66.16 - * accompanied this code).
   66.17 - *
   66.18 - * You should have received a copy of the GNU General Public License version
   66.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   66.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   66.21 - *
   66.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   66.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   66.24 - * have any questions.
   66.25 - */
   66.26 -
   66.27 -/*
   66.28 - * @test
   66.29 + * @test /nodynamiccopyright/
   66.30   * @author Maurizio Cimadamore
   66.31   * @bug     6557182
   66.32   * @summary  Unchecked warning *and* inconvertible types

    67.1 --- a/test/tools/javac/cast/6557182/T6557182.out	Mon Aug 24 22:28:37 2009 -0700
    67.2 +++ b/test/tools/javac/cast/6557182/T6557182.out	Fri Aug 28 16:54:10 2009 -0700
    67.3 @@ -1,4 +1,4 @@
    67.4 -T6557182.java:35:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
    67.5 -T6557182.java:39:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
    67.6 +T6557182.java:12:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
    67.7 +T6557182.java:16:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
    67.8  1 error
    67.9  1 warning

    68.1 --- a/test/tools/javac/cast/6665356/T6665356.java	Mon Aug 24 22:28:37 2009 -0700
    68.2 +++ b/test/tools/javac/cast/6665356/T6665356.java	Fri Aug 28 16:54:10 2009 -0700
    68.3 @@ -1,28 +1,5 @@
    68.4  /*
    68.5 - * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
    68.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    68.7 - *
    68.8 - * This code is free software; you can redistribute it and/or modify it
    68.9 - * under the terms of the GNU General Public License version 2 only, as
   68.10 - * published by the Free Software Foundation.
   68.11 - *
   68.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   68.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   68.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   68.15 - * version 2 for more details (a copy is included in the LICENSE file that
   68.16 - * accompanied this code).
   68.17 - *
   68.18 - * You should have received a copy of the GNU General Public License version
   68.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   68.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   68.21 - *
   68.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   68.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   68.24 - * have any questions.
   68.25 - */
   68.26 -
   68.27 -/*
   68.28 - * @test
   68.29 + * @test /nodynamiccopyright/
   68.30   * @author Maurizio Cimadamore
   68.31   * @bug     6665356
   68.32   * @summary Cast not allowed when both qualifying type and inner class are parameterized
   68.33 @@ -77,4 +54,4 @@
   68.34      void cast11(Outer<Integer>.Inner<Long> p) {
   68.35          Object o = (Outer<Integer>.Inner<? super String>)p;
   68.36      }
   68.37 -}
   68.38 \ No newline at end of file
   68.39 +}

    69.1 --- a/test/tools/javac/cast/6665356/T6665356.out	Mon Aug 24 22:28:37 2009 -0700
    69.2 +++ b/test/tools/javac/cast/6665356/T6665356.out	Fri Aug 28 16:54:10 2009 -0700
    69.3 @@ -1,8 +1,8 @@
    69.4 -T6665356.java:54:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
    69.5 -T6665356.java:58:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
    69.6 -T6665356.java:62:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
    69.7 -T6665356.java:66:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
    69.8 -T6665356.java:70:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
    69.9 -T6665356.java:74:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
   69.10 -T6665356.java:78:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
   69.11 -7 errors
   69.12 \ No newline at end of file
   69.13 +T6665356.java:31:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
   69.14 +T6665356.java:35:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
   69.15 +T6665356.java:39:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
   69.16 +T6665356.java:43:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
   69.17 +T6665356.java:47:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
   69.18 +T6665356.java:51:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
   69.19 +T6665356.java:55:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
   69.20 +7 errors

    70.1 --- a/test/tools/javac/cast/6795580/T6795580.java	Mon Aug 24 22:28:37 2009 -0700
    70.2 +++ b/test/tools/javac/cast/6795580/T6795580.java	Fri Aug 28 16:54:10 2009 -0700
    70.3 @@ -1,28 +1,5 @@
    70.4  /*
    70.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    70.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    70.7 - *
    70.8 - * This code is free software; you can redistribute it and/or modify it
    70.9 - * under the terms of the GNU General Public License version 2 only, as
   70.10 - * published by the Free Software Foundation.
   70.11 - *
   70.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   70.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   70.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   70.15 - * version 2 for more details (a copy is included in the LICENSE file that
   70.16 - * accompanied this code).
   70.17 - *
   70.18 - * You should have received a copy of the GNU General Public License version
   70.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   70.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   70.21 - *
   70.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   70.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   70.24 - * have any questions.
   70.25 - */
   70.26 -
   70.27 -/*
   70.28 - * @test
   70.29 + * @test /nodynamiccopyright/
   70.30   * @author Maurizio Cimadamore
   70.31   * @bug     6795580
   70.32   * @summary parser confused by square brackets in qualified generic cast
   70.33 @@ -77,4 +54,4 @@
   70.34      void cast11(Outer<Integer>.Inner<Long>[] p) {
   70.35          Object o = (Outer<Integer>.Inner<? super String>[])p;
   70.36      }
   70.37 -}
   70.38 \ No newline at end of file
   70.39 +}

    71.1 --- a/test/tools/javac/cast/6795580/T6795580.out	Mon Aug 24 22:28:37 2009 -0700
    71.2 +++ b/test/tools/javac/cast/6795580/T6795580.out	Fri Aug 28 16:54:10 2009 -0700
    71.3 @@ -1,8 +1,8 @@
    71.4 -T6795580.java:54:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
    71.5 -T6795580.java:58:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
    71.6 -T6795580.java:62:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
    71.7 -T6795580.java:66:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
    71.8 -T6795580.java:70:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
    71.9 -T6795580.java:74:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
   71.10 -T6795580.java:78:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
   71.11 +T6795580.java:31:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
   71.12 +T6795580.java:35:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
   71.13 +T6795580.java:39:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
   71.14 +T6795580.java:43:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
   71.15 +T6795580.java:47:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
   71.16 +T6795580.java:51:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
   71.17 +T6795580.java:55:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
   71.18  7 errors

    72.1 --- a/test/tools/javac/generics/5009937/T5009937.java	Mon Aug 24 22:28:37 2009 -0700
    72.2 +++ b/test/tools/javac/generics/5009937/T5009937.java	Fri Aug 28 16:54:10 2009 -0700
    72.3 @@ -1,28 +1,5 @@
    72.4  /*
    72.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    72.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    72.7 - *
    72.8 - * This code is free software; you can redistribute it and/or modify it
    72.9 - * under the terms of the GNU General Public License version 2 only, as
   72.10 - * published by the Free Software Foundation.
   72.11 - *
   72.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   72.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   72.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   72.15 - * version 2 for more details (a copy is included in the LICENSE file that
   72.16 - * accompanied this code).
   72.17 - *
   72.18 - * You should have received a copy of the GNU General Public License version
   72.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   72.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   72.21 - *
   72.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   72.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   72.24 - * have any questions.
   72.25 - */
   72.26 -
   72.27 -/*
   72.28 - * @test
   72.29 + * @test /nodynamiccopyright/
   72.30   * @bug 5009937
   72.31   * @summary hiding versus generics versus binary compatibility
   72.32   * @author Maurizio Cimadamore

    73.1 --- a/test/tools/javac/generics/5009937/T5009937.out	Mon Aug 24 22:28:37 2009 -0700
    73.2 +++ b/test/tools/javac/generics/5009937/T5009937.out	Fri Aug 28 16:54:10 2009 -0700
    73.3 @@ -1,2 +1,2 @@
    73.4 -T5009937.java:39:21: compiler.err.name.clash.same.erasure.no.override: m(T5009937<java.lang.Integer>), T5009937.B, m(T5009937<java.lang.String>), T5009937.A
    73.5 +T5009937.java:16:21: compiler.err.name.clash.same.erasure.no.override: m(T5009937<java.lang.Integer>), T5009937.B, m(T5009937<java.lang.String>), T5009937.A
    73.6  1 error

    74.1 --- a/test/tools/javac/generics/6182950/T6182950a.java	Mon Aug 24 22:28:37 2009 -0700
    74.2 +++ b/test/tools/javac/generics/6182950/T6182950a.java	Fri Aug 28 16:54:10 2009 -0700
    74.3 @@ -1,28 +1,5 @@
    74.4  /*
    74.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    74.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    74.7 - *
    74.8 - * This code is free software; you can redistribute it and/or modify it
    74.9 - * under the terms of the GNU General Public License version 2 only, as
   74.10 - * published by the Free Software Foundation.
   74.11 - *
   74.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   74.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   74.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   74.15 - * version 2 for more details (a copy is included in the LICENSE file that
   74.16 - * accompanied this code).
   74.17 - *
   74.18 - * You should have received a copy of the GNU General Public License version
   74.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   74.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   74.21 - *
   74.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   74.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   74.24 - * have any questions.
   74.25 - */
   74.26 -
   74.27 -/*
   74.28 - * @test
   74.29 + * @test /nodynamiccopyright/
   74.30   * @bug     6182950
   74.31   * @summary methods clash algorithm should not depend on return type
   74.32   * @author  mcimadamore

    75.1 --- a/test/tools/javac/generics/6182950/T6182950a.out	Mon Aug 24 22:28:37 2009 -0700
    75.2 +++ b/test/tools/javac/generics/6182950/T6182950a.out	Fri Aug 28 16:54:10 2009 -0700
    75.3 @@ -1,2 +1,2 @@
    75.4 -T6182950a.java:35:12: compiler.err.name.clash.same.erasure: m(java.util.List<java.lang.Integer>), m(java.util.List<java.lang.String>)
    75.5 +T6182950a.java:12:12: compiler.err.name.clash.same.erasure: m(java.util.List<java.lang.Integer>), m(java.util.List<java.lang.String>)
    75.6  1 error

    76.1 --- a/test/tools/javac/generics/6182950/T6182950b.java	Mon Aug 24 22:28:37 2009 -0700
    76.2 +++ b/test/tools/javac/generics/6182950/T6182950b.java	Fri Aug 28 16:54:10 2009 -0700
    76.3 @@ -1,28 +1,5 @@
    76.4  /*
    76.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    76.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    76.7 - *
    76.8 - * This code is free software; you can redistribute it and/or modify it
    76.9 - * under the terms of the GNU General Public License version 2 only, as
   76.10 - * published by the Free Software Foundation.
   76.11 - *
   76.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   76.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   76.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   76.15 - * version 2 for more details (a copy is included in the LICENSE file that
   76.16 - * accompanied this code).
   76.17 - *
   76.18 - * You should have received a copy of the GNU General Public License version
   76.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   76.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   76.21 - *
   76.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   76.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   76.24 - * have any questions.
   76.25 - */
   76.26 -
   76.27 -/*
   76.28 - * @test
   76.29 + * @test /nodynamiccopyright/
   76.30   * @bug     6182950
   76.31   * @summary methods clash algorithm should not depend on return type
   76.32   * @author  mcimadamore

    77.1 --- a/test/tools/javac/generics/6182950/T6182950b.out	Mon Aug 24 22:28:37 2009 -0700
    77.2 +++ b/test/tools/javac/generics/6182950/T6182950b.out	Fri Aug 28 16:54:10 2009 -0700
    77.3 @@ -1,2 +1,2 @@
    77.4 -T6182950b.java:38:16: compiler.err.name.clash.same.erasure.no.override: m(java.util.List<java.lang.Integer>), T6182950b.B, m(java.util.List<java.lang.String>), T6182950b.A
    77.5 +T6182950b.java:15:16: compiler.err.name.clash.same.erasure.no.override: m(java.util.List<java.lang.Integer>), T6182950b.B, m(java.util.List<java.lang.String>), T6182950b.A
    77.6  1 error

    78.1 --- a/test/tools/javac/generics/6677785/T6677785.java	Mon Aug 24 22:28:37 2009 -0700
    78.2 +++ b/test/tools/javac/generics/6677785/T6677785.java	Fri Aug 28 16:54:10 2009 -0700
    78.3 @@ -1,28 +1,5 @@
    78.4  /*
    78.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    78.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    78.7 - *
    78.8 - * This code is free software; you can redistribute it and/or modify it
    78.9 - * under the terms of the GNU General Public License version 2 only, as
   78.10 - * published by the Free Software Foundation.
   78.11 - *
   78.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   78.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   78.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   78.15 - * version 2 for more details (a copy is included in the LICENSE file that
   78.16 - * accompanied this code).
   78.17 - *
   78.18 - * You should have received a copy of the GNU General Public License version
   78.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   78.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   78.21 - *
   78.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   78.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   78.24 - * have any questions.
   78.25 - */
   78.26 -
   78.27 -/*
   78.28 - * @test
   78.29 + * @test /nodynamiccopyright/
   78.30   * @bug     6677785
   78.31   * @summary REGRESSION: StackOverFlowError with Cyclic Class level Type Parameters when used in constructors
   78.32   * @author Maurizio Cimadamore

    79.1 --- a/test/tools/javac/generics/6677785/T6677785.out	Mon Aug 24 22:28:37 2009 -0700
    79.2 +++ b/test/tools/javac/generics/6677785/T6677785.out	Fri Aug 28 16:54:10 2009 -0700
    79.3 @@ -1,2 +1,2 @@
    79.4 -T6677785.java:31:23: compiler.err.cyclic.inheritance: E
    79.5 +T6677785.java:8:23: compiler.err.cyclic.inheritance: E
    79.6  1 error

    80.1 --- a/test/tools/javac/generics/6711619/T6711619a.java	Mon Aug 24 22:28:37 2009 -0700
    80.2 +++ b/test/tools/javac/generics/6711619/T6711619a.java	Fri Aug 28 16:54:10 2009 -0700
    80.3 @@ -1,28 +1,5 @@
    80.4  /*
    80.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    80.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    80.7 - *
    80.8 - * This code is free software; you can redistribute it and/or modify it
    80.9 - * under the terms of the GNU General Public License version 2 only, as
   80.10 - * published by the Free Software Foundation.
   80.11 - *
   80.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   80.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   80.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   80.15 - * version 2 for more details (a copy is included in the LICENSE file that
   80.16 - * accompanied this code).
   80.17 - *
   80.18 - * You should have received a copy of the GNU General Public License version
   80.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   80.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   80.21 - *
   80.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   80.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   80.24 - * have any questions.
   80.25 - */
   80.26 -
   80.27 -/*
   80.28 - * @test
   80.29 + * @test /nodynamiccopyright/
   80.30   * @bug 6711619
   80.31   *
   80.32   * @summary javac doesn't allow access to protected members in intersection types
   80.33 @@ -71,4 +48,4 @@
   80.34          ta = arg.w.a;
   80.35          tb = arg.w.b;
   80.36      }
   80.37 -}
   80.38 \ No newline at end of file
   80.39 +}

    81.1 --- a/test/tools/javac/generics/6711619/T6711619a.out	Mon Aug 24 22:28:37 2009 -0700
    81.2 +++ b/test/tools/javac/generics/6711619/T6711619a.out	Fri Aug 28 16:54:10 2009 -0700
    81.3 @@ -1,7 +1,7 @@
    81.4 -T6711619a.java:63:14: compiler.err.cant.resolve.args: kindname.method, a, , 
    81.5 -T6711619a.java:64:14: compiler.err.cant.resolve.args: kindname.method, b, , 
    81.6 -T6711619a.java:69:19: compiler.err.report.access: a, private, T6711619a.A
    81.7 -T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B
    81.8 -T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A
    81.9 -T6711619a.java:72:19: compiler.err.report.access: b, private, T6711619a.B
   81.10 +T6711619a.java:40:14: compiler.err.cant.resolve.args: kindname.method, a, , 
   81.11 +T6711619a.java:41:14: compiler.err.cant.resolve.args: kindname.method, b, , 
   81.12 +T6711619a.java:46:19: compiler.err.report.access: a, private, T6711619a.A
   81.13 +T6711619a.java:47:19: compiler.err.report.access: b, private, T6711619a.B
   81.14 +T6711619a.java:48:19: compiler.err.report.access: a, private, T6711619a.A
   81.15 +T6711619a.java:49:19: compiler.err.report.access: b, private, T6711619a.B
   81.16  6 errors

    82.1 --- a/test/tools/javac/generics/6711619/T6711619b.java	Mon Aug 24 22:28:37 2009 -0700
    82.2 +++ b/test/tools/javac/generics/6711619/T6711619b.java	Fri Aug 28 16:54:10 2009 -0700
    82.3 @@ -1,28 +1,5 @@
    82.4  /*
    82.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    82.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    82.7 - *
    82.8 - * This code is free software; you can redistribute it and/or modify it
    82.9 - * under the terms of the GNU General Public License version 2 only, as
   82.10 - * published by the Free Software Foundation.
   82.11 - *
   82.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   82.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   82.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   82.15 - * version 2 for more details (a copy is included in the LICENSE file that
   82.16 - * accompanied this code).
   82.17 - *
   82.18 - * You should have received a copy of the GNU General Public License version
   82.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   82.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   82.21 - *
   82.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   82.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   82.24 - * have any questions.
   82.25 - */
   82.26 -
   82.27 -/*
   82.28 - * @test
   82.29 + * @test /nodynamiccopyright/
   82.30   * @bug 6711619
   82.31   *
   82.32   * @summary javac doesn't allow access to protected members in intersection types
   82.33 @@ -61,4 +38,4 @@
   82.34               return E.i;
   82.35           }
   82.36      }
   82.37 -}
   82.38 \ No newline at end of file
   82.39 +}

    83.1 --- a/test/tools/javac/generics/6711619/T6711619b.out	Mon Aug 24 22:28:37 2009 -0700
    83.2 +++ b/test/tools/javac/generics/6711619/T6711619b.out	Fri Aug 28 16:54:10 2009 -0700
    83.3 @@ -1,5 +1,5 @@
    83.4 -T6711619b.java:39:22: compiler.err.report.access: i, private, T6711619b.X1
    83.5 -T6711619b.java:46:22: compiler.err.report.access: i, private, T6711619b.X2
    83.6 -T6711619b.java:54:22: compiler.err.report.access: i, private, T6711619b.X3
    83.7 -T6711619b.java:61:22: compiler.err.report.access: i, private, T6711619b.X4
    83.8 +T6711619b.java:16:22: compiler.err.report.access: i, private, T6711619b.X1
    83.9 +T6711619b.java:23:22: compiler.err.report.access: i, private, T6711619b.X2
   83.10 +T6711619b.java:31:22: compiler.err.report.access: i, private, T6711619b.X3
   83.11 +T6711619b.java:38:22: compiler.err.report.access: i, private, T6711619b.X4
   83.12  4 errors

    84.1 --- a/test/tools/javac/generics/6723444/T6723444.java	Mon Aug 24 22:28:37 2009 -0700
    84.2 +++ b/test/tools/javac/generics/6723444/T6723444.java	Fri Aug 28 16:54:10 2009 -0700
    84.3 @@ -1,28 +1,5 @@
    84.4  /*
    84.5 - * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
    84.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    84.7 - *
    84.8 - * This code is free software; you can redistribute it and/or modify it
    84.9 - * under the terms of the GNU General Public License version 2 only, as
   84.10 - * published by the Free Software Foundation.
   84.11 - *
   84.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   84.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   84.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   84.15 - * version 2 for more details (a copy is included in the LICENSE file that
   84.16 - * accompanied this code).
   84.17 - *
   84.18 - * You should have received a copy of the GNU General Public License version
   84.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   84.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   84.21 - *
   84.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   84.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   84.24 - * have any questions.
   84.25 - */
   84.26 -
   84.27 -/*
   84.28 - * @test
   84.29 + * @test /nodynamiccopyright/
   84.30   * @bug 6723444
   84.31   *
   84.32   * @summary javac fails to substitute type variables into a constructor's throws clause

    85.1 --- a/test/tools/javac/generics/6723444/T6723444.out	Mon Aug 24 22:28:37 2009 -0700
    85.2 +++ b/test/tools/javac/generics/6723444/T6723444.out	Fri Aug 28 16:54:10 2009 -0700
    85.3 @@ -1,13 +1,13 @@
    85.4 -T6723444.java:65:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
    85.5 -T6723444.java:66:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
    85.6 -T6723444.java:68:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    85.7 -T6723444.java:69:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    85.8 -T6723444.java:71:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    85.9 -T6723444.java:72:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.10 -T6723444.java:73:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.11 -T6723444.java:74:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.12 -T6723444.java:75:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.13 -T6723444.java:76:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.14 -T6723444.java:77:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.15 -T6723444.java:78:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.16 -12 errors
   85.17 \ No newline at end of file
   85.18 +T6723444.java:42:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
   85.19 +T6723444.java:43:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
   85.20 +T6723444.java:45:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.21 +T6723444.java:46:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.22 +T6723444.java:48:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.23 +T6723444.java:49:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.24 +T6723444.java:50:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.25 +T6723444.java:51:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.26 +T6723444.java:52:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.27 +T6723444.java:53:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.28 +T6723444.java:54:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.29 +T6723444.java:55:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   85.30 +12 errors

    86.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    86.2 +++ b/test/tools/javac/generics/diamond/neg/Neg01.java	Fri Aug 28 16:54:10 2009 -0700
    86.3 @@ -0,0 +1,38 @@
    86.4 +/*
    86.5 + * @test /nodynamiccopyright/
    86.6 + * @bug 6840638
    86.7 + *
    86.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    86.9 + * @author mcimadamore
   86.10 + * @compile/fail/ref=Neg01.out Neg01.java -source 1.7 -XDrawDiagnostics
   86.11 + *
   86.12 + */
   86.13 +
   86.14 +class Neg01<X extends Number> {
   86.15 +
   86.16 +    Neg01(X x) {}
   86.17 +
   86.18 +    <Z> Neg01(X x, Z z) {}
   86.19 +
   86.20 +    void test() {
   86.21 +        Neg01<String> n1 = new Neg01<>(""); //new Foo<Integer> created
   86.22 +        Neg01<? extends String> n2 = new Neg01<>(""); //new Foo<Integer> created
   86.23 +        Neg01<?> n3 = new Neg01<>(""); //new Foo<Object> created
   86.24 +        Neg01<? super String> n4 = new Neg01<>(""); //new Foo<Object> created
   86.25 +
   86.26 +        Neg01<String> n5 = new Neg01<>(""){}; //new Foo<Integer> created
   86.27 +        Neg01<? extends String> n6 = new Neg01<>(""){}; //new Foo<Integer> created
   86.28 +        Neg01<?> n7 = new Neg01<>(""){}; //new Foo<Object> created
   86.29 +        Neg01<? super String> n8 = new Neg01<>(""){}; //new Foo<Object> created
   86.30 +
   86.31 +        Neg01<String> n9 = new Neg01<>("", ""); //new Foo<Integer> created
   86.32 +        Neg01<? extends String> n10 = new Neg01<>("", ""); //new Foo<Integer> created
   86.33 +        Neg01<?> n11 = new Neg01<>("", ""); //new Foo<Object> created
   86.34 +        Foo<? super String> n12 = new Neg01<>("", ""); //new Foo<Object> created
   86.35 +
   86.36 +        Neg01<String> n13 = new Neg01<>("", ""){}; //new Foo<Integer> created
   86.37 +        Neg01<? extends String> n14 = new Neg01<>("", ""){}; //new Foo<Integer> created
   86.38 +        Neg01<?> n15 = new Neg01<>("", ""){}; //new Foo<Object> created
   86.39 +        Neg01<? super String> n16 = new Neg01<>("", ""){}; //new Foo<Object> created
   86.40 +    }
   86.41 +}

    87.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    87.2 +++ b/test/tools/javac/generics/diamond/neg/Neg01.out	Fri Aug 28 16:54:10 2009 -0700
    87.3 @@ -0,0 +1,31 @@
    87.4 +Neg01.java:18:15: compiler.err.not.within.bounds: java.lang.String
    87.5 +Neg01.java:18:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
    87.6 +Neg01.java:19:25: compiler.err.not.within.bounds: ? extends java.lang.String
    87.7 +Neg01.java:19:47: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
    87.8 +Neg01.java:20:23: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String, kindname.class, Neg01<java.lang.Number>
    87.9 +Neg01.java:21:23: compiler.err.not.within.bounds: ? super java.lang.String
   87.10 +Neg01.java:21:45: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<? super java.lang.String>)
   87.11 +Neg01.java:23:15: compiler.err.not.within.bounds: java.lang.String
   87.12 +Neg01.java:23:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
   87.13 +Neg01.java:24:25: compiler.err.not.within.bounds: ? extends java.lang.String
   87.14 +Neg01.java:24:47: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   87.15 +Neg01.java:25:23: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String, kindname.class, Neg01<java.lang.Number>
   87.16 +Neg01.java:25:38: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , , kindname.class, Neg01<java.lang.Number>
   87.17 +Neg01.java:26:23: compiler.err.not.within.bounds: ? super java.lang.String
   87.18 +Neg01.java:26:45: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<? super java.lang.String>)
   87.19 +Neg01.java:28:15: compiler.err.not.within.bounds: java.lang.String
   87.20 +Neg01.java:28:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
   87.21 +Neg01.java:29:25: compiler.err.not.within.bounds: ? extends java.lang.String
   87.22 +Neg01.java:29:48: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   87.23 +Neg01.java:30:24: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String,java.lang.String, kindname.class, Neg01<java.lang.Number>
   87.24 +Neg01.java:31:9: compiler.err.cant.resolve.location: kindname.class, Foo, , , kindname.class, Neg01<X>
   87.25 +Neg01.java:31:35: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String,java.lang.String, kindname.class, Neg01<java.lang.Number>
   87.26 +Neg01.java:33:15: compiler.err.not.within.bounds: java.lang.String
   87.27 +Neg01.java:33:38: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
   87.28 +Neg01.java:34:25: compiler.err.not.within.bounds: ? extends java.lang.String
   87.29 +Neg01.java:34:48: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   87.30 +Neg01.java:35:24: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String,java.lang.String, kindname.class, Neg01<java.lang.Number>
   87.31 +Neg01.java:35:43: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , , kindname.class, Neg01<java.lang.Number>
   87.32 +Neg01.java:36:23: compiler.err.not.within.bounds: ? super java.lang.String
   87.33 +Neg01.java:36:46: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<? super java.lang.String>)
   87.34 +30 errors

    88.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    88.2 +++ b/test/tools/javac/generics/diamond/neg/Neg02.java	Fri Aug 28 16:54:10 2009 -0700
    88.3 @@ -0,0 +1,61 @@
    88.4 +/*
    88.5 + * @test /nodynamiccopyright/
    88.6 + * @bug 6840638
    88.7 + *
    88.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    88.9 + * @author mcimadamore
   88.10 + * @compile/fail/ref=Neg02.out Neg02.java -source 1.7 -XDrawDiagnostics
   88.11 + *
   88.12 + */
   88.13 +
   88.14 +class Neg02 {
   88.15 +
   88.16 +    static class Foo<X extends Number> {
   88.17 +        Foo(X x) {}
   88.18 +        <Z> Foo(X x, Z z) {}
   88.19 +    }
   88.20 +
   88.21 +    void testSimple() {
   88.22 +        Foo<String> f1 = new Foo<>(""); //new Foo<Integer> created
   88.23 +        Foo<? extends String> f2 = new Foo<>(""); //new Foo<Integer> created
   88.24 +        Foo<?> f3 = new Foo<>(""); //new Foo<Object> created
   88.25 +        Foo<? super String> f4 = new Foo<>(""); //new Foo<Object> created
   88.26 +
   88.27 +        Foo<String> f5 = new Foo<>(""){}; //new Foo<Integer> created
   88.28 +        Foo<? extends String> f6 = new Foo<>(""){}; //new Foo<Integer> created
   88.29 +        Foo<?> f7 = new Foo<>(""){}; //new Foo<Object> created
   88.30 +        Foo<? super String> f8 = new Foo<>(""){}; //new Foo<Object> created
   88.31 +
   88.32 +        Foo<String> f9 = new Foo<>("", ""); //new Foo<Integer> created
   88.33 +        Foo<? extends String> f10 = new Foo<>("", ""); //new Foo<Integer> created
   88.34 +        Foo<?> f11 = new Foo<>("", ""); //new Foo<Object> created
   88.35 +        Foo<? super String> f12 = new Foo<>("", ""); //new Foo<Object> created
   88.36 +
   88.37 +        Foo<String> f13 = new Foo<>("", ""){}; //new Foo<Integer> created
   88.38 +        Foo<? extends String> f14 = new Foo<>("", ""){}; //new Foo<Integer> created
   88.39 +        Foo<?> f15 = new Foo<>("", ""){}; //new Foo<Object> created
   88.40 +        Foo<? super String> f16 = new Foo<>("", ""){}; //new Foo<Object> created
   88.41 +    }
   88.42 +
   88.43 +    void testQualified() {
   88.44 +        Foo<String> f1 = new Neg02.Foo<>(""); //new Foo<Integer> created
   88.45 +        Foo<? extends String> f2 = new Neg02.Foo<>(""); //new Foo<Integer> created
   88.46 +        Foo<?> f3 = new Neg02.Foo<>(""); //new Foo<Object> created
   88.47 +        Foo<? super String> f4 = new Neg02.Foo<>(""); //new Foo<Object> created
   88.48 +
   88.49 +        Foo<String> f5 = new Neg02.Foo<>(""){}; //new Foo<Integer> created
   88.50 +        Foo<? extends String> f6 = new Neg02.Foo<>(""){}; //new Foo<Integer> created
   88.51 +        Foo<?> f7 = new Neg02.Foo<>(""){}; //new Foo<Object> created
   88.52 +        Foo<? super String> f8 = new Neg02.Foo<>(""){}; //new Foo<Object> created
   88.53 +
   88.54 +        Foo<String> f9 = new Neg02.Foo<>("", ""); //new Foo<Integer> created
   88.55 +        Foo<? extends String> f10 = new Neg02.Foo<>("", ""); //new Foo<Integer> created
   88.56 +        Foo<?> f11 = new Neg02.Foo<>("", ""); //new Foo<Object> created
   88.57 +        Foo<? super String> f12 = new Neg02.Foo<>("", ""); //new Foo<Object> created
   88.58 +
   88.59 +        Foo<String> f13 = new Neg02.Foo<>("", ""){}; //new Foo<Integer> created
   88.60 +        Foo<? extends String> f14 = new Neg02.Foo<>("", ""){}; //new Foo<Integer> created
   88.61 +        Foo<?> f15 = new Neg02.Foo<>("", ""){}; //new Foo<Object> created
   88.62 +        Foo<? super String> f16 = new Neg02.Foo<>("", ""){}; //new Foo<Object> created
   88.63 +    }
   88.64 +}

    89.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    89.2 +++ b/test/tools/javac/generics/diamond/neg/Neg02.out	Fri Aug 28 16:54:10 2009 -0700
    89.3 @@ -0,0 +1,61 @@
    89.4 +Neg02.java:19:13: compiler.err.not.within.bounds: java.lang.String
    89.5 +Neg02.java:19:33: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
    89.6 +Neg02.java:20:23: compiler.err.not.within.bounds: ? extends java.lang.String
    89.7 +Neg02.java:20:43: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
    89.8 +Neg02.java:21:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
    89.9 +Neg02.java:22:21: compiler.err.not.within.bounds: ? super java.lang.String
   89.10 +Neg02.java:22:41: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
   89.11 +Neg02.java:24:13: compiler.err.not.within.bounds: java.lang.String
   89.12 +Neg02.java:24:33: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
   89.13 +Neg02.java:25:23: compiler.err.not.within.bounds: ? extends java.lang.String
   89.14 +Neg02.java:25:43: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   89.15 +Neg02.java:26:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
   89.16 +Neg02.java:26:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
   89.17 +Neg02.java:27:21: compiler.err.not.within.bounds: ? super java.lang.String
   89.18 +Neg02.java:27:41: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
   89.19 +Neg02.java:29:13: compiler.err.not.within.bounds: java.lang.String
   89.20 +Neg02.java:29:33: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
   89.21 +Neg02.java:30:23: compiler.err.not.within.bounds: ? extends java.lang.String
   89.22 +Neg02.java:30:44: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   89.23 +Neg02.java:31:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
   89.24 +Neg02.java:32:21: compiler.err.not.within.bounds: ? super java.lang.String
   89.25 +Neg02.java:32:42: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
   89.26 +Neg02.java:34:13: compiler.err.not.within.bounds: java.lang.String
   89.27 +Neg02.java:34:34: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
   89.28 +Neg02.java:35:23: compiler.err.not.within.bounds: ? extends java.lang.String
   89.29 +Neg02.java:35:44: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   89.30 +Neg02.java:36:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
   89.31 +Neg02.java:36:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
   89.32 +Neg02.java:37:21: compiler.err.not.within.bounds: ? super java.lang.String
   89.33 +Neg02.java:37:42: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
   89.34 +Neg02.java:41:13: compiler.err.not.within.bounds: java.lang.String
   89.35 +Neg02.java:41:39: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
   89.36 +Neg02.java:42:23: compiler.err.not.within.bounds: ? extends java.lang.String
   89.37 +Neg02.java:42:49: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   89.38 +Neg02.java:43:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
   89.39 +Neg02.java:44:21: compiler.err.not.within.bounds: ? super java.lang.String
   89.40 +Neg02.java:44:47: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
   89.41 +Neg02.java:46:13: compiler.err.not.within.bounds: java.lang.String
   89.42 +Neg02.java:46:39: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
   89.43 +Neg02.java:47:23: compiler.err.not.within.bounds: ? extends java.lang.String
   89.44 +Neg02.java:47:49: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   89.45 +Neg02.java:48:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
   89.46 +Neg02.java:48:40: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
   89.47 +Neg02.java:49:21: compiler.err.not.within.bounds: ? super java.lang.String
   89.48 +Neg02.java:49:47: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
   89.49 +Neg02.java:51:13: compiler.err.not.within.bounds: java.lang.String
   89.50 +Neg02.java:51:39: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
   89.51 +Neg02.java:52:23: compiler.err.not.within.bounds: ? extends java.lang.String
   89.52 +Neg02.java:52:50: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   89.53 +Neg02.java:53:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
   89.54 +Neg02.java:54:21: compiler.err.not.within.bounds: ? super java.lang.String
   89.55 +Neg02.java:54:48: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
   89.56 +Neg02.java:56:13: compiler.err.not.within.bounds: java.lang.String
   89.57 +Neg02.java:56:40: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
   89.58 +Neg02.java:57:23: compiler.err.not.within.bounds: ? extends java.lang.String
   89.59 +Neg02.java:57:50: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
   89.60 +Neg02.java:58:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
   89.61 +Neg02.java:58:45: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
   89.62 +Neg02.java:59:21: compiler.err.not.within.bounds: ? super java.lang.String
   89.63 +Neg02.java:59:48: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
   89.64 +60 errors

    90.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    90.2 +++ b/test/tools/javac/generics/diamond/neg/Neg03.java	Fri Aug 28 16:54:10 2009 -0700
    90.3 @@ -0,0 +1,83 @@
    90.4 +/*
    90.5 + * @test /nodynamiccopyright/
    90.6 + * @bug 6840638
    90.7 + *
    90.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    90.9 + * @author mcimadamore
   90.10 + * @compile/fail/ref=Neg03.out Neg03.java -source 1.7 -XDrawDiagnostics
   90.11 + *
   90.12 + */
   90.13 +
   90.14 +class Neg03<U> {
   90.15 +
   90.16 +    class Foo<V extends Number> {
   90.17 +        Foo(V x) {}
   90.18 +        <Z> Foo(V x, Z z) {}
   90.19 +    }
   90.20 +
   90.21 +    void testSimple() {
   90.22 +        Foo<String> f1 = new Foo<>(""); //new Foo<Integer> created
   90.23 +        Foo<? extends String> f2 = new Foo<>(""); //new Foo<Integer> created
   90.24 +        Foo<?> f3 = new Foo<>(""); //new Foo<Object> created
   90.25 +        Foo<? super String> f4 = new Foo<>(""); //new Foo<Object> created
   90.26 +
   90.27 +        Foo<String> f5 = new Foo<>(""){}; //new Foo<Integer> created
   90.28 +        Foo<? extends String> f6 = new Foo<>(""){}; //new Foo<Integer> created
   90.29 +        Foo<?> f7 = new Foo<>(""){}; //new Foo<Object> created
   90.30 +        Foo<? super String> f8 = new Foo<>(""){}; //new Foo<Object> created
   90.31 +
   90.32 +        Foo<String> f9 = new Foo<>("", ""); //new Foo<Integer> created
   90.33 +        Foo<? extends String> f10 = new Foo<>("", ""); //new Foo<Integer> created
   90.34 +        Foo<?> f11 = new Foo<>("", ""); //new Foo<Object> created
   90.35 +        Foo<? super String> f12 = new Foo<>("", ""); //new Foo<Object> created
   90.36 +
   90.37 +        Foo<String> f13 = new Foo<>("", ""){}; //new Foo<Integer> created
   90.38 +        Foo<? extends String> f14 = new Foo<>("", ""){}; //new Foo<Integer> created
   90.39 +        Foo<?> f15 = new Foo<>("", ""){}; //new Foo<Object> created
   90.40 +        Foo<? super String> f16 = new Foo<>("", ""){}; //new Foo<Object> created
   90.41 +    }
   90.42 +
   90.43 +    void testQualified_1() {
   90.44 +        Foo<String> f1 = new Neg03<U>.Foo<>(""); //new Foo<Integer> created
   90.45 +        Foo<? extends String> f2 = new Neg03<U>.Foo<>(""); //new Foo<Integer> created
   90.46 +        Foo<?> f3 = new Neg03<U>.Foo<>(""); //new Foo<Object> created
   90.47 +        Foo<? super String> f4 = new Neg03<U>.Foo<>(""); //new Foo<Object> created
   90.48 +
   90.49 +        Foo<String> f5 = new Neg03<U>.Foo<>(""){}; //new Foo<Integer> created
   90.50 +        Foo<? extends String> f6 = new Neg03<U>.Foo<>(""){}; //new Foo<Integer> created
   90.51 +        Foo<?> f7 = new Neg03<U>.Foo<>(""){}; //new Foo<Object> created
   90.52 +        Foo<? super String> f8 = new Neg03<U>.Foo<>(""){}; //new Foo<Object> created
   90.53 +
   90.54 +        Foo<String> f9 = new Neg03<U>.Foo<>("", ""); //new Foo<Integer> created
   90.55 +        Foo<? extends String> f10 = new Neg03<U>.Foo<>("", ""); //new Foo<Integer> created
   90.56 +        Foo<?> f11 = new Neg03<U>.Foo<>("", ""); //new Foo<Object> created
   90.57 +        Foo<? super String> f12 = new Neg03<U>.Foo<>("", ""); //new Foo<Object> created
   90.58 +
   90.59 +        Foo<String> f13 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Integer> created
   90.60 +        Foo<? extends String> f14 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Integer> created
   90.61 +        Foo<?> f15 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Object> created
   90.62 +        Foo<? super String> f16 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Object> created
   90.63 +    }
   90.64 +
   90.65 +    void testQualified_2(Neg03<U> n) {
   90.66 +        Foo<String> f1 = n.new Foo<>(""); //new Foo<Integer> created
   90.67 +        Foo<? extends String> f2 = n.new Foo<>(""); //new Foo<Integer> created
   90.68 +        Foo<?> f3 = n.new Foo<>(""); //new Foo<Integer> created
   90.69 +        Foo<? super String> f4 = n.new Foo<>(""); //new Foo<Integer> created
   90.70 +
   90.71 +        Foo<String> f5 = n.new Foo<>(""){}; //new Foo<Integer> created
   90.72 +        Foo<? extends String> f6 = n.new Foo<>(""){}; //new Foo<Integer> created
   90.73 +        Foo<?> f7 = n.new Foo<>(""){}; //new Foo<Integer> created
   90.74 +        Foo<? super String> f8 = n.new Foo<>(""){}; //new Foo<Integer> created
   90.75 +
   90.76 +        Foo<String> f9 = n.new Foo<>("", ""); //new Foo<Integer> created
   90.77 +        Foo<? extends String> f10 = n.new Foo<>("", ""); //new Foo<Integer> created
   90.78 +        Foo<?> f11 = n.new Foo<>("", ""); //new Foo<Integer> created
   90.79 +        Foo<? super String> f12 = n.new Foo<>("", ""); //new Foo<Integer> created
   90.80 +
   90.81 +        Foo<String> f13 = n.new Foo<>("", ""){}; //new Foo<Integer> created
   90.82 +        Foo<? extends String> f14 = n.new Foo<>("", ""){}; //new Foo<Integer> created
   90.83 +        Foo<?> f15 = n.new Foo<>("", ""){}; //new Foo<Integer> created
   90.84 +        Foo<? super String> f16 = n.new Foo<>("", ""){}; //new Foo<Integer> created
   90.85 +    }
   90.86 +}

    91.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    91.2 +++ b/test/tools/javac/generics/diamond/neg/Neg03.out	Fri Aug 28 16:54:10 2009 -0700
    91.3 @@ -0,0 +1,91 @@
    91.4 +Neg03.java:19:13: compiler.err.not.within.bounds: java.lang.String
    91.5 +Neg03.java:19:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
    91.6 +Neg03.java:20:23: compiler.err.not.within.bounds: ? extends java.lang.String
    91.7 +Neg03.java:20:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
    91.8 +Neg03.java:21:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
    91.9 +Neg03.java:22:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.10 +Neg03.java:22:41: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.11 +Neg03.java:24:13: compiler.err.not.within.bounds: java.lang.String
   91.12 +Neg03.java:24:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.13 +Neg03.java:25:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.14 +Neg03.java:25:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.15 +Neg03.java:26:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.16 +Neg03.java:26:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.17 +Neg03.java:27:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.18 +Neg03.java:27:41: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.19 +Neg03.java:29:13: compiler.err.not.within.bounds: java.lang.String
   91.20 +Neg03.java:29:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.21 +Neg03.java:30:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.22 +Neg03.java:30:44: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.23 +Neg03.java:31:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.24 +Neg03.java:32:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.25 +Neg03.java:32:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.26 +Neg03.java:34:13: compiler.err.not.within.bounds: java.lang.String
   91.27 +Neg03.java:34:34: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.28 +Neg03.java:35:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.29 +Neg03.java:35:44: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.30 +Neg03.java:36:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.31 +Neg03.java:36:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.32 +Neg03.java:37:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.33 +Neg03.java:37:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.34 +Neg03.java:41:13: compiler.err.not.within.bounds: java.lang.String
   91.35 +Neg03.java:41:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.36 +Neg03.java:42:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.37 +Neg03.java:42:52: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.38 +Neg03.java:43:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.39 +Neg03.java:44:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.40 +Neg03.java:44:50: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.41 +Neg03.java:46:13: compiler.err.not.within.bounds: java.lang.String
   91.42 +Neg03.java:46:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.43 +Neg03.java:47:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.44 +Neg03.java:47:52: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.45 +Neg03.java:48:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.46 +Neg03.java:48:43: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.47 +Neg03.java:49:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.48 +Neg03.java:49:50: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.49 +Neg03.java:51:13: compiler.err.not.within.bounds: java.lang.String
   91.50 +Neg03.java:51:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.51 +Neg03.java:52:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.52 +Neg03.java:52:53: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.53 +Neg03.java:53:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.54 +Neg03.java:54:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.55 +Neg03.java:54:51: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.56 +Neg03.java:56:13: compiler.err.not.within.bounds: java.lang.String
   91.57 +Neg03.java:56:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.58 +Neg03.java:57:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.59 +Neg03.java:57:53: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.60 +Neg03.java:58:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.61 +Neg03.java:58:48: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.62 +Neg03.java:59:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.63 +Neg03.java:59:51: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.64 +Neg03.java:63:13: compiler.err.not.within.bounds: java.lang.String
   91.65 +Neg03.java:63:28: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.66 +Neg03.java:64:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.67 +Neg03.java:64:38: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.68 +Neg03.java:65:23: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.69 +Neg03.java:66:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.70 +Neg03.java:66:36: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.71 +Neg03.java:68:13: compiler.err.not.within.bounds: java.lang.String
   91.72 +Neg03.java:68:28: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.73 +Neg03.java:69:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.74 +Neg03.java:69:38: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.75 +Neg03.java:70:23: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.76 +Neg03.java:70:36: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.77 +Neg03.java:71:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.78 +Neg03.java:71:36: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.79 +Neg03.java:73:13: compiler.err.not.within.bounds: java.lang.String
   91.80 +Neg03.java:73:28: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.81 +Neg03.java:74:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.82 +Neg03.java:74:39: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.83 +Neg03.java:75:24: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.84 +Neg03.java:76:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.85 +Neg03.java:76:37: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.86 +Neg03.java:78:13: compiler.err.not.within.bounds: java.lang.String
   91.87 +Neg03.java:78:29: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
   91.88 +Neg03.java:79:23: compiler.err.not.within.bounds: ? extends java.lang.String
   91.89 +Neg03.java:79:39: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   91.90 +Neg03.java:80:24: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.91 +Neg03.java:80:41: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
   91.92 +Neg03.java:81:21: compiler.err.not.within.bounds: ? super java.lang.String
   91.93 +Neg03.java:81:37: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
   91.94 +90 errors

    92.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    92.2 +++ b/test/tools/javac/generics/diamond/neg/Neg04.java	Fri Aug 28 16:54:10 2009 -0700
    92.3 @@ -0,0 +1,38 @@
    92.4 +/*
    92.5 + * @test /nodynamiccopyright/
    92.6 + * @bug 6840638
    92.7 + *
    92.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    92.9 + * @author mcimadamore
   92.10 + * @compile/fail/ref=Neg04.out Neg04.java -source 1.7 -XDrawDiagnostics
   92.11 + *
   92.12 + */
   92.13 +
   92.14 +class Neg04 {
   92.15 +
   92.16 +    void test() {
   92.17 +        class Foo<V extends Number> {
   92.18 +            Foo(V x) {}
   92.19 +            <Z> Foo(V x, Z z) {}
   92.20 +        }
   92.21 +        Foo<String> n1 = new Foo<>(""); //new Foo<Integer> created
   92.22 +        Foo<? extends String> n2 = new Foo<>(""); //new Foo<Integer> created
   92.23 +        Foo<?> n3 = new Foo<>(""); //new Foo<Object> created
   92.24 +        Foo<? super String> n4 = new Foo<>(""); //new Foo<Object> created
   92.25 +
   92.26 +        Foo<String> n5 = new Foo<>(""){}; //new Foo<Integer> created
   92.27 +        Foo<? extends String> n6 = new Foo<>(""){}; //new Foo<Integer> created
   92.28 +        Foo<?> n7 = new Foo<>(""){}; //new Foo<Object> created
   92.29 +        Foo<? super String> n8 = new Foo<>(""){}; //new Foo<Object> created
   92.30 +
   92.31 +        Foo<String> n9 = new Foo<>("", ""); //new Foo<Integer> created
   92.32 +        Foo<? extends String> n10 = new Foo<>("", ""); //new Foo<Integer> created
   92.33 +        Foo<?> n11 = new Foo<>("", ""); //new Foo<Object> created
   92.34 +        Foo<? super String> n12 = new Foo<>("", ""); //new Foo<Object> created
   92.35 +
   92.36 +        Foo<String> n13 = new Foo<>("", ""){}; //new Foo<Integer> created
   92.37 +        Foo<? extends String> n14 = new Foo<>("", ""){}; //new Foo<Integer> created
   92.38 +        Foo<?> n15 = new Foo<>("", ""){}; //new Foo<Object> created
   92.39 +        Foo<? super String> n16 = new Foo<>("", ""){}; //new Foo<Object> created
   92.40 +    }
   92.41 +}

    93.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    93.2 +++ b/test/tools/javac/generics/diamond/neg/Neg04.out	Fri Aug 28 16:54:10 2009 -0700
    93.3 @@ -0,0 +1,31 @@
    93.4 +Neg04.java:18:13: compiler.err.not.within.bounds: java.lang.String
    93.5 +Neg04.java:18:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
    93.6 +Neg04.java:19:23: compiler.err.not.within.bounds: ? extends java.lang.String
    93.7 +Neg04.java:19:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
    93.8 +Neg04.java:20:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Foo<java.lang.Number>
    93.9 +Neg04.java:21:21: compiler.err.not.within.bounds: ? super java.lang.String
   93.10 +Neg04.java:21:41: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<? super java.lang.String>)
   93.11 +Neg04.java:23:13: compiler.err.not.within.bounds: java.lang.String
   93.12 +Neg04.java:23:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
   93.13 +Neg04.java:24:23: compiler.err.not.within.bounds: ? extends java.lang.String
   93.14 +Neg04.java:24:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   93.15 +Neg04.java:25:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Foo<java.lang.Number>
   93.16 +Neg04.java:25:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Foo<java.lang.Number>
   93.17 +Neg04.java:26:21: compiler.err.not.within.bounds: ? super java.lang.String
   93.18 +Neg04.java:26:41: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<? super java.lang.String>)
   93.19 +Neg04.java:28:13: compiler.err.not.within.bounds: java.lang.String
   93.20 +Neg04.java:28:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
   93.21 +Neg04.java:29:23: compiler.err.not.within.bounds: ? extends java.lang.String
   93.22 +Neg04.java:29:44: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   93.23 +Neg04.java:30:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Foo<java.lang.Number>
   93.24 +Neg04.java:31:21: compiler.err.not.within.bounds: ? super java.lang.String
   93.25 +Neg04.java:31:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<? super java.lang.String>)
   93.26 +Neg04.java:33:13: compiler.err.not.within.bounds: java.lang.String
   93.27 +Neg04.java:33:34: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
   93.28 +Neg04.java:34:23: compiler.err.not.within.bounds: ? extends java.lang.String
   93.29 +Neg04.java:34:44: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
   93.30 +Neg04.java:35:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Foo<java.lang.Number>
   93.31 +Neg04.java:35:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Foo<java.lang.Number>
   93.32 +Neg04.java:36:21: compiler.err.not.within.bounds: ? super java.lang.String
   93.33 +Neg04.java:36:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<? super java.lang.String>)
   93.34 +30 errors

    94.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    94.2 +++ b/test/tools/javac/generics/diamond/neg/Neg05.java	Fri Aug 28 16:54:10 2009 -0700
    94.3 @@ -0,0 +1,61 @@
    94.4 +/*
    94.5 + * @test /nodynamiccopyright/
    94.6 + * @bug 6840638
    94.7 + *
    94.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    94.9 + * @author mcimadamore
   94.10 + * @compile/fail/ref=Neg05.out Neg05.java -source 1.7 -XDrawDiagnostics
   94.11 + *
   94.12 + */
   94.13 +
   94.14 +class Neg05<U> {
   94.15 +
   94.16 +    class Foo<V> {
   94.17 +        Foo(V x) {}
   94.18 +        <Z> Foo(V x, Z z) {}
   94.19 +    }
   94.20 +
   94.21 +    void testRare_1() {
   94.22 +        Neg05<?>.Foo<String> f1 = new Neg05.Foo<>(""); //new Foo<Integer> created
   94.23 +        Neg05<?>.Foo<? extends String> f2 = new Neg05.Foo<>(""); //new Foo<Integer> created
   94.24 +        Neg05<?>.Foo<?> f3 = new Neg05.Foo<>(""); //new Foo<Object> created
   94.25 +        Neg05<?>.Foo<? super String> f4 = new Neg05.Foo<>(""); //new Foo<Object> created
   94.26 +
   94.27 +        Neg05<?>.Foo<String> f5 = new Neg05.Foo<>(""){}; //new Foo<Integer> created
   94.28 +        Neg05<?>.Foo<? extends String> f6 = new Neg05.Foo<>(""){}; //new Foo<Integer> created
   94.29 +        Neg05<?>.Foo<?> f7 = new Neg05.Foo<>(""){}; //new Foo<Object> created
   94.30 +        Neg05<?>.Foo<? super String> f8 = new Neg05.Foo<>(""){}; //new Foo<Object> created
   94.31 +
   94.32 +        Neg05<?>.Foo<String> f9 = new Neg05.Foo<>("", ""); //new Foo<Integer> created
   94.33 +        Neg05<?>.Foo<? extends String> f10 = new Neg05.Foo<>("", ""); //new Foo<Integer> created
   94.34 +        Neg05<?>.Foo<?> f11 = new Neg05.Foo<>("", ""); //new Foo<Object> created
   94.35 +        Neg05<?>.Foo<? super String> f12 = new Neg05.Foo<>("", ""); //new Foo<Object> created
   94.36 +
   94.37 +        Neg05<?>.Foo<String> f13 = new Neg05.Foo<>("", ""){}; //new Foo<Integer> created
   94.38 +        Neg05<?>.Foo<? extends String> f14 = new Neg05.Foo<>("", ""){}; //new Foo<Integer> created
   94.39 +        Neg05<?>.Foo<?> f15 = new Neg05.Foo<>("", ""){}; //new Foo<Object> created
   94.40 +        Neg05<?>.Foo<? super String> f16 = new Neg05.Foo<>("", ""){}; //new Foo<Object> created
   94.41 +    }
   94.42 +
   94.43 +    void testRare_2(Neg05 n) {
   94.44 +        Neg05<?>.Foo<String> f1 = n.new Foo<>(""); //new Foo<Integer> created
   94.45 +        Neg05<?>.Foo<? extends String> f2 = n.new Foo<>(""); //new Foo<Integer> created
   94.46 +        Neg05<?>.Foo<?> f3 = n.new Foo<>(""); //new Foo<Integer> created
   94.47 +        Neg05<?>.Foo<? super String> f4 = n.new Foo<>(""); //new Foo<Integer> created
   94.48 +
   94.49 +        Neg05<?>.Foo<String> f5 = n.new Foo<>(""){}; //new Foo<Integer> created
   94.50 +        Neg05<?>.Foo<? extends String> f6 = n.new Foo<>(""){}; //new Foo<Integer> created
   94.51 +        Neg05<?>.Foo<?> f7 = n.new Foo<>(""){}; //new Foo<Integer> created
   94.52 +        Neg05<?>.Foo<? super String> f8 = n.new Foo<>(""){}; //new Foo<Integer> created
   94.53 +
   94.54 +        Neg05<?>.Foo<String> f9 = n.new Foo<>("", ""); //new Foo<Integer> created
   94.55 +        Neg05<?>.Foo<? extends String> f10 = n.new Foo<>("", ""); //new Foo<Integer> created
   94.56 +        Neg05<?>.Foo<?> f11 = n.new Foo<>("", ""); //new Foo<Integer> created
   94.57 +        Neg05<?>.Foo<? super String> f12 = n.new Foo<>("", ""); //new Foo<Integer> created
   94.58 +
   94.59 +        Neg05<?>.Foo<String> f13 = n.new Foo<>("", ""){}; //new Foo<Integer> created
   94.60 +        Neg05<?>.Foo<? extends String> f14 = n.new Foo<>("", ""){}; //new Foo<Integer> created
   94.61 +        Neg05<?>.Foo<?> f15 = n.new Foo<>("", ""){}; //new Foo<Integer> created
   94.62 +        Neg05<?>.Foo<? super String> f16 = n.new Foo<>("", ""){}; //new Foo<Integer> created
   94.63 +    }
   94.64 +}

    95.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    95.2 +++ b/test/tools/javac/generics/diamond/neg/Neg05.out	Fri Aug 28 16:54:10 2009 -0700
    95.3 @@ -0,0 +1,33 @@
    95.4 +Neg05.java:19:48: compiler.err.improperly.formed.type.inner.raw.param
    95.5 +Neg05.java:20:58: compiler.err.improperly.formed.type.inner.raw.param
    95.6 +Neg05.java:21:43: compiler.err.improperly.formed.type.inner.raw.param
    95.7 +Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param
    95.8 +Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param
    95.9 +Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param
   95.10 +Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param
   95.11 +Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param
   95.12 +Neg05.java:29:48: compiler.err.improperly.formed.type.inner.raw.param
   95.13 +Neg05.java:30:59: compiler.err.improperly.formed.type.inner.raw.param
   95.14 +Neg05.java:31:44: compiler.err.improperly.formed.type.inner.raw.param
   95.15 +Neg05.java:32:57: compiler.err.improperly.formed.type.inner.raw.param
   95.16 +Neg05.java:34:49: compiler.err.improperly.formed.type.inner.raw.param
   95.17 +Neg05.java:35:59: compiler.err.improperly.formed.type.inner.raw.param
   95.18 +Neg05.java:36:44: compiler.err.improperly.formed.type.inner.raw.param
   95.19 +Neg05.java:37:57: compiler.err.improperly.formed.type.inner.raw.param
   95.20 +Neg05.java:41:37: compiler.err.improperly.formed.type.inner.raw.param
   95.21 +Neg05.java:42:47: compiler.err.improperly.formed.type.inner.raw.param
   95.22 +Neg05.java:43:32: compiler.err.improperly.formed.type.inner.raw.param
   95.23 +Neg05.java:44:45: compiler.err.improperly.formed.type.inner.raw.param
   95.24 +Neg05.java:46:37: compiler.err.improperly.formed.type.inner.raw.param
   95.25 +Neg05.java:47:47: compiler.err.improperly.formed.type.inner.raw.param
   95.26 +Neg05.java:48:32: compiler.err.improperly.formed.type.inner.raw.param
   95.27 +Neg05.java:49:45: compiler.err.improperly.formed.type.inner.raw.param
   95.28 +Neg05.java:51:37: compiler.err.improperly.formed.type.inner.raw.param
   95.29 +Neg05.java:52:48: compiler.err.improperly.formed.type.inner.raw.param
   95.30 +Neg05.java:53:33: compiler.err.improperly.formed.type.inner.raw.param
   95.31 +Neg05.java:54:46: compiler.err.improperly.formed.type.inner.raw.param
   95.32 +Neg05.java:56:38: compiler.err.improperly.formed.type.inner.raw.param
   95.33 +Neg05.java:57:48: compiler.err.improperly.formed.type.inner.raw.param
   95.34 +Neg05.java:58:33: compiler.err.improperly.formed.type.inner.raw.param
   95.35 +Neg05.java:59:46: compiler.err.improperly.formed.type.inner.raw.param
   95.36 +32 errors

    96.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    96.2 +++ b/test/tools/javac/generics/diamond/pos/Pos01.java	Fri Aug 28 16:54:10 2009 -0700
    96.3 @@ -0,0 +1,44 @@
    96.4 +/*
    96.5 + * @test /nodynamiccopyright/
    96.6 + * @bug 6840638
    96.7 + *
    96.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    96.9 + * @author mcimadamore
   96.10 + * @compile Pos01.java -source 1.7
   96.11 + * @run main Pos01
   96.12 + *
   96.13 + */
   96.14 +
   96.15 +public class Pos01<X> {
   96.16 +
   96.17 +    Pos01(X x) {}
   96.18 +
   96.19 +    <Z> Pos01(X x, Z z) {}
   96.20 +
   96.21 +    void test() {
   96.22 +        Pos01<Integer> p1 = new Pos01<>(1); //new Foo<Integer> created
   96.23 +        Pos01<? extends Integer> p2 = new Pos01<>(1); //new Foo<Integer> created
   96.24 +        Pos01<?> p3 = new Pos01<>(1); //new Foo<Object> created
   96.25 +        Pos01<? super Integer> p4 = new Pos01<>(1); //new Foo<Object> created
   96.26 +
   96.27 +        Pos01<Integer> p5 = new Pos01<>(1){}; //new Foo<Integer> created
   96.28 +        Pos01<? extends Integer> p6 = new Pos01<>(1){}; //new Foo<Integer> created
   96.29 +        Pos01<?> p7 = new Pos01<>(1){}; //new Foo<Object> created
   96.30 +        Pos01<? super Integer> p8 = new Pos01<>(1){}; //new Foo<Object> created
   96.31 +
   96.32 +        Pos01<Integer> p9 = new Pos01<>(1, ""); //new Foo<Integer> created
   96.33 +        Pos01<? extends Integer> p10 = new Pos01<>(1, ""); //new Foo<Integer> created
   96.34 +        Pos01<?> p11 = new Pos01<>(1, ""); //new Foo<Object> created
   96.35 +        Pos01<? super Integer> p12 = new Pos01<>(1, ""); //new Foo<Object> created
   96.36 +
   96.37 +        Pos01<Integer> p13 = new Pos01<>(1, ""){}; //new Foo<Integer> created
   96.38 +        Pos01<? extends Integer> p14= new Pos01<>(1, ""){}; //new Foo<Integer> created
   96.39 +        Pos01<?> p15 = new Pos01<>(1, ""){}; //new Foo<Object> created
   96.40 +        Pos01<? super Integer> p16 = new Pos01<>(1, ""){}; //new Foo<Object> created
   96.41 +    }
   96.42 +
   96.43 +    public static void main(String[] args) {
   96.44 +        Pos01<String> p1 = new Pos01<>("");
   96.45 +        p1.test();
   96.46 +    }
   96.47 +}

    97.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    97.2 +++ b/test/tools/javac/generics/diamond/pos/Pos02.java	Fri Aug 28 16:54:10 2009 -0700
    97.3 @@ -0,0 +1,67 @@
    97.4 +/*
    97.5 + * @test /nodynamiccopyright/
    97.6 + * @bug 6840638
    97.7 + *
    97.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    97.9 + * @author mcimadamore
   97.10 + * @compile Pos02.java -source 1.7
   97.11 + * @run main Pos02
   97.12 + */
   97.13 +
   97.14 +public class Pos02 {
   97.15 +
   97.16 +    static class Foo<X> {
   97.17 +        Foo(X x) {}
   97.18 +        <Z> Foo(X x, Z z) {}
   97.19 +    }
   97.20 +
   97.21 +    void testSimple() {
   97.22 +        Foo<Integer> f1 = new Foo<>(1); //new Foo<Integer> created
   97.23 +        Foo<? extends Integer> f2 = new Foo<>(1); //new Foo<Integer> created
   97.24 +        Foo<?> f3 = new Foo<>(1); //new Foo<Object> created
   97.25 +        Foo<? super Integer> f4 = new Foo<>(1); //new Foo<Object> created
   97.26 +
   97.27 +        Foo<Integer> f5 = new Foo<>(1){}; //new Foo<Integer> created
   97.28 +        Foo<? extends Integer> f6 = new Foo<>(1){}; //new Foo<Integer> created
   97.29 +        Foo<?> f7 = new Foo<>(1){}; //new Foo<Object> created
   97.30 +        Foo<? super Integer> f8 = new Foo<>(1){}; //new Foo<Object> created
   97.31 +
   97.32 +        Foo<Integer> f9 = new Foo<>(1, ""); //new Foo<Integer> created
   97.33 +        Foo<? extends Integer> f10 = new Foo<>(1, ""); //new Foo<Integer> created
   97.34 +        Foo<?> f11 = new Foo<>(1, ""); //new Foo<Object> created
   97.35 +        Foo<? super Integer> f12 = new Foo<>(1, ""); //new Foo<Object> created
   97.36 +
   97.37 +        Foo<Integer> f13 = new Foo<>(1, ""){}; //new Foo<Integer> created
   97.38 +        Foo<? extends Integer> f14 = new Foo<>(1, ""){}; //new Foo<Integer> created
   97.39 +        Foo<?> f15 = new Foo<>(1, ""){}; //new Foo<Object> created
   97.40 +        Foo<? super Integer> f16 = new Foo<>(1, ""){}; //new Foo<Object> created
   97.41 +    }
   97.42 +
   97.43 +    void testQualified() {
   97.44 +        Foo<Integer> f1 = new Pos02.Foo<>(1); //new Foo<Integer> created
   97.45 +        Foo<? extends Integer> f2 = new Pos02.Foo<>(1); //new Foo<Integer> created
   97.46 +        Foo<?> f3 = new Pos02.Foo<>(1); //new Foo<Object> created
   97.47 +        Foo<? super Integer> f4 = new Pos02.Foo<>(1); //new Foo<Object> created
   97.48 +
   97.49 +        Foo<Integer> f5 = new Pos02.Foo<>(1){}; //new Foo<Integer> created
   97.50 +        Foo<? extends Integer> f6 = new Pos02.Foo<>(1){}; //new Foo<Integer> created
   97.51 +        Foo<?> f7 = new Pos02.Foo<>(1){}; //new Foo<Object> created
   97.52 +        Foo<? super Integer> f8 = new Pos02.Foo<>(1){}; //new Foo<Object> created
   97.53 +
   97.54 +        Foo<Integer> f9 = new Pos02.Foo<>(1, ""); //new Foo<Integer> created
   97.55 +        Foo<? extends Integer> f10 = new Pos02.Foo<>(1, ""); //new Foo<Integer> created
   97.56 +        Foo<?> f11 = new Pos02.Foo<>(1, ""); //new Foo<Object> created
   97.57 +        Foo<? super Integer> f12 = new Pos02.Foo<>(1, ""); //new Foo<Object> created
   97.58 +
   97.59 +        Foo<Integer> f13 = new Pos02.Foo<>(1, ""){}; //new Foo<Integer> created
   97.60 +        Foo<? extends Integer> f14 = new Pos02.Foo<>(1, ""){}; //new Foo<Integer> created
   97.61 +        Foo<?> f15 = new Pos02.Foo<>(1, ""){}; //new Foo<Object> created
   97.62 +        Foo<? super Integer> f16 = new Pos02.Foo<>(1, ""){}; //new Foo<Object> created
   97.63 +    }
   97.64 +
   97.65 +    public static void main(String[] args) {
   97.66 +        Pos02 p2 = new Pos02();
   97.67 +        p2.testSimple();
   97.68 +        p2.testQualified();
   97.69 +    }
   97.70 +}

    98.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    98.2 +++ b/test/tools/javac/generics/diamond/pos/Pos03.java	Fri Aug 28 16:54:10 2009 -0700
    98.3 @@ -0,0 +1,91 @@
    98.4 +/*
    98.5 + * @test /nodynamiccopyright/
    98.6 + * @bug 6840638
    98.7 + *
    98.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    98.9 + * @author mcimadamore
   98.10 + * @compile Pos03.java -source 1.7
   98.11 + * @run main Pos03
   98.12 + *
   98.13 + */
   98.14 +
   98.15 +public class Pos03<U> {
   98.16 +
   98.17 +    class Foo<V> {
   98.18 +        Foo(V x) {}
   98.19 +        <Z> Foo(V x, Z z) {}
   98.20 +    }
   98.21 +
   98.22 +    void testSimple() {
   98.23 +        Foo<Integer> f1 = new Foo<>(1); //new Foo<Integer> created
   98.24 +        Foo<? extends Integer> f2 = new Foo<>(1); //new Foo<Integer> created
   98.25 +        Foo<?> f3 = new Foo<>(1); //new Foo<Object> created
   98.26 +        Foo<? super Integer> f4 = new Foo<>(1); //new Foo<Object> created
   98.27 +
   98.28 +        Foo<Integer> f5 = new Foo<>(1){}; //new Foo<Integer> created
   98.29 +        Foo<? extends Integer> f6 = new Foo<>(1){}; //new Foo<Integer> created
   98.30 +        Foo<?> f7 = new Foo<>(1){}; //new Foo<Object> created
   98.31 +        Foo<? super Integer> f8 = new Foo<>(1){}; //new Foo<Object> created
   98.32 +
   98.33 +        Foo<Integer> f9 = new Foo<>(1, ""); //new Foo<Integer> created
   98.34 +        Foo<? extends Integer> f10 = new Foo<>(1, ""); //new Foo<Integer> created
   98.35 +        Foo<?> f11 = new Foo<>(1, ""); //new Foo<Object> created
   98.36 +        Foo<? super Integer> f12 = new Foo<>(1, ""); //new Foo<Object> created
   98.37 +
   98.38 +        Foo<Integer> f13 = new Foo<>(1, ""){}; //new Foo<Integer> created
   98.39 +        Foo<? extends Integer> f14 = new Foo<>(1, ""){}; //new Foo<Integer> created
   98.40 +        Foo<?> f15 = new Foo<>(1, ""){}; //new Foo<Object> created
   98.41 +        Foo<? super Integer> f16 = new Foo<>(1, ""){}; //new Foo<Object> created
   98.42 +    }
   98.43 +
   98.44 +    void testQualified_1() {
   98.45 +        Foo<Integer> f1 = new Pos03<U>.Foo<>(1); //new Foo<Integer> created
   98.46 +        Foo<? extends Integer> f2 = new Pos03<U>.Foo<>(1); //new Foo<Integer> created
   98.47 +        Foo<?> f3 = new Pos03<U>.Foo<>(1); //new Foo<Object> created
   98.48 +        Foo<? super Integer> f4 = new Pos03<U>.Foo<>(1); //new Foo<Object> created
   98.49 +
   98.50 +        Foo<Integer> f5 = new Pos03<U>.Foo<>(1){}; //new Foo<Integer> created
   98.51 +        Foo<? extends Integer> f6 = new Pos03<U>.Foo<>(1){}; //new Foo<Integer> created
   98.52 +        Foo<?> f7 = new Pos03<U>.Foo<>(1){}; //new Foo<Object> created
   98.53 +        Foo<? super Integer> f8 = new Pos03<U>.Foo<>(1){}; //new Foo<Object> created
   98.54 +
   98.55 +        Foo<Integer> f9 = new Pos03<U>.Foo<>(1, ""); //new Foo<Integer> created
   98.56 +        Foo<? extends Integer> f10 = new Pos03<U>.Foo<>(1, ""); //new Foo<Integer> created
   98.57 +        Foo<?> f11 = new Pos03<U>.Foo<>(1, ""); //new Foo<Object> created
   98.58 +        Foo<? super Integer> f12 = new Pos03<U>.Foo<>(1, ""); //new Foo<Object> created
   98.59 +
   98.60 +        Foo<Integer> f13 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Integer> created
   98.61 +        Foo<? extends Integer> f14 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Integer> created
   98.62 +        Foo<?> f15 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Object> created
   98.63 +        Foo<? super Integer> f16 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Object> created
   98.64 +    }
   98.65 +
   98.66 +    void testQualified_2(Pos03<U> p) {
   98.67 +        Foo<Integer> f1 = p.new Foo<>(1); //new Foo<Integer> created
   98.68 +        Foo<? extends Integer> f2 = p.new Foo<>(1); //new Foo<Integer> created
   98.69 +        Foo<?> f3 = p.new Foo<>(1); //new Foo<Object> created
   98.70 +        Foo<? super Integer> f4 = p.new Foo<>(1); //new Foo<Object> created
   98.71 +
   98.72 +        Foo<Integer> f5 = p.new Foo<>(1){}; //new Foo<Integer> created
   98.73 +        Foo<? extends Integer> f6 = p.new Foo<>(1){}; //new Foo<Integer> created
   98.74 +        Foo<?> f7 = p.new Foo<>(1){}; //new Foo<Object> created
   98.75 +        Foo<? super Integer> f8 = p.new Foo<>(1){}; //new Foo<Object> created
   98.76 +
   98.77 +        Foo<Integer> f9 = p.new Foo<>(1, ""); //new Foo<Integer> created
   98.78 +        Foo<? extends Integer> f10 = p.new Foo<>(1, ""); //new Foo<Integer> created
   98.79 +        Foo<?> f11 = p.new Foo<>(1, ""); //new Foo<Object> created
   98.80 +        Foo<? super Integer> f12 = p.new Foo<>(1, ""); //new Foo<Object> created
   98.81 +
   98.82 +        Foo<Integer> f13 = p.new Foo<>(1, ""){}; //new Foo<Integer> created
   98.83 +        Foo<? extends Integer> f14 = p.new Foo<>(1, ""){}; //new Foo<Integer> created
   98.84 +        Foo<?> f15 = p.new Foo<>(1, ""){}; //new Foo<Object> created
   98.85 +        Foo<? super Integer> f16 = p.new Foo<>(1, ""){}; //new Foo<Object> created
   98.86 +    }
   98.87 +
   98.88 +    public static void main(String[] args) {
   98.89 +        Pos03<String> p3 = new Pos03<>();
   98.90 +        p3.testSimple();
   98.91 +        p3.testQualified_1();
   98.92 +        p3.testQualified_2(p3);
   98.93 +    }
   98.94 +}

    99.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    99.2 +++ b/test/tools/javac/generics/diamond/pos/Pos04.java	Fri Aug 28 16:54:10 2009 -0700
    99.3 @@ -0,0 +1,44 @@
    99.4 +/*
    99.5 + * @test /nodynamiccopyright/
    99.6 + * @bug 6840638
    99.7 + *
    99.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
    99.9 + * @author mcimadamore
   99.10 + * @compile Pos04.java -source 1.7
   99.11 + * @run main Pos04
   99.12 + *
   99.13 + */
   99.14 +
   99.15 +public class Pos04<U> {
   99.16 +
   99.17 +    void test() {
   99.18 +        class Foo<V> {
   99.19 +            Foo(V x) {}
   99.20 +            <Z> Foo(V x, Z z) {}
   99.21 +        }
   99.22 +        Foo<Integer> p1 = new Foo<>(1); //new Foo<Integer> created
   99.23 +        Foo<? extends Integer> p2 = new Foo<>(1); //new Foo<Integer> created
   99.24 +        Foo<?> p3 = new Foo<>(1); //new Foo<Object> created
   99.25 +        Foo<? super Integer> p4 = new Foo<>(1); //new Foo<Object> created
   99.26 +
   99.27 +        Foo<Integer> p5 = new Foo<>(1){}; //new Foo<Integer> created
   99.28 +        Foo<? extends Integer> p6 = new Foo<>(1){}; //new Foo<Integer> created
   99.29 +        Foo<?> p7 = new Foo<>(1){}; //new Foo<Object> created
   99.30 +        Foo<? super Integer> p8 = new Foo<>(1){}; //new Foo<Object> created
   99.31 +
   99.32 +        Foo<Integer> p9 = new Foo<>(1, ""); //new Foo<Integer> created
   99.33 +        Foo<? extends Integer> p10 = new Foo<>(1, ""); //new Foo<Integer> created
   99.34 +        Foo<?> p11 = new Foo<>(1, ""); //new Foo<Object> created
   99.35 +        Foo<? super Integer> p12 = new Foo<>(1, ""); //new Foo<Object> created
   99.36 +
   99.37 +        Foo<Integer> p13 = new Foo<>(1, ""){}; //new Foo<Integer> created
   99.38 +        Foo<? extends Integer> p14 = new Foo<>(1, ""){}; //new Foo<Integer> created
   99.39 +        Foo<?> p15 = new Foo<>(1, ""){}; //new Foo<Object> created
   99.40 +        Foo<? super Integer> p16 = new Foo<>(1, ""){}; //new Foo<Object> created
   99.41 +    }
   99.42 +
   99.43 +    public static void main(String[] args) {
   99.44 +        Pos04<String> p4 = new Pos04<>();
   99.45 +        p4.test();
   99.46 +    }
   99.47 +}

   100.1 --- a/test/tools/javac/generics/inference/6315770/T6315770.java	Mon Aug 24 22:28:37 2009 -0700
   100.2 +++ b/test/tools/javac/generics/inference/6315770/T6315770.java	Fri Aug 28 16:54:10 2009 -0700
   100.3 @@ -1,28 +1,5 @@
   100.4 -/*
   100.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   100.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   100.7 - *
   100.8 - * This code is free software; you can redistribute it and/or modify it
   100.9 - * under the terms of the GNU General Public License version 2 only, as
  100.10 - * published by the Free Software Foundation.
  100.11 - *
  100.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  100.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  100.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  100.15 - * version 2 for more details (a copy is included in the LICENSE file that
  100.16 - * accompanied this code).
  100.17 - *
  100.18 - * You should have received a copy of the GNU General Public License version
  100.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  100.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  100.21 - *
  100.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  100.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  100.24 - * have any questions.
  100.25 - */
  100.26 -
  100.27  /**
  100.28 - * @test
  100.29 + * @test /nodynamiccopyright/
  100.30   * @bug     6315770
  100.31   * @summary javac inference allows creation of strange types: Integer & Runnable
  100.32   * @author Maurizio Cimadamore

   101.1 --- a/test/tools/javac/generics/inference/6315770/T6315770.out	Mon Aug 24 22:28:37 2009 -0700
   101.2 +++ b/test/tools/javac/generics/inference/6315770/T6315770.out	Fri Aug 28 16:54:10 2009 -0700
   101.3 @@ -1,3 +1,3 @@
   101.4 -T6315770.java:39:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
   101.5 -T6315770.java:40:40: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
   101.6 +T6315770.java:16:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
   101.7 +T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
   101.8  2 errors

   102.1 --- a/test/tools/javac/generics/inference/6611449/T6611449.java	Mon Aug 24 22:28:37 2009 -0700
   102.2 +++ b/test/tools/javac/generics/inference/6611449/T6611449.java	Fri Aug 28 16:54:10 2009 -0700
   102.3 @@ -1,28 +1,5 @@
   102.4 -/*
   102.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   102.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   102.7 - *
   102.8 - * This code is free software; you can redistribute it and/or modify it
   102.9 - * under the terms of the GNU General Public License version 2 only, as
  102.10 - * published by the Free Software Foundation.
  102.11 - *
  102.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  102.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  102.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  102.15 - * version 2 for more details (a copy is included in the LICENSE file that
  102.16 - * accompanied this code).
  102.17 - *
  102.18 - * You should have received a copy of the GNU General Public License version
  102.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  102.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  102.21 - *
  102.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  102.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  102.24 - * have any questions.
  102.25 - */
  102.26 -
  102.27  /**
  102.28 - * @test
  102.29 + * @test /nodynamiccopyright/
  102.30   * @bug 6611449
  102.31   * @summary Internal Error thrown during generic method/constructor invocation
  102.32   * @compile/fail/ref=T6611449.out -XDstdout -XDrawDiagnostics T6611449.java

   103.1 --- a/test/tools/javac/generics/inference/6611449/T6611449.out	Mon Aug 24 22:28:37 2009 -0700
   103.2 +++ b/test/tools/javac/generics/inference/6611449/T6611449.out	Fri Aug 28 16:54:10 2009 -0700
   103.3 @@ -1,5 +1,5 @@
   103.4 -T6611449.java:41:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
   103.5 -T6611449.java:42:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
   103.6 -T6611449.java:43:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
   103.7 -T6611449.java:44:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
   103.8 +T6611449.java:18:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
   103.9 +T6611449.java:19:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
  103.10 +T6611449.java:20:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
  103.11 +T6611449.java:21:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
  103.12  4 errors

   104.1 --- a/test/tools/javac/generics/inference/6638712/T6638712a.java	Mon Aug 24 22:28:37 2009 -0700
   104.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712a.java	Fri Aug 28 16:54:10 2009 -0700
   104.3 @@ -1,28 +1,5 @@
   104.4  /*
   104.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   104.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   104.7 - *
   104.8 - * This code is free software; you can redistribute it and/or modify it
   104.9 - * under the terms of the GNU General Public License version 2 only, as
  104.10 - * published by the Free Software Foundation.
  104.11 - *
  104.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  104.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  104.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  104.15 - * version 2 for more details (a copy is included in the LICENSE file that
  104.16 - * accompanied this code).
  104.17 - *
  104.18 - * You should have received a copy of the GNU General Public License version
  104.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  104.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  104.21 - *
  104.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  104.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  104.24 - * have any questions.
  104.25 - */
  104.26 -
  104.27 -/*
  104.28 - * @test
  104.29 + * @test /nodynamiccopyright/
  104.30   * @bug     6638712
  104.31   * @author  mcimadamore
  104.32   * @summary Inference with wildcard types causes selection of inapplicable method

   105.1 --- a/test/tools/javac/generics/inference/6638712/T6638712a.out	Mon Aug 24 22:28:37 2009 -0700
   105.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712a.out	Fri Aug 28 16:54:10 2009 -0700
   105.3 @@ -1,2 +1,2 @@
   105.4 -T6638712a.java:39:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
   105.5 +T6638712a.java:16:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
   105.6  1 error

   106.1 --- a/test/tools/javac/generics/inference/6638712/T6638712b.java	Mon Aug 24 22:28:37 2009 -0700
   106.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712b.java	Fri Aug 28 16:54:10 2009 -0700
   106.3 @@ -1,28 +1,5 @@
   106.4  /*
   106.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   106.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   106.7 - *
   106.8 - * This code is free software; you can redistribute it and/or modify it
   106.9 - * under the terms of the GNU General Public License version 2 only, as
  106.10 - * published by the Free Software Foundation.
  106.11 - *
  106.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  106.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  106.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  106.15 - * version 2 for more details (a copy is included in the LICENSE file that
  106.16 - * accompanied this code).
  106.17 - *
  106.18 - * You should have received a copy of the GNU General Public License version
  106.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  106.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  106.21 - *
  106.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  106.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  106.24 - * have any questions.
  106.25 - */
  106.26 -
  106.27 -/*
  106.28 - * @test
  106.29 + * @test /nodynamiccopyright/
  106.30   * @bug     6638712
  106.31   * @author  mcimadamore
  106.32   * @summary Inference with wildcard types causes selection of inapplicable method

   107.1 --- a/test/tools/javac/generics/inference/6638712/T6638712b.out	Mon Aug 24 22:28:37 2009 -0700
   107.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712b.out	Fri Aug 28 16:54:10 2009 -0700
   107.3 @@ -1,2 +1,2 @@
   107.4 -T6638712b.java:37:21: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.bounds: T6638712b<java.lang.Integer>, T6638712b<java.lang.String>)
   107.5 +T6638712b.java:14:21: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.bounds: T6638712b<java.lang.Integer>, T6638712b<java.lang.String>)
   107.6  1 error

   108.1 --- a/test/tools/javac/generics/inference/6638712/T6638712c.java	Mon Aug 24 22:28:37 2009 -0700
   108.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712c.java	Fri Aug 28 16:54:10 2009 -0700
   108.3 @@ -1,28 +1,5 @@
   108.4  /*
   108.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   108.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   108.7 - *
   108.8 - * This code is free software; you can redistribute it and/or modify it
   108.9 - * under the terms of the GNU General Public License version 2 only, as
  108.10 - * published by the Free Software Foundation.
  108.11 - *
  108.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  108.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  108.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  108.15 - * version 2 for more details (a copy is included in the LICENSE file that
  108.16 - * accompanied this code).
  108.17 - *
  108.18 - * You should have received a copy of the GNU General Public License version
  108.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  108.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  108.21 - *
  108.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  108.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  108.24 - * have any questions.
  108.25 - */
  108.26 -
  108.27 -/*
  108.28 - * @test
  108.29 + * @test /nodynamiccopyright/
  108.30   * @bug     6638712 6707034
  108.31   * @author  mcimadamore
  108.32   * @summary Inference with wildcard types causes selection of inapplicable method

   109.1 --- a/test/tools/javac/generics/inference/6638712/T6638712c.out	Mon Aug 24 22:28:37 2009 -0700
   109.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712c.out	Fri Aug 28 16:54:10 2009 -0700
   109.3 @@ -1,2 +1,2 @@
   109.4 -T6638712c.java:39:9: compiler.err.cant.apply.symbol: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, null
   109.5 +T6638712c.java:16:9: compiler.err.cant.apply.symbol: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, null
   109.6  1 error

   110.1 --- a/test/tools/javac/generics/inference/6638712/T6638712d.java	Mon Aug 24 22:28:37 2009 -0700
   110.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712d.java	Fri Aug 28 16:54:10 2009 -0700
   110.3 @@ -1,28 +1,5 @@
   110.4  /*
   110.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   110.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   110.7 - *
   110.8 - * This code is free software; you can redistribute it and/or modify it
   110.9 - * under the terms of the GNU General Public License version 2 only, as
  110.10 - * published by the Free Software Foundation.
  110.11 - *
  110.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  110.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  110.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  110.15 - * version 2 for more details (a copy is included in the LICENSE file that
  110.16 - * accompanied this code).
  110.17 - *
  110.18 - * You should have received a copy of the GNU General Public License version
  110.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  110.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  110.21 - *
  110.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  110.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  110.24 - * have any questions.
  110.25 - */
  110.26 -
  110.27 -/*
  110.28 - * @test
  110.29 + * @test /nodynamiccopyright/
  110.30   * @bug     6638712 6730468
  110.31   * @author  mcimadamore
  110.32   * @summary Inference with wildcard types causes selection of inapplicable method

   111.1 --- a/test/tools/javac/generics/inference/6638712/T6638712d.out	Mon Aug 24 22:28:37 2009 -0700
   111.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712d.out	Fri Aug 28 16:54:10 2009 -0700
   111.3 @@ -1,2 +1,2 @@
   111.4 -T6638712d.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, null
   111.5 +T6638712d.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, null
   111.6  1 error

   112.1 --- a/test/tools/javac/generics/inference/6638712/T6638712e.java	Mon Aug 24 22:28:37 2009 -0700
   112.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712e.java	Fri Aug 28 16:54:10 2009 -0700
   112.3 @@ -1,28 +1,5 @@
   112.4  /*
   112.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   112.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   112.7 - *
   112.8 - * This code is free software; you can redistribute it and/or modify it
   112.9 - * under the terms of the GNU General Public License version 2 only, as
  112.10 - * published by the Free Software Foundation.
  112.11 - *
  112.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  112.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  112.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  112.15 - * version 2 for more details (a copy is included in the LICENSE file that
  112.16 - * accompanied this code).
  112.17 - *
  112.18 - * You should have received a copy of the GNU General Public License version
  112.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  112.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  112.21 - *
  112.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  112.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  112.24 - * have any questions.
  112.25 - */
  112.26 -
  112.27 -/*
  112.28 - * @test
  112.29 + * @test /nodynamiccopyright/
  112.30   * @bug     6638712 6795689
  112.31   * @author  mcimadamore
  112.32   * @summary Inference with wildcard types causes selection of inapplicable method

   113.1 --- a/test/tools/javac/generics/inference/6638712/T6638712e.out	Mon Aug 24 22:28:37 2009 -0700
   113.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712e.out	Fri Aug 28 16:54:10 2009 -0700
   113.3 @@ -1,2 +1,2 @@
   113.4 -T6638712e.java:40:27: compiler.err.invalid.inferred.types: X, (compiler.misc.inferred.do.not.conform.to.params: T6638712e.Foo<? super java.lang.Object,? extends java.lang.Boolean>, T6638712e.Foo<java.lang.Boolean,java.lang.Boolean>)
   113.5 +T6638712e.java:17:27: compiler.err.invalid.inferred.types: X, (compiler.misc.inferred.do.not.conform.to.params: T6638712e.Foo<? super java.lang.Object,? extends java.lang.Boolean>, T6638712e.Foo<java.lang.Boolean,java.lang.Boolean>)
   113.6  1 error

   114.1 --- a/test/tools/javac/generics/inference/6718364/T6718364.java	Mon Aug 24 22:28:37 2009 -0700
   114.2 +++ b/test/tools/javac/generics/inference/6718364/T6718364.java	Fri Aug 28 16:54:10 2009 -0700
   114.3 @@ -1,28 +1,5 @@
   114.4 -/*
   114.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   114.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   114.7 - *
   114.8 - * This code is free software; you can redistribute it and/or modify it
   114.9 - * under the terms of the GNU General Public License version 2 only, as
  114.10 - * published by the Free Software Foundation.
  114.11 - *
  114.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  114.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  114.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  114.15 - * version 2 for more details (a copy is included in the LICENSE file that
  114.16 - * accompanied this code).
  114.17 - *
  114.18 - * You should have received a copy of the GNU General Public License version
  114.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  114.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  114.21 - *
  114.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  114.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  114.24 - * have any questions.
  114.25 - */
  114.26 -
  114.27  /**
  114.28 - * @test
  114.29 + * @test /nodynamiccopyright/
  114.30   * @bug 6718364
  114.31   * @summary inference fails when a generic method is invoked with raw arguments
  114.32   * @compile/ref=T6718364.out -XDstdout -XDrawDiagnostics -Xlint:unchecked T6718364.java

   115.1 --- a/test/tools/javac/generics/inference/6718364/T6718364.out	Mon Aug 24 22:28:37 2009 -0700
   115.2 +++ b/test/tools/javac/generics/inference/6718364/T6718364.out	Fri Aug 28 16:54:10 2009 -0700
   115.3 @@ -1,3 +1,3 @@
   115.4 -T6718364.java:36:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
   115.5 -T6718364.java:36:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
   115.6 -2 warnings
   115.7 \ No newline at end of file
   115.8 +T6718364.java:13:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
   115.9 +T6718364.java:13:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
  115.10 +2 warnings

   116.1 --- a/test/tools/javac/generics/rare/6665356/T6665356.java	Mon Aug 24 22:28:37 2009 -0700
   116.2 +++ b/test/tools/javac/generics/rare/6665356/T6665356.java	Fri Aug 28 16:54:10 2009 -0700
   116.3 @@ -1,28 +1,5 @@
   116.4  /*
   116.5 - * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
   116.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   116.7 - *
   116.8 - * This code is free software; you can redistribute it and/or modify it
   116.9 - * under the terms of the GNU General Public License version 2 only, as
  116.10 - * published by the Free Software Foundation.
  116.11 - *
  116.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  116.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  116.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  116.15 - * version 2 for more details (a copy is included in the LICENSE file that
  116.16 - * accompanied this code).
  116.17 - *
  116.18 - * You should have received a copy of the GNU General Public License version
  116.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  116.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  116.21 - *
  116.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  116.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  116.24 - * have any questions.
  116.25 - */
  116.26 -
  116.27 -/*
  116.28 - * @test
  116.29 + * @test /nodynamiccopyright/
  116.30   * @author Maurizio Cimadamore
  116.31   * @bug     6665356
  116.32   * @summary Cast not allowed when both qualifying type and inner class are parameterized
  116.33 @@ -50,4 +27,4 @@
  116.34          o = (Outer.Inner<?>)null;
  116.35          o = (Outer<?>.Inner<?>)null;
  116.36      }
  116.37 -}
  116.38 \ No newline at end of file
  116.39 +}

   117.1 --- a/test/tools/javac/generics/rare/6665356/T6665356.out	Mon Aug 24 22:28:37 2009 -0700
   117.2 +++ b/test/tools/javac/generics/rare/6665356/T6665356.out	Fri Aug 28 16:54:10 2009 -0700
   117.3 @@ -1,5 +1,5 @@
   117.4 -T6665356.java:40:37: compiler.err.improperly.formed.type.param.missing
   117.5 -T6665356.java:41:40: compiler.err.improperly.formed.type.inner.raw.param
   117.6 -T6665356.java:49:23: compiler.err.improperly.formed.type.param.missing
   117.7 -T6665356.java:50:25: compiler.err.improperly.formed.type.inner.raw.param
   117.8 -4 errors
   117.9 \ No newline at end of file
  117.10 +T6665356.java:17:37: compiler.err.improperly.formed.type.param.missing
  117.11 +T6665356.java:18:40: compiler.err.improperly.formed.type.inner.raw.param
  117.12 +T6665356.java:26:23: compiler.err.improperly.formed.type.param.missing
  117.13 +T6665356.java:27:25: compiler.err.improperly.formed.type.inner.raw.param
  117.14 +4 errors

   118.1 --- a/test/tools/javac/generics/typevars/6569404/T6569404b.java	Mon Aug 24 22:28:37 2009 -0700
   118.2 +++ b/test/tools/javac/generics/typevars/6569404/T6569404b.java	Fri Aug 28 16:54:10 2009 -0700
   118.3 @@ -1,28 +1,5 @@
   118.4  /*
   118.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   118.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   118.7 - *
   118.8 - * This code is free software; you can redistribute it and/or modify it
   118.9 - * under the terms of the GNU General Public License version 2 only, as
  118.10 - * published by the Free Software Foundation.
  118.11 - *
  118.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  118.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  118.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  118.15 - * version 2 for more details (a copy is included in the LICENSE file that
  118.16 - * accompanied this code).
  118.17 - *
  118.18 - * You should have received a copy of the GNU General Public License version
  118.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  118.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  118.21 - *
  118.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  118.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  118.24 - * have any questions.
  118.25 - */
  118.26 -
  118.27 -/*
  118.28 - * @test
  118.29 + * @test /nodynamiccopyright/
  118.30   * @bug     6569404
  118.31   * @summary Regression: Cannot instantiate an inner class of a type variable
  118.32   * @author  mcimadamore

   119.1 --- a/test/tools/javac/generics/typevars/6569404/T6569404b.out	Mon Aug 24 22:28:37 2009 -0700
   119.2 +++ b/test/tools/javac/generics/typevars/6569404/T6569404b.out	Fri Aug 28 16:54:10 2009 -0700
   119.3 @@ -1,2 +1,2 @@
   119.4 -T6569404b.java:36:48: compiler.err.type.var.cant.be.deref
   119.5 +T6569404b.java:13:48: compiler.err.type.var.cant.be.deref
   119.6  1 error

   120.1 --- a/test/tools/javac/generics/typevars/6680106/T6680106.java	Mon Aug 24 22:28:37 2009 -0700
   120.2 +++ b/test/tools/javac/generics/typevars/6680106/T6680106.java	Fri Aug 28 16:54:10 2009 -0700
   120.3 @@ -1,28 +1,5 @@
   120.4  /*
   120.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   120.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   120.7 - *
   120.8 - * This code is free software; you can redistribute it and/or modify it
   120.9 - * under the terms of the GNU General Public License version 2 only, as
  120.10 - * published by the Free Software Foundation.
  120.11 - *
  120.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  120.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  120.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  120.15 - * version 2 for more details (a copy is included in the LICENSE file that
  120.16 - * accompanied this code).
  120.17 - *
  120.18 - * You should have received a copy of the GNU General Public License version
  120.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  120.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  120.21 - *
  120.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  120.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  120.24 - * have any questions.
  120.25 - */
  120.26 -
  120.27 -/*
  120.28 - * @test
  120.29 + * @test /nodynamiccopyright/
  120.30   * @bug     6680106
  120.31   * @summary StackOverFlowError for Cyclic inheritance in TypeParameters with ArrayType Bounds
  120.32   * @author  Maurizio Cimadamore

   121.1 --- a/test/tools/javac/generics/typevars/6680106/T6680106.out	Mon Aug 24 22:28:37 2009 -0700
   121.2 +++ b/test/tools/javac/generics/typevars/6680106/T6680106.out	Fri Aug 28 16:54:10 2009 -0700
   121.3 @@ -1,13 +1,13 @@
   121.4 -T6680106.java:34:25: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   121.5 -T6680106.java:35:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
   121.6 -T6680106.java:35:40: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   121.7 -T6680106.java:36:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
   121.8 -T6680106.java:36:40: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
   121.9 -T6680106.java:36:55: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.10 -T6680106.java:37:30: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.11 -T6680106.java:38:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
  121.12 -T6680106.java:38:50: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.13 -T6680106.java:39:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
  121.14 -T6680106.java:39:50: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
  121.15 -T6680106.java:39:70: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.16 -12 errors
  121.17 \ No newline at end of file
  121.18 +T6680106.java:11:25: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.19 +T6680106.java:12:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
  121.20 +T6680106.java:12:40: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.21 +T6680106.java:13:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
  121.22 +T6680106.java:13:40: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
  121.23 +T6680106.java:13:55: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.24 +T6680106.java:14:30: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.25 +T6680106.java:15:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
  121.26 +T6680106.java:15:50: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.27 +T6680106.java:16:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
  121.28 +T6680106.java:16:50: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
  121.29 +T6680106.java:16:70: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
  121.30 +12 errors

   122.1 --- a/test/tools/javac/generics/typevars/6804733/T6804733.java	Mon Aug 24 22:28:37 2009 -0700
   122.2 +++ b/test/tools/javac/generics/typevars/6804733/T6804733.java	Fri Aug 28 16:54:10 2009 -0700
   122.3 @@ -1,28 +1,5 @@
   122.4  /*
   122.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   122.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   122.7 - *
   122.8 - * This code is free software; you can redistribute it and/or modify it
   122.9 - * under the terms of the GNU General Public License version 2 only, as
  122.10 - * published by the Free Software Foundation.
  122.11 - *
  122.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  122.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  122.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  122.15 - * version 2 for more details (a copy is included in the LICENSE file that
  122.16 - * accompanied this code).
  122.17 - *
  122.18 - * You should have received a copy of the GNU General Public License version
  122.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  122.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  122.21 - *
  122.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  122.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  122.24 - * have any questions.
  122.25 - */
  122.26 -
  122.27 -/*
  122.28 - * @test
  122.29 + * @test /nodynamiccopyright/
  122.30   * @bug     6804733
  122.31   * @summary javac generates spourious diagnostics for ill-formed type-variable bounds
  122.32   * @author  mcimadamore

   123.1 --- a/test/tools/javac/generics/typevars/6804733/T6804733.out	Mon Aug 24 22:28:37 2009 -0700
   123.2 +++ b/test/tools/javac/generics/typevars/6804733/T6804733.out	Fri Aug 28 16:54:10 2009 -0700
   123.3 @@ -1,2 +1,2 @@
   123.4 -T6804733.java:34:20: compiler.err.type.var.may.not.be.followed.by.other.bounds
   123.5 +T6804733.java:11:20: compiler.err.type.var.may.not.be.followed.by.other.bounds
   123.6  1 error

   124.1 --- a/test/tools/javac/javazip/Test.sh	Mon Aug 24 22:28:37 2009 -0700
   124.2 +++ b/test/tools/javac/javazip/Test.sh	Fri Aug 28 16:54:10 2009 -0700
   124.3 @@ -42,14 +42,16 @@
   124.4  OS=`uname -s`
   124.5  case "$OS" in
   124.6    SunOS | Linux )
   124.7 -    NULL=/dev/null
   124.8 -    PS=":"
   124.9      FS="/"
  124.10 +    SCR=`pwd`
  124.11 +    ;;
  124.12 +  CYGWIN* )
  124.13 +    FS="/"
  124.14 +    SCR=`pwd | cygpath -d`
  124.15      ;;
  124.16    Windows* )
  124.17 -    NULL=NUL
  124.18 -    PS=";"
  124.19      FS="\\"
  124.20 +    SCR=`pwd`
  124.21      ;;
  124.22    * )
  124.23      echo "Unrecognized system!"

   125.1 --- a/test/tools/javac/meth/InvokeMH_BAD68.java	Mon Aug 24 22:28:37 2009 -0700
   125.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   125.3 @@ -1,75 +0,0 @@
   125.4 -/*
   125.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   125.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   125.7 - *
   125.8 - * This code is free software; you can redistribute it and/or modify it
   125.9 - * under the terms of the GNU General Public License version 2 only, as
  125.10 - * published by the Free Software Foundation.
  125.11 - *
  125.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  125.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  125.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  125.15 - * version 2 for more details (a copy is included in the LICENSE file that
  125.16 - * accompanied this code).
  125.17 - *
  125.18 - * You should have received a copy of the GNU General Public License version
  125.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  125.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  125.21 - *
  125.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  125.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  125.24 - * have any questions.
  125.25 - */
  125.26 -
  125.27 -/*
  125.28 - * ##test
  125.29 - * ##bug 6754038
  125.30 - * ##summary Generate call sites for method handle
  125.31 - * ##author jrose
  125.32 - *
  125.33 - * ##compile/fail -source 7 -target 7 InvokeMH_BAD68.java
  125.34 - */
  125.35 -
  125.36 -/*
  125.37 - * Standalone testing:
  125.38 - * <code>
  125.39 - * $ cd $MY_REPO_DIR/langtools
  125.40 - * $ (cd make; make)
  125.41 - * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/meth/InvokeMH_BAD68.java
  125.42 - * $ javap -c -classpath dist meth.InvokeMH_BAD68
  125.43 - * </code>
  125.44 - */
  125.45 -
  125.46 -package meth;
  125.47 -
  125.48 -import java.dyn.MethodHandle;
  125.49 -
  125.50 -public class InvokeMH_BAD68 {
  125.51 -    void test(MethodHandle mh_SiO,
  125.52 -              MethodHandle mh_vS,
  125.53 -              MethodHandle mh_vi,
  125.54 -              MethodHandle mh_vv) {
  125.55 -        Object o; String s; int i;  // for return type testing
  125.56 -
  125.57 -        // next five must have sig = (String,int)Object
  125.58 -        mh_SiO.invoke("world", 123);
  125.59 -        mh_SiO.invoke("mundus", 456);
  125.60 -        Object k = "kosmos";
  125.61 -        mh_SiO.invoke((String)k, 789);
  125.62 -        o = mh_SiO.invoke((String)null, 000);
  125.63 -        o = mh_SiO.<Object>invoke("arda", -123);
  125.64 -
  125.65 -        // sig = ()String
  125.66 -        s = mh_vS.<String>invoke();
  125.67 -
  125.68 -        // sig = ()int
  125.69 -        i = mh_vi.<int>invoke();
  125.70 -        o = mh_vi.<int>invoke();
  125.71 -    s = mh_vi.<int>invoke(); //BAD
  125.72 -        mh_vi.<int>invoke();
  125.73 -
  125.74 -        // sig = ()void
  125.75 -        //o = mh_vv.<void>invoke(); //BAD
  125.76 -        mh_vv.<void>invoke();
  125.77 -    }
  125.78 -}

   126.1 --- a/test/tools/javac/meth/InvokeMH_BAD72.java	Mon Aug 24 22:28:37 2009 -0700
   126.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   126.3 @@ -1,75 +0,0 @@
   126.4 -/*
   126.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   126.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   126.7 - *
   126.8 - * This code is free software; you can redistribute it and/or modify it
   126.9 - * under the terms of the GNU General Public License version 2 only, as
  126.10 - * published by the Free Software Foundation.
  126.11 - *
  126.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  126.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  126.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  126.15 - * version 2 for more details (a copy is included in the LICENSE file that
  126.16 - * accompanied this code).
  126.17 - *
  126.18 - * You should have received a copy of the GNU General Public License version
  126.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  126.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  126.21 - *
  126.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  126.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  126.24 - * have any questions.
  126.25 - */
  126.26 -
  126.27 -/*
  126.28 - * ##test
  126.29 - * ##bug 6754038
  126.30 - * ##summary Generate call sites for method handle
  126.31 - * ##author jrose
  126.32 - *
  126.33 - * ##compile/fail -source 7 -target 7 InvokeMH_BAD72.java
  126.34 - */
  126.35 -
  126.36 -/*
  126.37 - * Standalone testing:
  126.38 - * <code>
  126.39 - * $ cd $MY_REPO_DIR/langtools
  126.40 - * $ (cd make; make)
  126.41 - * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/meth/InvokeMH_BAD72.java
  126.42 - * $ javap -c -classpath dist meth.InvokeMH_BAD72
  126.43 - * </code>
  126.44 - */
  126.45 -
  126.46 -package meth;
  126.47 -
  126.48 -import java.dyn.MethodHandle;
  126.49 -
  126.50 -public class InvokeMH_BAD72 {
  126.51 -    void test(MethodHandle mh_SiO,
  126.52 -              MethodHandle mh_vS,
  126.53 -              MethodHandle mh_vi,
  126.54 -              MethodHandle mh_vv) {
  126.55 -        Object o; String s; int i;  // for return type testing
  126.56 -
  126.57 -        // next five must have sig = (String,int)Object
  126.58 -        mh_SiO.invoke("world", 123);
  126.59 -        mh_SiO.invoke("mundus", 456);
  126.60 -        Object k = "kosmos";
  126.61 -        mh_SiO.invoke((String)k, 789);
  126.62 -        o = mh_SiO.invoke((String)null, 000);
  126.63 -        o = mh_SiO.<Object>invoke("arda", -123);
  126.64 -
  126.65 -        // sig = ()String
  126.66 -        s = mh_vS.<String>invoke();
  126.67 -
  126.68 -        // sig = ()int
  126.69 -        i = mh_vi.<int>invoke();
  126.70 -        o = mh_vi.<int>invoke();
  126.71 -        //s = mh_vi.<int>invoke(); //BAD
  126.72 -        mh_vi.<int>invoke();
  126.73 -
  126.74 -        // sig = ()void
  126.75 -    o = mh_vv.<void>invoke(); //BAD
  126.76 -        mh_vv.<void>invoke();
  126.77 -    }
  126.78 -}

   127.1 --- a/test/tools/javac/meth/MakeNegTests.sh	Mon Aug 24 22:28:37 2009 -0700
   127.2 +++ b/test/tools/javac/meth/MakeNegTests.sh	Fri Aug 28 16:54:10 2009 -0700
   127.3 @@ -78,7 +78,7 @@
   127.4  }
   127.5  
   127.6  getcasestem() {
   127.7 -  echo "$1" | sed 's/\.java$//;s/_BAD[0-9]*$//;s/$/_BAD/'
   127.8 +  echo `basename $1` | sed 's/\.java$//;s/_BAD[0-9]*$//;s/$/_BAD/'
   127.9  }
  127.10  
  127.11  testneg() {

   128.1 --- a/test/tools/javac/newlines/Newlines.sh	Mon Aug 24 22:28:37 2009 -0700
   128.2 +++ b/test/tools/javac/newlines/Newlines.sh	Fri Aug 28 16:54:10 2009 -0700
   128.3 @@ -50,14 +50,10 @@
   128.4  # set platform-dependent variables
   128.5  OS=`uname -s`
   128.6  case "$OS" in
   128.7 -  SunOS | Linux )
   128.8 -    NULL=/dev/null
   128.9 -    PS=":"
  128.10 +  SunOS | Linux | CYGWIN* )
  128.11      FS="/"
  128.12      ;;
  128.13    Windows* )
  128.14 -    NULL=NUL
  128.15 -    PS=";"
  128.16      FS="\\"
  128.17      ;;
  128.18    * )

   129.1 --- a/test/tools/javac/quid/MakeNegTests.sh	Mon Aug 24 22:28:37 2009 -0700
   129.2 +++ b/test/tools/javac/quid/MakeNegTests.sh	Fri Aug 28 16:54:10 2009 -0700
   129.3 @@ -77,7 +77,7 @@
   129.4  }
   129.5  
   129.6  getcasestem() {
   129.7 -  echo "$1" | sed 's/\.java$//;s/_BAD[0-9]*$//;s/$/_BAD/'
   129.8 +  echo `basename $1` | sed 's/.*\///;s/\.java$//;s/_BAD[0-9]*$//;s/$/_BAD/'
   129.9  }
  129.10  
  129.11  testneg() {

   130.1 --- a/test/tools/javac/quid/QuotedIdent_BAD61.java	Mon Aug 24 22:28:37 2009 -0700
   130.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   130.3 @@ -1,132 +0,0 @@
   130.4 -/*
   130.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   130.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   130.7 - *
   130.8 - * This code is free software; you can redistribute it and/or modify it
   130.9 - * under the terms of the GNU General Public License version 2 only, as
  130.10 - * published by the Free Software Foundation.
  130.11 - *
  130.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  130.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  130.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  130.15 - * version 2 for more details (a copy is included in the LICENSE file that
  130.16 - * accompanied this code).
  130.17 - *
  130.18 - * You should have received a copy of the GNU General Public License version
  130.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  130.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  130.21 - *
  130.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  130.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  130.24 - * have any questions.
  130.25 - */
  130.26 -
  130.27 -/*
  130.28 - * ##test
  130.29 - * ##bug 6746458
  130.30 - * ##summary Verify correct lexing of quoted identifiers.
  130.31 - * ##author jrose
  130.32 - *
  130.33 - * ##library ..
  130.34 - * ##run main quid.QuotedIdent_BAD61
  130.35 - */
  130.36 -
  130.37 -/*
  130.38 - * Standalone testing:
  130.39 - * <code>
  130.40 - * $ cd $MY_REPO_DIR/langtools
  130.41 - * $ (cd make; make)
  130.42 - * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/quid/QuotedIdent_BAD61.java
  130.43 - * $ java -version  # should print 1.6 or later
  130.44 - * $ java -cp dist quid.QuotedIdent_BAD61
  130.45 - * </code>
  130.46 - */
  130.47 -
  130.48 -package quid;
  130.49 -
  130.50 -public class QuotedIdent_BAD61 {
  130.51 -    static void check(int testid, String have, String expect)
  130.52 -                throws RuntimeException {
  130.53 -        if ((have == null && have != expect) ||
  130.54 -                (have != null && !have.equals(expect))) {
  130.55 -            String msg =
  130.56 -                "TEST " + testid + ": HAVE \"" +
  130.57 -                have + "\" EXPECT \"" + expect + "\"";
  130.58 -            System.out.println("StringConversion: " + msg);
  130.59 -            throw new RuntimeException(msg);
  130.60 -        }
  130.61 -    }
  130.62 -
  130.63 -    // negative tests:
  130.64 -    static class #"" { } //BAD empty ident name
  130.65 -    //static class #"<foo>" { } //BAD bad char in ident name
  130.66 -    /*static class /*(//BAD ident name interrupted by newline) #"jump:
  130.67 -    " { } /* uncomment previous line to attempt class w/ bad name */
  130.68 -
  130.69 -    static class #"int" extends Number {
  130.70 -        final int #"int";
  130.71 -        #"int"(int #"int") {
  130.72 -            this.#"int" = #"int";
  130.73 -        }
  130.74 -        static #"int" valueOf(int #"int") {
  130.75 -            return new #"int"(#"int");
  130.76 -        }
  130.77 -        public int intValue() { return #"int"; }
  130.78 -        public long longValue() { return #"int"; }
  130.79 -        public float floatValue() { return #"int"; }
  130.80 -        public double doubleValue() { return #"int"; }
  130.81 -        public String toString() { return String.valueOf(#"int"); }
  130.82 -    }
  130.83 -
  130.84 -    class #"*86" {
  130.85 -        String #"555-1212"() { return "[*86.555-1212]"; }
  130.86 -    }
  130.87 -    static#"*86"#"MAKE-*86"() {   // note close spacing
  130.88 -        return new QuotedIdent_BAD61().new#"*86"();
  130.89 -    }
  130.90 -
  130.91 -    static String bar() { return "[bar]"; }
  130.92 -
  130.93 -    public static void main(String[] args) throws Exception {
  130.94 -        String s;
  130.95 -
  130.96 -        String #"sticky \' wicket" = "wicked ' stick";
  130.97 -        s = #"sticky ' wicket";
  130.98 -        check(11, s, "wicked \' stick");
  130.99 -        check(12, #"s", s);
 130.100 -        check(13, #"\163", s);
 130.101 -
 130.102 -        s = #"QuotedIdent_BAD61".bar();
 130.103 -        check(21, s, "[bar]");
 130.104 -
 130.105 -        s = #"int".valueOf(123).toString();
 130.106 -        check(22, s, "123");
 130.107 -
 130.108 -        s = #"MAKE-*86"().#"555-1212"();
 130.109 -        check(23, s, "[*86.555-1212]");
 130.110 -
 130.111 -        class#"{{{inmost}}}" { }
 130.112 -        s = new#"{{{inmost}}}"().getClass().getName();
 130.113 -        if (!s.endsWith("{{{inmost}}}"))
 130.114 -            check(24, s, "should end with \"{{{inmost}}}\"");
 130.115 -
 130.116 -        s = #"Yog-Shoggoth".#"(nameless ululation)";
 130.117 -        check(25, s, "Tekeli-li!");
 130.118 -
 130.119 -        s = #"int".class.getName();
 130.120 -        check(31, s, QuotedIdent_BAD61.class.getName()+"$int");
 130.121 -
 130.122 -        Class x86 = Class.forName(QuotedIdent_BAD61.class.getName()+"$*86");
 130.123 -        if (x86 != #"*86".class)
 130.124 -            check(32, "reflected "+x86, "static "+#"*86".class);
 130.125 -
 130.126 -        s = (String) x86.getDeclaredMethod("555-1212").invoke(#"MAKE-*86"());
 130.127 -        check(31, s, "[*86.555-1212]");
 130.128 -
 130.129 -        System.out.println("OK");
 130.130 -    }
 130.131 -}
 130.132 -
 130.133 -interface #"Yog-Shoggoth" {
 130.134 -    final String #"(nameless ululation)" = "Tekeli-li!";
 130.135 -}

   131.1 --- a/test/tools/javac/quid/QuotedIdent_BAD62.java	Mon Aug 24 22:28:37 2009 -0700
   131.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   131.3 @@ -1,132 +0,0 @@
   131.4 -/*
   131.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   131.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   131.7 - *
   131.8 - * This code is free software; you can redistribute it and/or modify it
   131.9 - * under the terms of the GNU General Public License version 2 only, as
  131.10 - * published by the Free Software Foundation.
  131.11 - *
  131.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  131.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  131.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  131.15 - * version 2 for more details (a copy is included in the LICENSE file that
  131.16 - * accompanied this code).
  131.17 - *
  131.18 - * You should have received a copy of the GNU General Public License version
  131.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  131.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  131.21 - *
  131.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  131.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  131.24 - * have any questions.
  131.25 - */
  131.26 -
  131.27 -/*
  131.28 - * ##test
  131.29 - * ##bug 6746458
  131.30 - * ##summary Verify correct lexing of quoted identifiers.
  131.31 - * ##author jrose
  131.32 - *
  131.33 - * ##library ..
  131.34 - * ##run main quid.QuotedIdent_BAD62
  131.35 - */
  131.36 -
  131.37 -/*
  131.38 - * Standalone testing:
  131.39 - * <code>
  131.40 - * $ cd $MY_REPO_DIR/langtools
  131.41 - * $ (cd make; make)
  131.42 - * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/quid/QuotedIdent_BAD62.java
  131.43 - * $ java -version  # should print 1.6 or later
  131.44 - * $ java -cp dist quid.QuotedIdent_BAD62
  131.45 - * </code>
  131.46 - */
  131.47 -
  131.48 -package quid;
  131.49 -
  131.50 -public class QuotedIdent_BAD62 {
  131.51 -    static void check(int testid, String have, String expect)
  131.52 -                throws RuntimeException {
  131.53 -        if ((have == null && have != expect) ||
  131.54 -                (have != null && !have.equals(expect))) {
  131.55 -            String msg =
  131.56 -                "TEST " + testid + ": HAVE \"" +
  131.57 -                have + "\" EXPECT \"" + expect + "\"";
  131.58 -            System.out.println("StringConversion: " + msg);
  131.59 -            throw new RuntimeException(msg);
  131.60 -        }
  131.61 -    }
  131.62 -
  131.63 -    // negative tests:
  131.64 -    //static class #"" { } //BAD empty ident name
  131.65 -    static class #"<foo>" { } //BAD bad char in ident name
  131.66 -    /*static class /*(//BAD ident name interrupted by newline) #"jump:
  131.67 -    " { } /* uncomment previous line to attempt class w/ bad name */
  131.68 -
  131.69 -    static class #"int" extends Number {
  131.70 -        final int #"int";
  131.71 -        #"int"(int #"int") {
  131.72 -            this.#"int" = #"int";
  131.73 -        }
  131.74 -        static #"int" valueOf(int #"int") {
  131.75 -            return new #"int"(#"int");
  131.76 -        }
  131.77 -        public int intValue() { return #"int"; }
  131.78 -        public long longValue() { return #"int"; }
  131.79 -        public float floatValue() { return #"int"; }
  131.80 -        public double doubleValue() { return #"int"; }
  131.81 -        public String toString() { return String.valueOf(#"int"); }
  131.82 -    }
  131.83 -
  131.84 -    class #"*86" {
  131.85 -        String #"555-1212"() { return "[*86.555-1212]"; }
  131.86 -    }
  131.87 -    static#"*86"#"MAKE-*86"() {   // note close spacing
  131.88 -        return new QuotedIdent_BAD62().new#"*86"();
  131.89 -    }
  131.90 -
  131.91 -    static String bar() { return "[bar]"; }
  131.92 -
  131.93 -    public static void main(String[] args) throws Exception {
  131.94 -        String s;
  131.95 -
  131.96 -        String #"sticky \' wicket" = "wicked ' stick";
  131.97 -        s = #"sticky ' wicket";
  131.98 -        check(11, s, "wicked \' stick");
  131.99 -        check(12, #"s", s);
 131.100 -        check(13, #"\163", s);
 131.101 -
 131.102 -        s = #"QuotedIdent_BAD62".bar();
 131.103 -        check(21, s, "[bar]");
 131.104 -
 131.105 -        s = #"int".valueOf(123).toString();
 131.106 -        check(22, s, "123");
 131.107 -
 131.108 -        s = #"MAKE-*86"().#"555-1212"();
 131.109 -        check(23, s, "[*86.555-1212]");
 131.110 -
 131.111 -        class#"{{{inmost}}}" { }
 131.112 -        s = new#"{{{inmost}}}"().getClass().getName();
 131.113 -        if (!s.endsWith("{{{inmost}}}"))
 131.114 -            check(24, s, "should end with \"{{{inmost}}}\"");
 131.115 -
 131.116 -        s = #"Yog-Shoggoth".#"(nameless ululation)";
 131.117 -        check(25, s, "Tekeli-li!");
 131.118 -
 131.119 -        s = #"int".class.getName();
 131.120 -        check(31, s, QuotedIdent_BAD62.class.getName()+"$int");
 131.121 -
 131.122 -        Class x86 = Class.forName(QuotedIdent_BAD62.class.getName()+"$*86");
 131.123 -        if (x86 != #"*86".class)
 131.124 -            check(32, "reflected "+x86, "static "+#"*86".class);
 131.125 -
 131.126 -        s = (String) x86.getDeclaredMethod("555-1212").invoke(#"MAKE-*86"());
 131.127 -        check(31, s, "[*86.555-1212]");
 131.128 -
 131.129 -        System.out.println("OK");
 131.130 -    }
 131.131 -}
 131.132 -
 131.133 -interface #"Yog-Shoggoth" {
 131.134 -    final String #"(nameless ululation)" = "Tekeli-li!";
 131.135 -}