langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
changeset 25445 603f0c93d5c9
parent 25443 9187d77f2c64
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Wed Jul 09 10:49:32 2014 -0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Jul 10 13:57:27 2014 -0700
@@ -67,18 +67,10 @@
     private Symtab syms;
     private TreeMaker make;
     private Enter enter;
-    private boolean allowEnums;
     private boolean allowInterfaceBridges;
     private Types types;
     private final Resolve resolve;
 
-    /**
-     * Flag to indicate whether or not to generate bridge methods.
-     * For pre-Tiger source there is no need for bridge methods, so it
-     * can be skipped to get better performance for -source 1.4 etc.
-     */
-    private final boolean addBridges;
-
     private final CompileStates compileStates;
 
     protected TransTypes(Context context) {
@@ -90,8 +82,6 @@
         enter = Enter.instance(context);
         overridden = new HashMap<>();
         Source source = Source.instance(context);
-        allowEnums = source.allowEnums();
-        addBridges = source.addBridges();
         allowInterfaceBridges = source.allowDefaultMethods();
         types = Types.instance(context);
         make = TreeMaker.instance(context);
@@ -665,9 +655,7 @@
         Symbol meth = TreeInfo.symbol(tree.meth);
         Type mt = meth.erasure(types);
         List<Type> argtypes = mt.getParameterTypes();
-        if (allowEnums &&
-            meth.name==names.init &&
-            meth.owner == syms.enumSym)
+        if (meth.name == names.init && meth.owner == syms.enumSym)
             argtypes = argtypes.tail.tail;
         if (tree.varargsElement != null)
             tree.varargsElement = types.erasure(tree.varargsElement);
@@ -920,13 +908,11 @@
                 tree.typarams = List.nil();
                 super.visitClassDef(tree);
                 make.at(tree.pos);
-                if (addBridges) {
-                    ListBuffer<JCTree> bridges = new ListBuffer<>();
-                    if (allowInterfaceBridges || (tree.sym.flags() & INTERFACE) == 0) {
-                        addBridges(tree.pos(), c, bridges);
-                    }
-                    tree.defs = bridges.toList().prependList(tree.defs);
+                ListBuffer<JCTree> bridges = new ListBuffer<>();
+                if (allowInterfaceBridges || (tree.sym.flags() & INTERFACE) == 0) {
+                    addBridges(tree.pos(), c, bridges);
                 }
+                tree.defs = bridges.toList().prependList(tree.defs);
                 tree.type = erasure(tree.type);
             } finally {
                 make = savedMake;