--- a/langtools/src/share/classes/com/sun/tools/javac/code/ClassFinder.java	Tue Jul 08 18:26:34 2014 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/ClassFinder.java	Wed Jul 09 16:32:05 2014 +0200
@@ -37,6 +37,7 @@
 import static javax.tools.StandardLocation.*;
 
 import com.sun.tools.javac.comp.Annotate;
+import com.sun.tools.javac.code.Scope.WriteableScope;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.jvm.ClassReader;
 import com.sun.tools.javac.util.*;
@@ -218,7 +219,7 @@
         if (c.owner.kind == PCK) {
             Symbol owner = c.owner;
             for (Name name : Convert.enclosingCandidates(Convert.shortName(c.name))) {
-                Symbol encl = owner.members().lookup(name).sym;
+                Symbol encl = owner.members().findFirst(name);
                 if (encl == null)
                     encl = syms.classes.get(TypeSymbol.formFlatName(name, owner));
                 if (encl != null)
@@ -335,7 +336,7 @@
         boolean isPkgInfo = classname == names.package_info;
         ClassSymbol c = isPkgInfo
             ? p.package_info
-            : (ClassSymbol) p.members_field.lookup(classname).sym;
+            : (ClassSymbol) p.members_field.findFirst(classname);
         if (c == null) {
             c = syms.enterClass(classname, p);
             if (c.classfile == null) // only update the file if's it's newly created
@@ -399,7 +400,7 @@
      */
     private void fillIn(PackageSymbol p) throws IOException {
         if (p.members_field == null)
-            p.members_field = new Scope(p);
+            p.members_field = WriteableScope.create(p);
 
         preferCurrent = false;
         if (userPathsFirst) {