1.0.9b

Author: BlueAmulet

Packages/blueamulet.udonsharpoptimizer/Editor/Optimizer.cs

@@ -1,7 +1,7 @@
 /*
  * Unofficial UdonSharp Optimizer
  * The Optimizer.
- * Version 1.0.9
+ * Version 1.0.9b
  * Written by BlueAmulet
  */
 
@@ -458,7 +458,8 @@ internal static void OptimizeProgram(EmitContext moduleEmitContext)
                 // Observe what block variables are in for later
                 if (settings.EnableBlockReduction)
                 {
-                    if (hasJump.Contains(instrs[i]))
+                    // If previous instruction is a jump but the next isn't in hasJump, it was a call to another udon function
+                    if (hasJump.Contains(instrs[i]) || (i > 0 && instrs[i - 1] is JumpInstruction))
                     {
                         currentBlock++;
                     }
@@ -519,7 +520,8 @@ internal static void OptimizeProgram(EmitContext moduleEmitContext)
                 {
                     AssemblyInstruction instr = instrs[i];
                     int skip = 0;
-                    if (hasJump.Contains(instr))
+                    // If previous instruction is a jump but the next isn't in hasJump, it was a call to another udon function
+                    if (hasJump.Contains(instr) || (i > 0 && instrs[i - 1] is JumpInstruction))
                     {
                         blockCounters.Clear();
                     }

Packages/blueamulet.udonsharpoptimizer/README.txt

@@ -8,13 +8,14 @@ No permanent changes are made to the VRCSDK, all changes are made in memory and
 The USOPatch.dll included is part of the non permanent change system, allowing the optimizer access to UdonSharp's internals. The source code for this dll is included in the USOPatch folder
 
 Changelog:
-1.0.0 - Initial 2022 version
-1.0.1 - 2024 Update
-1.0.2 - Fixed switch statements
-1.0.3 - Reduced number of variables
-1.0.4 - __this_ fix for even less variables
-1.0.5 - Added ExternWrite+Copy check for variables, added missing jump checks
-1.0.6 - Added tail call optimization
-1.0.7 - Single .unitypackage installation
-1.0.8 - Added basic Settings panel
-1.0.9 - Moved TCO into first pass, added block based variable reduction
+1.0.0  - Initial 2022 version
+1.0.1  - 2024 Update
+1.0.2  - Fixed switch statements
+1.0.3  - Reduced number of variables
+1.0.4  - __this_ fix for even less variables
+1.0.5  - Added ExternWrite+Copy check for variables, added missing jump checks
+1.0.6  - Added tail call optimization
+1.0.7  - Single .unitypackage installation
+1.0.8  - Added basic Settings panel
+1.0.9  - Moved TCO into first pass, added block based variable reduction
+1.0.9b - Fixed udon functions destroying variables in other functions

README.md

@@ -17,13 +17,14 @@ Any call to another Udon function followed by a return, can have its setup and t
 UdonSharp makes a *LOT* of temporary variables. We detect places where we can reuse existing temporary variables instead of creating new ones. This does not make the program faster but does make the program smaller.
 
 ## Changelog
-1.0.0 - Initial 2022 version  
-1.0.1 - 2024 Update  
-1.0.2 - Fixed switch statements  
-1.0.3 - Reduced number of variables  
-1.0.4 - __this_ fix for even less variables  
-1.0.5 - Added ExternWrite+Copy check for variables, added missing jump checks  
-1.0.6 - Added tail call optimization  
-1.0.7 - Single .unitypackage installation  
-1.0.8 - Added basic Settings panel  
-1.0.9 - Moved TCO into first pass, added block based variable reduction  
+1.0.0  - Initial 2022 version  
+1.0.1  - 2024 Update  
+1.0.2  - Fixed switch statements  
+1.0.3  - Reduced number of variables  
+1.0.4  - __this_ fix for even less variables  
+1.0.5  - Added ExternWrite+Copy check for variables, added missing jump checks  
+1.0.6  - Added tail call optimization  
+1.0.7  - Single .unitypackage installation  
+1.0.8  - Added basic Settings panel  
+1.0.9  - Moved TCO into first pass, added block based variable reduction  
+1.0.9b - Fixed udon functions destroying variables in other functions