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

8009299: Javac crashes when compiling method reference to static interface method

Browse Source 
Assertion in Check.checMethod is too strict

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2013-03-06 15:29:30 +00:00
parent 3c0b52b10b
commit c9bae7b335
3 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -3593,8 +3593,7 @@ public class Attr extends JCTree.Visitor {
env.info.defaultSuperCallSite = null;
}
if (sym.isStatic() && site.isInterface()) {
Assert.check(env.tree.hasTag(APPLY));
if (sym.isStatic() && site.isInterface() && env.tree.hasTag(APPLY)) {
JCMethodInvocation app = (JCMethodInvocation)env.tree;
if (app.meth.hasTag(SELECT) &&
!TreeInfo.isStaticSelector(((JCFieldAccess)app.meth).selected, names)) {

1
langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java
View File

@ -293,6 +293,7 @@ public class Pool {
expectedKind = Kinds.MTH;
break;
case ClassFile.REF_invokeStatic:
interfaceOwner = true;
staticOk = true;
case ClassFile.REF_invokeVirtual:
case ClassFile.REF_invokeSpecial:

52
langtools/test/tools/javac/lambda/MethodReference66.java Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright (c) 2013, 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 8009299
* @summary Javac crashes when compiling method reference to static interface method
* @run main/othervm -Xverify:none MethodReference66
*/
public class MethodReference66 {
static int assertionCount = 0;
static void assertTrue(boolean cond) {
assertionCount++;
if (!cond)
throw new AssertionError();
}
interface SAM {
void m(int i);
}
interface I {
static void f(int i) { assertTrue(i == 42); }
}
public static void main(String[] args) {
SAM s = I::f;
s.m(42);
assertTrue(assertionCount == 1);
}
}