diff -r 000000000000 -r 9a66ca7c79fa src/share/classes/com/sun/tools/javac/comp/AttrContext.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright 1999-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.javac.comp;
+
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.code.*;
+
+/** Contains information specific to the attribute and enter
+ *  passes, to be used in place of the generic field in environments.
+ *
+ *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
+ *  you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class AttrContext {
+
+    /** The scope of local symbols.
+     */
+    Scope scope = null;
+
+    /** The number of enclosing `static' modifiers.
+     */
+    int staticLevel = 0;
+
+    /** Is this an environment for a this(...) or super(...) call?
+     */
+    boolean isSelfCall = false;
+
+    /** Are we evaluating the selector of a `super' or type name?
+     */
+    boolean selectSuper = false;
+
+    /** Are arguments to current function applications boxed into an array for varargs?
+     */
+    boolean varArgs = false;
+
+    /** A list of type variables that are all-quantifed in current context.
+     */
+    List<Type> tvars = List.nil();
+
+    /** A record of the lint/SuppressWarnings currently in effect
+     */
+    Lint lint;
+
+    /** Duplicate this context, replacing scope field and copying all others.
+     */
+    AttrContext dup(Scope scope) {
+        AttrContext info = new AttrContext();
+        info.scope = scope;
+        info.staticLevel = staticLevel;
+        info.isSelfCall = isSelfCall;
+        info.selectSuper = selectSuper;
+        info.varArgs = varArgs;
+        info.tvars = tvars;
+        info.lint = lint;
+        return info;
+    }
+
+    /** Duplicate this context, copying all fields.
+     */
+    AttrContext dup() {
+        return dup(scope);
+    }
+
+    public Iterable<Symbol> getLocalElements() {
+        if (scope == null)
+            return List.nil();
+        return scope.getElements();
+    }
+
+    public String toString() {
+        return "AttrContext[" + scope.toString() + "]";
+    }
+}