Fix issue where user defined functions would reuse return symbol

- Fix issue where user defined functions would reuse return symbols. This would cause unexpected behaviour if you reused the same function output multiple times without assigning it to something
MerlinVR · Feb 29, 2020 · 482e711 · 482e711
1 parent 41a5e8f
commit 482e711
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs b/Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs
@@ -763,13 +763,23 @@ private SymbolDefinition InvokeLocalMethod(SymbolDefinition[] invokeParams)
                 restoreReturnLocationScope.ExecuteSet(oldReturnLocation);
             }
 
+            SymbolDefinition returnValue = null;
+
             if (captureLocalMethod.returnSymbol != null)
             {
+                returnValue = visitorContext.topTable.CreateUnnamedSymbol(captureLocalMethod.returnSymbol.userCsType, SymbolDeclTypeFlags.Internal);
+
+                using (ExpressionCaptureScope returnValSetScope = new ExpressionCaptureScope(visitorContext, null))
+                {
+                    returnValSetScope.SetToLocalSymbol(returnValue);
+                    returnValSetScope.ExecuteSet(captureLocalMethod.returnSymbol);
+                }
+
                 if (visitorContext.topCaptureScope != null && visitorContext.topCaptureScope.IsUnknownArchetype())
-                    visitorContext.topCaptureScope.SetToLocalSymbol(captureLocalMethod.returnSymbol);
+                    visitorContext.topCaptureScope.SetToLocalSymbol(returnValue);
             }
 
-            return captureLocalMethod.returnSymbol;
+            return returnValue;
         }
 
         private SymbolDefinition InvokeUserExtern(SymbolDefinition[] invokeParams)