Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Fri Jun 27 20:32:12 2014 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Fri Jul 04 16:34:44 2014 +0100
     1.3 @@ -96,7 +96,7 @@
     1.4      public final boolean varargsEnabled;
     1.5      public final boolean allowMethodHandles;
     1.6      public final boolean allowFunctionalInterfaceMostSpecific;
     1.7 -    public final boolean checkVarargsAccessDuringResolution;
     1.8 +    public final boolean checkVarargsAccessAfterResolution;
     1.9      private final boolean debugResolve;
    1.10      private final boolean compactMethodDiags;
    1.11      final EnumSet<VerboseResolutionMode> verboseResolutionMode;
    1.12 @@ -138,7 +138,7 @@
    1.13          Target target = Target.instance(context);
    1.14          allowMethodHandles = target.hasMethodHandles();
    1.15          allowFunctionalInterfaceMostSpecific = source.allowFunctionalInterfaceMostSpecific();
    1.16 -        checkVarargsAccessDuringResolution =
    1.17 +        checkVarargsAccessAfterResolution =
    1.18                  source.allowPostApplicabilityVarargsAccessCheck();
    1.19          polymorphicSignatureScope = new Scope(syms.noSymbol);
    1.20  
    1.21 @@ -837,13 +837,16 @@
    1.22                                      Warner warn) {
    1.23              super.argumentsAcceptable(env, deferredAttrContext, argtypes, formals, warn);
    1.24              //should we expand formals?
    1.25 -            if ((!checkVarargsAccessDuringResolution ||
    1.26 -                (checkVarargsAccessDuringResolution &&
    1.27 -                 deferredAttrContext.mode == AttrMode.CHECK)) &&
    1.28 -                deferredAttrContext.phase.isVarargsRequired()) {
    1.29 -                //check varargs element type accessibility
    1.30 -                varargsAccessible(env, types.elemtype(formals.last()),
    1.31 -                        deferredAttrContext.inferenceContext);
    1.32 +            if (deferredAttrContext.phase.isVarargsRequired()) {
    1.33 +                Type typeToCheck = null;
    1.34 +                if (!checkVarargsAccessAfterResolution) {
    1.35 +                    typeToCheck = types.elemtype(formals.last());
    1.36 +                } else if (deferredAttrContext.mode == AttrMode.CHECK) {
    1.37 +                    typeToCheck = types.erasure(types.elemtype(formals.last()));
    1.38 +                }
    1.39 +                if (typeToCheck != null) {
    1.40 +                    varargsAccessible(env, typeToCheck, deferredAttrContext.inferenceContext);
    1.41 +                }
    1.42              }
    1.43          }
    1.44  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/varargs/T8049075/VarargsAndWildcardParameterizedTypeTest.java	Fri Jul 04 16:34:44 2014 +0100
     2.3 @@ -0,0 +1,40 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test
    2.29 + * @bug 8049075
    2.30 + * @summary javac, wildcards and generic vararg method invocation not accepted
    2.31 + * @compile VarargsAndWildcardParameterizedTypeTest.java
    2.32 + */
    2.33 +
    2.34 +class VarargsAndWildcardParameterizedTypeTest {
    2.35 +    interface I<T> {
    2.36 +        String m(T... t);
    2.37 +    }
    2.38 +
    2.39 +    void m() {
    2.40 +        I<? super Integer> i = null;
    2.41 +        i.m(Integer.valueOf(1), Integer.valueOf(1));
    2.42 +    }
    2.43 +}