revert fix for IDEA-110947 (IDEA-112122)

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

@@ -572,10 +572,6 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
                                                               final boolean captureWildcard) {
     if (arg instanceof PsiWildcardType && !captureWildcard) return FAILED_INFERENCE;
     if (arg != PsiType.NULL) {
-      if (arg instanceof PsiWildcardType) {
-        final PsiType bound = ((PsiWildcardType)arg).getBound();
-        if (bound instanceof PsiClassType && ((PsiClassType)bound).isRaw()) return Pair.create(null, constraintType);
-      }
       return new Pair<PsiType, ConstraintType>(arg, constraintType);
     }
     return null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA112122.java

@@ -0,0 +1,16 @@
+class Cast<T> implements SemElement {
+
+    {
+        final SemKey<? extends Cast> key = null;
+        final Cast semElement =    getSemElement(key);
+    }
+
+    public <T extends SemElement> T getSemElement(SemKey<T> key) {
+        return null;
+    }
+
+
+    class SemKey<T extends SemElement> {}
+}
+
+interface SemElement {}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java

@@ -300,7 +300,8 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testIDEA67682() { doTest5(false); }
   public void testIDEA57391() { doTest5(false); }
   public void testIDEA110869() { doTest5(false); }
-  public void testIDEA110947() { doTest5(false); }
+  public void _testIDEA110947() { doTest5(false); }
+  public void testIDEA112122() { doTest5(false); }
   public void testNoInferenceFromTypeCast() { doTest5(false); }
   public void testCaptureWildcardsInTypeCasts() { doTest5(false); }
   public void testIDEA111085() { doTest5(false); }