archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8080842: Using Lambda Expression with name clash results in ClassFormatError

Browse source 
Ensure ScopeImpl can cope properly with remove when a field and method share the name

Reviewed-by: mcimadamore, jlahoda
This commit is contained in:
Srikanth Adayapalam 2015-05-29 10:15:36 +05:30
parent 4815781a4a
commit f1a3698f4c
3 changed files with 178 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2015, 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
@ -407,12 +407,11 @@ public abstract class Scope {
}
}
/** Remove symbol from this scope. Used when an inner class
* attribute tells us that the class isn't a package member.
/** Remove symbol from this scope.
*/
public void remove(Symbol sym) {
Assert.check(shared == 0);
Entry e = lookup(sym.name);
Entry e = lookup(sym.name, candidate -> candidate == sym);
if (e.scope == null) return;
// remove e from table and shadowed list;

77
langtools/test/tools/javac/scope/RemoveSymbolTest.java Normal file
View file

@ -0,0 +1,77 @@
/*
* Copyright (c) 2015, 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 8080842
* @summary Ensure Scope impl can cope with remove() when a field and method share the name.
* @run main RemoveSymbolTest
*/
import java.util.Iterator;
import java.util.LinkedList;
public class RemoveSymbolTest<W> implements Iterable<W> {
static class Widget {
private String name;
Widget(String s) { name = s; }
@Override public String toString() { return name; }
}
private LinkedList<W> data;
// Instantiate an Iterable instance using a Lambda expression.
// Causes ClassFormatError if a local variable of type Widget is named after one of the methods.
private final Iterable<W> myIterator1 = () -> new Iterator<W>() {
private W hasNext = null;
private int index = 0;
@Override public boolean hasNext() { return index < data.size(); }
@Override public W next() { return data.get(index++); }
};
// Instantiate an Iterable instance using an anonymous class.
// Always works fine regardless of the name of the local variable.
private final Iterable<W> myIterator2 =
new Iterable<W>() {
@Override
public Iterator<W> iterator() {
return new Iterator<W>() {
private W hasNext = null;
private int index = 0;
@Override public boolean hasNext() { return index < data.size(); }
@Override public W next() { return data.get(index++); }
};
}
};
public RemoveSymbolTest() { data = new LinkedList<>(); }
public void add(W e) { data.add(e); }
@Override public String toString() { return data.toString(); }
@Override public Iterator<W> iterator() { return myIterator1.iterator(); }
public static void main(String[] args) {
RemoveSymbolTest<Widget> widgets = new RemoveSymbolTest<>();
widgets.add(new Widget("W1"));
widgets.add(new Widget("W2"));
widgets.add(new Widget("W3"));
System.out.println(".foreach() call: ");
widgets.forEach(w -> System.out.println(w + " "));
}
}

98
langtools/test/tools/javac/scope/RemoveSymbolUnitTest.java Normal file
View file

@ -0,0 +1,98 @@
/*
* Copyright (c) 2015 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 8080842
* @summary Ensure Scope impl can cope with remove() when a field and method share the name.
* @modules jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.util
*/
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Scope.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.file.JavacFileManager;
public class RemoveSymbolUnitTest {
Context context;
Names names;
Symtab symtab;
public static void main(String... args) throws Exception {
new RemoveSymbolUnitTest().run();
}
public void run() {
context = new Context();
JavacFileManager.preRegister(context); // required by ClassReader which is required by Symtab
names = Names.instance(context);
symtab = Symtab.instance(context);
Name hasNext = names.fromString("hasNext");
ClassSymbol clazz = new ClassSymbol(0,
names.fromString("X"),
Type.noType,
symtab.unnamedPackage);
VarSymbol v = new VarSymbol(0, hasNext, Type.noType, clazz);
MethodSymbol m = new MethodSymbol(0, hasNext, Type.noType, clazz);
// Try enter and remove in different shuffled combinations.
// working with fresh scope each time.
WriteableScope cs = WriteableScope.create(clazz);
cs.enter(v);
cs.enter(m);
cs.remove(v);
Symbol s = cs.findFirst(hasNext);
if (s != m)
throw new AssertionError("Wrong symbol");
cs = WriteableScope.create(clazz);
cs.enter(m);
cs.enter(v);
cs.remove(v);
s = cs.findFirst(hasNext);
if (s != m)
throw new AssertionError("Wrong symbol");
cs = WriteableScope.create(clazz);
cs.enter(v);
cs.enter(m);
cs.remove(m);
s = cs.findFirst(hasNext);
if (s != v)
throw new AssertionError("Wrong symbol");
cs = WriteableScope.create(clazz);
cs.enter(m);
cs.enter(v);
cs.remove(m);
s = cs.findFirst(hasNext);
if (s != v)
throw new AssertionError("Wrong symbol");
}
}