Skip to content
Permalink
Browse files
8235564: javac crashes while compiling incorrect method invocation wi…
…th member reference

Reviewed-by: vromero
  • Loading branch information
Jan Lahoda committed Jun 10, 2020
1 parent 0e770d1 commit a5e03e234b4f97e9b3d051a0d90b6c9c88dd927d
Showing 4 changed files with 225 additions and 4 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, 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
@@ -26,6 +26,7 @@
package com.sun.tools.javac.api;

import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Writer;
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -184,6 +185,10 @@ public <Z> Z getTask(Writer out,

task.addTaskListener(ctx);

if (out != null) {
Log.instance(ctx).setWriters(new PrintWriter(out, true));
}

Z result = worker.withTask(task);

//not returning the context to the pool if task crashes with an exception
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2020, 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
@@ -1082,7 +1082,12 @@ public Type visitMethodType(Type.MethodType t, Type pt) {
* a default expected type (j.l.Object).
*/
private Type recover(DeferredType dt, Type pt) {
dt.check(attr.new RecoveryInfo(deferredAttrContext, pt != null ? pt : Type.recoveryType) {
boolean isLambdaOrMemberRef =
dt.tree.hasTag(REFERENCE) || dt.tree.hasTag(LAMBDA);
boolean needsRecoveryType =
pt == null || (isLambdaOrMemberRef && !types.isFunctionalInterface(pt));
Type ptRecovery = needsRecoveryType ? Type.recoveryType: pt;
dt.check(attr.new RecoveryInfo(deferredAttrContext, ptRecovery) {
@Override
protected Type check(DiagnosticPosition pos, Type found) {
return chk.checkNonVoid(pos, super.check(pos, found));
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, 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
@@ -157,6 +157,34 @@ public void run() throws IOException {

doTest("class Test { void test() { cand((t, var s) -> \"\"); } void cand(I i) { } interface I { public String test(String s); } }",
implicitExplicitConflict2);

String[] noFunctionInterface = {
"s:none",
":t",
"super:java.lang.Object",
"this:Test"
};

doTest("class Test { void test() { cand((t, var s) -> \"\"); } void cand(String s) { } }",
noFunctionInterface);

String[] invocationInMethodInvocation = {
"d2:java.lang.Double",
"d1:java.lang.Double",
"super:java.lang.Object",
"this:Test"
};

doTest("""
class Test {
void test() { test(reduce(0.0, (d1, d2) -> 0)); }
void test(int i) {}
<T> T reduce(T t, BiFunction<T, T, T> f1) {}
static interface BiFunction<R, P, Q> {
R apply(P p, Q q);
}
}""",
invocationInMethodInvocation);
}

public void doTest(String code, String... expected) throws IOException {
@@ -0,0 +1,183 @@
/*
* Copyright (c) 2020, 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 8235564
* @summary Verify that passing member references to a method not accepting
* functional interface does not crash the compiler.
* @library /tools/lib /tools/javac/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build toolbox.ToolBox toolbox.JavacTask
* @build combo.ComboTestHelper
* @compile T8235564.java
* @run main T8235564
*/

import combo.ComboInstance;
import combo.ComboParameter;
import combo.ComboTask;
import combo.ComboTestHelper;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.tools.Diagnostic;
import toolbox.ToolBox;

public class T8235564 extends ComboInstance<T8235564> {
protected ToolBox tb;

T8235564() {
super();
tb = new ToolBox();
}

public static void main(String... args) throws Exception {
new ComboTestHelper<T8235564>()
.withDimension("INVOCATION", (x, invocation) -> x.invocation = invocation, Invocation.values())
.withDimension("PARAM", (x, param) -> x.param = param, Parameter.values())
.run(T8235564::new);
}

private Invocation invocation;
private Parameter param;

private static final String MAIN_TEMPLATE =
"""
public class Test {
static void test() {
Runnable r = () -> {};
#{INVOCATION};
}
private static void existingWithFunctional(Runnable r) {}
private static void existingWithoutFunctional(String parameter) {}
}
""";

@Override
protected void doWork() throws Throwable {
StringWriter out = new StringWriter();

ComboTask task = newCompilationTask()
.withSourceFromTemplate(MAIN_TEMPLATE, pname -> switch (pname) {
case "INVOCATION" -> invocation;
case "PARAM" -> param;
default -> throw new UnsupportedOperationException(pname);
})
.withOption("-XDshould-stop.at=FLOW")
.withOption("-XDrawDiagnostics")
.withOption("-XDdev")
.withWriter(out);

task.analyze(result -> {
List<String> diags = result.diagnosticsForKind(Diagnostic.Kind.ERROR)
.stream()
.map(d -> d.getLineNumber() + ":" + d.getCode())
.collect(Collectors.toList());
List<String> expected = new ArrayList<>();
switch (param) {
case VALID_VARIABLE, VALID_LAMBDA, VALID_MEMBER_REF -> {}
case UNDEFINED_VARIABLE ->
expected.add("4:compiler.err.cant.resolve.location");
case UNDEFINED_METHOD, UNDEFINED_LAMBDA ->
expected.add("4:compiler.err.cant.resolve.location.args");
case UNDEFINED_MEMBER_REF ->
expected.add("4:compiler.err.invalid.mref");
case UNDEFINED_CONDEXPR -> {
if (invocation != Invocation.EXISTING_WITHOUT_FUNCTIONAL) {
expected.add("4:compiler.err.invalid.mref");
expected.add("4:compiler.err.invalid.mref");
}
}
}
switch (invocation) {
case EXISTING_WITH_FUNCTIONAL -> {
if (param == Parameter.UNDEFINED_CONDEXPR) {
expected.add("4:compiler.err.cant.apply.symbol");
}
}
case EXISTING_WITHOUT_FUNCTIONAL -> {
if (param != Parameter.UNDEFINED_VARIABLE &&
param != Parameter.UNDEFINED_MEMBER_REF &&
param != Parameter.UNDEFINED_METHOD) {
expected.add("4:compiler.err.cant.apply.symbol");
}
}
case UNDEFINED -> {
if (param != Parameter.UNDEFINED_VARIABLE &&
param != Parameter.UNDEFINED_MEMBER_REF &&
param != Parameter.UNDEFINED_METHOD) {
expected.add("4:compiler.err.cant.resolve.location.args");
}
}
}
if (!expected.equals(diags)) {
throw new AssertionError("Expected errors not found, expected: " + expected + ", actual: " + diags);
}
if (out.toString().length() > 0) {
throw new AssertionError("No output expected, but got:\n" + out + "\n\n" + result.compilationInfo());
}
});
}

public enum Invocation implements ComboParameter {
EXISTING_WITH_FUNCTIONAL("existingWithFunctional(#{PARAM})"),
EXISTING_WITHOUT_FUNCTIONAL("existingWithoutFunctional(#{PARAM})"),
UNDEFINED("undefined(#{PARAM})");
private final String invocation;

private Invocation(String invocation) {
this.invocation = invocation;
}

@Override
public String expand(String optParameter) {
return invocation;
}
}

public enum Parameter implements ComboParameter {
VALID_VARIABLE("r"),
VALID_LAMBDA("() -> {}"),
VALID_MEMBER_REF("Test::test"),
UNDEFINED_VARIABLE("undefined"),
UNDEFINED_LAMBDA("() -> {undefined();}"),
UNDEFINED_MEMBER_REF("Test::undefined"),
UNDEFINED_METHOD("undefined()"),
UNDEFINED_CONDEXPR("1 == 2 ? Test::undefined : Test::undefined");
private final String code;

private Parameter(String code) {
this.code = code;
}

@Override
public String expand(String optParameter) {
return code;
}
}
}

0 comments on commit a5e03e2

Please sign in to comment.