8225559: assertion error at TransTypes.visitApply

Reviewed-by: sadayapalam, jlahoda
This commit is contained in:
Vicente Romero 2021-07-01 16:18:12 +00:00
parent 82bfc5d45c
commit de61328d30
3 changed files with 80 additions and 1 deletions
src/jdk.compiler/share/classes/com/sun/tools/javac/comp
test/langtools/tools/javac/generics/diamond/protectedConstructor

@ -157,7 +157,7 @@ public class DeferredAttr extends JCTree.Visitor {
JCExpression clazz = copy(t.clazz, p);
List<JCExpression> args = copy(t.args, p);
JCClassDecl def = null;
return make.at(t.pos).SpeculativeNewClass(encl, typeargs, clazz, args, def, t.def != null);
return make.at(t.pos).SpeculativeNewClass(encl, typeargs, clazz, args, def, t.def != null || t.classDeclRemoved());
} else {
return super.visitNewClass(node, p);
}

@ -0,0 +1,50 @@
/*
* Copyright (c) 2021, 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 8225559
* @summary assertion error at TransTypes.visitApply
* @compile ProtectedConstructorTest.java
*/
import pkg.Bar;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
class ProtectedConstructorTest {
public void foo() {
supply(getSupplier(new Bar<>(){}));
CompletableFuture<List<String>> completableFuture = getCompletableFuture(getSupplier(new Bar<>(){}));
completableFuture = getCompletableFuture(() -> getList(null, new Bar<>() {}));
}
static <U> Supplier<U> getSupplier(Bar<U> t) {
return null;
}
static <U> void supply(Supplier<U> supplier) {}
static <U> CompletableFuture<U> getCompletableFuture(Supplier<U> supplier) { return null; }
<T> List<T> getList(final Supplier<List<T>> supplier, Bar<T> t) { return null; }
}

@ -0,0 +1,29 @@
/*
* Copyright (c) 2021, 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.
*/
package pkg;
public abstract class Bar<T> {
protected Bar() {}
protected Bar(Class<?> c) {}
}