equal
deleted
inserted
replaced
3338 for (Scope.Entry e = s.lookup(sym.name); e.scope == s; e = e.next()) { |
3338 for (Scope.Entry e = s.lookup(sym.name); e.scope == s; e = e.next()) { |
3339 if (sym != e.sym && |
3339 if (sym != e.sym && |
3340 (e.sym.flags() & CLASH) == 0 && |
3340 (e.sym.flags() & CLASH) == 0 && |
3341 sym.kind == e.sym.kind && |
3341 sym.kind == e.sym.kind && |
3342 sym.name != names.error && |
3342 sym.name != names.error && |
3343 (sym.kind != MTH || types.hasSameArgs(types.erasure(sym.type), types.erasure(e.sym.type)))) { |
3343 (sym.kind != MTH || |
|
3344 types.hasSameArgs(sym.type, e.sym.type) || |
|
3345 types.hasSameArgs(types.erasure(sym.type), types.erasure(e.sym.type)))) { |
3344 if ((sym.flags() & VARARGS) != (e.sym.flags() & VARARGS)) { |
3346 if ((sym.flags() & VARARGS) != (e.sym.flags() & VARARGS)) { |
3345 varargsDuplicateError(pos, sym, e.sym); |
3347 varargsDuplicateError(pos, sym, e.sym); |
3346 return true; |
3348 return true; |
3347 } else if (sym.kind == MTH && !types.hasSameArgs(sym.type, e.sym.type, false)) { |
3349 } else if (sym.kind == MTH && !types.hasSameArgs(sym.type, e.sym.type, false)) { |
3348 duplicateErasureError(pos, sym, e.sym); |
3350 duplicateErasureError(pos, sym, e.sym); |