From 0c1fd3269da6710a653ec8032a188ed04c279b94 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 15 Apr 2011 17:34:32 +0200
Subject: [PATCH] return gen fixed

---
 idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java
index 711044ababe..342963f9b4a 100644
--- a/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+++ b/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java
@@ -69,7 +69,7 @@ public class FunctionCodegen {
     private void generateReturn(MethodVisitor mv, JetExpression bodyExpression, ExpressionCodegen codegen) {
         if (!endsWithReturn(bodyExpression)) {
             final JetType expressionType = bindingContext.getExpressionType(bodyExpression);
-            if (expressionType.equals(JetStandardClasses.getUnitType())) {
+            if (expressionType == null || expressionType.equals(JetStandardClasses.getUnitType())) {
                 mv.visitInsn(Opcodes.RETURN);
             }
             else {