Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Wed Sep 26 14:22:41 2012 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Fri Sep 28 16:56:53 2012 +0100
     1.3 @@ -27,17 +27,17 @@
     1.4  
     1.5  import com.sun.tools.javac.code.Flags;
     1.6  import com.sun.tools.javac.code.Kinds;
     1.7 -import java.util.*;
     1.8 -
     1.9  import com.sun.tools.javac.code.Symbol;
    1.10  import com.sun.tools.javac.code.Symbol.*;
    1.11  import com.sun.tools.javac.code.Type;
    1.12 -import com.sun.tools.javac.util.ArrayUtils;
    1.13 +
    1.14  import com.sun.tools.javac.util.Assert;
    1.15  import com.sun.tools.javac.util.Filter;
    1.16  import com.sun.tools.javac.util.Name;
    1.17  import com.sun.tools.javac.util.Names;
    1.18  
    1.19 +import java.util.*;
    1.20 +
    1.21  /** An internal structure that corresponds to the constant pool of a classfile.
    1.22   *
    1.23   *  <p><b>This is NOT part of any supported API.
    1.24 @@ -177,13 +177,9 @@
    1.25          /** Reference symbol */
    1.26          Symbol refSym;
    1.27  
    1.28 -        /** Reference to the name table */
    1.29 -        Names names;
    1.30 -
    1.31 -        public MethodHandle(int refKind, Symbol refSym, Names names) {
    1.32 +        public MethodHandle(int refKind, Symbol refSym) {
    1.33              this.refKind = refKind;
    1.34              this.refSym = refSym;
    1.35 -            this.names = names;
    1.36              checkConsistent();
    1.37          }
    1.38          public boolean equals(Object other) {
    1.39 @@ -244,13 +240,13 @@
    1.40          //where
    1.41                  Filter<Name> nonInitFilter = new Filter<Name>() {
    1.42                      public boolean accepts(Name n) {
    1.43 -                        return n != names.init && n != names.clinit;
    1.44 +                        return n != n.table.names.init && n != n.table.names.clinit;
    1.45                      }
    1.46                  };
    1.47  
    1.48                  Filter<Name> initFilter = new Filter<Name>() {
    1.49                      public boolean accepts(Name n) {
    1.50 -                        return n == names.init;
    1.51 +                        return n == n.table.names.init;
    1.52                      }
    1.53                  };
    1.54      }