--- a/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Tue Jul 08 18:26:34 2014 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Wed Jul 09 16:32:05 2014 +0200
@@ -27,6 +27,7 @@
 
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Scope.WriteableScope;
 
 /** Contains information specific to the attribute and enter
  *  passes, to be used in place of the generic field in environments.
@@ -40,7 +41,7 @@
 
     /** The scope of local symbols.
      */
-    Scope scope = null;
+    WriteableScope scope = null;
 
     /** The number of enclosing `static' modifiers.
      */
@@ -87,7 +88,7 @@
 
     /** Duplicate this context, replacing scope field and copying all others.
      */
-    AttrContext dup(Scope scope) {
+    AttrContext dup(WriteableScope scope) {
         AttrContext info = new AttrContext();
         info.scope = scope;
         info.staticLevel = staticLevel;
@@ -112,7 +113,7 @@
     public Iterable<Symbol> getLocalElements() {
         if (scope == null)
             return List.nil();
-        return scope.getElements();
+        return scope.getSymbols();
     }
 
     boolean lastResolveVarargs() {