Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Oct 23 18:10:23 2008 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Oct 23 18:29:11 2008 +0100
     1.3 @@ -802,10 +802,10 @@
     1.4  
     1.5          public void visitTypeApply(JCTypeApply tree) {
     1.6              if (tree.type.tag == CLASS) {
     1.7 -                List<Type> formals = tree.type.tsym.type.getTypeArguments();
     1.8 -                List<Type> actuals = tree.type.getTypeArguments();
     1.9 +                List<Type> formals = tree.type.tsym.type.allparams();
    1.10 +                List<Type> actuals = tree.type.allparams();
    1.11                  List<JCExpression> args = tree.arguments;
    1.12 -                List<Type> forms = formals;
    1.13 +                List<Type> forms = tree.type.tsym.type.getTypeArguments();
    1.14                  ListBuffer<TypeVar> tvars_buf = new ListBuffer<TypeVar>();
    1.15  
    1.16                  // For matching pairs of actual argument types `a' and
    1.17 @@ -828,7 +828,7 @@
    1.18                  args = tree.arguments;
    1.19                  List<Type> tvars_cap = types.substBounds(formals,
    1.20                                            formals,
    1.21 -                                          types.capture(tree.type).getTypeArguments());
    1.22 +                                          types.capture(tree.type).allparams());
    1.23                  while (args.nonEmpty() && tvars_cap.nonEmpty()) {
    1.24                      // Let the actual arguments know their bound
    1.25                      args.head.type.withTypeVar((TypeVar)tvars_cap.head);