stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8260892: Compilation fails: lambda parameter not visible in body when generics involved

Browse Source 
Reviewed-by: jlahoda
This commit is contained in:
Vicente Romero 2022-08-03 19:19:34 +00:00
parent 1b66cecd31
commit 67f001186b
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -2940,7 +2940,7 @@ public class Attr extends JCTree.Visitor {
&& ((tree.constructorType != null && inferenceContext.free(tree.constructorType))
|| (tree.clazz.type != null && inferenceContext.free(tree.clazz.type)))) {
final ResultInfo resultInfoForClassDefinition = this.resultInfo;
Env<AttrContext> dupLocalEnv = localEnv.dup(localEnv.tree, localEnv.info.dup(localEnv.info.scope.dupUnshared()));
Env<AttrContext> dupLocalEnv = copyEnv(localEnv);
inferenceContext.addFreeTypeListener(List.of(tree.constructorType, tree.clazz.type),
instantiatedContext -> {
tree.constructorType = instantiatedContext.asInstType(tree.constructorType);

51
test/langtools/tools/javac/generics/diamond/ScopeCopyCanGetAlteredTest.java Normal file
View File

@ -0,0 +1,51 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8260892
* @summary Compilation fails: lambda parameter not visible in body when generics involved
* @compile ScopeCopyCanGetAlteredTest.java
*/
import java.util.function.Function;
import java.util.function.IntFunction;
class ScopeCopyCanGetAlteredTest {
interface GenericOp<A> {
<B> A apply(IntFunction<B> func1, Function<B, A> func2);
}
static <A> GenericOp<A> foo(IntFunction<GenericOp<A>> f) {
return null;
}
static <A> GenericOp<A> bar() {
return foo((int arg) -> new GenericOp<>() {
@Override
public <B> A apply(IntFunction<B> func1, Function<B, A> func2) {
return func2.apply(func1.apply(arg));
}
});
}
}