lambda: use correct subst

java/java-impl/src/com/intellij/codeInspection/RedundantLambdaParameterTypeInspection.java

@@ -92,7 +92,7 @@ public class RedundantLambdaParameterTypeInspection extends BaseJavaLocalInspect
 
                 for (PsiTypeParameter parameter : typeParameters) {
                   final PsiType psiType = substitutor.substitute(parameter);
-                  if (psiType == null || LambdaUtil.dependsOnTypeParams(psiType, expression)) return;
+                  if (psiType == null || LambdaUtil.dependsOnTypeParams(psiType, expression, parameter)) return;
                 }
               }
             }

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

@@ -892,7 +892,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
             }
             final PsiMethod method = LambdaUtil.getFunctionalInterfaceMethod(functionalInterfaceType);
             if (method == null || methodParamsDependOnTypeParams((PsiLambdaExpression)expression, method.getParameterList().getParameters(), 
-                                                                 substitutor, typeParameter)) {
+                                                                 PsiUtil.resolveGenericsClassInType(functionalInterfaceType).getSubstitutor(), typeParameter)) {
               return getFailedInferenceConstraint(typeParameter);
             }
           }