8142467: Remove all references Flags.IPROXY
Summary: Remove all references to flag bit IPROXY that has fallen into disuse.
Reviewed-by: mcimadamore
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java Tue Nov 10 11:49:14 2015 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java Wed Nov 11 17:13:10 2015 +0530
@@ -126,10 +126,9 @@
*/
public static final int BLOCK = 1<<20;
- /** Flag is set for compiler-generated abstract methods that implement
- * an interface method (Miranda methods).
+ /** Flag bit 21 is available. (used earlier to tag compiler-generated abstract methods that implement
+ * an interface method (Miranda methods)).
*/
- public static final int IPROXY = 1<<21;
/** Flag is set for nested classes that do not access instance members
* or `this' of an outer class and therefore don't need to be passed
@@ -362,7 +361,6 @@
BLOCK(Flags.BLOCK),
ENUM(Flags.ENUM),
MANDATED(Flags.MANDATED),
- IPROXY(Flags.IPROXY),
NOOUTERTHIS(Flags.NOOUTERTHIS),
EXISTS(Flags.EXISTS),
COMPOUND(Flags.COMPOUND),
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java Tue Nov 10 11:49:14 2015 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java Wed Nov 11 17:13:10 2015 +0530
@@ -2763,7 +2763,7 @@
Scope s = c.members();
for (Symbol sym : s.getSymbols(NON_RECURSIVE)) {
if (sym.kind == MTH &&
- (sym.flags() & (ABSTRACT|IPROXY|DEFAULT|PRIVATE)) == ABSTRACT) {
+ (sym.flags() & (ABSTRACT|DEFAULT|PRIVATE)) == ABSTRACT) {
MethodSymbol absmeth = (MethodSymbol)sym;
MethodSymbol implmeth = absmeth.implementation(impl, this, true);
if (implmeth == null || implmeth == absmeth) {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Tue Nov 10 11:49:14 2015 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Wed Nov 11 17:13:10 2015 +0530
@@ -2371,7 +2371,6 @@
types.isSameType(types.erasure(sym.type), types.erasure(sym2.type)) &&
sym != sym2 &&
(sym.flags() & Flags.SYNTHETIC) != (sym2.flags() & Flags.SYNTHETIC) &&
- (sym.flags() & IPROXY) == 0 && (sym2.flags() & IPROXY) == 0 &&
(sym.flags() & BRIDGE) == 0 && (sym2.flags() & BRIDGE) == 0) {
syntheticError(pos, (sym2.flags() & SYNTHETIC) == 0 ? sym2 : sym);
return;
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java Tue Nov 10 11:49:14 2015 +0000
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java Wed Nov 11 17:13:10 2015 +0530
@@ -834,10 +834,6 @@
public void visitSelect(JCFieldAccess tree) {
Type t = types.skipTypeVars(tree.selected.type, false);
if (t.isCompound()) {
- if ((tree.sym.flags() & IPROXY) != 0) {
- tree.sym = ((MethodSymbol)tree.sym).
- implemented((TypeSymbol)tree.sym.owner, types);
- }
tree.selected = coerce(
translate(tree.selected, erasure(tree.selected.type)),
erasure(tree.sym.owner.type));