Reuse temp variables in InCodeGenerator

trinodb · May 17, 2024 · 34b8303 · 34b8303
1 parent 9929105
commit 34b8303
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/sql/gen/InCodeGenerator.java b/core/trino-main/src/main/java/io/trino/sql/gen/InCodeGenerator.java
@@ -170,10 +170,10 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext generatorContext
         LabelNode defaultLabel = new LabelNode("default");
 
         Scope scope = generatorContext.getScope();
-        Variable value = scope.createTempVariable(javaType);
+        Variable value = scope.getOrCreateTempVariable(javaType);
 
         BytecodeNode switchBlock;
-        Variable expression = scope.createTempVariable(int.class);
+        Variable expression = scope.getOrCreateTempVariable(int.class);
         SwitchBuilder switchBuilder = new SwitchBuilder().expression(expression);
 
         switch (switchGenerationCase) {
@@ -278,6 +278,9 @@ public BytecodeNode generateExpression(BytecodeGeneratorContext generatorContext
 
         block.visitLabel(end);
 
+        scope.releaseTempVariableForReuse(expression);
+        scope.releaseTempVariableForReuse(value);
+
         return block;
     }
 
@@ -299,7 +302,7 @@ private static BytecodeBlock buildInCase(
     {
         Variable caseWasNull = null; // caseWasNull is set to true the first time a null in `testValues` is encountered
         if (checkForNulls) {
-            caseWasNull = scope.createTempVariable(boolean.class);
+            caseWasNull = scope.getOrCreateTempVariable(boolean.class);
         }
 
         BytecodeBlock caseBlock = new BytecodeBlock();
@@ -360,6 +363,10 @@ private static BytecodeBlock buildInCase(
             elseLabel = testLabel;
         }
         caseBlock.append(elseNode);
+
+        if (checkForNulls) {
+            scope.releaseTempVariableForReuse(caseWasNull);
+        }
         return caseBlock;
     }