From a029002f81252c64c255849959500581b59f51da Mon Sep 17 00:00:00 2001 From: Nadeeshan96 Date: Mon, 5 Jun 2023 17:14:43 +0530 Subject: [PATCH] Remove unnecessary changes --- .../compiler/bir/codegen/CodeGenerator.java | 3 --- .../bir/codegen/optimizer/LargeMethodOptimizer.java | 5 ++--- .../ballerinalang/compiler/bir/emit/BIREmitter.java | 10 ++-------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/CodeGenerator.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/CodeGenerator.java index c369dacac0f8..a3cd78e0a0db 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/CodeGenerator.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/CodeGenerator.java @@ -21,7 +21,6 @@ import org.wso2.ballerinalang.compiler.PackageCache; import org.wso2.ballerinalang.compiler.bir.BIRGenUtils; import org.wso2.ballerinalang.compiler.bir.codegen.optimizer.LargeMethodOptimizer; -import org.wso2.ballerinalang.compiler.bir.emit.BIREmitter; import org.wso2.ballerinalang.compiler.diagnostic.BLangDiagnosticLog; import org.wso2.ballerinalang.compiler.semantics.analyzer.Types; import org.wso2.ballerinalang.compiler.semantics.model.SymbolTable; @@ -83,8 +82,6 @@ private CompiledJarFile generate(BPackageSymbol packageSymbol) { largeMethodOptimizer = new LargeMethodOptimizer(symbolTable); largeMethodOptimizer.splitLargeBIRFunctions(packageSymbol.bir); - BIREmitter.emit(packageSymbol.bir); - // Desugar BIR to include the observations JvmObservabilityGen jvmObservabilityGen = new JvmObservabilityGen(packageCache, symbolTable); jvmObservabilityGen.instrumentPackage(packageSymbol.bir); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/optimizer/LargeMethodOptimizer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/optimizer/LargeMethodOptimizer.java index 525ed0440141..b4f66e2b65c0 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/optimizer/LargeMethodOptimizer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/optimizer/LargeMethodOptimizer.java @@ -404,7 +404,6 @@ private void generateSplits(BIRFunction function, List possibleSplits, } function.errorTable.removeAll(currSplit.errorTableEntries); startInsNum = currSplit.lastIns + 1; - List args = new ArrayList<>(); for (BIRVariableDcl funcArg : currSplit.funcArgs) { args.add(new BIROperand(funcArg)); @@ -595,8 +594,8 @@ private void setLocalVarStartEndBB(BIRFunction birFunction, List * @param currSplit ongoing split details * @param newBBNum last BB id num of the parent function * @param fromAttachedFunction flag which indicates an original attached function is being split - * @param changedErrorTableEndBB - * @param parentFuncNewBB + * @param changedErrorTableEndBB error tables end BBs which needs to be changed + * @param parentFuncNewBB new BIRBasicBlock being added to the parent function * @return newly created BIR function */ private BIRFunction createNewBIRFunctionAcrossBB(BIRFunction parentFunc, Name funcName, BType retType, diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/emit/BIREmitter.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/emit/BIREmitter.java index 56f93e40d968..0a2ab560dc23 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/emit/BIREmitter.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/emit/BIREmitter.java @@ -49,7 +49,7 @@ public class BIREmitter { private static final CompilerContext.Key BIR_EMITTER = new CompilerContext.Key<>(); private static final PrintStream console = System.out; - private static boolean dumbBIR; + private boolean dumbBIR; public static BIREmitter getInstance(CompilerContext context) { @@ -68,19 +68,13 @@ private BIREmitter(CompilerContext context) { this.dumbBIR = getBooleanValueIfSet(compilerOptions, CompilerOptionName.DUMP_BIR); } - public static BLangPackage emit(BLangPackage bLangPackage) { + public BLangPackage emit(BLangPackage bLangPackage) { if (dumbBIR) { console.println(emitModule(bLangPackage.symbol.bir)); } return bLangPackage; } - public static void emit(BIRNode.BIRPackage birPackage) { - if (dumbBIR) { - console.println(emitModule(birPackage)); - } - } - public static String emitModule(BIRNode.BIRPackage mod) { String modStr = "================ Emitting Module ================";