Merge remote-tracking branch 'origin/master'

java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java

@@ -470,11 +470,9 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
         PsiType bound = intersectAllExtends(typeParam, arg);
         return new Pair<PsiType, ConstraintType>(bound, ConstraintType.SUPERTYPE);
       }
-      /*
       if (psiClass == null && arg instanceof PsiClassType) {
         return Pair.create(arg, ConstraintType.EQUALS);
       }
-      */
       return null;
     }
     if (paramClass == null) return null;