Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Wed Nov 07 17:20:12 2012 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Tue Nov 13 08:06:00 2012 -0800
     1.3 @@ -1120,10 +1120,10 @@
     1.4              if (context != null
     1.5                      && tree.encl == null
     1.6                      && tree.def == null
     1.7 -                    && tree.type.getEnclosingType().hasTag(NONE)) {
     1.8 +                    && !tree.type.getEnclosingType().hasTag(NONE)) {
     1.9                  Type encl = tree.type.getEnclosingType();
    1.10                  Type current = context.owner.enclClass().type;
    1.11 -                while (current.hasTag(NONE)) {
    1.12 +                while (!current.hasTag(NONE)) {
    1.13                      if (current.tsym.isSubClass(encl.tsym, types)) {
    1.14                          return true;
    1.15                      }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/lambda/InnerConstructor.java	Tue Nov 13 08:06:00 2012 -0800
     2.3 @@ -0,0 +1,48 @@
     2.4 +/*
     2.5 + * Copyright (c) 2012, 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 + * @summary Regression test JDK-8003306 inner class constructor in lambda
    2.30 + * @author  Robert Field
    2.31 + * @compile -XDallowLambda InnerConstructor.java
    2.32 + */
    2.33 +
    2.34 +class InnerConstructor {
    2.35 +
    2.36 +    public void testLambdaWithInnerConstructor() {
    2.37 +        System.out.printf("%s should be %s\n", seq1().m().toString(), "Cbl:nada");
    2.38 +    }
    2.39 +
    2.40 +    Ib1 seq1() {
    2.41 +        return () -> new Cbl();
    2.42 +    }
    2.43 +
    2.44 +    class Cbl {
    2.45 +        Cbl() {  }
    2.46 +    }
    2.47 +
    2.48 +    interface Ib1 {
    2.49 +        Object m();
    2.50 +    }
    2.51 +}