More improvements to the binary expression handling

- Avoid extra copy in binary expressions when the lhs is a constant expression since it can't be modified.
MerlinVR · Apr 10, 2020 · d502c4a · d502c4a
1 parent 68009c7
commit d502c4a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Assets/UdonSharp/Editor/UdonSharpASTVisitor.cs b/Assets/UdonSharp/Editor/UdonSharpASTVisitor.cs
@@ -1574,7 +1574,7 @@ public override void VisitBinaryExpression(BinaryExpressionSyntax node)
             {
                 Visit(node.Left);
 
-                if (lhsCapture.DoesReturnIntermediateSymbol())
+                if (lhsCapture.DoesReturnIntermediateSymbol() || lhsCapture.IsConstExpression())
                 {
                     lhsValue = lhsCapture.ExecuteGet();
                 }

diff --git a/Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs b/Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs
@@ -1419,6 +1419,15 @@ public bool DoesReturnIntermediateSymbol()
             return !IsLocalSymbol();
         }
 
+        public bool IsConstExpression()
+        {
+            // Only basic handling for local symbols for now since we can directly reference them
+            if (IsLocalSymbol() && ExecuteGet().declarationType.HasFlag(SymbolDeclTypeFlags.Constant))
+                return true;
+
+            return false;
+        }
+
         public bool ResolveAccessToken(string accessToken)
         {
             bool resolvedToken = false;