diff --git a/python/pyspark/sql/tests.py b/python/pyspark/sql/tests.py
index 9b8a5d6b605c4..61d82e768ad84 100644
--- a/python/pyspark/sql/tests.py
+++ b/python/pyspark/sql/tests.py
@@ -343,6 +343,7 @@ def test_udf_in_filter_on_top_of_outer_join(self):
         self.assertEqual(df.filter('b = "x"').collect(), [Row(a=1, b='x')])
 
     def test_udf_in_filter_on_top_of_join(self):
+        # regression test for SPARK-18589
         from pyspark.sql.functions import udf
         left = self.spark.createDataFrame([Row(a=1)])
         right = self.spark.createDataFrame([Row(b=1)])
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
index 42dc3a8682b8d..1c18f4457f52c 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
@@ -23,7 +23,6 @@ import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, ExprCo
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 import org.apache.spark.sql.catalyst.util.TypeUtils
 import org.apache.spark.sql.types._
-import org.apache.spark.util.Utils
 
 
 object InterpretedPredicate {
@@ -90,14 +89,12 @@ trait PredicateHelper {
   /**
    * Returns true iff `expr` could be evaluated as a condition within join.
    */
-  protected def canEvaluateWithinJoin(expr: Expression): Boolean = {
-    expr.find {
-      case e: SubqueryExpression =>
-        // non-correlated subquery will be replaced as literal
-        e.children.nonEmpty
-      case e: Unevaluable => true
-      case _ => false
-    }.isEmpty
+  protected def canEvaluateWithinJoin(expr: Expression): Boolean = expr match {
+    case e: SubqueryExpression =>
+      // non-correlated subquery will be replaced as literal
+      e.children.isEmpty
+    case e: Unevaluable => false
+    case e => e.children.forall(canEvaluateWithinJoin)
   }
 }