commit 317a269f17e0ebb3a5d210b80860b681ffbdd923
author fzaiser <fzaiser@google.com> Wed Aug 23 16:40:30 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Thu Aug 24 13:53:24 2017 +0200
tree 8b9e4dc4277d2f5a73f8c8fba5edddb922bb8e16
parent 5ce914f32f5b6a3459df29060b45e5ec8b0e9ecc

Refactor: Parse return statements without an expression properly

This is an internal refactoring necessary for the Skylark linter.
It does not change any behavior.

RELNOTES: None
PiperOrigin-RevId: 166199367

src/main/java/com/google/devtools/build/lib/syntax/UserDefinedFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/UserDefinedFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/UserDefinedFunction.java
index 6dae713..0740416 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/UserDefinedFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/UserDefinedFunction.java
@@ -80,7 +80,11 @@
           if (stmt instanceof ReturnStatement) {
             // Performance optimization.
             // Executing the statement would throw an exception, which is slow.
-            return ((ReturnStatement) stmt).getReturnExpression().eval(env);
+            Expression returnExpr = ((ReturnStatement) stmt).getReturnExpression();
+            if (returnExpr == null) {
+              return Runtime.NONE;
+            }
+            return returnExpr.eval(env);
           } else {
             stmt.exec(env);
           }