Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/code/Source.java	Thu Sep 03 10:53:14 2009 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Source.java	Thu Sep 03 18:34:17 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/code/Type.java	Thu Sep 03 10:53:14 2009 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java	Thu Sep 03 18:34:17 2009 -0700
     2.3 @@ -1068,7 +1068,7 @@
     2.4  
     2.5          /**
     2.6           * Replaces this ForAll's typevars with a set of concrete Java types
     2.7 -         * and returns the instantiated generic type. Subclasses might override
     2.8 +         * and returns the instantiated generic type. Subclasses should override
     2.9           * in order to check that the list of types is a valid instantiation
    2.10           * of the ForAll's typevars.
    2.11           *
    2.12 @@ -1081,6 +1081,42 @@
    2.13              return types.subst(qtype, tvars, actuals);
    2.14          }
    2.15  
    2.16 +        /**
    2.17 +         * Kind of type-constraint derived during type inference
    2.18 +         */
    2.19 +        public enum ConstraintKind {
    2.20 +            /**
    2.21 +             * upper bound constraint (a type variable must be instantiated
    2.22 +             * with a type T, where T is a subtype of all the types specified by
    2.23 +             * its EXTENDS constraints).
    2.24 +             */
    2.25 +            EXTENDS,
    2.26 +            /**
    2.27 +             * lower bound constraint (a type variable must be instantiated
    2.28 +             * with a type T, where T is a supertype of all the types specified by
    2.29 +             * its SUPER constraints).
    2.30 +             */
    2.31 +            SUPER,
    2.32 +            /**
    2.33 +             * equality constraint (a type variable must be instantiated to the type
    2.34 +             * specified by its EQUAL constraint.
    2.35 +             */
    2.36 +            EQUAL;
    2.37 +        }
    2.38 +
    2.39 +        /**
    2.40 +         * Get the type-constraints of a given kind for a given type-variable of
    2.41 +         * this ForAll type. Subclasses should override in order to return more
    2.42 +         * accurate sets of constraints.
    2.43 +         *
    2.44 +         * @param tv the type-variable for which the constraint is to be retrieved
    2.45 +         * @param ck the constraint kind to be retrieved
    2.46 +         * @return the list of types specified by the selected constraint
    2.47 +         */
    2.48 +        public List<Type> getConstraints(TypeVar tv, ConstraintKind ck) {
    2.49 +            return List.nil();
    2.50 +        }
    2.51 +
    2.52          public Type map(Mapping f) {
    2.53              return f.apply(qtype);
    2.54          }

     3.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Sep 03 10:53:14 2009 -0700
     3.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Sep 03 18:34:17 2009 -0700
     3.3 @@ -195,6 +195,21 @@
     3.4          return owntype;
     3.5      }
     3.6  
     3.7 +    Type checkReturn(JCTree tree, Type owntype, int ownkind, int pkind, Type pt) {
     3.8 +        if (owntype.tag != ERROR && pt.tag != METHOD && pt.tag != FORALL) {
     3.9 +            if ((ownkind & ~pkind) == 0) {
    3.10 +                owntype = chk.checkReturnType(tree.pos(), owntype, pt);
    3.11 +            } else {
    3.12 +                log.error(tree.pos(), "unexpected.type",
    3.13 +                          kindNames(pkind),
    3.14 +                          kindName(ownkind));
    3.15 +                owntype = types.createErrorType(owntype);
    3.16 +            }
    3.17 +        }
    3.18 +        tree.type = owntype;
    3.19 +        return owntype;
    3.20 +    }
    3.21 +
    3.22      /** Is given blank final variable assignable, i.e. in a scope where it
    3.23       *  may be assigned to even though it is final?
    3.24       *  @param v      The blank final variable.
    3.25 @@ -413,7 +428,14 @@
    3.26      /** Derived visitor method: attribute a type tree.
    3.27       */
    3.28      Type attribType(JCTree tree, Env<AttrContext> env) {
    3.29 -        Type result = attribTree(tree, env, TYP, Type.noType);
    3.30 +        Type result = attribType(tree, env, Type.noType);
    3.31 +        return result;
    3.32 +    }
    3.33 +
    3.34 +    /** Derived visitor method: attribute a type tree.
    3.35 +     */
    3.36 +    Type attribType(JCTree tree, Env<AttrContext> env, Type pt) {
    3.37 +        Type result = attribTree(tree, env, TYP, pt);
    3.38          return result;
    3.39      }
    3.40  
    3.41 @@ -1357,7 +1379,7 @@
    3.42  
    3.43              // Check that value of resulting type is admissible in the
    3.44              // current context.  Also, capture the return type
    3.45 -            result = check(tree, capture(restype), VAL, pkind, pt);
    3.46 +            result = checkReturn(tree, capture(restype), VAL, pkind, pt);
    3.47          }
    3.48          chk.validate(tree.typeargs, localEnv);
    3.49      }
    3.50 @@ -1432,9 +1454,9 @@
    3.51  
    3.52          // Attribute clazz expression and store
    3.53          // symbol + type back into the attributed tree.
    3.54 -        Type clazztype = chk.checkClassType(
    3.55 -            tree.clazz.pos(), attribType(clazz, env), true);
    3.56 +        Type clazztype = attribType(clazz, env);
    3.57          chk.validate(clazz, localEnv);
    3.58 +        clazztype = chk.checkNewClassType(clazz.pos(), clazztype, true, pt);
    3.59          if (tree.encl != null) {
    3.60              // We have to work in this case to store
    3.61              // symbol + type back into the attributed tree.
    3.62 @@ -1539,7 +1561,9 @@
    3.63                  //       ...
    3.64                  //     }
    3.65                  if (Resolve.isStatic(env)) cdef.mods.flags |= STATIC;
    3.66 -
    3.67 +                clazz = TreeInfo.isDiamond(tree) ?
    3.68 +                    make.Type(clazztype)
    3.69 +                    : clazz;
    3.70                  if (clazztype.tsym.isInterface()) {
    3.71                      cdef.implementing = List.of(clazz);
    3.72                  } else {
    3.73 @@ -2522,7 +2546,7 @@
    3.74          if (clazztype.tag == CLASS) {
    3.75              List<Type> formals = clazztype.tsym.type.getTypeArguments();
    3.76  
    3.77 -            if (actuals.length() == formals.length()) {
    3.78 +            if (actuals.length() == formals.length() || actuals.isEmpty()) {
    3.79                  List<Type> a = actuals;
    3.80                  List<Type> f = formals;
    3.81                  while (a.nonEmpty()) {
    3.82 @@ -2548,7 +2572,18 @@
    3.83                          clazzOuter = site;
    3.84                      }
    3.85                  }
    3.86 -                owntype = new ClassType(clazzOuter, actuals, clazztype.tsym);
    3.87 +                if (actuals.nonEmpty()) {
    3.88 +                    owntype = new ClassType(clazzOuter, actuals, clazztype.tsym);
    3.89 +                }
    3.90 +                else if (TreeInfo.isDiamond(tree)) {
    3.91 +                    //a type apply with no explicit type arguments - diamond operator
    3.92 +                    //the result type is a forall F where F's tvars are the type-variables
    3.93 +                    //that will be inferred when F is checked against the expected type
    3.94 +                    List<Type> ftvars = clazztype.tsym.type.getTypeArguments();
    3.95 +                    List<Type> new_tvars = types.newInstances(ftvars);
    3.96 +                    clazztype = new ClassType(clazzOuter, new_tvars, clazztype.tsym);
    3.97 +                    owntype = new ForAll(new_tvars, clazztype);
    3.98 +                }
    3.99              } else {
   3.100                  if (formals.length() != 0) {
   3.101                      log.error(tree.pos(), "wrong.number.type.args",

     4.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Sep 03 10:53:14 2009 -0700
     4.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Sep 03 18:34:17 2009 -0700
     4.3 @@ -60,8 +60,6 @@
     4.4      private final Log log;
     4.5      private final Symtab syms;
     4.6      private final Infer infer;
     4.7 -    private final Target target;
     4.8 -    private final Source source;
     4.9      private final Types types;
    4.10      private final JCDiagnostic.Factory diags;
    4.11      private final boolean skipAnnotations;
    4.12 @@ -90,18 +88,20 @@
    4.13          this.types = Types.instance(context);
    4.14          diags = JCDiagnostic.Factory.instance(context);
    4.15          Options options = Options.instance(context);
    4.16 -        target = Target.instance(context);
    4.17 -        source = Source.instance(context);
    4.18          lint = Lint.instance(context);
    4.19          treeinfo = TreeInfo.instance(context);
    4.20  
    4.21          Source source = Source.instance(context);
    4.22          allowGenerics = source.allowGenerics();
    4.23          allowAnnotations = source.allowAnnotations();
    4.24 +        allowCovariantReturns = source.allowCovariantReturns();
    4.25          complexInference = options.get("-complexinference") != null;
    4.26          skipAnnotations = options.get("skipAnnotations") != null;
    4.27          warnOnSyntheticConflicts = options.get("warnOnSyntheticConflicts") != null;
    4.28  
    4.29 +        Target target = Target.instance(context);
    4.30 +        syntheticNameChar = target.syntheticNameChar();
    4.31 +
    4.32          boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION);
    4.33          boolean verboseUnchecked = lint.isEnabled(LintCategory.UNCHECKED);
    4.34          boolean verboseSunApi = lint.isEnabled(LintCategory.SUNAPI);
    4.35 @@ -123,10 +123,18 @@
    4.36       */
    4.37      boolean allowAnnotations;
    4.38  
    4.39 +    /** Switch: covariant returns enabled?
    4.40 +     */
    4.41 +    boolean allowCovariantReturns;
    4.42 +
    4.43      /** Switch: -complexinference option set?
    4.44       */
    4.45      boolean complexInference;
    4.46  
    4.47 +    /** Character for synthetic names
    4.48 +     */
    4.49 +    char syntheticNameChar;
    4.50 +
    4.51      /** A table mapping flat names of all compiled classes in this run to their
    4.52       *  symbols; maintained from outside.
    4.53       */
    4.54 @@ -343,7 +351,7 @@
    4.55          for (int i=1; ; i++) {
    4.56              Name flatname = names.
    4.57                  fromString("" + c.owner.enclClass().flatname +
    4.58 -                           target.syntheticNameChar() + i +
    4.59 +                           syntheticNameChar + i +
    4.60                             c.name);
    4.61              if (compiled.get(flatname) == null) return flatname;
    4.62          }
    4.63 @@ -362,8 +370,6 @@
    4.64      Type checkType(DiagnosticPosition pos, Type found, Type req) {
    4.65          if (req.tag == ERROR)
    4.66              return req;
    4.67 -        if (found.tag == FORALL)
    4.68 -            return instantiatePoly(pos, (ForAll)found, req, convertWarner(pos, found, req));
    4.69          if (req.tag == NONE)
    4.70              return found;
    4.71          if (types.isAssignable(found, req, convertWarner(pos, found, req)))
    4.72 @@ -381,11 +387,38 @@
    4.73          return typeError(pos, diags.fragment("incompatible.types"), found, req);
    4.74      }
    4.75  
    4.76 +    Type checkReturnType(DiagnosticPosition pos, Type found, Type req) {
    4.77 +        if (found.tag == FORALL) {
    4.78 +            try {
    4.79 +                return instantiatePoly(pos, (ForAll) found, req, convertWarner(pos, found, req));
    4.80 +            } catch (Infer.NoInstanceException ex) {
    4.81 +                if (ex.isAmbiguous) {
    4.82 +                    JCDiagnostic d = ex.getDiagnostic();
    4.83 +                    log.error(pos,
    4.84 +                            "undetermined.type" + (d != null ? ".1" : ""),
    4.85 +                            found, d);
    4.86 +                    return types.createErrorType(req);
    4.87 +                } else {
    4.88 +                    JCDiagnostic d = ex.getDiagnostic();
    4.89 +                    return typeError(pos,
    4.90 +                            diags.fragment("incompatible.types" + (d != null ? ".1" : ""), d),
    4.91 +                            found, req);
    4.92 +                }
    4.93 +            } catch (Infer.InvalidInstanceException ex) {
    4.94 +                JCDiagnostic d = ex.getDiagnostic();
    4.95 +                log.error(pos, "invalid.inferred.types", ((ForAll)found).tvars, d);
    4.96 +                return types.createErrorType(req);
    4.97 +            }
    4.98 +        } else {
    4.99 +            return checkType(pos, found, req);
   4.100 +        }
   4.101 +    }
   4.102 +
   4.103      /** Instantiate polymorphic type to some prototype, unless
   4.104       *  prototype is `anyPoly' in which case polymorphic type
   4.105       *  is returned unchanged.
   4.106       */
   4.107 -    Type instantiatePoly(DiagnosticPosition pos, ForAll t, Type pt, Warner warn) {
   4.108 +    Type instantiatePoly(DiagnosticPosition pos, ForAll t, Type pt, Warner warn) throws Infer.NoInstanceException {
   4.109          if (pt == Infer.anyPoly && complexInference) {
   4.110              return t;
   4.111          } else if (pt == Infer.anyPoly || pt.tag == NONE) {
   4.112 @@ -394,28 +427,9 @@
   4.113          } else if (pt.tag == ERROR) {
   4.114              return pt;
   4.115          } else {
   4.116 -            try {
   4.117 -                return infer.instantiateExpr(t, pt, warn);
   4.118 -            } catch (Infer.NoInstanceException ex) {
   4.119 -                if (ex.isAmbiguous) {
   4.120 -                    JCDiagnostic d = ex.getDiagnostic();
   4.121 -                    log.error(pos,
   4.122 -                              "undetermined.type" + (d!=null ? ".1" : ""),
   4.123 -                              t, d);
   4.124 -                    return types.createErrorType(pt);
   4.125 -                } else {
   4.126 -                    JCDiagnostic d = ex.getDiagnostic();
   4.127 -                    return typeError(pos,
   4.128 -                                     diags.fragment("incompatible.types" + (d!=null ? ".1" : ""), d),
   4.129 -                                     t, pt);
   4.130 -                }
   4.131 -            } catch (Infer.InvalidInstanceException ex) {
   4.132 -                JCDiagnostic d = ex.getDiagnostic();
   4.133 -                log.error(pos, "invalid.inferred.types", t.tvars, d);
   4.134 -                return types.createErrorType(pt);
   4.135 -            }
   4.136 +            return infer.instantiateExpr(t, pt, warn);
   4.137          }
   4.138 -    }
   4.139 +     }
   4.140  
   4.141      /** Check that a given type can be cast to a given target type.
   4.142       *  Return the result of the cast.
   4.143 @@ -530,7 +544,7 @@
   4.144              while (args.nonEmpty()) {
   4.145                  if (args.head.tag == WILDCARD)
   4.146                      return typeTagError(pos,
   4.147 -                                        log.getLocalizedString("type.req.exact"),
   4.148 +                                        Log.getLocalizedString("type.req.exact"),
   4.149                                          args.head);
   4.150                  args = args.tail;
   4.151              }
   4.152 @@ -538,6 +552,29 @@
   4.153          return t;
   4.154      }
   4.155  
   4.156 +    /** Check that type is a valid type for a new expression. If the type contains
   4.157 +     * some uninferred type variables, instantiate them exploiting the expected
   4.158 +     * type.
   4.159 +     *
   4.160 +     *  @param pos           Position to be used for error reporting.
   4.161 +     *  @param t             The type to be checked.
   4.162 +     *  @param noBounds    True if type bounds are illegal here.
   4.163 +     *  @param pt          Expected type (used with diamond operator)
   4.164 +     */
   4.165 +    Type checkNewClassType(DiagnosticPosition pos, Type t, boolean noBounds, Type pt) {
   4.166 +        if (t.tag == FORALL) {
   4.167 +            try {
   4.168 +                t = instantiatePoly(pos, (ForAll)t, pt, Warner.noWarnings);
   4.169 +            }
   4.170 +            catch (Infer.NoInstanceException ex) {
   4.171 +                JCDiagnostic d = ex.getDiagnostic();
   4.172 +                log.error(pos, "cant.apply.diamond", t.getTypeArguments(), d);
   4.173 +                return types.createErrorType(pt);
   4.174 +            }
   4.175 +        }
   4.176 +        return checkClassType(pos, t, noBounds);
   4.177 +    }
   4.178 +
   4.179      /** Check that type is a reifiable class, interface or array type.
   4.180       *  @param pos           Position to be used for error reporting.
   4.181       *  @param t             The type to be checked.
   4.182 @@ -765,8 +802,10 @@
   4.183                  this.specialized = false;
   4.184              };
   4.185  
   4.186 +            @Override
   4.187              public void visitTree(JCTree tree) { /* no-op */ }
   4.188  
   4.189 +            @Override
   4.190              public void visitVarDef(JCVariableDecl tree) {
   4.191                  if ((tree.mods.flags & ENUM) != 0) {
   4.192                      if (tree.init instanceof JCNewClass &&
   4.193 @@ -838,10 +877,12 @@
   4.194       */
   4.195      class Validator extends JCTree.Visitor {
   4.196  
   4.197 +        @Override
   4.198          public void visitTypeArray(JCArrayTypeTree tree) {
   4.199              validate(tree.elemtype, env);
   4.200          }
   4.201  
   4.202 +        @Override
   4.203          public void visitTypeApply(JCTypeApply tree) {
   4.204              if (tree.type.tag == CLASS) {
   4.205                  List<Type> formals = tree.type.tsym.type.allparams();
   4.206 @@ -890,7 +931,8 @@
   4.207                  }
   4.208  
   4.209                  checkCapture(tree);
   4.210 -
   4.211 +            }
   4.212 +            if (tree.type.tag == CLASS || tree.type.tag == FORALL) {
   4.213                  // Check that this type is either fully parameterized, or
   4.214                  // not parameterized at all.
   4.215                  if (tree.type.getEnclosingType().isRaw())
   4.216 @@ -900,6 +942,7 @@
   4.217              }
   4.218          }
   4.219  
   4.220 +        @Override
   4.221          public void visitTypeParameter(JCTypeParameter tree) {
   4.222              validate(tree.bounds, env);
   4.223              checkClassBounds(tree.pos(), tree.type);
   4.224 @@ -911,6 +954,7 @@
   4.225                  validate(tree.inner, env);
   4.226          }
   4.227  
   4.228 +        @Override
   4.229          public void visitSelect(JCFieldAccess tree) {
   4.230              if (tree.type.tag == CLASS) {
   4.231                  visitSelectInternal(tree);
   4.232 @@ -934,12 +978,14 @@
   4.233              }
   4.234          }
   4.235  
   4.236 +        @Override
   4.237          public void visitAnnotatedType(JCAnnotatedType tree) {
   4.238              tree.underlyingType.accept(this);
   4.239          }
   4.240  
   4.241          /** Default visitor method: do nothing.
   4.242           */
   4.243 +        @Override
   4.244          public void visitTree(JCTree tree) {
   4.245          }
   4.246  
   4.247 @@ -1211,7 +1257,7 @@
   4.248          boolean resultTypesOK =
   4.249              types.returnTypeSubstitutable(mt, ot, otres, overrideWarner);
   4.250          if (!resultTypesOK) {
   4.251 -            if (!source.allowCovariantReturns() &&
   4.252 +            if (!allowCovariantReturns &&
   4.253                  m.owner != origin &&
   4.254                  m.owner.isSubClass(other.owner, types)) {
   4.255                  // allow limited interoperability with covariant returns
   4.256 @@ -2319,6 +2365,7 @@
   4.257              this.expected = expected;
   4.258          }
   4.259  
   4.260 +        @Override
   4.261          public void warnUnchecked() {
   4.262              boolean warned = this.warned;
   4.263              super.warnUnchecked();

     5.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Sep 03 10:53:14 2009 -0700
     5.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Sep 03 18:34:17 2009 -0700
     5.3 @@ -29,6 +29,7 @@
     5.4  import com.sun.tools.javac.util.List;
     5.5  import com.sun.tools.javac.code.*;
     5.6  import com.sun.tools.javac.code.Type.*;
     5.7 +import com.sun.tools.javac.code.Type.ForAll.ConstraintKind;
     5.8  import com.sun.tools.javac.code.Symbol.*;
     5.9  import com.sun.tools.javac.util.JCDiagnostic;
    5.10  
    5.11 @@ -50,6 +51,7 @@
    5.12  
    5.13      Symtab syms;
    5.14      Types types;
    5.15 +    Check chk;
    5.16      Resolve rs;
    5.17      JCDiagnostic.Factory diags;
    5.18  
    5.19 @@ -65,6 +67,7 @@
    5.20          syms = Symtab.instance(context);
    5.21          types = Types.instance(context);
    5.22          rs = Resolve.instance(context);
    5.23 +        chk = Check.instance(context);
    5.24          diags = JCDiagnostic.Factory.instance(context);
    5.25          ambiguousNoInstanceException =
    5.26              new NoInstanceException(true, diags);
    5.27 @@ -250,14 +253,19 @@
    5.28                                  Warner warn) throws InferenceException {
    5.29          List<Type> undetvars = Type.map(that.tvars, fromTypeVarFun);
    5.30          for (List<Type> l = undetvars; l.nonEmpty(); l = l.tail) {
    5.31 -            UndetVar v = (UndetVar) l.head;
    5.32 +            UndetVar uv = (UndetVar) l.head;
    5.33 +            TypeVar tv = (TypeVar)uv.qtype;
    5.34              ListBuffer<Type> hibounds = new ListBuffer<Type>();
    5.35 -            for (List<Type> l1 = types.getBounds((TypeVar) v.qtype); l1.nonEmpty(); l1 = l1.tail) {
    5.36 -                if (!l1.head.containsSome(that.tvars)) {
    5.37 -                    hibounds.append(l1.head);
    5.38 +            for (Type t : that.getConstraints(tv, ConstraintKind.EXTENDS).prependList(types.getBounds(tv))) {
    5.39 +                if (!t.containsSome(that.tvars) && t.tag != BOT) {
    5.40 +                    hibounds.append(t);
    5.41                  }
    5.42              }
    5.43 -            v.hibounds = hibounds.toList();
    5.44 +            List<Type> inst = that.getConstraints(tv, ConstraintKind.EQUAL);
    5.45 +            if (inst.nonEmpty() && inst.head.tag != BOT) {
    5.46 +                uv.inst = inst.head;
    5.47 +            }
    5.48 +            uv.hibounds = hibounds.toList();
    5.49          }
    5.50          Type qtype1 = types.subst(that.qtype, that.tvars, undetvars);
    5.51          if (!types.isSubtype(qtype1, to)) {
    5.52 @@ -273,7 +281,7 @@
    5.53          List<Type> targs = Type.map(undetvars, getInstFun);
    5.54          targs = types.subst(targs, that.tvars, targs);
    5.55          checkWithinBounds(that.tvars, targs, warn);
    5.56 -        return that.inst(targs, types);
    5.57 +        return chk.checkType(warn.pos(), that.inst(targs, types), to);
    5.58      }
    5.59  
    5.60      /** Instantiate method type `mt' by finding instantiations of
    5.61 @@ -349,6 +357,9 @@
    5.62          /** Type variables instantiated to bottom */
    5.63          ListBuffer<Type> restvars = new ListBuffer<Type>();
    5.64  
    5.65 +        /** Undet vars instantiated to bottom */
    5.66 +        final ListBuffer<Type> restundet = new ListBuffer<Type>();
    5.67 +
    5.68          /** Instantiated types or TypeVars if under-constrained */
    5.69          ListBuffer<Type> insttypes = new ListBuffer<Type>();
    5.70  
    5.71 @@ -359,6 +370,7 @@
    5.72              UndetVar uv = (UndetVar)t;
    5.73              if (uv.inst.tag == BOT) {
    5.74                  restvars.append(uv.qtype);
    5.75 +                restundet.append(uv);
    5.76                  insttypes.append(uv.qtype);
    5.77                  undettypes.append(uv);
    5.78                  uv.inst = null;
    5.79 @@ -379,17 +391,32 @@
    5.80              final MethodType mt2 = new MethodType(mt.argtypes, null, mt.thrown, syms.methodClass);
    5.81              mt2.restype = new ForAll(restvars.toList(), mt.restype) {
    5.82                  @Override
    5.83 +                public List<Type> getConstraints(TypeVar tv, ConstraintKind ck) {
    5.84 +                    for (Type t : restundet.toList()) {
    5.85 +                        UndetVar uv = (UndetVar)t;
    5.86 +                        if (uv.qtype == tv) {
    5.87 +                            switch (ck) {
    5.88 +                                case EXTENDS: return uv.hibounds;
    5.89 +                                case SUPER: return uv.lobounds;
    5.90 +                                case EQUAL: return uv.inst != null ? List.of(uv.inst) : List.<Type>nil();
    5.91 +                            }
    5.92 +                        }
    5.93 +                    }
    5.94 +                    return List.nil();
    5.95 +                }
    5.96 +
    5.97 +                @Override
    5.98                  public Type inst(List<Type> inferred, Types types) throws NoInstanceException {
    5.99                      List<Type> formals = types.subst(mt2.argtypes, tvars, inferred);
   5.100 -                   if (!rs.argumentsAcceptable(capturedArgs, formals,
   5.101 +                    if (!rs.argumentsAcceptable(capturedArgs, formals,
   5.102                             allowBoxing, useVarargs, warn)) {
   5.103                        // inferred method is not applicable
   5.104                        throw invalidInstanceException.setMessage("inferred.do.not.conform.to.params", formals, argtypes);
   5.105 -                   }
   5.106 -                   // check that inferred bounds conform to their bounds
   5.107 -                   checkWithinBounds(all_tvars,
   5.108 +                    }
   5.109 +                    // check that inferred bounds conform to their bounds
   5.110 +                    checkWithinBounds(all_tvars,
   5.111                             types.subst(inferredTypes, tvars, inferred), warn);
   5.112 -                   return super.inst(inferred, types);
   5.113 +                    return super.inst(inferred, types);
   5.114              }};
   5.115              return mt2;
   5.116          }

     6.1 --- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Thu Sep 03 10:53:14 2009 -0700
     6.2 +++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Thu Sep 03 18:34:17 2009 -0700
     6.3 @@ -131,6 +131,7 @@
     6.4          this.allowForeach = source.allowForeach();
     6.5          this.allowStaticImport = source.allowStaticImport();
     6.6          this.allowAnnotations = source.allowAnnotations();
     6.7 +        this.allowDiamond = source.allowDiamond();
     6.8          this.allowTypeAnnotations = source.allowTypeAnnotations();
     6.9          this.keepDocComments = keepDocComments;
    6.10          if (keepDocComments)
    6.11 @@ -148,6 +149,10 @@
    6.12       */
    6.13      boolean allowGenerics;
    6.14  
    6.15 +    /** Switch: Should diamond operator be recognized?
    6.16 +     */
    6.17 +    boolean allowDiamond;
    6.18 +
    6.19      /** Switch: Should varargs be recognized?
    6.20       */
    6.21      boolean allowVarargs;
    6.22 @@ -194,6 +199,7 @@
    6.23      static final int TYPE = 2;
    6.24      static final int NOPARAMS = 4;
    6.25      static final int TYPEARG = 8;
    6.26 +    static final int DIAMOND = 16;
    6.27  
    6.28      /** The current mode.
    6.29       */
    6.30 @@ -1326,6 +1332,11 @@
    6.31          ListBuffer<JCExpression> args = lb();
    6.32          if (S.token() == LT) {
    6.33              S.nextToken();
    6.34 +            if (S.token() == GT && (mode & DIAMOND) != 0) {
    6.35 +                checkDiamond();
    6.36 +                S.nextToken();
    6.37 +                return List.nil();
    6.38 +            }
    6.39              args.append(((mode & EXPR) == 0) ? typeArgument() : parseType());
    6.40              while (S.token() == COMMA) {
    6.41                  S.nextToken();
    6.42 @@ -1497,7 +1508,7 @@
    6.43              t = F.AnnotatedType(newAnnotations, t);
    6.44  
    6.45          int oldmode = mode;
    6.46 -        mode = TYPE;
    6.47 +        mode = TYPE | DIAMOND;
    6.48          if (S.token() == LT) {
    6.49              checkGenerics();
    6.50              t = typeArguments(t);
    6.51 @@ -1547,8 +1558,11 @@
    6.52      JCExpression innerCreator(int newpos, List<JCExpression> typeArgs, JCExpression encl) {
    6.53          JCExpression t = toP(F.at(S.pos()).Ident(ident()));
    6.54          if (S.token() == LT) {
    6.55 +            int oldmode = mode;
    6.56 +            mode |= DIAMOND;
    6.57              checkGenerics();
    6.58              t = typeArguments(t);
    6.59 +            mode = oldmode;
    6.60          }
    6.61          return classCreatorRest(newpos, encl, typeArgs, t);
    6.62      }
    6.63 @@ -3099,6 +3113,12 @@
    6.64          }
    6.65      }
    6.66  
    6.67 +    void checkDiamond() {
    6.68 +        if (!allowDiamond) {
    6.69 +            log.error(S.pos(), "diamond.not.supported.in.source", source.name);
    6.70 +            allowDiamond = true;
    6.71 +        }
    6.72 +    }
    6.73      void checkGenerics() {
    6.74          if (!allowGenerics) {
    6.75              log.error(S.pos(), "generics.not.supported.in.source", source.name);

     7.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Sep 03 10:53:14 2009 -0700
     7.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Sep 03 18:34:17 2009 -0700
     7.3 @@ -287,11 +287,12 @@
     7.4          // The to-be-wrapped iterator.
     7.5          private Iterator<?> iterator;
     7.6          private Log log;
     7.7 +        private Class<?> loaderClass;
     7.8 +        private boolean jusl;
     7.9 +        private Object loader;
    7.10  
    7.11          ServiceIterator(ClassLoader classLoader, Log log) {
    7.12 -            Class<?> loaderClass;
    7.13              String loadMethodName;
    7.14 -            boolean jusl;
    7.15  
    7.16              this.log = log;
    7.17              try {
    7.18 @@ -324,6 +325,7 @@
    7.19                  // For java.util.ServiceLoader, we have to call another
    7.20                  // method to get the iterator.
    7.21                  if (jusl) {
    7.22 +                    loader = result; // Store ServiceLoader to call reload later
    7.23                      Method m = loaderClass.getMethod("iterator");
    7.24                      result = m.invoke(result); // serviceLoader.iterator();
    7.25                  }
    7.26 @@ -365,6 +367,18 @@
    7.27          public void remove() {
    7.28              throw new UnsupportedOperationException();
    7.29          }
    7.30 +
    7.31 +        public void close() {
    7.32 +            if (jusl) {
    7.33 +                try {
    7.34 +                    // Call java.util.ServiceLoader.reload
    7.35 +                    Method reloadMethod = loaderClass.getMethod("reload");
    7.36 +                    reloadMethod.invoke(loader);
    7.37 +                } catch(Exception e) {
    7.38 +                    ; // Ignore problems during a call to reload.
    7.39 +                }
    7.40 +            }
    7.41 +        }
    7.42      }
    7.43  
    7.44  
    7.45 @@ -552,7 +566,7 @@
    7.46       * been discoverd so far as well as the means to discover more, if
    7.47       * necessary.  A single iterator should be used per round of
    7.48       * annotation processing.  The iterator first visits already
    7.49 -     * discovered processors then fails over to the service provided
    7.50 +     * discovered processors then fails over to the service provider
    7.51       * mechanism if additional queries are made.
    7.52       */
    7.53      class DiscoveredProcessors implements Iterable<ProcessorState> {
    7.54 @@ -624,6 +638,16 @@
    7.55              this.processorIterator = processorIterator;
    7.56              this.procStateList = new ArrayList<ProcessorState>();
    7.57          }
    7.58 +
    7.59 +        /**
    7.60 +         * Free jar files, etc. if using a service loader.
    7.61 +         */
    7.62 +        public void close() {
    7.63 +            if (processorIterator != null &&
    7.64 +                processorIterator instanceof ServiceIterator) {
    7.65 +                ((ServiceIterator) processorIterator).close();
    7.66 +            }
    7.67 +        }
    7.68      }
    7.69  
    7.70      private void discoverAndRunProcs(Context context,
    7.71 @@ -910,7 +934,7 @@
    7.72          * second to last round; errorRaised() gives the error status
    7.73          * of the last round.
    7.74          */
    7.75 -       errorStatus = errorStatus || messager.errorRaised();
    7.76 +        errorStatus = errorStatus || messager.errorRaised();
    7.77  
    7.78  
    7.79          // Free resources
    7.80 @@ -1023,6 +1047,8 @@
    7.81       */
    7.82      public void close() throws IOException {
    7.83          filer.close();
    7.84 +        if (discoveredProcs != null) // Make calling close idempotent
    7.85 +            discoveredProcs.close();
    7.86          discoveredProcs = null;
    7.87          if (processorClassLoader != null && processorClassLoader instanceof Closeable)
    7.88              ((Closeable) processorClassLoader).close();

     8.1 --- a/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Thu Sep 03 10:53:14 2009 -0700
     8.2 +++ b/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Thu Sep 03 18:34:17 2009 -0700
     8.3 @@ -48,7 +48,8 @@
     8.4   * deletion without notice.</b>
     8.5   */
     8.6  @SupportedAnnotationTypes("*")
     8.7 -@SupportedSourceVersion(SourceVersion.RELEASE_6)
     8.8 +// TODO: Change to version 7 based visitors when available
     8.9 +@SupportedSourceVersion(SourceVersion.RELEASE_7)
    8.10  public class PrintingProcessor extends AbstractProcessor {
    8.11      PrintWriter writer;
    8.12  
    8.13 @@ -374,6 +375,7 @@
    8.14                  for(TypeParameterElement tpe: typeParams) {
    8.15                      if (!first)
    8.16                          writer.print(", ");
    8.17 +                    printAnnotationsInline(tpe);
    8.18                      writer.print(tpe.toString());
    8.19                      first = false;
    8.20                  }

     9.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Sep 03 10:53:14 2009 -0700
     9.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Sep 03 18:34:17 2009 -0700
     9.3 @@ -1073,6 +1073,10 @@
     9.4      symbol:   {0} <{2}>{1}({3})\n\
     9.5      location: {4} {5}
     9.6  
     9.7 +compiler.err.cant.apply.diamond=\
     9.8 +    diamond operator cannot infer types for {0};\n\
     9.9 +    reason: {1}
    9.10 +
    9.11  ## The following are all possible string for "kindname".
    9.12  ## They should be called whatever the JLS calls them after it been translated
    9.13  ## to the appropriate language.
    9.14 @@ -1205,6 +1209,10 @@
    9.15      enums are not supported in -source {0}\n\
    9.16  (use -source 5 or higher to enable enums)
    9.17  
    9.18 +compiler.err.diamond.not.supported.in.source=\
    9.19 +    diamond operator is not supported in -source {0}\n\
    9.20 +(use -source 7 or higher to enable diamond operator)
    9.21 +
    9.22  ########################################
    9.23  # Diagnostics for where clause implementation
    9.24  # used by the RichDiagnosticFormatter.

    10.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Thu Sep 03 10:53:14 2009 -0700
    10.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Thu Sep 03 18:34:17 2009 -0700
    10.3 @@ -204,6 +204,15 @@
    10.4          return (JCMethodInvocation)exec.expr;
    10.5      }
    10.6  
    10.7 +    /** Return true if a tree represents a diamond new expr. */
    10.8 +    public static boolean isDiamond(JCTree tree) {
    10.9 +        switch(tree.getTag()) {
   10.10 +            case JCTree.TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
   10.11 +            case JCTree.NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
   10.12 +            default: return false;
   10.13 +        }
   10.14 +    }
   10.15 +
   10.16      /** Return true if a tree represents the null literal. */
   10.17      public static boolean isNull(JCTree tree) {
   10.18          if (tree.getTag() != JCTree.LITERAL)

    11.1 --- a/test/Makefile	Thu Sep 03 10:53:14 2009 -0700
    11.2 +++ b/test/Makefile	Thu Sep 03 18:34:17 2009 -0700
    11.3 @@ -44,7 +44,6 @@
    11.4  # Default bundle of all test results (passed or not)
    11.5  JPRT_ARCHIVE_BUNDLE=$(TEST_ROOT)/JPRT_ARCHIVE_BUNDLE.zip
    11.6  
    11.7 -# Default home for JTREG
    11.8  ifeq ($(PLATFORM), windows)
    11.9    SLASH_JAVA = J:
   11.10  else
   11.11 @@ -52,8 +51,12 @@
   11.12  endif
   11.13  
   11.14  # Default JTREG to run
   11.15 -JT_HOME = $(SLASH_JAVA)/svc/jct-tools3.2.2_02
   11.16 -JTREG = $(JT_HOME)/$(JT_PLATFORM)/bin/jtreg
   11.17 +ifdef JPRT_JTREG_HOME
   11.18 +  JTREG_HOME = $(JPRT_JTREG_HOME)
   11.19 +else
   11.20 +  JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
   11.21 +endif
   11.22 +JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg
   11.23  
   11.24  # Default JDK for JTREG
   11.25  ifdef JPRT_JAVA_HOME
   11.26 @@ -63,7 +66,12 @@
   11.27  endif
   11.28  
   11.29  # Default JDK to test
   11.30 -TESTJAVA = $(SLASH_JAVA)/re/jdk/1.7.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
   11.31 +ifdef JPRT_IMPORT_PRODUCT_HOME
   11.32 +  TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME)
   11.33 +else
   11.34 +  TESTJAVA = $(SLASH_JAVA)/re/jdk/1.7.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
   11.35 +endif
   11.36 +
   11.37  TESTBOOTCLASSPATH = $(PRODUCT_HOME)/dist/lib/classes.jar
   11.38  
   11.39  # The test directories to run
   11.40 @@ -73,41 +81,40 @@
   11.41  # Root of all test results
   11.42  TEST_OUTPUT_DIR = $(TEST_ROOT)/o_$(PLATFORM)-$(ARCH)
   11.43  
   11.44 -# Export this setting and pass it in.
   11.45 -JAVA_TOOL_OPTIONS = -Djava.awt.headless=true
   11.46 -export JAVA_TOOL_OPTIONS
   11.47 -
   11.48  # Default make rule
   11.49 -all javac javadoc javah javap apt: clean check jtreg-tests $(JPRT_ARCHIVE_BUNDLE)
   11.50 +all apt javac javadoc javah javap: clean check jtreg-tests $(JPRT_ARCHIVE_BUNDLE)
   11.51  	@echo "Testing completed successfully"
   11.52  
   11.53  # for use with JPRT -testrule
   11.54  all:		TESTDIRS = .
   11.55 -javac fastjavac: TESTDIRS = tools/javac
   11.56 +apt:		TESTDIRS = tools/apt
   11.57 +javac: 		TESTDIRS = tools/javac
   11.58  javadoc:	TESTDIRS = tools/javadoc com/sun/javadoc
   11.59  javah:		TESTDIRS = tools/javah
   11.60  javap:		TESTDIRS = tools/javap
   11.61 -apt:		TESTDIRS = tools/apt
   11.62 -
   11.63 -fastjavac:	SAMEVM = -samevm
   11.64  
   11.65  # Check to make sure these directories exist
   11.66  check: $(JT_HOME) $(PRODUCT_HOME) $(JTREG)
   11.67  
   11.68  # Run the tests
   11.69  jtreg-tests: FRC
   11.70 -	ls /opt/jprt /opt/jprt/jdk*
   11.71  	@echo "Using export JAVA_TOOL_OPTIONS=$(JAVA_TOOL_OPTIONS)"
   11.72  	@rm -f -r $(TEST_OUTPUT_DIR)/JTwork $(TEST_OUTPUT_DIR)/JTreport
   11.73  	@mkdir -p $(TEST_OUTPUT_DIR)
   11.74 -	JT_JAVA=$(JT_JAVA) $(JTREG) -k:\!ignore -a -v:fail,error $(SAMEVM) \
   11.75 +	JT_JAVA=$(JT_JAVA) $(JTREG) \
   11.76 +	  -a -samevm -k:\!ignore -v:fail,error,nopass \
   11.77            -r:$(TEST_OUTPUT_DIR)/JTreport \
   11.78            -w:$(TEST_OUTPUT_DIR)/JTwork \
   11.79            -jdk:$(TESTJAVA) \
   11.80  	  -Xbootclasspath/p:$(TESTBOOTCLASSPATH) \
   11.81 -          $(JAVA_TOOL_OPTIONS:%=-vmoption:%) \
   11.82            $(JAVA_ARGS:%=-vmoption:%) \
   11.83 -          $(TESTDIRS)
   11.84 +          $(TESTDIRS) \
   11.85 +	|| ( status=$$? ; \
   11.86 +		echo ; echo "Summary of test failures" ; \
   11.87 +		cat $(TEST_OUTPUT_DIR)/JTreport/text/summary.txt | \
   11.88 +			grep -v 'Not run' | grep -v 'Passed' ; \
   11.89 +		echo ; \
   11.90 +		exit $$status )
   11.91  
   11.92  # Bundle up the results
   11.93  $(JPRT_ARCHIVE_BUNDLE): FRC

    12.1 --- a/test/com/sun/javadoc/lib/JavadocTester.java	Thu Sep 03 10:53:14 2009 -0700
    12.2 +++ b/test/com/sun/javadoc/lib/JavadocTester.java	Thu Sep 03 18:34:17 2009 -0700
    12.3 @@ -124,6 +124,14 @@
    12.4      private static int javadocRunNum = 0;
    12.5  
    12.6      /**
    12.7 +     * Whether or not to match newlines exactly.
    12.8 +     * Set this value to false if the match strings
    12.9 +     * contain text from javadoc comments containing
   12.10 +     * non-platform newlines.
   12.11 +     */
   12.12 +    protected boolean exactNewlineMatch = true;
   12.13 +
   12.14 +    /**
   12.15       * Construct a JavadocTester.
   12.16       */
   12.17      public JavadocTester() {
   12.18 @@ -419,15 +427,22 @@
   12.19      /**
   12.20       * Search for the string in the given file and return true
   12.21       * if the string was found.
   12.22 +     * If exactNewlineMatch is false, newlines will be normalized
   12.23 +     * before the comparison.
   12.24       *
   12.25       * @param fileString    the contents of the file to search through
   12.26       * @param stringToFind  the string to search for
   12.27       * @return              true if the string was found
   12.28       */
   12.29      private boolean findString(String fileString, String stringToFind) {
   12.30 -        return fileString.indexOf(stringToFind) >= 0;
   12.31 +        if (exactNewlineMatch) {
   12.32 +            return fileString.indexOf(stringToFind) >= 0;
   12.33 +        } else {
   12.34 +            return fileString.replace(NL, "\n").indexOf(stringToFind.replace(NL, "\n")) >= 0;
   12.35 +        }
   12.36      }
   12.37  
   12.38 +
   12.39      /**
   12.40       * Return the standard output.
   12.41       * @return the standard output

    13.1 --- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Thu Sep 03 10:53:14 2009 -0700
    13.2 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Thu Sep 03 18:34:17 2009 -0700
    13.3 @@ -351,6 +351,7 @@
    13.4       */
    13.5      public static void main(String[] args) {
    13.6          TestHtmlDefinitionListTag tester = new TestHtmlDefinitionListTag();
    13.7 +        tester.exactNewlineMatch = false;
    13.8          run(tester, ARGS1, TEST_ALL, NEGATED_TEST);
    13.9          run(tester, ARGS1, TEST_CMNT_DEPR, NEGATED_TEST);
   13.10          run(tester, ARGS2, TEST_ALL, NEGATED_TEST);

    14.1 --- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Thu Sep 03 10:53:14 2009 -0700
    14.2 +++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Thu Sep 03 18:34:17 2009 -0700
    14.3 @@ -128,6 +128,7 @@
    14.4       */
    14.5      public static void main(String[] args) {
    14.6          TestSerializedFormDeprecationInfo tester = new TestSerializedFormDeprecationInfo();
    14.7 +        tester.exactNewlineMatch = false;
    14.8          run(tester, ARGS1, TEST_CMNT_DEPR, TEST_NOCMNT);
    14.9          run(tester, ARGS2, TEST_NOCMNT, TEST_CMNT_DEPR);
   14.10          run(tester, ARGS3, TEST_NODEPR, TEST_NOCMNT_NODEPR);

    15.1 --- a/test/tools/apt/Basics/apt.sh	Thu Sep 03 10:53:14 2009 -0700
    15.2 +++ b/test/tools/apt/Basics/apt.sh	Thu Sep 03 18:34:17 2009 -0700
    15.3 @@ -33,12 +33,11 @@
    15.4  
    15.5  OS=`uname -s`;
    15.6  case "${OS}" in
    15.7 -        Windows* | CYGWIN* )
    15.8 -                SEP=";"
    15.9 +        CYGWIN* )
   15.10 +                DIFFOPTS="--strip-trailing-cr"
   15.11          ;;
   15.12  
   15.13  	* )
   15.14 -	SEP=":"
   15.15  	;;
   15.16  esac
   15.17  
   15.18 @@ -94,7 +93,7 @@
   15.19  do
   15.20  	printf "%s\n" "Testing annotations on source file ${i}"
   15.21  	${APT} @options ${i} 2> result.txt
   15.22 -	diff ${TESTSRC}/golden.txt result.txt
   15.23 +	diff ${DIFFOPTS} ${TESTSRC}/golden.txt result.txt
   15.24  
   15.25  	RESULT=$?
   15.26  	case "$RESULT" in
   15.27 @@ -109,7 +108,7 @@
   15.28  	CLASS=`basename ${i} .java`
   15.29  	printf "%s\n" "Testing annotations on class file ${CLASS}"
   15.30  	${APT} @options1 ${CLASS} 2> result2.txt
   15.31 -	diff ${TESTSRC}/golden.txt result2.txt
   15.32 +	diff ${DIFFOPTS} ${TESTSRC}/golden.txt result2.txt
   15.33  
   15.34  	RESULT=$?
   15.35  	case "$RESULT" in

    16.1 --- a/test/tools/apt/Basics/print.sh	Thu Sep 03 10:53:14 2009 -0700
    16.2 +++ b/test/tools/apt/Basics/print.sh	Thu Sep 03 18:34:17 2009 -0700
    16.3 @@ -32,12 +32,11 @@
    16.4  
    16.5  OS=`uname -s`;
    16.6  case "${OS}" in
    16.7 -        Windows* | CYGWIN* )
    16.8 -                SEP=";"
    16.9 +        CYGWIN* )
   16.10 +                DIFFOPTS="--strip-trailing-cr"
   16.11          ;;
   16.12  
   16.13  	* )
   16.14 -	SEP=":"
   16.15  	;;
   16.16  esac
   16.17  
   16.18 @@ -88,7 +87,7 @@
   16.19  # check for mutliple methods and no static initializer
   16.20  
   16.21  ${APT} -XclassesAsDecls -cp ${TESTCLASSES} -print Aggregate > aggregate.txt
   16.22 -diff aggregate.txt ${TESTSRC}/goldenAggregate.txt
   16.23 +diff ${DIFFOPTS} aggregate.txt ${TESTSRC}/goldenAggregate.txt
   16.24  
   16.25  RESULT=$?
   16.26  case "$RESULT" in

    17.1 --- a/test/tools/apt/Compile/compile.sh	Thu Sep 03 10:53:14 2009 -0700
    17.2 +++ b/test/tools/apt/Compile/compile.sh	Thu Sep 03 18:34:17 2009 -0700
    17.3 @@ -57,7 +57,12 @@
    17.4  
    17.5  OS=`uname -s`;
    17.6  case "${OS}" in
    17.7 -        Windows* | CYGWIN* )
    17.8 +        Windows* )
    17.9 +                SEP=";"
   17.10 +        ;;
   17.11 +
   17.12 +        CYGWIN* )
   17.13 +		DIFFOPTS="--strip-trailing-cr"
   17.14                  SEP=";"
   17.15          ;;
   17.16  
   17.17 @@ -150,7 +155,7 @@
   17.18  
   17.19  TestNoFile "HelloWorld.class"
   17.20  
   17.21 -diff output ${TESTSRC}/golden.txt
   17.22 +diff ${DIFFOPTS} output ${TESTSRC}/golden.txt
   17.23  
   17.24  RESULT=$?
   17.25  case "$RESULT" in
   17.26 @@ -180,7 +185,7 @@
   17.27  printf "%s\n" "HelloAnnotation.java"        >> options3
   17.28  ${APT} @options3 2> output
   17.29  
   17.30 -diff output ${TESTSRC}/goldenWarn.txt
   17.31 +diff ${DIFFOPTS} output ${TESTSRC}/goldenWarn.txt
   17.32  
   17.33  RESULT=$?
   17.34  case "$RESULT" in
   17.35 @@ -485,7 +490,7 @@
   17.36  printf "%s\n" "${TESTSRC}/Dummy1.java" >> options8
   17.37  ${APT} @options8 > multiRoundOutput 2> multiRoundError
   17.38  
   17.39 -diff multiRoundOutput  ${TESTSRC}/goldenFactory.txt
   17.40 +diff ${DIFFOPTS} multiRoundOutput  ${TESTSRC}/goldenFactory.txt
   17.41  
   17.42  RESULT=$?
   17.43  case "$RESULT" in

    18.1 --- a/test/tools/javac/4846262/Test.sh	Thu Sep 03 10:53:14 2009 -0700
    18.2 +++ b/test/tools/javac/4846262/Test.sh	Thu Sep 03 18:34:17 2009 -0700
    18.3 @@ -45,13 +45,13 @@
    18.4  OS=`uname -s`
    18.5  case "$OS" in
    18.6    SunOS | Linux )
    18.7 -    NULL=/dev/null
    18.8 -    PS=":"
    18.9      FS="/"
   18.10      ;;
   18.11 +  CYGWIN* )
   18.12 +    FS="/"
   18.13 +    DIFFOPTS="--strip-trailing-cr"
   18.14 +    ;;
   18.15    Windows* )
   18.16 -    NULL=NUL
   18.17 -    PS=";"
   18.18      FS="\\"
   18.19      ;;
   18.20    * )
   18.21 @@ -68,7 +68,7 @@
   18.22  
   18.23  "${TESTJAVA}${FS}bin${FS}native2ascii" ${TESTTOOLVMOPTS} -encoding IBM1047 Test.tmp Test.out
   18.24  
   18.25 -diff -c "${TESTSRC}${FS}Test.out" Test.out
   18.26 +diff ${DIFFOPTS} -c "${TESTSRC}${FS}Test.out" Test.out
   18.27  result=$?
   18.28  
   18.29  if [ $result -eq o ]

    19.1 --- a/test/tools/javac/6302184/T6302184.sh	Thu Sep 03 10:53:14 2009 -0700
    19.2 +++ b/test/tools/javac/6302184/T6302184.sh	Thu Sep 03 18:34:17 2009 -0700
    19.3 @@ -42,13 +42,13 @@
    19.4  OS=`uname -s`
    19.5  case "$OS" in
    19.6    SunOS | Linux )
    19.7 -    NULL=/dev/null
    19.8 -    PS=":"
    19.9      FS="/"
   19.10      ;;
   19.11 +  CYGWIN* )
   19.12 +    FS="/"
   19.13 +    DIFFOPTS="--strip-trailing-cr"
   19.14 +    ;;
   19.15    Windows* )
   19.16 -    NULL=NUL
   19.17 -    PS=";"
   19.18      FS="\\"
   19.19      ;;
   19.20    * )
   19.21 @@ -57,8 +57,8 @@
   19.22      ;;
   19.23  esac
   19.24  
   19.25 -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1 > ${NULL}
   19.26 -diff -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
   19.27 +"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1
   19.28 +diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
   19.29  result=$?
   19.30  
   19.31  

    20.1 --- a/test/tools/javac/6521805/T6521805a.java	Thu Sep 03 10:53:14 2009 -0700
    20.2 +++ b/test/tools/javac/6521805/T6521805a.java	Thu Sep 03 18:34:17 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/T6521805a_1.out	Thu Sep 03 10:53:14 2009 -0700
    21.2 +++ b/test/tools/javac/6521805/T6521805a_1.out	Thu Sep 03 18:34:17 2009 -0700
    21.3 @@ -1,2 +1,2 @@
    21.4 -T6521805a.java:40:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
    21.5 +T6521805a.java:17:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
    21.6  1 error

    22.1 --- a/test/tools/javac/6521805/T6521805a_2.out	Thu Sep 03 10:53:14 2009 -0700
    22.2 +++ b/test/tools/javac/6521805/T6521805a_2.out	Thu Sep 03 18:34:17 2009 -0700
    22.3 @@ -1,2 +1,2 @@
    22.4 -T6521805a.java:40:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
    22.5 +T6521805a.java:17:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
    22.6  1 warning

    23.1 --- a/test/tools/javac/6521805/T6521805d.java	Thu Sep 03 10:53:14 2009 -0700
    23.2 +++ b/test/tools/javac/6521805/T6521805d.java	Thu Sep 03 18:34:17 2009 -0700
    23.3 @@ -1,28 +1,5 @@
    23.4  /*
    23.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    23.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.7 - *
    23.8 - * This code is free software; you can redistribute it and/or modify it
    23.9 - * under the terms of the GNU General Public License version 2 only, as
   23.10 - * published by the Free Software Foundation.
   23.11 - *
   23.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   23.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   23.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   23.15 - * version 2 for more details (a copy is included in the LICENSE file that
   23.16 - * accompanied this code).
   23.17 - *
   23.18 - * You should have received a copy of the GNU General Public License version
   23.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   23.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   23.21 - *
   23.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   23.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   23.24 - * have any questions.
   23.25 - */
   23.26 -
   23.27 -/*
   23.28 - * @test
   23.29 + * @test /nodynamiccopyright/
   23.30   * @bug 6521805
   23.31   * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
   23.32   * @author mcimadamore

    24.1 --- a/test/tools/javac/6521805/T6521805d.out	Thu Sep 03 10:53:14 2009 -0700
    24.2 +++ b/test/tools/javac/6521805/T6521805d.out	Thu Sep 03 18:34:17 2009 -0700
    24.3 @@ -1,2 +1,2 @@
    24.4 -T6521805d.java:41:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
    24.5 +T6521805d.java:18:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
    24.6  1 error

    25.1 --- a/test/tools/javac/6589361/T6589361.java	Thu Sep 03 10:53:14 2009 -0700
    25.2 +++ b/test/tools/javac/6589361/T6589361.java	Thu Sep 03 18:34:17 2009 -0700
    25.3 @@ -23,8 +23,9 @@
    25.4              set.add(JavaFileObject.Kind.CLASS);
    25.5              Iterable<JavaFileObject> files = fm.list(StandardLocation.PLATFORM_CLASS_PATH, "java.lang", set, false);
    25.6              for (JavaFileObject file : files) {
    25.7 -
    25.8 -                if (file.toString().contains("java" + File.separator + "lang" + File.separator + "Object.class")) {
    25.9 +                // Note: Zip/Jar entry names use '/', not File.separator, but just to be sure,
   25.10 +                // we normalize the filename as well.
   25.11 +                if (file.toString().replace(File.separatorChar, '/').contains("java/lang/Object.class")) {
   25.12                      String str = fm.inferBinaryName(StandardLocation.CLASS_PATH, file);
   25.13                      if (!str.equals("java.lang.Object")) {
   25.14                          throw new AssertionError("Error in JavacFileManager.inferBinaryName method!");
   25.15 @@ -40,7 +41,7 @@
   25.16                  fm.close();
   25.17              }
   25.18          }
   25.19 -        throw new AssertionError("Could not fing java/lang/Object.class while compiling");
   25.20 +        throw new AssertionError("Could not find java/lang/Object.class while compiling");
   25.21      }
   25.22  
   25.23  }

    26.1 --- a/test/tools/javac/6627362/T6627362.java	Thu Sep 03 10:53:14 2009 -0700
    26.2 +++ b/test/tools/javac/6627362/T6627362.java	Thu Sep 03 18:34:17 2009 -0700
    26.3 @@ -75,7 +75,7 @@
    26.4  
    26.5          StringWriter sw = new StringWriter();
    26.6          javap(new PrintWriter(sw, true), jpArgs);
    26.7 -        check(sw.toString(), "//Method java/lang/System.arraycopy:(Ljava/lang/Object;ILjava/lang/Object;II)V");
    26.8 +        check(sw.toString(), "// Method java/lang/System.arraycopy:(Ljava/lang/Object;ILjava/lang/Object;II)V");
    26.9          callValues();
   26.10      }
   26.11  
   26.12 @@ -86,26 +86,13 @@
   26.13      }
   26.14  
   26.15      void javap(PrintWriter out, String... args) throws Exception {
   26.16 -        // for now, we have to exec javap
   26.17 -        File javaHome = new File(System.getProperty("java.home"));
   26.18 -        if (javaHome.getName().equals("jre"))
   26.19 -            javaHome = javaHome.getParentFile();
   26.20 -        File javap = new File(new File(javaHome, "bin"), "javap");
   26.21 -        String[] cmd = new String[args.length + 1];
   26.22 -        cmd[0] = javap.getPath();
   26.23 -        System.arraycopy(args, 0, cmd, 1, args.length);
   26.24 -        Process p = new ProcessBuilder(cmd).redirectErrorStream(true).start();
   26.25 -        p.getOutputStream().close();
   26.26 -        BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
   26.27 -        String line;
   26.28 -        while ((line = in.readLine()) != null)
   26.29 -            out.println(line);
   26.30 -        int rc = p.waitFor();
   26.31 +        int rc = com.sun.tools.javap.Main.run(args, out);
   26.32          if (rc != 0)
   26.33              throw new Error("javap failed: " + Arrays.asList(args) + ": " + rc);
   26.34      }
   26.35  
   26.36      void check(String s, String require) {
   26.37 +        System.out.println("Checking:\n" + s);
   26.38          if (s.indexOf(require) == -1) {
   26.39              System.err.println("Can't find " + require);
   26.40              errors++;

    27.1 --- a/test/tools/javac/6717241/T6717241a.java	Thu Sep 03 10:53:14 2009 -0700
    27.2 +++ b/test/tools/javac/6717241/T6717241a.java	Thu Sep 03 18:34:17 2009 -0700
    27.3 @@ -1,28 +1,5 @@
    27.4 -/*
    27.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    27.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    27.7 - *
    27.8 - * This code is free software; you can redistribute it and/or modify it
    27.9 - * under the terms of the GNU General Public License version 2 only, as
   27.10 - * published by the Free Software Foundation.
   27.11 - *
   27.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   27.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   27.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   27.15 - * version 2 for more details (a copy is included in the LICENSE file that
   27.16 - * accompanied this code).
   27.17 - *
   27.18 - * You should have received a copy of the GNU General Public License version
   27.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   27.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   27.21 - *
   27.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   27.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   27.24 - * have any questions.
   27.25 - */
   27.26 -
   27.27  /**
   27.28 - * @test
   27.29 + * @test /nodynamiccopyright/
   27.30   * @bug     6717241
   27.31   * @summary some diagnostic argument is prematurely converted into a String object
   27.32   * @author  Maurizio Cimadamore

    28.1 --- a/test/tools/javac/6717241/T6717241a.out	Thu Sep 03 10:53:14 2009 -0700
    28.2 +++ b/test/tools/javac/6717241/T6717241a.out	Thu Sep 03 18:34:17 2009 -0700
    28.3 @@ -1,4 +1,4 @@
    28.4 -T6717241a.java:36:21: compiler.err.cant.resolve: kindname.variable, v, , 
    28.5 -T6717241a.java:38:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
    28.6 -T6717241a.java:40:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
    28.7 +T6717241a.java:13:21: compiler.err.cant.resolve: kindname.variable, v, , 
    28.8 +T6717241a.java:15:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
    28.9 +T6717241a.java:17:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
   28.10  3 errors

    29.1 --- a/test/tools/javac/6717241/T6717241b.java	Thu Sep 03 10:53:14 2009 -0700
    29.2 +++ b/test/tools/javac/6717241/T6717241b.java	Thu Sep 03 18:34:17 2009 -0700
    29.3 @@ -1,28 +1,5 @@
    29.4 -/*
    29.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    29.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.7 - *
    29.8 - * This code is free software; you can redistribute it and/or modify it
    29.9 - * under the terms of the GNU General Public License version 2 only, as
   29.10 - * published by the Free Software Foundation.
   29.11 - *
   29.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   29.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   29.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   29.15 - * version 2 for more details (a copy is included in the LICENSE file that
   29.16 - * accompanied this code).
   29.17 - *
   29.18 - * You should have received a copy of the GNU General Public License version
   29.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   29.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   29.21 - *
   29.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   29.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   29.24 - * have any questions.
   29.25 - */
   29.26 -
   29.27  /**
   29.28 - * @test
   29.29 + * @test /nodynamiccopyright/
   29.30   * @bug     6717241
   29.31   * @summary some diagnostic argument is prematurely converted into a String object
   29.32   * @author  Maurizio Cimadamore

    30.1 --- a/test/tools/javac/6717241/T6717241b.out	Thu Sep 03 10:53:14 2009 -0700
    30.2 +++ b/test/tools/javac/6717241/T6717241b.out	Thu Sep 03 18:34:17 2009 -0700
    30.3 @@ -1,4 +1,4 @@
    30.4 -T6717241b.java:35:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
    30.5 -T6717241b.java:37:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
    30.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
    30.7 +T6717241b.java:12:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
    30.8 +T6717241b.java:14:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
    30.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
   30.10  3 errors

    31.1 --- a/test/tools/javac/6734819/T6734819c.java	Thu Sep 03 10:53:14 2009 -0700
    31.2 +++ b/test/tools/javac/6734819/T6734819c.java	Thu Sep 03 18:34:17 2009 -0700
    31.3 @@ -1,28 +1,5 @@
    31.4  /*
    31.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    31.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.7 - *
    31.8 - * This code is free software; you can redistribute it and/or modify it
    31.9 - * under the terms of the GNU General Public License version 2 only, as
   31.10 - * published by the Free Software Foundation.
   31.11 - *
   31.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   31.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   31.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   31.15 - * version 2 for more details (a copy is included in the LICENSE file that
   31.16 - * accompanied this code).
   31.17 - *
   31.18 - * You should have received a copy of the GNU General Public License version
   31.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   31.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   31.21 - *
   31.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   31.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   31.24 - * have any questions.
   31.25 - */
   31.26 -
   31.27 -/*
   31.28 - * @test
   31.29 + * @test /nodynamiccopyright/
   31.30   * @bug 6734819
   31.31   * @summary Javac performs flows analysis on already translated classes
   31.32   * @author Maurizio Cimadamore

    32.1 --- a/test/tools/javac/6734819/T6734819c.out	Thu Sep 03 10:53:14 2009 -0700
    32.2 +++ b/test/tools/javac/6734819/T6734819c.out	Thu Sep 03 18:34:17 2009 -0700
    32.3 @@ -4,5 +4,5 @@
    32.4  [flow W]
    32.5  [attribute Z]
    32.6  [flow Z]
    32.7 -T6734819c.java:38:11: compiler.err.unreachable.stmt
    32.8 +T6734819c.java:15:11: compiler.err.unreachable.stmt
    32.9  1 error

    33.1 --- a/test/tools/javac/6758789/T6758789a.java	Thu Sep 03 10:53:14 2009 -0700
    33.2 +++ b/test/tools/javac/6758789/T6758789a.java	Thu Sep 03 18:34:17 2009 -0700
    33.3 @@ -1,28 +1,5 @@
    33.4  /*
    33.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    33.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.7 - *
    33.8 - * This code is free software; you can redistribute it and/or modify it
    33.9 - * under the terms of the GNU General Public License version 2 only, as
   33.10 - * published by the Free Software Foundation.
   33.11 - *
   33.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   33.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   33.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   33.15 - * version 2 for more details (a copy is included in the LICENSE file that
   33.16 - * accompanied this code).
   33.17 - *
   33.18 - * You should have received a copy of the GNU General Public License version
   33.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   33.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   33.21 - *
   33.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   33.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   33.24 - * have any questions.
   33.25 - */
   33.26 -
   33.27 -/*
   33.28 - * @test
   33.29 + * @test /nodynamiccopyright/
   33.30   * @bug 6758789
   33.31   * @summary 6758789: Some method resolution diagnostic should be improved
   33.32   * @author Maurizio Cimadamore

    34.1 --- a/test/tools/javac/6758789/T6758789a.out	Thu Sep 03 10:53:14 2009 -0700
    34.2 +++ b/test/tools/javac/6758789/T6758789a.out	Thu Sep 03 18:34:17 2009 -0700
    34.3 @@ -1,3 +1,3 @@
    34.4 -T6758789a.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
    34.5 -T6758789a.java:38:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
    34.6 -2 errors
    34.7 \ No newline at end of file
    34.8 +T6758789a.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
    34.9 +T6758789a.java:15:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
   34.10 +2 errors

    35.1 --- a/test/tools/javac/6758789/T6758789b.java	Thu Sep 03 10:53:14 2009 -0700
    35.2 +++ b/test/tools/javac/6758789/T6758789b.java	Thu Sep 03 18:34:17 2009 -0700
    35.3 @@ -1,28 +1,5 @@
    35.4  /*
    35.5 - * Copyright 2008 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 6758789
   35.31   * @summary 6758789: Some method resolution diagnostic should be improved
   35.32   * @author Maurizio Cimadamore

    36.1 --- a/test/tools/javac/6758789/T6758789b.out	Thu Sep 03 10:53:14 2009 -0700
    36.2 +++ b/test/tools/javac/6758789/T6758789b.out	Thu Sep 03 18:34:17 2009 -0700
    36.3 @@ -1,5 +1,5 @@
    36.4 -T6758789b.java:39:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
    36.5 -T6758789b.java:39:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
    36.6 +T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
    36.7 +T6758789b.java:16:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
    36.8  - compiler.err.warnings.and.werror
    36.9  1 error
   36.10  2 warnings

    37.1 --- a/test/tools/javac/6840059/T6840059.java	Thu Sep 03 10:53:14 2009 -0700
    37.2 +++ b/test/tools/javac/6840059/T6840059.java	Thu Sep 03 18:34:17 2009 -0700
    37.3 @@ -1,28 +1,5 @@
    37.4  /*
    37.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    37.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    37.7 - *
    37.8 - * This code is free software; you can redistribute it and/or modify it
    37.9 - * under the terms of the GNU General Public License version 2 only, as
   37.10 - * published by the Free Software Foundation.
   37.11 - *
   37.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   37.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   37.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   37.15 - * version 2 for more details (a copy is included in the LICENSE file that
   37.16 - * accompanied this code).
   37.17 - *
   37.18 - * You should have received a copy of the GNU General Public License version
   37.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   37.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   37.21 - *
   37.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   37.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   37.24 - * have any questions.
   37.25 - */
   37.26 -
   37.27 -/*
   37.28 - * @test
   37.29 + * @test /nodynamiccopyright/
   37.30   * @bug 6840059
   37.31   * @summary 6758789: Some method resolution diagnostic should be improved
   37.32   * @author Maurizio Cimadamore

    38.1 --- a/test/tools/javac/6840059/T6840059.out	Thu Sep 03 10:53:14 2009 -0700
    38.2 +++ b/test/tools/javac/6840059/T6840059.out	Thu Sep 03 18:34:17 2009 -0700
    38.3 @@ -1,3 +1,3 @@
    38.4 -T6840059.java:38:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
    38.5 -T6840059.java:38:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
    38.6 +T6840059.java:15:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
    38.7 +T6840059.java:15:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
    38.8  2 errors

    39.1 --- a/test/tools/javac/ClassPathTest/ClassPathTest.sh	Thu Sep 03 10:53:14 2009 -0700
    39.2 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh	Thu Sep 03 18:34:17 2009 -0700
    39.3 @@ -56,14 +56,10 @@
    39.4  # set platform-dependent variables
    39.5  OS=`uname -s`
    39.6  case "$OS" in
    39.7 -  SunOS | Linux )
    39.8 -    NULL=/dev/null
    39.9 -    PS=":"
   39.10 +  SunOS | Linux | CYGWIN* )
   39.11      FS="/"
   39.12      ;;
   39.13    Windows* )
   39.14 -    NULL=NUL
   39.15 -    PS=";"
   39.16      FS="\\"
   39.17      ;;
   39.18    * )

    40.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a.java	Thu Sep 03 10:53:14 2009 -0700
    40.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a.java	Thu Sep 03 18:34:17 2009 -0700
    40.3 @@ -1,28 +1,5 @@
    40.4 -/*
    40.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    40.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    40.7 - *
    40.8 - * This code is free software; you can redistribute it and/or modify it
    40.9 - * under the terms of the GNU General Public License version 2 only, as
   40.10 - * published by the Free Software Foundation.
   40.11 - *
   40.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   40.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   40.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   40.15 - * version 2 for more details (a copy is included in the LICENSE file that
   40.16 - * accompanied this code).
   40.17 - *
   40.18 - * You should have received a copy of the GNU General Public License version
   40.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   40.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   40.21 - *
   40.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   40.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   40.24 - * have any questions.
   40.25 - */
   40.26 -
   40.27  /**
   40.28 - * @test
   40.29 + * @test /nodynamiccopyright/
   40.30   * @bug     6722234
   40.31   * @summary javac diagnostics need better integration with the type-system
   40.32   * @author  mcimadamore

    41.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Sep 03 10:53:14 2009 -0700
    41.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Sep 03 18:34:17 2009 -0700
    41.3 @@ -1,2 +1,2 @@
    41.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
    41.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
    41.6  1 error

    42.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Sep 03 10:53:14 2009 -0700
    42.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Sep 03 18:34:17 2009 -0700
    42.3 @@ -1,3 +1,3 @@
    42.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
    42.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
    42.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))}
    42.7  1 error

    43.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234b.java	Thu Sep 03 10:53:14 2009 -0700
    43.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b.java	Thu Sep 03 18:34:17 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/T6722234b_1.out	Thu Sep 03 10:53:14 2009 -0700
    44.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b_1.out	Thu Sep 03 18:34:17 2009 -0700
    44.3 @@ -1,2 +1,2 @@
    44.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
    44.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
    44.6  1 error

    45.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234b_2.out	Thu Sep 03 10:53:14 2009 -0700
    45.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b_2.out	Thu Sep 03 18:34:17 2009 -0700
    45.3 @@ -1,4 +1,4 @@
    45.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
    45.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
    45.6  - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, Object, kindname.method, <T>m(List<T>,List<T>))}
    45.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)}
    45.8  1 error

    46.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234c.java	Thu Sep 03 10:53:14 2009 -0700
    46.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234c.java	Thu Sep 03 18:34:17 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     6722234
   46.31   * @summary javac diagnostics need better integration with the type-system
   46.32   * @author  mcimadamore

    47.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Sep 03 10:53:14 2009 -0700
    47.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Sep 03 18:34:17 2009 -0700
    47.3 @@ -1,2 +1,2 @@
    47.4 -T6722234c.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
    47.5 +T6722234c.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
    47.6  1 error

    48.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d.java	Thu Sep 03 10:53:14 2009 -0700
    48.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d.java	Thu Sep 03 18:34:17 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     6722234
   48.31   * @summary javac diagnostics need better integration with the type-system
   48.32   * @author  mcimadamore

    49.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Sep 03 10:53:14 2009 -0700
    49.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Sep 03 18:34:17 2009 -0700
    49.3 @@ -1,3 +1,3 @@
    49.4 -T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    49.5 +T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    49.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)}
    49.7  1 error

    50.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Sep 03 10:53:14 2009 -0700
    50.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Sep 03 18:34:17 2009 -0700
    50.3 @@ -1,3 +1,3 @@
    50.4 -T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    50.5 +T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    50.6  - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, Object,I1,I2)}
    50.7  1 error

    51.1 --- a/test/tools/javac/Diagnostics/6799605/T6799605.java	Thu Sep 03 10:53:14 2009 -0700
    51.2 +++ b/test/tools/javac/Diagnostics/6799605/T6799605.java	Thu Sep 03 18:34:17 2009 -0700
    51.3 @@ -1,28 +1,5 @@
    51.4 -/*
    51.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    51.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    51.7 - *
    51.8 - * This code is free software; you can redistribute it and/or modify it
    51.9 - * under the terms of the GNU General Public License version 2 only, as
   51.10 - * published by the Free Software Foundation.
   51.11 - *
   51.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   51.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   51.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   51.15 - * version 2 for more details (a copy is included in the LICENSE file that
   51.16 - * accompanied this code).
   51.17 - *
   51.18 - * You should have received a copy of the GNU General Public License version
   51.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   51.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   51.21 - *
   51.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   51.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   51.24 - * have any questions.
   51.25 - */
   51.26 -
   51.27  /**
   51.28 - * @test
   51.29 + * @test /nodynamiccopyright/
   51.30   * @bug     6799605
   51.31   * @summary Basic/Raw formatters should use type/symbol printer instead of toString()
   51.32   * @author  mcimadamore

    52.1 --- a/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Sep 03 10:53:14 2009 -0700
    52.2 +++ b/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Sep 03 18:34:17 2009 -0700
    52.3 @@ -1,4 +1,4 @@
    52.4 -T6799605.java:40:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
    52.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>
    52.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>
    52.7 +T6799605.java:17:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
    52.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>
    52.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>
   52.10  3 errors

    53.1 --- a/test/tools/javac/Diagnostics/6860795/T6860795.java	Thu Sep 03 10:53:14 2009 -0700
    53.2 +++ b/test/tools/javac/Diagnostics/6860795/T6860795.java	Thu Sep 03 18:34:17 2009 -0700
    53.3 @@ -1,28 +1,5 @@
    53.4 -/*
    53.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    53.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    53.7 - *
    53.8 - * This code is free software; you can redistribute it and/or modify it
    53.9 - * under the terms of the GNU General Public License version 2 only, as
   53.10 - * published by the Free Software Foundation.
   53.11 - *
   53.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   53.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   53.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   53.15 - * version 2 for more details (a copy is included in the LICENSE file that
   53.16 - * accompanied this code).
   53.17 - *
   53.18 - * You should have received a copy of the GNU General Public License version
   53.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   53.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   53.21 - *
   53.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   53.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   53.24 - * have any questions.
   53.25 - */
   53.26 -
   53.27  /**
   53.28 - * @test
   53.29 + * @test /nodynamiccopyright/
   53.30   * @bug     6860795
   53.31   * @summary NullPointerException when compiling a negative java source
   53.32   * @author  mcimadamore

    54.1 --- a/test/tools/javac/Diagnostics/6860795/T6860795.out	Thu Sep 03 10:53:14 2009 -0700
    54.2 +++ b/test/tools/javac/Diagnostics/6860795/T6860795.out	Thu Sep 03 18:34:17 2009 -0700
    54.3 @@ -1,2 +1,2 @@
    54.4 -T6860795.java:33:27: compiler.err.already.defined: x, foo
    54.5 +T6860795.java:10:27: compiler.err.already.defined: x, foo
    54.6  1 error

    55.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608a.java	Thu Sep 03 10:53:14 2009 -0700
    55.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608a.java	Thu Sep 03 18:34:17 2009 -0700
    55.3 @@ -1,28 +1,5 @@
    55.4 -/*
    55.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    55.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55.7 - *
    55.8 - * This code is free software; you can redistribute it and/or modify it
    55.9 - * under the terms of the GNU General Public License version 2 only, as
   55.10 - * published by the Free Software Foundation.
   55.11 - *
   55.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   55.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   55.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   55.15 - * version 2 for more details (a copy is included in the LICENSE file that
   55.16 - * accompanied this code).
   55.17 - *
   55.18 - * You should have received a copy of the GNU General Public License version
   55.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   55.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   55.21 - *
   55.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   55.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   55.24 - * have any questions.
   55.25 - */
   55.26 -
   55.27  /**
   55.28 - * @test
   55.29 + * @test /nodynamiccopyright/
   55.30   * @bug     6862608
   55.31   * @summary rich diagnostic sometimes contain wrong type variable numbering
   55.32   * @author  mcimadamore

    56.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Sep 03 10:53:14 2009 -0700
    56.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Sep 03 18:34:17 2009 -0700
    56.3 @@ -1,3 +1,3 @@
    56.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<?>>)
    56.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<?>>)
    56.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>>))}
    56.7  1 error

    57.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608b.java	Thu Sep 03 10:53:14 2009 -0700
    57.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608b.java	Thu Sep 03 18:34:17 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     6862608
   57.31   * @summary rich diagnostic sometimes contain wrong type variable numbering
   57.32   * @author  mcimadamore

    58.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Sep 03 10:53:14 2009 -0700
    58.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Sep 03 18:34:17 2009 -0700
    58.3 @@ -1,3 +1,3 @@
    58.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
    58.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
    58.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)}
    58.7  1 error

    59.1 --- a/test/tools/javac/Diagnostics/6864382/T6864382.java	Thu Sep 03 10:53:14 2009 -0700
    59.2 +++ b/test/tools/javac/Diagnostics/6864382/T6864382.java	Thu Sep 03 18:34:17 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     6864382
   59.31   * @summary NullPointerException when compiling a negative java source
   59.32   * @author  mcimadamore

    60.1 --- a/test/tools/javac/Diagnostics/6864382/T6864382.out	Thu Sep 03 10:53:14 2009 -0700
    60.2 +++ b/test/tools/javac/Diagnostics/6864382/T6864382.out	Thu Sep 03 18:34:17 2009 -0700
    60.3 @@ -1,2 +1,2 @@
    60.4 -T6864382.java:32:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
    60.5 +T6864382.java:9:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
    60.6  1 error

    61.1 --- a/test/tools/javac/ExtDirs/ExtDirs.sh	Thu Sep 03 10:53:14 2009 -0700
    61.2 +++ b/test/tools/javac/ExtDirs/ExtDirs.sh	Thu Sep 03 18:34:17 2009 -0700
    61.3 @@ -55,12 +55,14 @@
    61.4  OS=`uname -s`
    61.5  case "$OS" in
    61.6    SunOS | Linux )
    61.7 -    NULL=/dev/null
    61.8      PS=":"
    61.9      FS="/"
   61.10      ;;
   61.11 +  CYGWIN* )
   61.12 +    PS=";" # native PS, not Cygwin PS
   61.13 +    FS="/"
   61.14 +    ;;
   61.15    Windows* )
   61.16 -    NULL=NUL
   61.17      PS=";"
   61.18      FS="\\"
   61.19      ;;

    62.1 --- a/test/tools/javac/MissingInclude.sh	Thu Sep 03 10:53:14 2009 -0700
    62.2 +++ b/test/tools/javac/MissingInclude.sh	Thu Sep 03 18:34:17 2009 -0700
    62.3 @@ -47,14 +47,10 @@
    62.4  # set platform-dependent variables
    62.5  OS=`uname -s`
    62.6  case "$OS" in
    62.7 -  SunOS | Linux )
    62.8 -    NULL=/dev/null
    62.9 -    PS=":"
   62.10 +  SunOS | Linux | CYGWIN* )
   62.11      FS="/"
   62.12      ;;
   62.13    Windows* )
   62.14 -    NULL=NUL
   62.15 -    PS=";"
   62.16      FS="\\"
   62.17      ;;
   62.18    * )

    63.1 --- a/test/tools/javac/OverrideChecks/6199153/T6199153.java	Thu Sep 03 10:53:14 2009 -0700
    63.2 +++ b/test/tools/javac/OverrideChecks/6199153/T6199153.java	Thu Sep 03 18:34:17 2009 -0700
    63.3 @@ -1,28 +1,5 @@
    63.4 -/*
    63.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    63.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    63.7 - *
    63.8 - * This code is free software; you can redistribute it and/or modify it
    63.9 - * under the terms of the GNU General Public License version 2 only, as
   63.10 - * published by the Free Software Foundation.
   63.11 - *
   63.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   63.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   63.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   63.15 - * version 2 for more details (a copy is included in the LICENSE file that
   63.16 - * accompanied this code).
   63.17 - *
   63.18 - * You should have received a copy of the GNU General Public License version
   63.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   63.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   63.21 - *
   63.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   63.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   63.24 - * have any questions.
   63.25 - */
   63.26 -
   63.27  /**
   63.28 - * @test
   63.29 + * @test /nodynamiccopyright/
   63.30   * @bug 6199153
   63.31   * @summary Generic throws and overriding
   63.32   * @author  mcimadamore

    64.1 --- a/test/tools/javac/OverrideChecks/6199153/T6199153.out	Thu Sep 03 10:53:14 2009 -0700
    64.2 +++ b/test/tools/javac/OverrideChecks/6199153/T6199153.out	Thu Sep 03 18:34:17 2009 -0700
    64.3 @@ -1,4 +1,4 @@
    64.4 -T6199153.java:41:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
    64.5 +T6199153.java:18:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
    64.6  - compiler.err.warnings.and.werror
    64.7  1 error
    64.8  1 warning

    65.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189a.java	Thu Sep 03 10:53:14 2009 -0700
    65.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.java	Thu Sep 03 18:34:17 2009 -0700
    65.3 @@ -1,28 +1,5 @@
    65.4  /*
    65.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    65.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    65.7 - *
    65.8 - * This code is free software; you can redistribute it and/or modify it
    65.9 - * under the terms of the GNU General Public License version 2 only, as
   65.10 - * published by the Free Software Foundation.
   65.11 - *
   65.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   65.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   65.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   65.15 - * version 2 for more details (a copy is included in the LICENSE file that
   65.16 - * accompanied this code).
   65.17 - *
   65.18 - * You should have received a copy of the GNU General Public License version
   65.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   65.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   65.21 - *
   65.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   65.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   65.24 - * have any questions.
   65.25 - */
   65.26 -
   65.27 -/*
   65.28 - * @test
   65.29 + * @test /nodynamiccopyright/
   65.30   * @bug     6400189
   65.31   * @summary raw types and inference
   65.32   * @author  mcimadamore

    66.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Sep 03 10:53:14 2009 -0700
    66.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Sep 03 18:34:17 2009 -0700
    66.3 @@ -1,4 +1,4 @@
    66.4 -T6400189a.java:37:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
    66.5 -T6400189a.java:37:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
    66.6 +T6400189a.java:14:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
    66.7 +T6400189a.java:14:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
    66.8  1 error
    66.9  1 warning

    67.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189b.java	Thu Sep 03 10:53:14 2009 -0700
    67.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.java	Thu Sep 03 18:34:17 2009 -0700
    67.3 @@ -1,28 +1,5 @@
    67.4  /*
    67.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    67.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    67.7 - *
    67.8 - * This code is free software; you can redistribute it and/or modify it
    67.9 - * under the terms of the GNU General Public License version 2 only, as
   67.10 - * published by the Free Software Foundation.
   67.11 - *
   67.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   67.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   67.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   67.15 - * version 2 for more details (a copy is included in the LICENSE file that
   67.16 - * accompanied this code).
   67.17 - *
   67.18 - * You should have received a copy of the GNU General Public License version
   67.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   67.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   67.21 - *
   67.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   67.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   67.24 - * have any questions.
   67.25 - */
   67.26 -
   67.27 -/*
   67.28 - * @test
   67.29 + * @test /nodynamiccopyright/
   67.30   * @bug     6400189
   67.31   * @summary raw types and inference
   67.32   * @author  mcimadamore

    68.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Sep 03 10:53:14 2009 -0700
    68.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Sep 03 18:34:17 2009 -0700
    68.3 @@ -1,4 +1,4 @@
    68.4 -T6400189b.java:47:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
    68.5 -T6400189b.java:47:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
    68.6 +T6400189b.java:24:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
    68.7 +T6400189b.java:24:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
    68.8  1 error
    68.9  1 warning

    69.1 --- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Thu Sep 03 10:53:14 2009 -0700
    69.2 +++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Thu Sep 03 18:34:17 2009 -0700
    69.3 @@ -53,12 +53,14 @@
    69.4  OS=`uname -s`
    69.5  case "$OS" in
    69.6    SunOS | Linux )
    69.7 -    NULL=/dev/null
    69.8      PS=":"
    69.9      FS="/"
   69.10      ;;
   69.11 +  CYGWIN* ) 
   69.12 +    PS=";" # native PS, not Cygwin PS
   69.13 +    FS="/"
   69.14 +    ;;
   69.15    Windows* )
   69.16 -    NULL=NUL
   69.17      PS=";"
   69.18      FS="\\"
   69.19      ;;

    70.1 --- a/test/tools/javac/T5090006/compiler.sh	Thu Sep 03 10:53:14 2009 -0700
    70.2 +++ b/test/tools/javac/T5090006/compiler.sh	Thu Sep 03 18:34:17 2009 -0700
    70.3 @@ -47,14 +47,10 @@
    70.4  # set platform-dependent variables
    70.5  OS=`uname -s`
    70.6  case "$OS" in
    70.7 -  SunOS | Linux )
    70.8 -    NULL=/dev/null
    70.9 -    PS=":"
   70.10 +  SunOS | Linux | CYGWIN* )
   70.11      FS="/"
   70.12      ;;
   70.13    Windows* )
   70.14 -    NULL=NUL
   70.15 -    PS=";"
   70.16      FS="\\"
   70.17      ;;
   70.18    * )

    71.1 --- a/test/tools/javac/api/6440333/T6440333.java	Thu Sep 03 10:53:14 2009 -0700
    71.2 +++ b/test/tools/javac/api/6440333/T6440333.java	Thu Sep 03 18:34:17 2009 -0700
    71.3 @@ -26,6 +26,7 @@
    71.4   * @bug     6440333
    71.5   * @summary SimpleJavaFileObject.toString() generates URI with some extra message
    71.6   * @author  Peter von der Ah\u00e9
    71.7 + * @ignore 6877223 test ignored because of issues with File.toUri on Windows (6877206)
    71.8   * @library ../lib
    71.9   * @compile T6440333.java
   71.10   * @run main T6440333
   71.11 @@ -42,6 +43,10 @@
   71.12          JavaFileObject fo = fm.getJavaFileObjects(src).iterator().next();
   71.13          String expect = src.getCanonicalFile().getPath().replace(File.separatorChar, '/');
   71.14          System.err.println("Expect " + expect);
   71.15 +        // CURRENTLY, the following line fails on Windows because a file C:/w/jjg/...
   71.16 +        // returns a URI file://C/w/jjg... which incorrectly encodes the drive letter
   71.17 +        // in the URI authority.   This is against the spec that the authority is
   71.18 +        // undefined and breaks the contract that new File(f.toURI()).equals(f.getAbsoluteFile())
   71.19          System.err.println("Got: " +  fo.toUri().getPath());
   71.20          if (!expect.equals(fo.toUri().getPath())) {
   71.21              throw new AssertionError();

    72.1 --- a/test/tools/javac/api/Sibling.java	Thu Sep 03 10:53:14 2009 -0700
    72.2 +++ b/test/tools/javac/api/Sibling.java	Thu Sep 03 18:34:17 2009 -0700
    72.3 @@ -26,6 +26,7 @@
    72.4   * @bug     6399602
    72.5   * @summary Verify that files are created relative to sibling
    72.6   * @author  Peter von der Ah\u00e9
    72.7 + * @ignore 6877223 test ignored because of issues with File.toUri on Windows (6877206)
    72.8   */
    72.9  
   72.10  import java.io.File;

    73.1 --- a/test/tools/javac/cast/6467183/T6467183a.java	Thu Sep 03 10:53:14 2009 -0700
    73.2 +++ b/test/tools/javac/cast/6467183/T6467183a.java	Thu Sep 03 18:34:17 2009 -0700
    73.3 @@ -1,28 +1,5 @@
    73.4  /*
    73.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    73.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    73.7 - *
    73.8 - * This code is free software; you can redistribute it and/or modify it
    73.9 - * under the terms of the GNU General Public License version 2 only, as
   73.10 - * published by the Free Software Foundation.
   73.11 - *
   73.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   73.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   73.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   73.15 - * version 2 for more details (a copy is included in the LICENSE file that
   73.16 - * accompanied this code).
   73.17 - *
   73.18 - * You should have received a copy of the GNU General Public License version
   73.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   73.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   73.21 - *
   73.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   73.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   73.24 - * have any questions.
   73.25 - */
   73.26 -
   73.27 -/*
   73.28 - * @test
   73.29 + * @test /nodynamiccopyright/
   73.30   * @author mcimadamore
   73.31   * @bug     6467183
   73.32   * @summary

    74.1 --- a/test/tools/javac/cast/6467183/T6467183a.out	Thu Sep 03 10:53:14 2009 -0700
    74.2 +++ b/test/tools/javac/cast/6467183/T6467183a.out	Thu Sep 03 18:34:17 2009 -0700
    74.3 @@ -1,6 +1,6 @@
    74.4 -T6467183a.java:39:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
    74.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>
    74.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>
    74.7 +T6467183a.java:16:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
    74.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>
    74.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>
   74.10  - compiler.err.warnings.and.werror
   74.11  1 error
   74.12  3 warnings

    75.1 --- a/test/tools/javac/cast/6557182/T6557182.java	Thu Sep 03 10:53:14 2009 -0700
    75.2 +++ b/test/tools/javac/cast/6557182/T6557182.java	Thu Sep 03 18:34:17 2009 -0700
    75.3 @@ -1,28 +1,5 @@
    75.4  /*
    75.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    75.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    75.7 - *
    75.8 - * This code is free software; you can redistribute it and/or modify it
    75.9 - * under the terms of the GNU General Public License version 2 only, as
   75.10 - * published by the Free Software Foundation.
   75.11 - *
   75.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   75.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   75.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   75.15 - * version 2 for more details (a copy is included in the LICENSE file that
   75.16 - * accompanied this code).
   75.17 - *
   75.18 - * You should have received a copy of the GNU General Public License version
   75.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   75.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   75.21 - *
   75.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   75.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   75.24 - * have any questions.
   75.25 - */
   75.26 -
   75.27 -/*
   75.28 - * @test
   75.29 + * @test /nodynamiccopyright/
   75.30   * @author Maurizio Cimadamore
   75.31   * @bug     6557182
   75.32   * @summary  Unchecked warning *and* inconvertible types

    76.1 --- a/test/tools/javac/cast/6557182/T6557182.out	Thu Sep 03 10:53:14 2009 -0700
    76.2 +++ b/test/tools/javac/cast/6557182/T6557182.out	Thu Sep 03 18:34:17 2009 -0700
    76.3 @@ -1,4 +1,4 @@
    76.4 -T6557182.java:35:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
    76.5 -T6557182.java:39:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
    76.6 +T6557182.java:12:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
    76.7 +T6557182.java:16:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
    76.8  1 error
    76.9  1 warning

    77.1 --- a/test/tools/javac/cast/6665356/T6665356.java	Thu Sep 03 10:53:14 2009 -0700
    77.2 +++ b/test/tools/javac/cast/6665356/T6665356.java	Thu Sep 03 18:34:17 2009 -0700
    77.3 @@ -1,28 +1,5 @@
    77.4  /*
    77.5 - * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
    77.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    77.7 - *
    77.8 - * This code is free software; you can redistribute it and/or modify it
    77.9 - * under the terms of the GNU General Public License version 2 only, as
   77.10 - * published by the Free Software Foundation.
   77.11 - *
   77.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   77.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   77.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   77.15 - * version 2 for more details (a copy is included in the LICENSE file that
   77.16 - * accompanied this code).
   77.17 - *
   77.18 - * You should have received a copy of the GNU General Public License version
   77.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   77.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   77.21 - *
   77.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   77.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   77.24 - * have any questions.
   77.25 - */
   77.26 -
   77.27 -/*
   77.28 - * @test
   77.29 + * @test /nodynamiccopyright/
   77.30   * @author Maurizio Cimadamore
   77.31   * @bug     6665356
   77.32   * @summary Cast not allowed when both qualifying type and inner class are parameterized
   77.33 @@ -77,4 +54,4 @@
   77.34      void cast11(Outer<Integer>.Inner<Long> p) {
   77.35          Object o = (Outer<Integer>.Inner<? super String>)p;
   77.36      }
   77.37 -}
   77.38 \ No newline at end of file
   77.39 +}

    78.1 --- a/test/tools/javac/cast/6665356/T6665356.out	Thu Sep 03 10:53:14 2009 -0700
    78.2 +++ b/test/tools/javac/cast/6665356/T6665356.out	Thu Sep 03 18:34:17 2009 -0700
    78.3 @@ -1,8 +1,8 @@
    78.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>
    78.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>
    78.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>
    78.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>
    78.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>
    78.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>
   78.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>
   78.11 -7 errors
   78.12 \ No newline at end of file
   78.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>
   78.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>
   78.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>
   78.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>
   78.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>
   78.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>
   78.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>
   78.20 +7 errors

    79.1 --- a/test/tools/javac/cast/6795580/T6795580.java	Thu Sep 03 10:53:14 2009 -0700
    79.2 +++ b/test/tools/javac/cast/6795580/T6795580.java	Thu Sep 03 18:34:17 2009 -0700
    79.3 @@ -1,28 +1,5 @@
    79.4  /*
    79.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    79.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    79.7 - *
    79.8 - * This code is free software; you can redistribute it and/or modify it
    79.9 - * under the terms of the GNU General Public License version 2 only, as
   79.10 - * published by the Free Software Foundation.
   79.11 - *
   79.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   79.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   79.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   79.15 - * version 2 for more details (a copy is included in the LICENSE file that
   79.16 - * accompanied this code).
   79.17 - *
   79.18 - * You should have received a copy of the GNU General Public License version
   79.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   79.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   79.21 - *
   79.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   79.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   79.24 - * have any questions.
   79.25 - */
   79.26 -
   79.27 -/*
   79.28 - * @test
   79.29 + * @test /nodynamiccopyright/
   79.30   * @author Maurizio Cimadamore
   79.31   * @bug     6795580
   79.32   * @summary parser confused by square brackets in qualified generic cast
   79.33 @@ -77,4 +54,4 @@
   79.34      void cast11(Outer<Integer>.Inner<Long>[] p) {
   79.35          Object o = (Outer<Integer>.Inner<? super String>[])p;
   79.36      }
   79.37 -}
   79.38 \ No newline at end of file
   79.39 +}

    80.1 --- a/test/tools/javac/cast/6795580/T6795580.out	Thu Sep 03 10:53:14 2009 -0700
    80.2 +++ b/test/tools/javac/cast/6795580/T6795580.out	Thu Sep 03 18:34:17 2009 -0700
    80.3 @@ -1,8 +1,8 @@
    80.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>[]
    80.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>[]
    80.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>[]
    80.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>[]
    80.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>[]
    80.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>[]
   80.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>[]
   80.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>[]
   80.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>[]
   80.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>[]
   80.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>[]
   80.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>[]
   80.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>[]
   80.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>[]
   80.18  7 errors

    81.1 --- a/test/tools/javac/code/ArrayClone.java	Thu Sep 03 10:53:14 2009 -0700
    81.2 +++ b/test/tools/javac/code/ArrayClone.java	Thu Sep 03 18:34:17 2009 -0700
    81.3 @@ -47,7 +47,7 @@
    81.4          String out = sw.toString();
    81.5          System.out.println(out);
    81.6  
    81.7 -        for (String line: out.split("\n")) {
    81.8 +        for (String line: out.split("(\\n|\\r\\n?)")) {
    81.9              String match = "[ \t]+[0-9]+:[ \t]+invokevirtual[ \t]+#[0-9]+[ \t]+// Method \"\\[Ljava/lang/String;\".clone:\\(\\)Ljava/lang/Object;";
   81.10              if (line.matches(match))
   81.11                  return;

    82.1 --- a/test/tools/javac/constDebug/ConstDebug.sh	Thu Sep 03 10:53:14 2009 -0700
    82.2 +++ b/test/tools/javac/constDebug/ConstDebug.sh	Thu Sep 03 18:34:17 2009 -0700
    82.3 @@ -48,12 +48,14 @@
    82.4  OS=`uname -s`
    82.5  case "$OS" in
    82.6    SunOS | Linux )
    82.7 -    NULL=/dev/null
    82.8      PS=":"
    82.9      FS="/"
   82.10      ;;
   82.11 +  CYGWIN* )
   82.12 +    PS=";" # Platform PS, not Cygwin PS
   82.13 +    FS="/"
   82.14 +    ;;
   82.15    Windows* )
   82.16 -    NULL=NUL
   82.17      PS=";"
   82.18      FS="\\"
   82.19      ;;
   82.20 @@ -69,7 +71,7 @@
   82.21  "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -g -d . -classpath .${PS}${TESTSRC} $1.java 2> ${TMP1}
   82.22  result=$?
   82.23  if [ $result -ne 0 ]; then exit $result; fi
   82.24 -if strings $1.class | grep clinit; then
   82.25 +if "${TESTJAVA}${FS}bin${FS}javap" $1.class | grep clinit; then
   82.26    echo "Failed"
   82.27    exit 1;
   82.28  else

    83.1 --- a/test/tools/javac/fatalErrors/NoJavaLang.sh	Thu Sep 03 10:53:14 2009 -0700
    83.2 +++ b/test/tools/javac/fatalErrors/NoJavaLang.sh	Thu Sep 03 18:34:17 2009 -0700
    83.3 @@ -49,13 +49,13 @@
    83.4  OS=`uname -s`
    83.5  case "$OS" in
    83.6    SunOS | Linux )
    83.7 -    NULL=/dev/null
    83.8 -    PS=":"
    83.9      FS="/"
   83.10      ;;
   83.11 +  CYGWIN* )
   83.12 +    FS="/"
   83.13 +    DIFFOPTS="--strip-trailing-cr"
   83.14 +    ;;
   83.15    Windows* )
   83.16 -    NULL=NUL
   83.17 -    PS=";"
   83.18      FS="\\"
   83.19      ;;
   83.20    * )
   83.21 @@ -98,7 +98,7 @@
   83.22  
   83.23  # expected message
   83.24  cat "${TMP1}"
   83.25 -diff -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}"
   83.26 +diff ${DIFFOPTS} -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}"
   83.27  result=$?
   83.28  rm "${TMP1}"
   83.29  

    84.1 --- a/test/tools/javac/generics/5009937/T5009937.java	Thu Sep 03 10:53:14 2009 -0700
    84.2 +++ b/test/tools/javac/generics/5009937/T5009937.java	Thu Sep 03 18:34:17 2009 -0700
    84.3 @@ -1,28 +1,5 @@
    84.4  /*
    84.5 - * Copyright 2008 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 5009937
   84.31   * @summary hiding versus generics versus binary compatibility
   84.32   * @author Maurizio Cimadamore

    85.1 --- a/test/tools/javac/generics/5009937/T5009937.out	Thu Sep 03 10:53:14 2009 -0700
    85.2 +++ b/test/tools/javac/generics/5009937/T5009937.out	Thu Sep 03 18:34:17 2009 -0700
    85.3 @@ -1,2 +1,2 @@
    85.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
    85.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
    85.6  1 error

    86.1 --- a/test/tools/javac/generics/6182950/T6182950a.java	Thu Sep 03 10:53:14 2009 -0700
    86.2 +++ b/test/tools/javac/generics/6182950/T6182950a.java	Thu Sep 03 18:34:17 2009 -0700
    86.3 @@ -1,28 +1,5 @@
    86.4  /*
    86.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    86.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    86.7 - *
    86.8 - * This code is free software; you can redistribute it and/or modify it
    86.9 - * under the terms of the GNU General Public License version 2 only, as
   86.10 - * published by the Free Software Foundation.
   86.11 - *
   86.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   86.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   86.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   86.15 - * version 2 for more details (a copy is included in the LICENSE file that
   86.16 - * accompanied this code).
   86.17 - *
   86.18 - * You should have received a copy of the GNU General Public License version
   86.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   86.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   86.21 - *
   86.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   86.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   86.24 - * have any questions.
   86.25 - */
   86.26 -
   86.27 -/*
   86.28 - * @test
   86.29 + * @test /nodynamiccopyright/
   86.30   * @bug     6182950
   86.31   * @summary methods clash algorithm should not depend on return type
   86.32   * @author  mcimadamore

    87.1 --- a/test/tools/javac/generics/6182950/T6182950a.out	Thu Sep 03 10:53:14 2009 -0700
    87.2 +++ b/test/tools/javac/generics/6182950/T6182950a.out	Thu Sep 03 18:34:17 2009 -0700
    87.3 @@ -1,2 +1,2 @@
    87.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>)
    87.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>)
    87.6  1 error

    88.1 --- a/test/tools/javac/generics/6182950/T6182950b.java	Thu Sep 03 10:53:14 2009 -0700
    88.2 +++ b/test/tools/javac/generics/6182950/T6182950b.java	Thu Sep 03 18:34:17 2009 -0700
    88.3 @@ -1,28 +1,5 @@
    88.4  /*
    88.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    88.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    88.7 - *
    88.8 - * This code is free software; you can redistribute it and/or modify it
    88.9 - * under the terms of the GNU General Public License version 2 only, as
   88.10 - * published by the Free Software Foundation.
   88.11 - *
   88.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   88.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   88.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   88.15 - * version 2 for more details (a copy is included in the LICENSE file that
   88.16 - * accompanied this code).
   88.17 - *
   88.18 - * You should have received a copy of the GNU General Public License version
   88.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   88.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   88.21 - *
   88.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   88.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   88.24 - * have any questions.
   88.25 - */
   88.26 -
   88.27 -/*
   88.28 - * @test
   88.29 + * @test /nodynamiccopyright/
   88.30   * @bug     6182950
   88.31   * @summary methods clash algorithm should not depend on return type
   88.32   * @author  mcimadamore

    89.1 --- a/test/tools/javac/generics/6182950/T6182950b.out	Thu Sep 03 10:53:14 2009 -0700
    89.2 +++ b/test/tools/javac/generics/6182950/T6182950b.out	Thu Sep 03 18:34:17 2009 -0700
    89.3 @@ -1,2 +1,2 @@
    89.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
    89.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
    89.6  1 error

    90.1 --- a/test/tools/javac/generics/6677785/T6677785.java	Thu Sep 03 10:53:14 2009 -0700
    90.2 +++ b/test/tools/javac/generics/6677785/T6677785.java	Thu Sep 03 18:34:17 2009 -0700
    90.3 @@ -1,28 +1,5 @@
    90.4  /*
    90.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    90.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    90.7 - *
    90.8 - * This code is free software; you can redistribute it and/or modify it
    90.9 - * under the terms of the GNU General Public License version 2 only, as
   90.10 - * published by the Free Software Foundation.
   90.11 - *
   90.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   90.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   90.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   90.15 - * version 2 for more details (a copy is included in the LICENSE file that
   90.16 - * accompanied this code).
   90.17 - *
   90.18 - * You should have received a copy of the GNU General Public License version
   90.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   90.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   90.21 - *
   90.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   90.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   90.24 - * have any questions.
   90.25 - */
   90.26 -
   90.27 -/*
   90.28 - * @test
   90.29 + * @test /nodynamiccopyright/
   90.30   * @bug     6677785
   90.31   * @summary REGRESSION: StackOverFlowError with Cyclic Class level Type Parameters when used in constructors
   90.32   * @author Maurizio Cimadamore

    91.1 --- a/test/tools/javac/generics/6677785/T6677785.out	Thu Sep 03 10:53:14 2009 -0700
    91.2 +++ b/test/tools/javac/generics/6677785/T6677785.out	Thu Sep 03 18:34:17 2009 -0700
    91.3 @@ -1,2 +1,2 @@
    91.4 -T6677785.java:31:23: compiler.err.cyclic.inheritance: E
    91.5 +T6677785.java:8:23: compiler.err.cyclic.inheritance: E
    91.6  1 error

    92.1 --- a/test/tools/javac/generics/6711619/T6711619a.java	Thu Sep 03 10:53:14 2009 -0700
    92.2 +++ b/test/tools/javac/generics/6711619/T6711619a.java	Thu Sep 03 18:34:17 2009 -0700
    92.3 @@ -1,28 +1,5 @@
    92.4  /*
    92.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    92.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    92.7 - *
    92.8 - * This code is free software; you can redistribute it and/or modify it
    92.9 - * under the terms of the GNU General Public License version 2 only, as
   92.10 - * published by the Free Software Foundation.
   92.11 - *
   92.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   92.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   92.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   92.15 - * version 2 for more details (a copy is included in the LICENSE file that
   92.16 - * accompanied this code).
   92.17 - *
   92.18 - * You should have received a copy of the GNU General Public License version
   92.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   92.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   92.21 - *
   92.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   92.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   92.24 - * have any questions.
   92.25 - */
   92.26 -
   92.27 -/*
   92.28 - * @test
   92.29 + * @test /nodynamiccopyright/
   92.30   * @bug 6711619
   92.31   *
   92.32   * @summary javac doesn't allow access to protected members in intersection types
   92.33 @@ -71,4 +48,4 @@
   92.34          ta = arg.w.a;
   92.35          tb = arg.w.b;
   92.36      }
   92.37 -}
   92.38 \ No newline at end of file
   92.39 +}

    93.1 --- a/test/tools/javac/generics/6711619/T6711619a.out	Thu Sep 03 10:53:14 2009 -0700
    93.2 +++ b/test/tools/javac/generics/6711619/T6711619a.out	Thu Sep 03 18:34:17 2009 -0700
    93.3 @@ -1,7 +1,7 @@
    93.4 -T6711619a.java:63:14: compiler.err.cant.resolve.args: kindname.method, a, , 
    93.5 -T6711619a.java:64:14: compiler.err.cant.resolve.args: kindname.method, b, , 
    93.6 -T6711619a.java:69:19: compiler.err.report.access: a, private, T6711619a.A
    93.7 -T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B
    93.8 -T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A
    93.9 -T6711619a.java:72:19: compiler.err.report.access: b, private, T6711619a.B
   93.10 +T6711619a.java:40:14: compiler.err.cant.resolve.args: kindname.method, a, , 
   93.11 +T6711619a.java:41:14: compiler.err.cant.resolve.args: kindname.method, b, , 
   93.12 +T6711619a.java:46:19: compiler.err.report.access: a, private, T6711619a.A
   93.13 +T6711619a.java:47:19: compiler.err.report.access: b, private, T6711619a.B
   93.14 +T6711619a.java:48:19: compiler.err.report.access: a, private, T6711619a.A
   93.15 +T6711619a.java:49:19: compiler.err.report.access: b, private, T6711619a.B
   93.16  6 errors

    94.1 --- a/test/tools/javac/generics/6711619/T6711619b.java	Thu Sep 03 10:53:14 2009 -0700
    94.2 +++ b/test/tools/javac/generics/6711619/T6711619b.java	Thu Sep 03 18:34:17 2009 -0700
    94.3 @@ -1,28 +1,5 @@
    94.4  /*
    94.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    94.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    94.7 - *
    94.8 - * This code is free software; you can redistribute it and/or modify it
    94.9 - * under the terms of the GNU General Public License version 2 only, as
   94.10 - * published by the Free Software Foundation.
   94.11 - *
   94.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   94.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   94.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   94.15 - * version 2 for more details (a copy is included in the LICENSE file that
   94.16 - * accompanied this code).
   94.17 - *
   94.18 - * You should have received a copy of the GNU General Public License version
   94.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   94.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   94.21 - *
   94.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   94.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   94.24 - * have any questions.
   94.25 - */
   94.26 -
   94.27 -/*
   94.28 - * @test
   94.29 + * @test /nodynamiccopyright/
   94.30   * @bug 6711619
   94.31   *
   94.32   * @summary javac doesn't allow access to protected members in intersection types
   94.33 @@ -61,4 +38,4 @@
   94.34               return E.i;
   94.35           }
   94.36      }
   94.37 -}
   94.38 \ No newline at end of file
   94.39 +}

    95.1 --- a/test/tools/javac/generics/6711619/T6711619b.out	Thu Sep 03 10:53:14 2009 -0700
    95.2 +++ b/test/tools/javac/generics/6711619/T6711619b.out	Thu Sep 03 18:34:17 2009 -0700
    95.3 @@ -1,5 +1,5 @@
    95.4 -T6711619b.java:39:22: compiler.err.report.access: i, private, T6711619b.X1
    95.5 -T6711619b.java:46:22: compiler.err.report.access: i, private, T6711619b.X2
    95.6 -T6711619b.java:54:22: compiler.err.report.access: i, private, T6711619b.X3
    95.7 -T6711619b.java:61:22: compiler.err.report.access: i, private, T6711619b.X4
    95.8 +T6711619b.java:16:22: compiler.err.report.access: i, private, T6711619b.X1
    95.9 +T6711619b.java:23:22: compiler.err.report.access: i, private, T6711619b.X2
   95.10 +T6711619b.java:31:22: compiler.err.report.access: i, private, T6711619b.X3
   95.11 +T6711619b.java:38:22: compiler.err.report.access: i, private, T6711619b.X4
   95.12  4 errors

    96.1 --- a/test/tools/javac/generics/6723444/T6723444.java	Thu Sep 03 10:53:14 2009 -0700
    96.2 +++ b/test/tools/javac/generics/6723444/T6723444.java	Thu Sep 03 18:34:17 2009 -0700
    96.3 @@ -1,28 +1,5 @@
    96.4  /*
    96.5 - * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
    96.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    96.7 - *
    96.8 - * This code is free software; you can redistribute it and/or modify it
    96.9 - * under the terms of the GNU General Public License version 2 only, as
   96.10 - * published by the Free Software Foundation.
   96.11 - *
   96.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   96.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   96.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   96.15 - * version 2 for more details (a copy is included in the LICENSE file that
   96.16 - * accompanied this code).
   96.17 - *
   96.18 - * You should have received a copy of the GNU General Public License version
   96.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   96.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   96.21 - *
   96.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   96.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   96.24 - * have any questions.
   96.25 - */
   96.26 -
   96.27 -/*
   96.28 - * @test
   96.29 + * @test /nodynamiccopyright/
   96.30   * @bug 6723444
   96.31   *
   96.32   * @summary javac fails to substitute type variables into a constructor's throws clause

    97.1 --- a/test/tools/javac/generics/6723444/T6723444.out	Thu Sep 03 10:53:14 2009 -0700
    97.2 +++ b/test/tools/javac/generics/6723444/T6723444.out	Thu Sep 03 18:34:17 2009 -0700
    97.3 @@ -1,13 +1,13 @@
    97.4 -T6723444.java:65:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
    97.5 -T6723444.java:66:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
    97.6 -T6723444.java:68:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    97.7 -T6723444.java:69:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    97.8 -T6723444.java:71:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    97.9 -T6723444.java:72:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.10 -T6723444.java:73:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.11 -T6723444.java:74:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.12 -T6723444.java:75:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.13 -T6723444.java:76:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.14 -T6723444.java:77:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.15 -T6723444.java:78:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.16 -12 errors
   97.17 \ No newline at end of file
   97.18 +T6723444.java:42:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
   97.19 +T6723444.java:43:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
   97.20 +T6723444.java:45:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.21 +T6723444.java:46:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.22 +T6723444.java:48:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.23 +T6723444.java:49:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.24 +T6723444.java:50:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.25 +T6723444.java:51:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.26 +T6723444.java:52:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.27 +T6723444.java:53:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.28 +T6723444.java:54:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.29 +T6723444.java:55:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   97.30 +12 errors

    98.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    98.2 +++ b/test/tools/javac/generics/diamond/neg/Neg01.java	Thu Sep 03 18:34:17 2009 -0700
    98.3 @@ -0,0 +1,38 @@
    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/fail/ref=Neg01.out Neg01.java -source 1.7 -XDrawDiagnostics
   98.11 + *
   98.12 + */
   98.13 +
   98.14 +class Neg01<X extends Number> {
   98.15 +
   98.16 +    Neg01(X x) {}
   98.17 +
   98.18 +    <Z> Neg01(X x, Z z) {}
   98.19 +
   98.20 +    void test() {
   98.21 +        Neg01<String> n1 = new Neg01<>(""); //new Foo<Integer> created
   98.22 +        Neg01<? extends String> n2 = new Neg01<>(""); //new Foo<Integer> created
   98.23 +        Neg01<?> n3 = new Neg01<>(""); //new Foo<Object> created
   98.24 +        Neg01<? super String> n4 = new Neg01<>(""); //new Foo<Object> created
   98.25 +
   98.26 +        Neg01<String> n5 = new Neg01<>(""){}; //new Foo<Integer> created
   98.27 +        Neg01<? extends String> n6 = new Neg01<>(""){}; //new Foo<Integer> created
   98.28 +        Neg01<?> n7 = new Neg01<>(""){}; //new Foo<Object> created
   98.29 +        Neg01<? super String> n8 = new Neg01<>(""){}; //new Foo<Object> created
   98.30 +
   98.31 +        Neg01<String> n9 = new Neg01<>("", ""); //new Foo<Integer> created
   98.32 +        Neg01<? extends String> n10 = new Neg01<>("", ""); //new Foo<Integer> created
   98.33 +        Neg01<?> n11 = new Neg01<>("", ""); //new Foo<Object> created
   98.34 +        Foo<? super String> n12 = new Neg01<>("", ""); //new Foo<Object> created
   98.35 +
   98.36 +        Neg01<String> n13 = new Neg01<>("", ""){}; //new Foo<Integer> created
   98.37 +        Neg01<? extends String> n14 = new Neg01<>("", ""){}; //new Foo<Integer> created
   98.38 +        Neg01<?> n15 = new Neg01<>("", ""){}; //new Foo<Object> created
   98.39 +        Neg01<? super String> n16 = new Neg01<>("", ""){}; //new Foo<Object> created
   98.40 +    }
   98.41 +}

    99.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    99.2 +++ b/test/tools/javac/generics/diamond/neg/Neg01.out	Thu Sep 03 18:34:17 2009 -0700
    99.3 @@ -0,0 +1,31 @@
    99.4 +Neg01.java:18:15: compiler.err.not.within.bounds: java.lang.String
    99.5 +Neg01.java:18:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
    99.6 +Neg01.java:19:25: compiler.err.not.within.bounds: ? extends java.lang.String
    99.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)
    99.8 +Neg01.java:20:23: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String, kindname.class, Neg01<java.lang.Number>
    99.9 +Neg01.java:21:23: compiler.err.not.within.bounds: ? super java.lang.String
   99.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>)
   99.11 +Neg01.java:23:15: compiler.err.not.within.bounds: java.lang.String
   99.12 +Neg01.java:23:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
   99.13 +Neg01.java:24:25: compiler.err.not.within.bounds: ? extends java.lang.String
   99.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)
   99.15 +Neg01.java:25:23: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String, kindname.class, Neg01<java.lang.Number>
   99.16 +Neg01.java:25:38: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , , kindname.class, Neg01<java.lang.Number>
   99.17 +Neg01.java:26:23: compiler.err.not.within.bounds: ? super java.lang.String
   99.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>)
   99.19 +Neg01.java:28:15: compiler.err.not.within.bounds: java.lang.String
   99.20 +Neg01.java:28:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
   99.21 +Neg01.java:29:25: compiler.err.not.within.bounds: ? extends java.lang.String
   99.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)
   99.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>
   99.24 +Neg01.java:31:9: compiler.err.cant.resolve.location: kindname.class, Foo, , , kindname.class, Neg01<X>
   99.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>
   99.26 +Neg01.java:33:15: compiler.err.not.within.bounds: java.lang.String
   99.27 +Neg01.java:33:38: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
   99.28 +Neg01.java:34:25: compiler.err.not.within.bounds: ? extends java.lang.String
   99.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)
   99.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>
   99.31 +Neg01.java:35:43: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , , kindname.class, Neg01<java.lang.Number>
   99.32 +Neg01.java:36:23: compiler.err.not.within.bounds: ? super java.lang.String
   99.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>)
   99.34 +30 errors

   100.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   100.2 +++ b/test/tools/javac/generics/diamond/neg/Neg02.java	Thu Sep 03 18:34:17 2009 -0700
   100.3 @@ -0,0 +1,61 @@
   100.4 +/*
   100.5 + * @test /nodynamiccopyright/
   100.6 + * @bug 6840638
   100.7 + *
   100.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
   100.9 + * @author mcimadamore
  100.10 + * @compile/fail/ref=Neg02.out Neg02.java -source 1.7 -XDrawDiagnostics
  100.11 + *
  100.12 + */
  100.13 +
  100.14 +class Neg02 {
  100.15 +
  100.16 +    static class Foo<X extends Number> {
  100.17 +        Foo(X x) {}
  100.18 +        <Z> Foo(X x, Z z) {}
  100.19 +    }
  100.20 +
  100.21 +    void testSimple() {
  100.22 +        Foo<String> f1 = new Foo<>(""); //new Foo<Integer> created
  100.23 +        Foo<? extends String> f2 = new Foo<>(""); //new Foo<Integer> created
  100.24 +        Foo<?> f3 = new Foo<>(""); //new Foo<Object> created
  100.25 +        Foo<? super String> f4 = new Foo<>(""); //new Foo<Object> created
  100.26 +
  100.27 +        Foo<String> f5 = new Foo<>(""){}; //new Foo<Integer> created
  100.28 +        Foo<? extends String> f6 = new Foo<>(""){}; //new Foo<Integer> created
  100.29 +        Foo<?> f7 = new Foo<>(""){}; //new Foo<Object> created
  100.30 +        Foo<? super String> f8 = new Foo<>(""){}; //new Foo<Object> created
  100.31 +
  100.32 +        Foo<String> f9 = new Foo<>("", ""); //new Foo<Integer> created
  100.33 +        Foo<? extends String> f10 = new Foo<>("", ""); //new Foo<Integer> created
  100.34 +        Foo<?> f11 = new Foo<>("", ""); //new Foo<Object> created
  100.35 +        Foo<? super String> f12 = new Foo<>("", ""); //new Foo<Object> created
  100.36 +
  100.37 +        Foo<String> f13 = new Foo<>("", ""){}; //new Foo<Integer> created
  100.38 +        Foo<? extends String> f14 = new Foo<>("", ""){}; //new Foo<Integer> created
  100.39 +        Foo<?> f15 = new Foo<>("", ""){}; //new Foo<Object> created
  100.40 +        Foo<? super String> f16 = new Foo<>("", ""){}; //new Foo<Object> created
  100.41 +    }
  100.42 +
  100.43 +    void testQualified() {
  100.44 +        Foo<String> f1 = new Neg02.Foo<>(""); //new Foo<Integer> created
  100.45 +        Foo<? extends String> f2 = new Neg02.Foo<>(""); //new Foo<Integer> created
  100.46 +        Foo<?> f3 = new Neg02.Foo<>(""); //new Foo<Object> created
  100.47 +        Foo<? super String> f4 = new Neg02.Foo<>(""); //new Foo<Object> created
  100.48 +
  100.49 +        Foo<String> f5 = new Neg02.Foo<>(""){}; //new Foo<Integer> created
  100.50 +        Foo<? extends String> f6 = new Neg02.Foo<>(""){}; //new Foo<Integer> created
  100.51 +        Foo<?> f7 = new Neg02.Foo<>(""){}; //new Foo<Object> created
  100.52 +        Foo<? super String> f8 = new Neg02.Foo<>(""){}; //new Foo<Object> created
  100.53 +
  100.54 +        Foo<String> f9 = new Neg02.Foo<>("", ""); //new Foo<Integer> created
  100.55 +        Foo<? extends String> f10 = new Neg02.Foo<>("", ""); //new Foo<Integer> created
  100.56 +        Foo<?> f11 = new Neg02.Foo<>("", ""); //new Foo<Object> created
  100.57 +        Foo<? super String> f12 = new Neg02.Foo<>("", ""); //new Foo<Object> created
  100.58 +
  100.59 +        Foo<String> f13 = new Neg02.Foo<>("", ""){}; //new Foo<Integer> created
  100.60 +        Foo<? extends String> f14 = new Neg02.Foo<>("", ""){}; //new Foo<Integer> created
  100.61 +        Foo<?> f15 = new Neg02.Foo<>("", ""){}; //new Foo<Object> created
  100.62 +        Foo<? super String> f16 = new Neg02.Foo<>("", ""){}; //new Foo<Object> created
  100.63 +    }
  100.64 +}

   101.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   101.2 +++ b/test/tools/javac/generics/diamond/neg/Neg02.out	Thu Sep 03 18:34:17 2009 -0700
   101.3 @@ -0,0 +1,61 @@
   101.4 +Neg02.java:19:13: compiler.err.not.within.bounds: java.lang.String
   101.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>)
   101.6 +Neg02.java:20:23: compiler.err.not.within.bounds: ? extends java.lang.String
   101.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)
   101.8 +Neg02.java:21:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
   101.9 +Neg02.java:22:21: compiler.err.not.within.bounds: ? super java.lang.String
  101.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>)
  101.11 +Neg02.java:24:13: compiler.err.not.within.bounds: java.lang.String
  101.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>)
  101.13 +Neg02.java:25:23: compiler.err.not.within.bounds: ? extends java.lang.String
  101.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)
  101.15 +Neg02.java:26:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
  101.16 +Neg02.java:26:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
  101.17 +Neg02.java:27:21: compiler.err.not.within.bounds: ? super java.lang.String
  101.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>)
  101.19 +Neg02.java:29:13: compiler.err.not.within.bounds: java.lang.String
  101.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>)
  101.21 +Neg02.java:30:23: compiler.err.not.within.bounds: ? extends java.lang.String
  101.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)
  101.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>
  101.24 +Neg02.java:32:21: compiler.err.not.within.bounds: ? super java.lang.String
  101.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>)
  101.26 +Neg02.java:34:13: compiler.err.not.within.bounds: java.lang.String
  101.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>)
  101.28 +Neg02.java:35:23: compiler.err.not.within.bounds: ? extends java.lang.String
  101.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)
  101.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>
  101.31 +Neg02.java:36:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
  101.32 +Neg02.java:37:21: compiler.err.not.within.bounds: ? super java.lang.String
  101.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>)
  101.34 +Neg02.java:41:13: compiler.err.not.within.bounds: java.lang.String
  101.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>)
  101.36 +Neg02.java:42:23: compiler.err.not.within.bounds: ? extends java.lang.String
  101.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)
  101.38 +Neg02.java:43:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
  101.39 +Neg02.java:44:21: compiler.err.not.within.bounds: ? super java.lang.String
  101.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>)
  101.41 +Neg02.java:46:13: compiler.err.not.within.bounds: java.lang.String
  101.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>)
  101.43 +Neg02.java:47:23: compiler.err.not.within.bounds: ? extends java.lang.String
  101.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)
  101.45 +Neg02.java:48:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
  101.46 +Neg02.java:48:40: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
  101.47 +Neg02.java:49:21: compiler.err.not.within.bounds: ? super java.lang.String
  101.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>)
  101.49 +Neg02.java:51:13: compiler.err.not.within.bounds: java.lang.String
  101.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>)
  101.51 +Neg02.java:52:23: compiler.err.not.within.bounds: ? extends java.lang.String
  101.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)
  101.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>
  101.54 +Neg02.java:54:21: compiler.err.not.within.bounds: ? super java.lang.String
  101.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>)
  101.56 +Neg02.java:56:13: compiler.err.not.within.bounds: java.lang.String
  101.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>)
  101.58 +Neg02.java:57:23: compiler.err.not.within.bounds: ? extends java.lang.String
  101.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)
  101.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>
  101.61 +Neg02.java:58:45: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
  101.62 +Neg02.java:59:21: compiler.err.not.within.bounds: ? super java.lang.String
  101.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>)
  101.64 +60 errors

   102.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   102.2 +++ b/test/tools/javac/generics/diamond/neg/Neg03.java	Thu Sep 03 18:34:17 2009 -0700
   102.3 @@ -0,0 +1,83 @@
   102.4 +/*
   102.5 + * @test /nodynamiccopyright/
   102.6 + * @bug 6840638
   102.7 + *
   102.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
   102.9 + * @author mcimadamore
  102.10 + * @compile/fail/ref=Neg03.out Neg03.java -source 1.7 -XDrawDiagnostics
  102.11 + *
  102.12 + */
  102.13 +
  102.14 +class Neg03<U> {
  102.15 +
  102.16 +    class Foo<V extends Number> {
  102.17 +        Foo(V x) {}
  102.18 +        <Z> Foo(V x, Z z) {}
  102.19 +    }
  102.20 +
  102.21 +    void testSimple() {
  102.22 +        Foo<String> f1 = new Foo<>(""); //new Foo<Integer> created
  102.23 +        Foo<? extends String> f2 = new Foo<>(""); //new Foo<Integer> created
  102.24 +        Foo<?> f3 = new Foo<>(""); //new Foo<Object> created
  102.25 +        Foo<? super String> f4 = new Foo<>(""); //new Foo<Object> created
  102.26 +
  102.27 +        Foo<String> f5 = new Foo<>(""){}; //new Foo<Integer> created
  102.28 +        Foo<? extends String> f6 = new Foo<>(""){}; //new Foo<Integer> created
  102.29 +        Foo<?> f7 = new Foo<>(""){}; //new Foo<Object> created
  102.30 +        Foo<? super String> f8 = new Foo<>(""){}; //new Foo<Object> created
  102.31 +
  102.32 +        Foo<String> f9 = new Foo<>("", ""); //new Foo<Integer> created
  102.33 +        Foo<? extends String> f10 = new Foo<>("", ""); //new Foo<Integer> created
  102.34 +        Foo<?> f11 = new Foo<>("", ""); //new Foo<Object> created
  102.35 +        Foo<? super String> f12 = new Foo<>("", ""); //new Foo<Object> created
  102.36 +
  102.37 +        Foo<String> f13 = new Foo<>("", ""){}; //new Foo<Integer> created
  102.38 +        Foo<? extends String> f14 = new Foo<>("", ""){}; //new Foo<Integer> created
  102.39 +        Foo<?> f15 = new Foo<>("", ""){}; //new Foo<Object> created
  102.40 +        Foo<? super String> f16 = new Foo<>("", ""){}; //new Foo<Object> created
  102.41 +    }
  102.42 +
  102.43 +    void testQualified_1() {
  102.44 +        Foo<String> f1 = new Neg03<U>.Foo<>(""); //new Foo<Integer> created
  102.45 +        Foo<? extends String> f2 = new Neg03<U>.Foo<>(""); //new Foo<Integer> created
  102.46 +        Foo<?> f3 = new Neg03<U>.Foo<>(""); //new Foo<Object> created
  102.47 +        Foo<? super String> f4 = new Neg03<U>.Foo<>(""); //new Foo<Object> created
  102.48 +
  102.49 +        Foo<String> f5 = new Neg03<U>.Foo<>(""){}; //new Foo<Integer> created
  102.50 +        Foo<? extends String> f6 = new Neg03<U>.Foo<>(""){}; //new Foo<Integer> created
  102.51 +        Foo<?> f7 = new Neg03<U>.Foo<>(""){}; //new Foo<Object> created
  102.52 +        Foo<? super String> f8 = new Neg03<U>.Foo<>(""){}; //new Foo<Object> created
  102.53 +
  102.54 +        Foo<String> f9 = new Neg03<U>.Foo<>("", ""); //new Foo<Integer> created
  102.55 +        Foo<? extends String> f10 = new Neg03<U>.Foo<>("", ""); //new Foo<Integer> created
  102.56 +        Foo<?> f11 = new Neg03<U>.Foo<>("", ""); //new Foo<Object> created
  102.57 +        Foo<? super String> f12 = new Neg03<U>.Foo<>("", ""); //new Foo<Object> created
  102.58 +
  102.59 +        Foo<String> f13 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Integer> created
  102.60 +        Foo<? extends String> f14 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Integer> created
  102.61 +        Foo<?> f15 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Object> created
  102.62 +        Foo<? super String> f16 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Object> created
  102.63 +    }
  102.64 +
  102.65 +    void testQualified_2(Neg03<U> n) {
  102.66 +        Foo<String> f1 = n.new Foo<>(""); //new Foo<Integer> created
  102.67 +        Foo<? extends String> f2 = n.new Foo<>(""); //new Foo<Integer> created
  102.68 +        Foo<?> f3 = n.new Foo<>(""); //new Foo<Integer> created
  102.69 +        Foo<? super String> f4 = n.new Foo<>(""); //new Foo<Integer> created
  102.70 +
  102.71 +        Foo<String> f5 = n.new Foo<>(""){}; //new Foo<Integer> created
  102.72 +        Foo<? extends String> f6 = n.new Foo<>(""){}; //new Foo<Integer> created
  102.73 +        Foo<?> f7 = n.new Foo<>(""){}; //new Foo<Integer> created
  102.74 +        Foo<? super String> f8 = n.new Foo<>(""){}; //new Foo<Integer> created
  102.75 +
  102.76 +        Foo<String> f9 = n.new Foo<>("", ""); //new Foo<Integer> created
  102.77 +        Foo<? extends String> f10 = n.new Foo<>("", ""); //new Foo<Integer> created
  102.78 +        Foo<?> f11 = n.new Foo<>("", ""); //new Foo<Integer> created
  102.79 +        Foo<? super String> f12 = n.new Foo<>("", ""); //new Foo<Integer> created
  102.80 +
  102.81 +        Foo<String> f13 = n.new Foo<>("", ""){}; //new Foo<Integer> created
  102.82 +        Foo<? extends String> f14 = n.new Foo<>("", ""){}; //new Foo<Integer> created
  102.83 +        Foo<?> f15 = n.new Foo<>("", ""){}; //new Foo<Integer> created
  102.84 +        Foo<? super String> f16 = n.new Foo<>("", ""){}; //new Foo<Integer> created
  102.85 +    }
  102.86 +}

   103.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   103.2 +++ b/test/tools/javac/generics/diamond/neg/Neg03.out	Thu Sep 03 18:34:17 2009 -0700
   103.3 @@ -0,0 +1,91 @@
   103.4 +Neg03.java:19:13: compiler.err.not.within.bounds: java.lang.String
   103.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>)
   103.6 +Neg03.java:20:23: compiler.err.not.within.bounds: ? extends java.lang.String
   103.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)
   103.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>
   103.9 +Neg03.java:22:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.11 +Neg03.java:24:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.13 +Neg03.java:25:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.16 +Neg03.java:26:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
  103.17 +Neg03.java:27:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.19 +Neg03.java:29:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.21 +Neg03.java:30:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.24 +Neg03.java:32:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.26 +Neg03.java:34:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.28 +Neg03.java:35:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.31 +Neg03.java:36:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
  103.32 +Neg03.java:37:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.34 +Neg03.java:41:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.36 +Neg03.java:42:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.39 +Neg03.java:44:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.41 +Neg03.java:46:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.43 +Neg03.java:47:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.46 +Neg03.java:48:43: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
  103.47 +Neg03.java:49:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.49 +Neg03.java:51:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.51 +Neg03.java:52:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.54 +Neg03.java:54:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.56 +Neg03.java:56:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.58 +Neg03.java:57:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.61 +Neg03.java:58:48: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
  103.62 +Neg03.java:59:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.64 +Neg03.java:63:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.66 +Neg03.java:64:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.69 +Neg03.java:66:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.71 +Neg03.java:68:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.73 +Neg03.java:69:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.76 +Neg03.java:70:36: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
  103.77 +Neg03.java:71:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.79 +Neg03.java:73:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.81 +Neg03.java:74:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.84 +Neg03.java:76:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.86 +Neg03.java:78:13: compiler.err.not.within.bounds: java.lang.String
  103.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>)
  103.88 +Neg03.java:79:23: compiler.err.not.within.bounds: ? extends java.lang.String
  103.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)
  103.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>
  103.91 +Neg03.java:80:41: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
  103.92 +Neg03.java:81:21: compiler.err.not.within.bounds: ? super java.lang.String
  103.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>)
  103.94 +90 errors

   104.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   104.2 +++ b/test/tools/javac/generics/diamond/neg/Neg04.java	Thu Sep 03 18:34:17 2009 -0700
   104.3 @@ -0,0 +1,38 @@
   104.4 +/*
   104.5 + * @test /nodynamiccopyright/
   104.6 + * @bug 6840638
   104.7 + *
   104.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
   104.9 + * @author mcimadamore
  104.10 + * @compile/fail/ref=Neg04.out Neg04.java -source 1.7 -XDrawDiagnostics
  104.11 + *
  104.12 + */
  104.13 +
  104.14 +class Neg04 {
  104.15 +
  104.16 +    void test() {
  104.17 +        class Foo<V extends Number> {
  104.18 +            Foo(V x) {}
  104.19 +            <Z> Foo(V x, Z z) {}
  104.20 +        }
  104.21 +        Foo<String> n1 = new Foo<>(""); //new Foo<Integer> created
  104.22 +        Foo<? extends String> n2 = new Foo<>(""); //new Foo<Integer> created
  104.23 +        Foo<?> n3 = new Foo<>(""); //new Foo<Object> created
  104.24 +        Foo<? super String> n4 = new Foo<>(""); //new Foo<Object> created
  104.25 +
  104.26 +        Foo<String> n5 = new Foo<>(""){}; //new Foo<Integer> created
  104.27 +        Foo<? extends String> n6 = new Foo<>(""){}; //new Foo<Integer> created
  104.28 +        Foo<?> n7 = new Foo<>(""){}; //new Foo<Object> created
  104.29 +        Foo<? super String> n8 = new Foo<>(""){}; //new Foo<Object> created
  104.30 +
  104.31 +        Foo<String> n9 = new Foo<>("", ""); //new Foo<Integer> created
  104.32 +        Foo<? extends String> n10 = new Foo<>("", ""); //new Foo<Integer> created
  104.33 +        Foo<?> n11 = new Foo<>("", ""); //new Foo<Object> created
  104.34 +        Foo<? super String> n12 = new Foo<>("", ""); //new Foo<Object> created
  104.35 +
  104.36 +        Foo<String> n13 = new Foo<>("", ""){}; //new Foo<Integer> created
  104.37 +        Foo<? extends String> n14 = new Foo<>("", ""){}; //new Foo<Integer> created
  104.38 +        Foo<?> n15 = new Foo<>("", ""){}; //new Foo<Object> created
  104.39 +        Foo<? super String> n16 = new Foo<>("", ""){}; //new Foo<Object> created
  104.40 +    }
  104.41 +}

   105.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   105.2 +++ b/test/tools/javac/generics/diamond/neg/Neg04.out	Thu Sep 03 18:34:17 2009 -0700
   105.3 @@ -0,0 +1,31 @@
   105.4 +Neg04.java:18:13: compiler.err.not.within.bounds: java.lang.String
   105.5 +Neg04.java:18:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
   105.6 +Neg04.java:19:23: compiler.err.not.within.bounds: ? extends java.lang.String
   105.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)
   105.8 +Neg04.java:20:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Foo<java.lang.Number>
   105.9 +Neg04.java:21:21: compiler.err.not.within.bounds: ? super java.lang.String
  105.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>)
  105.11 +Neg04.java:23:13: compiler.err.not.within.bounds: java.lang.String
  105.12 +Neg04.java:23:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
  105.13 +Neg04.java:24:23: compiler.err.not.within.bounds: ? extends java.lang.String
  105.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)
  105.15 +Neg04.java:25:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Foo<java.lang.Number>
  105.16 +Neg04.java:25:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Foo<java.lang.Number>
  105.17 +Neg04.java:26:21: compiler.err.not.within.bounds: ? super java.lang.String
  105.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>)
  105.19 +Neg04.java:28:13: compiler.err.not.within.bounds: java.lang.String
  105.20 +Neg04.java:28:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
  105.21 +Neg04.java:29:23: compiler.err.not.within.bounds: ? extends java.lang.String
  105.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)
  105.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>
  105.24 +Neg04.java:31:21: compiler.err.not.within.bounds: ? super java.lang.String
  105.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>)
  105.26 +Neg04.java:33:13: compiler.err.not.within.bounds: java.lang.String
  105.27 +Neg04.java:33:34: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
  105.28 +Neg04.java:34:23: compiler.err.not.within.bounds: ? extends java.lang.String
  105.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)
  105.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>
  105.31 +Neg04.java:35:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Foo<java.lang.Number>
  105.32 +Neg04.java:36:21: compiler.err.not.within.bounds: ? super java.lang.String
  105.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>)
  105.34 +30 errors

   106.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   106.2 +++ b/test/tools/javac/generics/diamond/neg/Neg05.java	Thu Sep 03 18:34:17 2009 -0700
   106.3 @@ -0,0 +1,61 @@
   106.4 +/*
   106.5 + * @test /nodynamiccopyright/
   106.6 + * @bug 6840638
   106.7 + *
   106.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
   106.9 + * @author mcimadamore
  106.10 + * @compile/fail/ref=Neg05.out Neg05.java -source 1.7 -XDrawDiagnostics
  106.11 + *
  106.12 + */
  106.13 +
  106.14 +class Neg05<U> {
  106.15 +
  106.16 +    class Foo<V> {
  106.17 +        Foo(V x) {}
  106.18 +        <Z> Foo(V x, Z z) {}
  106.19 +    }
  106.20 +
  106.21 +    void testRare_1() {
  106.22 +        Neg05<?>.Foo<String> f1 = new Neg05.Foo<>(""); //new Foo<Integer> created
  106.23 +        Neg05<?>.Foo<? extends String> f2 = new Neg05.Foo<>(""); //new Foo<Integer> created
  106.24 +        Neg05<?>.Foo<?> f3 = new Neg05.Foo<>(""); //new Foo<Object> created
  106.25 +        Neg05<?>.Foo<? super String> f4 = new Neg05.Foo<>(""); //new Foo<Object> created
  106.26 +
  106.27 +        Neg05<?>.Foo<String> f5 = new Neg05.Foo<>(""){}; //new Foo<Integer> created
  106.28 +        Neg05<?>.Foo<? extends String> f6 = new Neg05.Foo<>(""){}; //new Foo<Integer> created
  106.29 +        Neg05<?>.Foo<?> f7 = new Neg05.Foo<>(""){}; //new Foo<Object> created
  106.30 +        Neg05<?>.Foo<? super String> f8 = new Neg05.Foo<>(""){}; //new Foo<Object> created
  106.31 +
  106.32 +        Neg05<?>.Foo<String> f9 = new Neg05.Foo<>("", ""); //new Foo<Integer> created
  106.33 +        Neg05<?>.Foo<? extends String> f10 = new Neg05.Foo<>("", ""); //new Foo<Integer> created
  106.34 +        Neg05<?>.Foo<?> f11 = new Neg05.Foo<>("", ""); //new Foo<Object> created
  106.35 +        Neg05<?>.Foo<? super String> f12 = new Neg05.Foo<>("", ""); //new Foo<Object> created
  106.36 +
  106.37 +        Neg05<?>.Foo<String> f13 = new Neg05.Foo<>("", ""){}; //new Foo<Integer> created
  106.38 +        Neg05<?>.Foo<? extends String> f14 = new Neg05.Foo<>("", ""){}; //new Foo<Integer> created
  106.39 +        Neg05<?>.Foo<?> f15 = new Neg05.Foo<>("", ""){}; //new Foo<Object> created
  106.40 +        Neg05<?>.Foo<? super String> f16 = new Neg05.Foo<>("", ""){}; //new Foo<Object> created
  106.41 +    }
  106.42 +
  106.43 +    void testRare_2(Neg05 n) {
  106.44 +        Neg05<?>.Foo<String> f1 = n.new Foo<>(""); //new Foo<Integer> created
  106.45 +        Neg05<?>.Foo<? extends String> f2 = n.new Foo<>(""); //new Foo<Integer> created
  106.46 +        Neg05<?>.Foo<?> f3 = n.new Foo<>(""); //new Foo<Integer> created
  106.47 +        Neg05<?>.Foo<? super String> f4 = n.new Foo<>(""); //new Foo<Integer> created
  106.48 +
  106.49 +        Neg05<?>.Foo<String> f5 = n.new Foo<>(""){}; //new Foo<Integer> created
  106.50 +        Neg05<?>.Foo<? extends String> f6 = n.new Foo<>(""){}; //new Foo<Integer> created
  106.51 +        Neg05<?>.Foo<?> f7 = n.new Foo<>(""){}; //new Foo<Integer> created
  106.52 +        Neg05<?>.Foo<? super String> f8 = n.new Foo<>(""){}; //new Foo<Integer> created
  106.53 +
  106.54 +        Neg05<?>.Foo<String> f9 = n.new Foo<>("", ""); //new Foo<Integer> created
  106.55 +        Neg05<?>.Foo<? extends String> f10 = n.new Foo<>("", ""); //new Foo<Integer> created
  106.56 +        Neg05<?>.Foo<?> f11 = n.new Foo<>("", ""); //new Foo<Integer> created
  106.57 +        Neg05<?>.Foo<? super String> f12 = n.new Foo<>("", ""); //new Foo<Integer> created
  106.58 +
  106.59 +        Neg05<?>.Foo<String> f13 = n.new Foo<>("", ""){}; //new Foo<Integer> created
  106.60 +        Neg05<?>.Foo<? extends String> f14 = n.new Foo<>("", ""){}; //new Foo<Integer> created
  106.61 +        Neg05<?>.Foo<?> f15 = n.new Foo<>("", ""){}; //new Foo<Integer> created
  106.62 +        Neg05<?>.Foo<? super String> f16 = n.new Foo<>("", ""){}; //new Foo<Integer> created
  106.63 +    }
  106.64 +}

   107.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   107.2 +++ b/test/tools/javac/generics/diamond/neg/Neg05.out	Thu Sep 03 18:34:17 2009 -0700
   107.3 @@ -0,0 +1,33 @@
   107.4 +Neg05.java:19:48: compiler.err.improperly.formed.type.inner.raw.param
   107.5 +Neg05.java:20:58: compiler.err.improperly.formed.type.inner.raw.param
   107.6 +Neg05.java:21:43: compiler.err.improperly.formed.type.inner.raw.param
   107.7 +Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param
   107.8 +Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param
   107.9 +Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param
  107.10 +Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param
  107.11 +Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param
  107.12 +Neg05.java:29:48: compiler.err.improperly.formed.type.inner.raw.param
  107.13 +Neg05.java:30:59: compiler.err.improperly.formed.type.inner.raw.param
  107.14 +Neg05.java:31:44: compiler.err.improperly.formed.type.inner.raw.param
  107.15 +Neg05.java:32:57: compiler.err.improperly.formed.type.inner.raw.param
  107.16 +Neg05.java:34:49: compiler.err.improperly.formed.type.inner.raw.param
  107.17 +Neg05.java:35:59: compiler.err.improperly.formed.type.inner.raw.param
  107.18 +Neg05.java:36:44: compiler.err.improperly.formed.type.inner.raw.param
  107.19 +Neg05.java:37:57: compiler.err.improperly.formed.type.inner.raw.param
  107.20 +Neg05.java:41:37: compiler.err.improperly.formed.type.inner.raw.param
  107.21 +Neg05.java:42:47: compiler.err.improperly.formed.type.inner.raw.param
  107.22 +Neg05.java:43:32: compiler.err.improperly.formed.type.inner.raw.param
  107.23 +Neg05.java:44:45: compiler.err.improperly.formed.type.inner.raw.param
  107.24 +Neg05.java:46:37: compiler.err.improperly.formed.type.inner.raw.param
  107.25 +Neg05.java:47:47: compiler.err.improperly.formed.type.inner.raw.param
  107.26 +Neg05.java:48:32: compiler.err.improperly.formed.type.inner.raw.param
  107.27 +Neg05.java:49:45: compiler.err.improperly.formed.type.inner.raw.param
  107.28 +Neg05.java:51:37: compiler.err.improperly.formed.type.inner.raw.param
  107.29 +Neg05.java:52:48: compiler.err.improperly.formed.type.inner.raw.param
  107.30 +Neg05.java:53:33: compiler.err.improperly.formed.type.inner.raw.param
  107.31 +Neg05.java:54:46: compiler.err.improperly.formed.type.inner.raw.param
  107.32 +Neg05.java:56:38: compiler.err.improperly.formed.type.inner.raw.param
  107.33 +Neg05.java:57:48: compiler.err.improperly.formed.type.inner.raw.param
  107.34 +Neg05.java:58:33: compiler.err.improperly.formed.type.inner.raw.param
  107.35 +Neg05.java:59:46: compiler.err.improperly.formed.type.inner.raw.param
  107.36 +32 errors

   108.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   108.2 +++ b/test/tools/javac/generics/diamond/pos/Pos01.java	Thu Sep 03 18:34:17 2009 -0700
   108.3 @@ -0,0 +1,44 @@
   108.4 +/*
   108.5 + * @test /nodynamiccopyright/
   108.6 + * @bug 6840638
   108.7 + *
   108.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
   108.9 + * @author mcimadamore
  108.10 + * @compile Pos01.java -source 1.7
  108.11 + * @run main Pos01
  108.12 + *
  108.13 + */
  108.14 +
  108.15 +public class Pos01<X> {
  108.16 +
  108.17 +    Pos01(X x) {}
  108.18 +
  108.19 +    <Z> Pos01(X x, Z z) {}
  108.20 +
  108.21 +    void test() {
  108.22 +        Pos01<Integer> p1 = new Pos01<>(1); //new Foo<Integer> created
  108.23 +        Pos01<? extends Integer> p2 = new Pos01<>(1); //new Foo<Integer> created
  108.24 +        Pos01<?> p3 = new Pos01<>(1); //new Foo<Object> created
  108.25 +        Pos01<? super Integer> p4 = new Pos01<>(1); //new Foo<Object> created
  108.26 +
  108.27 +        Pos01<Integer> p5 = new Pos01<>(1){}; //new Foo<Integer> created
  108.28 +        Pos01<? extends Integer> p6 = new Pos01<>(1){}; //new Foo<Integer> created
  108.29 +        Pos01<?> p7 = new Pos01<>(1){}; //new Foo<Object> created
  108.30 +        Pos01<? super Integer> p8 = new Pos01<>(1){}; //new Foo<Object> created
  108.31 +
  108.32 +        Pos01<Integer> p9 = new Pos01<>(1, ""); //new Foo<Integer> created
  108.33 +        Pos01<? extends Integer> p10 = new Pos01<>(1, ""); //new Foo<Integer> created
  108.34 +        Pos01<?> p11 = new Pos01<>(1, ""); //new Foo<Object> created
  108.35 +        Pos01<? super Integer> p12 = new Pos01<>(1, ""); //new Foo<Object> created
  108.36 +
  108.37 +        Pos01<Integer> p13 = new Pos01<>(1, ""){}; //new Foo<Integer> created
  108.38 +        Pos01<? extends Integer> p14= new Pos01<>(1, ""){}; //new Foo<Integer> created
  108.39 +        Pos01<?> p15 = new Pos01<>(1, ""){}; //new Foo<Object> created
  108.40 +        Pos01<? super Integer> p16 = new Pos01<>(1, ""){}; //new Foo<Object> created
  108.41 +    }
  108.42 +
  108.43 +    public static void main(String[] args) {
  108.44 +        Pos01<String> p1 = new Pos01<>("");
  108.45 +        p1.test();
  108.46 +    }
  108.47 +}

   109.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   109.2 +++ b/test/tools/javac/generics/diamond/pos/Pos02.java	Thu Sep 03 18:34:17 2009 -0700
   109.3 @@ -0,0 +1,67 @@
   109.4 +/*
   109.5 + * @test /nodynamiccopyright/
   109.6 + * @bug 6840638
   109.7 + *
   109.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
   109.9 + * @author mcimadamore
  109.10 + * @compile Pos02.java -source 1.7
  109.11 + * @run main Pos02
  109.12 + */
  109.13 +
  109.14 +public class Pos02 {
  109.15 +
  109.16 +    static class Foo<X> {
  109.17 +        Foo(X x) {}
  109.18 +        <Z> Foo(X x, Z z) {}
  109.19 +    }
  109.20 +
  109.21 +    void testSimple() {
  109.22 +        Foo<Integer> f1 = new Foo<>(1); //new Foo<Integer> created
  109.23 +        Foo<? extends Integer> f2 = new Foo<>(1); //new Foo<Integer> created
  109.24 +        Foo<?> f3 = new Foo<>(1); //new Foo<Object> created
  109.25 +        Foo<? super Integer> f4 = new Foo<>(1); //new Foo<Object> created
  109.26 +
  109.27 +        Foo<Integer> f5 = new Foo<>(1){}; //new Foo<Integer> created
  109.28 +        Foo<? extends Integer> f6 = new Foo<>(1){}; //new Foo<Integer> created
  109.29 +        Foo<?> f7 = new Foo<>(1){}; //new Foo<Object> created
  109.30 +        Foo<? super Integer> f8 = new Foo<>(1){}; //new Foo<Object> created
  109.31 +
  109.32 +        Foo<Integer> f9 = new Foo<>(1, ""); //new Foo<Integer> created
  109.33 +        Foo<? extends Integer> f10 = new Foo<>(1, ""); //new Foo<Integer> created
  109.34 +        Foo<?> f11 = new Foo<>(1, ""); //new Foo<Object> created
  109.35 +        Foo<? super Integer> f12 = new Foo<>(1, ""); //new Foo<Object> created
  109.36 +
  109.37 +        Foo<Integer> f13 = new Foo<>(1, ""){}; //new Foo<Integer> created
  109.38 +        Foo<? extends Integer> f14 = new Foo<>(1, ""){}; //new Foo<Integer> created
  109.39 +        Foo<?> f15 = new Foo<>(1, ""){}; //new Foo<Object> created
  109.40 +        Foo<? super Integer> f16 = new Foo<>(1, ""){}; //new Foo<Object> created
  109.41 +    }
  109.42 +
  109.43 +    void testQualified() {
  109.44 +        Foo<Integer> f1 = new Pos02.Foo<>(1); //new Foo<Integer> created
  109.45 +        Foo<? extends Integer> f2 = new Pos02.Foo<>(1); //new Foo<Integer> created
  109.46 +        Foo<?> f3 = new Pos02.Foo<>(1); //new Foo<Object> created
  109.47 +        Foo<? super Integer> f4 = new Pos02.Foo<>(1); //new Foo<Object> created
  109.48 +
  109.49 +        Foo<Integer> f5 = new Pos02.Foo<>(1){}; //new Foo<Integer> created
  109.50 +        Foo<? extends Integer> f6 = new Pos02.Foo<>(1){}; //new Foo<Integer> created
  109.51 +        Foo<?> f7 = new Pos02.Foo<>(1){}; //new Foo<Object> created
  109.52 +        Foo<? super Integer> f8 = new Pos02.Foo<>(1){}; //new Foo<Object> created
  109.53 +
  109.54 +        Foo<Integer> f9 = new Pos02.Foo<>(1, ""); //new Foo<Integer> created
  109.55 +        Foo<? extends Integer> f10 = new Pos02.Foo<>(1, ""); //new Foo<Integer> created
  109.56 +        Foo<?> f11 = new Pos02.Foo<>(1, ""); //new Foo<Object> created
  109.57 +        Foo<? super Integer> f12 = new Pos02.Foo<>(1, ""); //new Foo<Object> created
  109.58 +
  109.59 +        Foo<Integer> f13 = new Pos02.Foo<>(1, ""){}; //new Foo<Integer> created
  109.60 +        Foo<? extends Integer> f14 = new Pos02.Foo<>(1, ""){}; //new Foo<Integer> created
  109.61 +        Foo<?> f15 = new Pos02.Foo<>(1, ""){}; //new Foo<Object> created
  109.62 +        Foo<? super Integer> f16 = new Pos02.Foo<>(1, ""){}; //new Foo<Object> created
  109.63 +    }
  109.64 +
  109.65 +    public static void main(String[] args) {
  109.66 +        Pos02 p2 = new Pos02();
  109.67 +        p2.testSimple();
  109.68 +        p2.testQualified();
  109.69 +    }
  109.70 +}

   110.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   110.2 +++ b/test/tools/javac/generics/diamond/pos/Pos03.java	Thu Sep 03 18:34:17 2009 -0700
   110.3 @@ -0,0 +1,91 @@
   110.4 +/*
   110.5 + * @test /nodynamiccopyright/
   110.6 + * @bug 6840638
   110.7 + *
   110.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
   110.9 + * @author mcimadamore
  110.10 + * @compile Pos03.java -source 1.7
  110.11 + * @run main Pos03
  110.12 + *
  110.13 + */
  110.14 +
  110.15 +public class Pos03<U> {
  110.16 +
  110.17 +    class Foo<V> {
  110.18 +        Foo(V x) {}
  110.19 +        <Z> Foo(V x, Z z) {}
  110.20 +    }
  110.21 +
  110.22 +    void testSimple() {
  110.23 +        Foo<Integer> f1 = new Foo<>(1); //new Foo<Integer> created
  110.24 +        Foo<? extends Integer> f2 = new Foo<>(1); //new Foo<Integer> created
  110.25 +        Foo<?> f3 = new Foo<>(1); //new Foo<Object> created
  110.26 +        Foo<? super Integer> f4 = new Foo<>(1); //new Foo<Object> created
  110.27 +
  110.28 +        Foo<Integer> f5 = new Foo<>(1){}; //new Foo<Integer> created
  110.29 +        Foo<? extends Integer> f6 = new Foo<>(1){}; //new Foo<Integer> created
  110.30 +        Foo<?> f7 = new Foo<>(1){}; //new Foo<Object> created
  110.31 +        Foo<? super Integer> f8 = new Foo<>(1){}; //new Foo<Object> created
  110.32 +
  110.33 +        Foo<Integer> f9 = new Foo<>(1, ""); //new Foo<Integer> created
  110.34 +        Foo<? extends Integer> f10 = new Foo<>(1, ""); //new Foo<Integer> created
  110.35 +        Foo<?> f11 = new Foo<>(1, ""); //new Foo<Object> created
  110.36 +        Foo<? super Integer> f12 = new Foo<>(1, ""); //new Foo<Object> created
  110.37 +
  110.38 +        Foo<Integer> f13 = new Foo<>(1, ""){}; //new Foo<Integer> created
  110.39 +        Foo<? extends Integer> f14 = new Foo<>(1, ""){}; //new Foo<Integer> created
  110.40 +        Foo<?> f15 = new Foo<>(1, ""){}; //new Foo<Object> created
  110.41 +        Foo<? super Integer> f16 = new Foo<>(1, ""){}; //new Foo<Object> created
  110.42 +    }
  110.43 +
  110.44 +    void testQualified_1() {
  110.45 +        Foo<Integer> f1 = new Pos03<U>.Foo<>(1); //new Foo<Integer> created
  110.46 +        Foo<? extends Integer> f2 = new Pos03<U>.Foo<>(1); //new Foo<Integer> created
  110.47 +        Foo<?> f3 = new Pos03<U>.Foo<>(1); //new Foo<Object> created
  110.48 +        Foo<? super Integer> f4 = new Pos03<U>.Foo<>(1); //new Foo<Object> created
  110.49 +
  110.50 +        Foo<Integer> f5 = new Pos03<U>.Foo<>(1){}; //new Foo<Integer> created
  110.51 +        Foo<? extends Integer> f6 = new Pos03<U>.Foo<>(1){}; //new Foo<Integer> created
  110.52 +        Foo<?> f7 = new Pos03<U>.Foo<>(1){}; //new Foo<Object> created
  110.53 +        Foo<? super Integer> f8 = new Pos03<U>.Foo<>(1){}; //new Foo<Object> created
  110.54 +
  110.55 +        Foo<Integer> f9 = new Pos03<U>.Foo<>(1, ""); //new Foo<Integer> created
  110.56 +        Foo<? extends Integer> f10 = new Pos03<U>.Foo<>(1, ""); //new Foo<Integer> created
  110.57 +        Foo<?> f11 = new Pos03<U>.Foo<>(1, ""); //new Foo<Object> created
  110.58 +        Foo<? super Integer> f12 = new Pos03<U>.Foo<>(1, ""); //new Foo<Object> created
  110.59 +
  110.60 +        Foo<Integer> f13 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Integer> created
  110.61 +        Foo<? extends Integer> f14 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Integer> created
  110.62 +        Foo<?> f15 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Object> created
  110.63 +        Foo<? super Integer> f16 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Object> created
  110.64 +    }
  110.65 +
  110.66 +    void testQualified_2(Pos03<U> p) {
  110.67 +        Foo<Integer> f1 = p.new Foo<>(1); //new Foo<Integer> created
  110.68 +        Foo<? extends Integer> f2 = p.new Foo<>(1); //new Foo<Integer> created
  110.69 +        Foo<?> f3 = p.new Foo<>(1); //new Foo<Object> created
  110.70 +        Foo<? super Integer> f4 = p.new Foo<>(1); //new Foo<Object> created
  110.71 +
  110.72 +        Foo<Integer> f5 = p.new Foo<>(1){}; //new Foo<Integer> created
  110.73 +        Foo<? extends Integer> f6 = p.new Foo<>(1){}; //new Foo<Integer> created
  110.74 +        Foo<?> f7 = p.new Foo<>(1){}; //new Foo<Object> created
  110.75 +        Foo<? super Integer> f8 = p.new Foo<>(1){}; //new Foo<Object> created
  110.76 +
  110.77 +        Foo<Integer> f9 = p.new Foo<>(1, ""); //new Foo<Integer> created
  110.78 +        Foo<? extends Integer> f10 = p.new Foo<>(1, ""); //new Foo<Integer> created
  110.79 +        Foo<?> f11 = p.new Foo<>(1, ""); //new Foo<Object> created
  110.80 +        Foo<? super Integer> f12 = p.new Foo<>(1, ""); //new Foo<Object> created
  110.81 +
  110.82 +        Foo<Integer> f13 = p.new Foo<>(1, ""){}; //new Foo<Integer> created
  110.83 +        Foo<? extends Integer> f14 = p.new Foo<>(1, ""){}; //new Foo<Integer> created
  110.84 +        Foo<?> f15 = p.new Foo<>(1, ""){}; //new Foo<Object> created
  110.85 +        Foo<? super Integer> f16 = p.new Foo<>(1, ""){}; //new Foo<Object> created
  110.86 +    }
  110.87 +
  110.88 +    public static void main(String[] args) {
  110.89 +        Pos03<String> p3 = new Pos03<>();
  110.90 +        p3.testSimple();
  110.91 +        p3.testQualified_1();
  110.92 +        p3.testQualified_2(p3);
  110.93 +    }
  110.94 +}

   111.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   111.2 +++ b/test/tools/javac/generics/diamond/pos/Pos04.java	Thu Sep 03 18:34:17 2009 -0700
   111.3 @@ -0,0 +1,44 @@
   111.4 +/*
   111.5 + * @test /nodynamiccopyright/
   111.6 + * @bug 6840638
   111.7 + *
   111.8 + * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
   111.9 + * @author mcimadamore
  111.10 + * @compile Pos04.java -source 1.7
  111.11 + * @run main Pos04
  111.12 + *
  111.13 + */
  111.14 +
  111.15 +public class Pos04<U> {
  111.16 +
  111.17 +    void test() {
  111.18 +        class Foo<V> {
  111.19 +            Foo(V x) {}
  111.20 +            <Z> Foo(V x, Z z) {}
  111.21 +        }
  111.22 +        Foo<Integer> p1 = new Foo<>(1); //new Foo<Integer> created
  111.23 +        Foo<? extends Integer> p2 = new Foo<>(1); //new Foo<Integer> created
  111.24 +        Foo<?> p3 = new Foo<>(1); //new Foo<Object> created
  111.25 +        Foo<? super Integer> p4 = new Foo<>(1); //new Foo<Object> created
  111.26 +
  111.27 +        Foo<Integer> p5 = new Foo<>(1){}; //new Foo<Integer> created
  111.28 +        Foo<? extends Integer> p6 = new Foo<>(1){}; //new Foo<Integer> created
  111.29 +        Foo<?> p7 = new Foo<>(1){}; //new Foo<Object> created
  111.30 +        Foo<? super Integer> p8 = new Foo<>(1){}; //new Foo<Object> created
  111.31 +
  111.32 +        Foo<Integer> p9 = new Foo<>(1, ""); //new Foo<Integer> created
  111.33 +        Foo<? extends Integer> p10 = new Foo<>(1, ""); //new Foo<Integer> created
  111.34 +        Foo<?> p11 = new Foo<>(1, ""); //new Foo<Object> created
  111.35 +        Foo<? super Integer> p12 = new Foo<>(1, ""); //new Foo<Object> created
  111.36 +
  111.37 +        Foo<Integer> p13 = new Foo<>(1, ""){}; //new Foo<Integer> created
  111.38 +        Foo<? extends Integer> p14 = new Foo<>(1, ""){}; //new Foo<Integer> created
  111.39 +        Foo<?> p15 = new Foo<>(1, ""){}; //new Foo<Object> created
  111.40 +        Foo<? super Integer> p16 = new Foo<>(1, ""){}; //new Foo<Object> created
  111.41 +    }
  111.42 +
  111.43 +    public static void main(String[] args) {
  111.44 +        Pos04<String> p4 = new Pos04<>();
  111.45 +        p4.test();
  111.46 +    }
  111.47 +}

   112.1 --- a/test/tools/javac/generics/inference/6302954/T6476073.java	Thu Sep 03 10:53:14 2009 -0700
   112.2 +++ b/test/tools/javac/generics/inference/6302954/T6476073.java	Thu Sep 03 18:34:17 2009 -0700
   112.3 @@ -25,7 +25,6 @@
   112.4   * @test
   112.5   * @bug     6476073
   112.6   * @summary Capture using super wildcard of type variables doesn't work
   112.7 - * @ignore awaiting for 6650759 (see bug report for a detailed evaluation)
   112.8   * @compile T6476073.java
   112.9   */
  112.10  

   113.1 --- a/test/tools/javac/generics/inference/6315770/T6315770.java	Thu Sep 03 10:53:14 2009 -0700
   113.2 +++ b/test/tools/javac/generics/inference/6315770/T6315770.java	Thu Sep 03 18:34:17 2009 -0700
   113.3 @@ -1,28 +1,5 @@
   113.4 -/*
   113.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   113.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   113.7 - *
   113.8 - * This code is free software; you can redistribute it and/or modify it
   113.9 - * under the terms of the GNU General Public License version 2 only, as
  113.10 - * published by the Free Software Foundation.
  113.11 - *
  113.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  113.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  113.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  113.15 - * version 2 for more details (a copy is included in the LICENSE file that
  113.16 - * accompanied this code).
  113.17 - *
  113.18 - * You should have received a copy of the GNU General Public License version
  113.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  113.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  113.21 - *
  113.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  113.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  113.24 - * have any questions.
  113.25 - */
  113.26 -
  113.27  /**
  113.28 - * @test
  113.29 + * @test /nodynamiccopyright/
  113.30   * @bug     6315770
  113.31   * @summary javac inference allows creation of strange types: Integer & Runnable
  113.32   * @author Maurizio Cimadamore

   114.1 --- a/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Sep 03 10:53:14 2009 -0700
   114.2 +++ b/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Sep 03 18:34:17 2009 -0700
   114.3 @@ -1,3 +1,3 @@
   114.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)
   114.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>
   114.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)
   114.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>
   114.8  2 errors

   115.1 --- a/test/tools/javac/generics/inference/6611449/T6611449.java	Thu Sep 03 10:53:14 2009 -0700
   115.2 +++ b/test/tools/javac/generics/inference/6611449/T6611449.java	Thu Sep 03 18:34:17 2009 -0700
   115.3 @@ -1,28 +1,5 @@
   115.4 -/*
   115.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   115.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   115.7 - *
   115.8 - * This code is free software; you can redistribute it and/or modify it
   115.9 - * under the terms of the GNU General Public License version 2 only, as
  115.10 - * published by the Free Software Foundation.
  115.11 - *
  115.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  115.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  115.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  115.15 - * version 2 for more details (a copy is included in the LICENSE file that
  115.16 - * accompanied this code).
  115.17 - *
  115.18 - * You should have received a copy of the GNU General Public License version
  115.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  115.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  115.21 - *
  115.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  115.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  115.24 - * have any questions.
  115.25 - */
  115.26 -
  115.27  /**
  115.28 - * @test
  115.29 + * @test /nodynamiccopyright/
  115.30   * @bug 6611449
  115.31   * @summary Internal Error thrown during generic method/constructor invocation
  115.32   * @compile/fail/ref=T6611449.out -XDstdout -XDrawDiagnostics T6611449.java

   116.1 --- a/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Sep 03 10:53:14 2009 -0700
   116.2 +++ b/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Sep 03 18:34:17 2009 -0700
   116.3 @@ -1,5 +1,5 @@
   116.4 -T6611449.java:41:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
   116.5 -T6611449.java:42:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
   116.6 -T6611449.java:43:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
   116.7 -T6611449.java:44:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
   116.8 +T6611449.java:18:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
   116.9 +T6611449.java:19:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
  116.10 +T6611449.java:20:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
  116.11 +T6611449.java:21:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
  116.12  4 errors

   117.1 --- a/test/tools/javac/generics/inference/6638712/T6638712a.java	Thu Sep 03 10:53:14 2009 -0700
   117.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712a.java	Thu Sep 03 18:34:17 2009 -0700
   117.3 @@ -1,28 +1,5 @@
   117.4  /*
   117.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   117.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   117.7 - *
   117.8 - * This code is free software; you can redistribute it and/or modify it
   117.9 - * under the terms of the GNU General Public License version 2 only, as
  117.10 - * published by the Free Software Foundation.
  117.11 - *
  117.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  117.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  117.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  117.15 - * version 2 for more details (a copy is included in the LICENSE file that
  117.16 - * accompanied this code).
  117.17 - *
  117.18 - * You should have received a copy of the GNU General Public License version
  117.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  117.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  117.21 - *
  117.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  117.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  117.24 - * have any questions.
  117.25 - */
  117.26 -
  117.27 -/*
  117.28 - * @test
  117.29 + * @test /nodynamiccopyright/
  117.30   * @bug     6638712
  117.31   * @author  mcimadamore
  117.32   * @summary Inference with wildcard types causes selection of inapplicable method

   118.1 --- a/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Sep 03 10:53:14 2009 -0700
   118.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Sep 03 18:34:17 2009 -0700
   118.3 @@ -1,2 +1,2 @@
   118.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<?>>)
   118.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<?>>)
   118.6  1 error

   119.1 --- a/test/tools/javac/generics/inference/6638712/T6638712b.java	Thu Sep 03 10:53:14 2009 -0700
   119.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712b.java	Thu Sep 03 18:34:17 2009 -0700
   119.3 @@ -1,28 +1,5 @@
   119.4  /*
   119.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   119.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   119.7 - *
   119.8 - * This code is free software; you can redistribute it and/or modify it
   119.9 - * under the terms of the GNU General Public License version 2 only, as
  119.10 - * published by the Free Software Foundation.
  119.11 - *
  119.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  119.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  119.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  119.15 - * version 2 for more details (a copy is included in the LICENSE file that
  119.16 - * accompanied this code).
  119.17 - *
  119.18 - * You should have received a copy of the GNU General Public License version
  119.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  119.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  119.21 - *
  119.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  119.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  119.24 - * have any questions.
  119.25 - */
  119.26 -
  119.27 -/*
  119.28 - * @test
  119.29 + * @test /nodynamiccopyright/
  119.30   * @bug     6638712
  119.31   * @author  mcimadamore
  119.32   * @summary Inference with wildcard types causes selection of inapplicable method

   120.1 --- a/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Sep 03 10:53:14 2009 -0700
   120.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Sep 03 18:34:17 2009 -0700
   120.3 @@ -1,2 +1,2 @@
   120.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>)
   120.5 +T6638712b.java:14:21: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T, java.lang.String)), <T>T, java.lang.String
   120.6  1 error

   121.1 --- a/test/tools/javac/generics/inference/6638712/T6638712c.java	Thu Sep 03 10:53:14 2009 -0700
   121.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712c.java	Thu Sep 03 18:34:17 2009 -0700
   121.3 @@ -1,28 +1,5 @@
   121.4  /*
   121.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   121.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   121.7 - *
   121.8 - * This code is free software; you can redistribute it and/or modify it
   121.9 - * under the terms of the GNU General Public License version 2 only, as
  121.10 - * published by the Free Software Foundation.
  121.11 - *
  121.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  121.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  121.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  121.15 - * version 2 for more details (a copy is included in the LICENSE file that
  121.16 - * accompanied this code).
  121.17 - *
  121.18 - * You should have received a copy of the GNU General Public License version
  121.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  121.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  121.21 - *
  121.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  121.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  121.24 - * have any questions.
  121.25 - */
  121.26 -
  121.27 -/*
  121.28 - * @test
  121.29 + * @test /nodynamiccopyright/
  121.30   * @bug     6638712 6707034
  121.31   * @author  mcimadamore
  121.32   * @summary Inference with wildcard types causes selection of inapplicable method

   122.1 --- a/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Sep 03 10:53:14 2009 -0700
   122.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Sep 03 18:34:17 2009 -0700
   122.3 @@ -1,2 +1,2 @@
   122.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
   122.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
   122.6  1 error

   123.1 --- a/test/tools/javac/generics/inference/6638712/T6638712d.java	Thu Sep 03 10:53:14 2009 -0700
   123.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712d.java	Thu Sep 03 18:34:17 2009 -0700
   123.3 @@ -1,28 +1,5 @@
   123.4  /*
   123.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   123.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   123.7 - *
   123.8 - * This code is free software; you can redistribute it and/or modify it
   123.9 - * under the terms of the GNU General Public License version 2 only, as
  123.10 - * published by the Free Software Foundation.
  123.11 - *
  123.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  123.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  123.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  123.15 - * version 2 for more details (a copy is included in the LICENSE file that
  123.16 - * accompanied this code).
  123.17 - *
  123.18 - * You should have received a copy of the GNU General Public License version
  123.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  123.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  123.21 - *
  123.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  123.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  123.24 - * have any questions.
  123.25 - */
  123.26 -
  123.27 -/*
  123.28 - * @test
  123.29 + * @test /nodynamiccopyright/
  123.30   * @bug     6638712 6730468
  123.31   * @author  mcimadamore
  123.32   * @summary Inference with wildcard types causes selection of inapplicable method

   124.1 --- a/test/tools/javac/generics/inference/6638712/T6638712d.out	Thu Sep 03 10:53:14 2009 -0700
   124.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712d.out	Thu Sep 03 18:34:17 2009 -0700
   124.3 @@ -1,2 +1,2 @@
   124.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
   124.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
   124.6  1 error

   125.1 --- a/test/tools/javac/generics/inference/6638712/T6638712e.java	Thu Sep 03 10:53:14 2009 -0700
   125.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712e.java	Thu Sep 03 18:34:17 2009 -0700
   125.3 @@ -1,28 +1,5 @@
   125.4  /*
   125.5 - * Copyright 2009 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 + * @test /nodynamiccopyright/
  125.30   * @bug     6638712 6795689
  125.31   * @author  mcimadamore
  125.32   * @summary Inference with wildcard types causes selection of inapplicable method

   126.1 --- a/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Sep 03 10:53:14 2009 -0700
   126.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Sep 03 18:34:17 2009 -0700
   126.3 @@ -1,2 +1,2 @@
   126.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>)
   126.5 +T6638712e.java:17:27: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: X, T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>)), <X>T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>
   126.6  1 error

   127.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   127.2 +++ b/test/tools/javac/generics/inference/6650759/T6650759a.java	Thu Sep 03 18:34:17 2009 -0700
   127.3 @@ -0,0 +1,45 @@
   127.4 +/*
   127.5 + * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   127.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   127.7 + *
   127.8 + * This code is free software; you can redistribute it and/or modify it
   127.9 + * under the terms of the GNU General Public License version 2 only, as
  127.10 + * published by the Free Software Foundation.
  127.11 + *
  127.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
  127.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  127.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  127.15 + * version 2 for more details (a copy is included in the LICENSE file that
  127.16 + * accompanied this code).
  127.17 + *
  127.18 + * You should have received a copy of the GNU General Public License version
  127.19 + * 2 along with this work; if not, write to the Free Software Foundation,
  127.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  127.21 + *
  127.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  127.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
  127.24 + * have any questions.
  127.25 + */
  127.26 +
  127.27 +/*
  127.28 + * @test
  127.29 + * @bug     6650759
  127.30 + * @author  mcimadamore
  127.31 + * @summary Inference of formal type parameter (unused in formal parameters) is not performed
  127.32 + * @compile T6650759a.java
  127.33 + */
  127.34 +
  127.35 +class T6650759a {
  127.36 +
  127.37 +    public static interface Interface<T> { }
  127.38 +    public static class IntegerInterface implements Interface<Integer> { }
  127.39 +
  127.40 +    <I extends Interface<T>, T> T getGenericValue(I test) { return null; }
  127.41 +
  127.42 +    void testSet(Integer test) { }
  127.43 +
  127.44 +    void test() {
  127.45 +        Integer test = getGenericValue(new IntegerInterface());
  127.46 +        testSet(getGenericValue(new IntegerInterface()));
  127.47 +    }
  127.48 +}
  127.49 \ No newline at end of file

   128.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   128.2 +++ b/test/tools/javac/generics/inference/6650759/T6650759b.java	Thu Sep 03 18:34:17 2009 -0700
   128.3 @@ -0,0 +1,52 @@
   128.4 +/*
   128.5 + * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
   128.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   128.7 + *
   128.8 + * This code is free software; you can redistribute it and/or modify it
   128.9 + * under the terms of the GNU General Public License version 2 only, as
  128.10 + * published by the Free Software Foundation.
  128.11 + *
  128.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
  128.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  128.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  128.15 + * version 2 for more details (a copy is included in the LICENSE file that
  128.16 + * accompanied this code).
  128.17 + *
  128.18 + * You should have received a copy of the GNU General Public License version
  128.19 + * 2 along with this work; if not, write to the Free Software Foundation,
  128.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  128.21 + *
  128.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  128.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
  128.24 + * have any questions.
  128.25 + */
  128.26 +
  128.27 +/*
  128.28 + * @test
  128.29 + * @bug     6650759
  128.30 + * @author  mcimadamore
  128.31 + * @summary Inference of formal type parameter (unused in formal parameters) is not performed
  128.32 + * @compile T6650759b.java
  128.33 + */
  128.34 +
  128.35 +public class T6650759b {
  128.36 +
  128.37 +    interface A<X extends A<X, Y>, Y extends B<X>> {}
  128.38 +
  128.39 +    static class B<X extends A<X, ?>> {}
  128.40 +
  128.41 +    interface C<X extends A<X, Y>, Y extends B<X>> {}
  128.42 +
  128.43 +    interface D<X extends A<X, Y>, Y extends B<X>> {}
  128.44 +
  128.45 +    static class E<X extends A<X, Y>, Y extends B<X>, W extends C<X, Y>> implements D<X, Y> {
  128.46 +
  128.47 +        static <X extends A<X, Y>, Y extends B<X>, W extends C<X, Y>> D<X, Y> of(W w) {
  128.48 +            return null;
  128.49 +        }
  128.50 +    }
  128.51 +
  128.52 +    <X extends A<X, Y>, Y extends B<X>, W extends C<X, Y>, Z extends D<X, Y>> Z test(W w) {
  128.53 +        return (Z) E.of(w);
  128.54 +    }
  128.55 +}