[groovy] branch GROOVY_2_5_X updated: GROOVY-9153: fix merge glitch

[paulk]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
     new 84226f6  GROOVY-9153: fix merge glitch
84226f6 is described below

commit 84226f614f57e7c235ef2687ad3aad4a8b82a951
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Aug 6 21:22:54 2019 +1000

    GROOVY-9153: fix merge glitch
---
 src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java 
b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index adc9716..d3db7c6 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -605,6 +605,10 @@ public class GeneralUtils {
         return new BooleanExpression(new BinaryExpression(objectExpression, 
INSTANCEOF, classX(cNode)));
     }
 
+    public static BooleanExpression isNullX(Expression expr) {
+        return new BooleanExpression(new BinaryExpression(expr, EQ, new 
ConstantExpression(null)));
+    }
+
     public static BooleanExpression isOneX(Expression expr) {
         return new BooleanExpression(new BinaryExpression(expr, EQ, new 
ConstantExpression(1)));
     }