--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java Wed Sep 26 14:22:41 2012 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java Fri Sep 28 16:56:53 2012 +0100
@@ -27,17 +27,17 @@
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Kinds;
-import java.util.*;
-
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.util.ArrayUtils;
+
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.Filter;
import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.util.Names;
+import java.util.*;
+
/** An internal structure that corresponds to the constant pool of a classfile.
*
* <p><b>This is NOT part of any supported API.
@@ -177,13 +177,9 @@
/** Reference symbol */
Symbol refSym;
- /** Reference to the name table */
- Names names;
-
- public MethodHandle(int refKind, Symbol refSym, Names names) {
+ public MethodHandle(int refKind, Symbol refSym) {
this.refKind = refKind;
this.refSym = refSym;
- this.names = names;
checkConsistent();
}
public boolean equals(Object other) {
@@ -244,13 +240,13 @@
//where
Filter<Name> nonInitFilter = new Filter<Name>() {
public boolean accepts(Name n) {
- return n != names.init && n != names.clinit;
+ return n != n.table.names.init && n != n.table.names.clinit;
}
};
Filter<Name> initFilter = new Filter<Name>() {
public boolean accepts(Name n) {
- return n == names.init;
+ return n == n.table.names.init;
}
};
}