update

2 files changed, 16 insertions, 2 deletions

diff --git a/script/vm/compiler.lua b/script/vm/compiler.lua
index c70f5d84..af810e19 100644
--- a/script/vm/compiler.lua
+++ b/script/vm/compiler.lua
@@ -261,11 +261,12 @@ local function getReturn(func, index, args)
     end
     local node = m.compileNode(func)
     ---@type vm.node.union
-    local result
+    local result, hasCalled
     if node then
         for cnode in nodeMgr.eachNode(node) do
             if cnode.type == 'function'
             or cnode.type == 'doc.type.function' then
+                hasCalled = true
                 local returnNode = getReturnOfFunction(cnode, index)
                 if returnNode and returnNode.type == 'generic' then
                     returnNode = returnNode:resolve(args)
@@ -277,6 +278,9 @@ local function getReturn(func, index, args)
             end
         end
     end
+    if not hasCalled then
+        result = globalMgr.getGlobal('type', 'unknown')
+    end
     return result
 end
 
@@ -374,7 +378,9 @@ local function selectNode(source, list, index)
     end
     result = result
           or m.compileNode(exp)
-          or union()
+    if not result then
+        return nodeMgr.setNode(source, result)
+    end
     local hasKnownType
     for n in nodeMgr.eachNode(result) do
         if guide.isLiteral(n)
diff --git a/test/type_inference/init.lua b/test/type_inference/init.lua
index 9edc49c3..f62ca013 100644
--- a/test/type_inference/init.lua
+++ b/test/type_inference/init.lua
@@ -289,6 +289,14 @@ end
 <?y?> = x()
 ]]
 
+TEST 'unknown' [[
+local function x()
+    return nil
+    return f()
+end
+_, <?y?> = x()
+]]
+
 TEST 'integer' [[
 local function x()
     return 1