Tolerate missing types

1 files changed, 15 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/expressiontransforms/BooleanExpressionTransformer.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/BooleanExpressionTransformer.java
index 25cd7fe7bd2..49fb48225e7 100644
--- a/config-model/src/main/java/com/yahoo/schema/expressiontransforms/BooleanExpressionTransformer.java
+++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/BooleanExpressionTransformer.java
@@ -65,7 +65,7 @@ public class BooleanExpressionTransformer extends ExpressionTransformer<Transfor
         ChildNode rhs = stack.pop();
         ChildNode lhs = stack.peek();
 
-        boolean primitives = isPrimitive(lhs.child, context) && isPrimitive(rhs.child, context);
+        boolean primitives = isDefinitelyPrimitive(lhs.child, context) && isDefinitelyPrimitive(rhs.child, context);
         ExpressionNode combination;
         if (primitives && rhs.op == Operator.and)
             combination = andByIfNode(lhs.child, rhs.child);
@@ -78,8 +78,20 @@ public class BooleanExpressionTransformer extends ExpressionTransformer<Transfor
         lhs.child = combination;
     }
 
-    private boolean isPrimitive(ExpressionNode node, TransformContext context) {
-        return node.type(context.types()).rank() == 0;
+    private boolean isDefinitelyPrimitive(ExpressionNode node, TransformContext context) {
+        try {
+            return node.type(context.types()).rank() == 0;
+        }
+        catch (IllegalArgumentException e) {
+            // Types can only be reliably resolved top down, which has not done here.
+            // E.g
+            // function(nameArg) {
+            //    attribute(nameArg)
+            // }
+            // is supported.
+            // So, we return false when something cannot be resolved.
+            return false;
+        }
     }
 
     private static OperationNode resolve(ChildNode left, ChildNode right) {
@@ -108,7 +120,6 @@ public class BooleanExpressionTransformer extends ExpressionTransformer<Transfor
             joinedChildren.add(node.child);
     }
 
-
     private IfNode andByIfNode(ExpressionNode a, ExpressionNode b) {
         return new IfNode(a, b, new ConstantNode(new BooleanValue(false)));
     }