From 1466006638c824d5d8df7b0e585c4bab79604f44 Mon Sep 17 00:00:00 2001 From: altrisi Date: Wed, 9 Nov 2022 09:59:00 +0100 Subject: [PATCH] Don't compute tree size and depth with debugging disabled (#1588) --- src/main/java/carpet/script/Expression.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/carpet/script/Expression.java b/src/main/java/carpet/script/Expression.java index 050a2944..33183935 100644 --- a/src/main/java/carpet/script/Expression.java +++ b/src/main/java/carpet/script/Expression.java @@ -1116,26 +1116,34 @@ public class Expression if (CarpetSettings.scriptsDebugging) CarpetScriptServer.LOG.info("Input code size for "+getModuleName()+": " + treeSize(root) + " nodes, " + treeDepth(root) + " deep"); + // Defined out here to not need to conditionally assign them with debugging disabled + int prevTreeSize = -1; + int prevTreeDepth = -1; + boolean changed = true; while(changed) { changed = false; while (true) { - int tree_size = treeSize(root); - int tree_depth = treeDepth(root); + if (CarpetSettings.scriptsDebugging) { + prevTreeSize = treeSize(root); + prevTreeDepth = treeDepth(root); + } boolean optimized = compactTree(root, Context.Type.NONE, 0); if (!optimized) break; changed = true; if (CarpetSettings.scriptsDebugging) - CarpetScriptServer.LOG.info("Compacted from " + tree_size + " nodes, " + tree_depth + " code depth to " + treeSize(root) + " nodes, " + treeDepth(root) + " code depth"); + CarpetScriptServer.LOG.info("Compacted from " + prevTreeSize + " nodes, " + prevTreeDepth + " code depth to " + treeSize(root) + " nodes, " + treeDepth(root) + " code depth"); } while (true) { - int tree_size = treeSize(root); - int tree_depth = treeDepth(root); + if (CarpetSettings.scriptsDebugging) { + prevTreeSize = treeSize(root); + prevTreeDepth = treeDepth(root); + } boolean optimized = optimizeTree(optimizeOnlyContext, root, Context.Type.NONE, 0); if (!optimized) break; changed = true; if (CarpetSettings.scriptsDebugging) - CarpetScriptServer.LOG.info("Optimized from " + tree_size + " nodes, " + tree_depth + " code depth to " + treeSize(root) + " nodes, " + treeDepth(root) + " code depth"); + CarpetScriptServer.LOG.info("Optimized from " + prevTreeSize + " nodes, " + prevTreeDepth + " code depth to " + treeSize(root) + " nodes, " + treeDepth(root) + " code depth"); } } return extractOp(optimizeOnlyContext, root, Context.Type.NONE);