arkanalyzer 1.0.6 → 1.0.8

package/lib/core/common/CfgBuilder.js

@@ -39,6 +39,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CfgBuilder = void 0;
 const ts = __importStar(require("ohos-typescript"));
+const Local_1 = require("../base/Local");
 const Stmt_1 = require("../base/Stmt");
 const BasicBlock_1 = require("../graph/BasicBlock");
 const Cfg_1 = require("../graph/Cfg");
@@ -180,7 +181,7 @@ class CfgBuilder {
     walkAST(lastStatement, nextStatement, nodes) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         function judgeLastType(s) {
-            if (lastStatement.type == 'ifStatement') {
+            if (lastStatement.type === 'ifStatement') {
                 let lastIf = lastStatement;
                 if (lastIf.nextT == null) {
                     lastIf.nextT = s;
@@ -191,12 +192,12 @@ class CfgBuilder {
                     s.lasts.add(lastIf);
                 }
             }
-            else if (lastStatement.type == 'loopStatement') {
+            else if (lastStatement.type === 'loopStatement') {
                 let lastLoop = lastStatement;
                 lastLoop.nextT = s;
                 s.lasts.add(lastLoop);
             }
-            else if (lastStatement.type == 'catchOrNot') {
+            else if (lastStatement.type === 'catchOrNot') {
                 let lastLoop = lastStatement;
                 lastLoop.nextT = s;
                 s.lasts.add(lastLoop);
@@ -209,7 +210,7 @@ class CfgBuilder {
         this.scopeLevel++;
         let scope = new Scope(this.scopes.length, new Set(), this.scopeLevel);
         for (let i = this.scopes.length - 1; i >= 0; i--) {
-            if (this.scopes[i].level == this.scopeLevel - 1) {
+            if (this.scopes[i].level === this.scopeLevel - 1) {
                 scope.parent = this.scopes[i];
                 break;
             }
@@ -222,6 +223,11 @@ class CfgBuilder {
                 judgeLastType(s);
                 lastStatement = s;
             }
+            else if (!this.declaringMethod.isDefaultArkMethod() && ts.isFunctionDeclaration(c)) {
+                let s = new StatementBuilder('functionDeclarationStatement', c.getText(this.sourceFile), c, scope.id);
+                judgeLastType(s);
+                lastStatement = s;
+            }
             else if (ts.isReturnStatement(c)) {
                 let s = new StatementBuilder('returnStatement', c.getText(this.sourceFile), c, scope.id);
                 judgeLastType(s);
@@ -367,7 +373,7 @@ class CfgBuilder {
                     this.walkAST(lastStatement, loopstm, [c.statement]);
                 }
                 let lastType = lastStatement.type;
-                if (lastType == 'ifStatement' || lastType == 'loopStatement') {
+                if (lastType === 'ifStatement' || lastType === 'loopStatement') {
                     let lastCondition = lastStatement;
                     loopstm.nextT = lastCondition.nextT;
                     (_f = lastCondition.nextT) === null || _f === void 0 ? void 0 : _f.lasts.add(loopstm);
@@ -376,7 +382,7 @@ class CfgBuilder {
                     loopstm.nextT = lastStatement.next;
                     (_g = lastStatement.next) === null || _g === void 0 ? void 0 : _g.lasts.add(loopstm);
                 }
-                if (loopstm.nextT && loopstm.nextT != loopstm) {
+                if (loopstm.nextT && loopstm.nextT !== loopstm) {
                     loopstm.nextT.isDoWhile = true;
                     loopstm.doStatement = loopstm.nextT;
                 }
@@ -424,7 +430,7 @@ class CfgBuilder {
                         (_h = casestm.next) === null || _h === void 0 ? void 0 : _h.lasts.add(lastCaseExit);
                     }
                     lastCaseExit = caseExit;
-                    if (i == c.caseBlock.clauses.length - 1) {
+                    if (i === c.caseBlock.clauses.length - 1) {
                         caseExit.next = switchExit;
                         switchExit.lasts.add(caseExit);
                     }
@@ -488,13 +494,13 @@ class CfgBuilder {
             }
         }
         this.scopeLevel--;
-        if (lastStatement.type != 'breakStatement' && lastStatement.type != 'continueStatement' && lastStatement.type != 'returnStatement') {
+        if (lastStatement.type !== 'breakStatement' && lastStatement.type !== 'continueStatement' && lastStatement.type !== 'returnStatement') {
             lastStatement.next = nextStatement;
             nextStatement.lasts.add(lastStatement);
         }
     }
     addReturnInEmptyMethod() {
-        if (this.entry.next == this.exit) {
+        if (this.entry.next === this.exit) {
             const ret = new StatementBuilder('returnStatement', 'return;', null, this.entry.scopeID);
             this.entry.next = ret;
             ret.lasts.add(this.entry);
@@ -506,13 +512,13 @@ class CfgBuilder {
         for (const exit of this.exits) {
             for (const last of [...exit.lasts]) {
                 if (last instanceof ConditionStatementBuilder) {
-                    if (last.nextT == exit) {
+                    if (last.nextT === exit) {
                         last.nextT = exit.next;
                         const lasts = exit.next.lasts;
                         lasts.delete(exit);
                         lasts.add(last);
                     }
-                    else if (last.nextF == exit) {
+                    else if (last.nextF === exit) {
                         last.nextF = exit.next;
                         const lasts = exit.next.lasts;
                         lasts.delete(exit);
@@ -522,7 +528,7 @@ class CfgBuilder {
                 else if (last instanceof SwitchStatementBuilder) {
                     for (let i = 0; i < last.nexts.length; i++) {
                         const stmt = last.nexts[i];
-                        if (stmt == exit) {
+                        if (stmt === exit) {
                             last.nexts[i] = exit.next;
                             const lasts = exit.next.lasts;
                             lasts.delete(exit);
@@ -559,7 +565,7 @@ class CfgBuilder {
             const block = new Block(this.blocks.length, []);
             this.blocks.push(block);
             while (stmt && !handledStmts.has(stmt)) {
-                if (stmt.type == 'loopStatement' && block.stmts.length > 0 && !stmt.isDoWhile) {
+                if (stmt.type === 'loopStatement' && block.stmts.length > 0 && !stmt.isDoWhile) {
                     stmtQueue.push(stmt);
                     break;
                 }
@@ -599,15 +605,15 @@ class CfgBuilder {
                 }
                 else {
                     if (stmt.next) {
-                        if ((stmt.type == 'continueStatement' || stmt.next.type == 'loopStatement') && stmt.next.block) {
+                        if ((stmt.type === 'continueStatement' || stmt.next.type === 'loopStatement') && stmt.next.block) {
                             break;
                         }
                         if (stmt.next.type.includes('exit')) {
                             break;
                         }
                         stmt.next.passTmies++;
-                        if (stmt.next.passTmies == stmt.next.lasts.size || (stmt.next.type == 'loopStatement') || stmt.next.isDoWhile) {
-                            if (stmt.next.scopeID != stmt.scopeID && !(stmt.next instanceof ConditionStatementBuilder && stmt.next.doStatement)
+                        if (stmt.next.passTmies === stmt.next.lasts.size || (stmt.next.type === 'loopStatement') || stmt.next.isDoWhile) {
+                            if (stmt.next.scopeID !== stmt.scopeID && !(stmt.next instanceof ConditionStatementBuilder && stmt.next.doStatement)
                                 && !(ts.isCaseClause(stmt.astNode) || ts.isDefaultClause(stmt.astNode))) {
                                 stmtQueue.push(stmt.next);
                                 break;
@@ -623,15 +629,15 @@ class CfgBuilder {
         var _a, _b, _c, _d, _e, _f;
         for (let block of this.blocks) {
             for (let originStatement of block.stmts) {
-                let lastStatement = (block.stmts.indexOf(originStatement) == block.stmts.length - 1);
+                let lastStatement = (block.stmts.indexOf(originStatement) === block.stmts.length - 1);
                 if (originStatement instanceof ConditionStatementBuilder) {
                     let nextT = (_a = originStatement.nextT) === null || _a === void 0 ? void 0 : _a.block;
-                    if (nextT && (lastStatement || nextT != block) && !((_b = originStatement.nextT) === null || _b === void 0 ? void 0 : _b.type.includes(' exit'))) {
+                    if (nextT && (lastStatement || nextT !== block) && !((_b = originStatement.nextT) === null || _b === void 0 ? void 0 : _b.type.includes(' exit'))) {
                         block.nexts.push(nextT);
                         nextT.lasts.push(block);
                     }
                     let nextF = (_c = originStatement.nextF) === null || _c === void 0 ? void 0 : _c.block;
-                    if (nextF && (lastStatement || nextF != block) && !((_d = originStatement.nextF) === null || _d === void 0 ? void 0 : _d.type.includes(' exit'))) {
+                    if (nextF && (lastStatement || nextF !== block) && !((_d = originStatement.nextF) === null || _d === void 0 ? void 0 : _d.type.includes(' exit'))) {
                         block.nexts.push(nextF);
                         nextF.lasts.push(block);
                     }
@@ -639,7 +645,7 @@ class CfgBuilder {
                 else if (originStatement instanceof SwitchStatementBuilder) {
                     for (const next of originStatement.nexts) {
                         const nextBlock = next.block;
-                        if (nextBlock && (lastStatement || nextBlock != block)) {
+                        if (nextBlock && (lastStatement || nextBlock !== block)) {
                             block.nexts.push(nextBlock);
                             nextBlock.lasts.push(block);
                         }
@@ -647,7 +653,7 @@ class CfgBuilder {
                 }
                 else {
                     let next = (_e = originStatement.next) === null || _e === void 0 ? void 0 : _e.block;
-                    if (next && (lastStatement || next != block) && !((_f = originStatement.next) === null || _f === void 0 ? void 0 : _f.type.includes(' exit'))) {
+                    if (next && (lastStatement || next !== block) && !((_f = originStatement.next) === null || _f === void 0 ? void 0 : _f.type.includes(' exit'))) {
                         block.nexts.push(next);
                         next.lasts.push(block);
                     }
@@ -659,7 +665,7 @@ class CfgBuilder {
         var _a, _b, _c, _d;
         let notReturnStmts = [];
         for (let stmt of [...this.exit.lasts]) {
-            if (stmt.type != 'returnStatement') {
+            if (stmt.type !== 'returnStatement') {
                 notReturnStmts.push(stmt);
             }
         }
@@ -668,7 +674,7 @@ class CfgBuilder {
         }
         const returnStatement = new StatementBuilder('returnStatement', 'return;', null, this.exit.scopeID);
         let tryExit = false;
-        if (notReturnStmts.length == 1 && notReturnStmts[0].block) {
+        if (notReturnStmts.length === 1 && notReturnStmts[0].block) {
             for (const stmt of notReturnStmts[0].block.stmts) {
                 if (stmt instanceof TryStatementBuilder) {
                     tryExit = true;
@@ -676,7 +682,7 @@ class CfgBuilder {
                 }
             }
         }
-        if (notReturnStmts.length == 1 && !(notReturnStmts[0] instanceof ConditionStatementBuilder) && !tryExit) {
+        if (notReturnStmts.length === 1 && !(notReturnStmts[0] instanceof ConditionStatementBuilder) && !tryExit) {
             const notReturnStmt = notReturnStmts[0];
             notReturnStmt.next = returnStatement;
             returnStatement.lasts = new Set([notReturnStmt]);
@@ -693,11 +699,11 @@ class CfgBuilder {
             this.blocks.push(returnBlock);
             for (const notReturnStmt of notReturnStmts) {
                 if (notReturnStmt instanceof ConditionStatementBuilder) {
-                    if (this.exit == notReturnStmt.nextT) {
+                    if (this.exit === notReturnStmt.nextT) {
                         notReturnStmt.nextT = returnStatement;
                         (_b = notReturnStmt.block) === null || _b === void 0 ? void 0 : _b.nexts.splice(0, 0, returnBlock);
                     }
-                    else if (this.exit == notReturnStmt.nextF) {
+                    else if (this.exit === notReturnStmt.nextF) {
                         notReturnStmt.nextF = returnStatement;
                         (_c = notReturnStmt.block) === null || _c === void 0 ? void 0 : _c.nexts.push(returnBlock);
                     }
@@ -736,7 +742,7 @@ class CfgBuilder {
         stmt.index = this.statementArray.length;
         if (!stmt.type.includes(' exit'))
             this.statementArray.push(stmt);
-        if (stmt.type == 'ifStatement' || stmt.type == 'loopStatement' || stmt.type == 'catchOrNot') {
+        if (stmt.type === 'ifStatement' || stmt.type === 'loopStatement' || stmt.type === 'catchOrNot') {
             let cstm = stmt;
             if (cstm.nextT == null || cstm.nextF == null) {
                 this.errorTest(cstm);
@@ -745,13 +751,13 @@ class CfgBuilder {
             this.CfgBuilder2Array(cstm.nextF);
             this.CfgBuilder2Array(cstm.nextT);
         }
-        else if (stmt.type == 'switchStatement') {
+        else if (stmt.type === 'switchStatement') {
             let sstm = stmt;
             for (let ss of sstm.nexts) {
                 this.CfgBuilder2Array(ss);
             }
         }
-        else if (stmt.type == 'tryStatement') {
+        else if (stmt.type === 'tryStatement') {
             let trystm = stmt;
             if (trystm.tryFirst) {
                 this.CfgBuilder2Array(trystm.tryFirst);
@@ -772,12 +778,12 @@ class CfgBuilder {
         }
     }
     getDotEdges(stmt) {
-        if (this.statementArray.length == 0)
+        if (this.statementArray.length === 0)
             this.CfgBuilder2Array(this.entry);
         if (stmt.walked)
             return;
         stmt.walked = true;
-        if (stmt.type == 'ifStatement' || stmt.type == 'loopStatement' || stmt.type == 'catchOrNot') {
+        if (stmt.type === 'ifStatement' || stmt.type === 'loopStatement' || stmt.type === 'catchOrNot') {
             let cstm = stmt;
             if (cstm.nextT == null || cstm.nextF == null) {
                 this.errorTest(cstm);
@@ -790,7 +796,7 @@ class CfgBuilder {
             this.getDotEdges(cstm.nextF);
             this.getDotEdges(cstm.nextT);
         }
-        else if (stmt.type == 'switchStatement') {
+        else if (stmt.type === 'switchStatement') {
             let sstm = stmt;
             for (let ss of sstm.nexts) {
                 let edge = [sstm.index, ss.index];
@@ -823,12 +829,12 @@ class CfgBuilder {
         }
         for (let bi = 0; bi < this.blocks.length; bi++) {
             let block = this.blocks[bi];
-            if (bi != 0)
+            if (bi !== 0)
                 text += 'label' + block.id + ':\n';
             let length = block.stmts.length;
             for (let i = 0; i < length; i++) {
                 let stmt = block.stmts[i];
-                if (stmt.type == 'ifStatement' || stmt.type == 'loopStatement' || stmt.type == 'catchOrNot') {
+                if (stmt.type === 'ifStatement' || stmt.type === 'loopStatement' || stmt.type === 'catchOrNot') {
                     let cstm = stmt;
                     if (cstm.nextT == null || cstm.nextF == null) {
                         this.errorTest(cstm);
@@ -839,13 +845,13 @@ class CfgBuilder {
                         return text;
                     }
                     stmt.code = 'if !(' + cstm.condition + ') goto label' + cstm.nextF.block.id;
-                    if (i == length - 1 && bi + 1 < this.blocks.length && this.blocks[bi + 1].id != cstm.nextT.block.id) {
+                    if (i === length - 1 && bi + 1 < this.blocks.length && this.blocks[bi + 1].id !== cstm.nextT.block.id) {
                         let gotoStm = new StatementBuilder('gotoStatement', 'goto label' + cstm.nextT.block.id, null, block.stmts[0].scopeID);
                         block.stmts.push(gotoStm);
                         length++;
                     }
                 }
-                else if (stmt.type == 'breakStatement' || stmt.type == 'continueStatement') {
+                else if (stmt.type === 'breakStatement' || stmt.type === 'continueStatement') {
                     if (!((_b = stmt.next) === null || _b === void 0 ? void 0 : _b.block)) {
                         this.errorTest(stmt);
                         return text;
@@ -853,13 +859,13 @@ class CfgBuilder {
                     stmt.code = 'goto label' + ((_c = stmt.next) === null || _c === void 0 ? void 0 : _c.block.id);
                 }
                 else {
-                    if (i == length - 1 && ((_d = stmt.next) === null || _d === void 0 ? void 0 : _d.block) && (bi + 1 < this.blocks.length && this.blocks[bi + 1].id != stmt.next.block.id || bi + 1 == this.blocks.length)) {
+                    if (i === length - 1 && ((_d = stmt.next) === null || _d === void 0 ? void 0 : _d.block) && (bi + 1 < this.blocks.length && this.blocks[bi + 1].id !== stmt.next.block.id || bi + 1 === this.blocks.length)) {
                         let gotoStm = new StatementBuilder('StatementBuilder', 'goto label' + ((_e = stmt.next) === null || _e === void 0 ? void 0 : _e.block.id), null, block.stmts[0].scopeID);
                         block.stmts.push(gotoStm);
                         length++;
                     }
                 }
-                if (stmt.addressCode3.length == 0) {
+                if (stmt.addressCode3.length === 0) {
                     text += '    ' + stmt.code + '\n';
                 }
                 else {
@@ -931,7 +937,7 @@ class CfgBuilder {
         this.CfgBuilder2Array(this.entry);
         this.addStmtBuilderPosition();
         this.buildBlocks();
-        this.blocks = this.blocks.filter((b) => b.stmts.length != 0);
+        this.blocks = this.blocks.filter((b) => b.stmts.length !== 0);
         this.buildBlocksNextLast();
         this.addReturnBlock();
     }
@@ -976,7 +982,6 @@ class CfgBuilder {
         expressionBodyStmts.push(returnStmt);
         arkIRTransformer.mapStmtsToTsStmt(expressionBodyStmts, expressionBodyNode);
         stmts.push(...expressionBodyStmts);
-        const stmtToOriginalStmt = arkIRTransformer.getStmtToOriginalStmt();
         const cfg = new Cfg_1.Cfg();
         const blockInCfg = new BasicBlock_1.BasicBlock();
         blockInCfg.setId(0);
@@ -986,15 +991,8 @@ class CfgBuilder {
         });
         cfg.addBlock(blockInCfg);
         cfg.setStartingStmt(stmts[0]);
-        const originalCfg = new Cfg_1.Cfg();
-        const blockInOriginalCfg = new BasicBlock_1.BasicBlock();
-        blockInOriginalCfg.setId(0);
-        originalCfg.addBlock(blockInOriginalCfg);
-        originalCfg.setStartingStmt(stmtToOriginalStmt.get(stmts[0]));
         return {
             cfg: cfg,
-            originalCfg: originalCfg,
-            stmtToOriginalStmt: stmtToOriginalStmt,
             locals: arkIRTransformer.getLocals(),
             aliasTypeMap: arkIRTransformer.getAliasTypeMap()
         };
@@ -1003,10 +1001,7 @@ class CfgBuilder {
         const cfg = new Cfg_1.Cfg();
         const blockBuilderToCfgBlock = new Map();
         let isStartingStmtInCfgBlock = true;
-        const stmtsInOriginalCfg = [];
-        const stmtSetInOriginalCfg = new Set();
         const arkIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(this.sourceFile, this.declaringMethod);
-        const stmtToOriginalStmt = arkIRTransformer.getStmtToOriginalStmt();
         const blocksContainLoopCondition = new Set();
         for (let i = 0; i < this.blocks.length; i++) {
             // build block in Cfg
@@ -1015,10 +1010,10 @@ class CfgBuilder {
                 stmtsInBlock.push(...arkIRTransformer.prebuildStmts());
             }
             for (const statementBuilder of this.blocks[i].stmts) {
-                if (statementBuilder.type == 'loopStatement') {
+                if (statementBuilder.type === 'loopStatement') {
                     blocksContainLoopCondition.add(this.blocks[i]);
                 }
-                if (statementBuilder.astNode && statementBuilder.code != '') {
+                if (statementBuilder.astNode && statementBuilder.code !== '') {
                     stmtsInBlock.push(...arkIRTransformer.tsNodeToStmts(statementBuilder.astNode));
                 }
                 else if (statementBuilder.code.startsWith('return')) {
@@ -1036,19 +1031,33 @@ class CfgBuilder {
             }
             cfg.addBlock(blockInCfg);
             blockBuilderToCfgBlock.set(this.blocks[i], blockInCfg);
-            // collect stmts in OriginalCfg
-            for (const stmt of stmtsInBlock) {
-                const originalStmt = stmtToOriginalStmt.get(stmt);
-                if (originalStmt) {
-                    if (!stmtSetInOriginalCfg.has(originalStmt)) {
-                        stmtSetInOriginalCfg.add(originalStmt);
-                        stmtsInOriginalCfg.push(originalStmt);
-                    }
-                }
-            }
         }
         let currBlockId = this.blocks.length;
-        // link blocks
+        this.linkBasicBlocks(blockBuilderToCfgBlock);
+        this.rebuildBlocksInLoop(blockBuilderToCfgBlock, blocksContainLoopCondition, cfg);
+        this.rebuildBlocksInConditionalOperator(cfg);
+        for (const blockBuilder of this.blocks) {
+            if (blockBuilder.id === -1) {
+                blockBuilder.id = currBlockId++;
+                const block = blockBuilderToCfgBlock.get(blockBuilder);
+                block.setId(blockBuilder.id);
+            }
+        }
+        for (const block of cfg.getBlocks()) {
+            if (block.getId() === -1) {
+                block.setId(currBlockId++);
+            }
+        }
+        for (const stmt of cfg.getStmts()) {
+            stmt.setCfg(cfg);
+        }
+        return {
+            cfg: cfg,
+            locals: arkIRTransformer.getLocals(),
+            aliasTypeMap: arkIRTransformer.getAliasTypeMap(),
+        };
+    }
+    linkBasicBlocks(blockBuilderToCfgBlock) {
         for (const [blockBuilder, cfgBlock] of blockBuilderToCfgBlock) {
             for (const successorBlockBuilder of blockBuilder.nexts) {
                 if (!blockBuilderToCfgBlock.get(successorBlockBuilder)) {
@@ -1065,7 +1074,204 @@ class CfgBuilder {
                 cfgBlock.addPredecessorBlock(predecessorBlock);
             }
         }
-        // put statements within loop in right position
+    }
+    rebuildBlocksInConditionalOperator(cfg) {
+        var _a;
+        for (const basicBlock of cfg.getBlocks()) {
+            const stmts = Array.from(basicBlock.getStmts());
+            const stmtCnt = stmts.length;
+            let endPos = -1;
+            for (let i = stmtCnt - 1; i >= 0; i--) {
+                const stmt = stmts[i];
+                if (stmt instanceof ArkIRTransformer_1.DummyStmt && ((_a = stmt.toString()) === null || _a === void 0 ? void 0 : _a.startsWith(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT))) {
+                    endPos = i;
+                    break;
+                }
+            }
+            if (endPos === -1) {
+                continue;
+            }
+            const { topBlock, bottomBlocks, allBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, 0, endPos);
+            basicBlock.getStmts().splice(topBlock.getStmts().length);
+            const succBlocksOfIfBlock = topBlock.getSuccessors();
+            succBlocksOfIfBlock.forEach((block) => {
+                block.setPredecessorBlock(0, basicBlock);
+            });
+            const conditionalOperatorBlockSet = new Set(allBlocks);
+            this.adjustSuccessorOfConditionalOperator(basicBlock, succBlocksOfIfBlock, stmts, bottomBlocks, endPos, conditionalOperatorBlockSet);
+            conditionalOperatorBlockSet.forEach((block) => {
+                if (block !== topBlock) {
+                    cfg.addBlock(block);
+                }
+            });
+        }
+    }
+    traverseAndRebuildConditionalOperator(stmts, beginPos, endPos) {
+        const { ifTruePos, ifFalsePos, conditionalOperatorEndPos } = this.findConditionalOperator(stmts, beginPos, endPos);
+        if (ifTruePos === -1) {
+            const block = new BasicBlock_1.BasicBlock();
+            block.getStmts().push(...stmts.slice(beginPos, endPos + 1));
+            return { topBlock: block, bottomBlocks: [], allBlocks: [block] };
+        }
+        const allBlocks = [];
+        const topBlock = new BasicBlock_1.BasicBlock();
+        topBlock.getStmts().push(...stmts.slice(beginPos, ifTruePos));
+        allBlocks.push(topBlock);
+        const { topBlock: ifTrueTopBlock, bottomBlocks: ifTrueBottomBlocks, allBlocks: ifTrueAllBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, ifTruePos + 1, ifFalsePos - 1);
+        allBlocks.push(...ifTrueAllBlocks);
+        const { topBlock: ifFalseTopBlock, bottomBlocks: ifFalseBottomBlocks, allBlocks: ifFalseAllBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, ifFalsePos + 1, conditionalOperatorEndPos - 1);
+        allBlocks.push(...ifFalseAllBlocks);
+        topBlock.addSuccessorBlock(ifTrueTopBlock);
+        topBlock.addSuccessorBlock(ifFalseTopBlock);
+        ifTrueTopBlock.addPredecessorBlock(topBlock);
+        ifFalseTopBlock.addPredecessorBlock(topBlock);
+        let bottomBlocks = [];
+        bottomBlocks.push(...(ifTrueBottomBlocks.length > 0 ? ifTrueBottomBlocks : [ifTrueTopBlock]));
+        bottomBlocks.push(...(ifFalseBottomBlocks.length > 0 ? ifFalseBottomBlocks : [ifFalseTopBlock]));
+        if (conditionalOperatorEndPos !== endPos) {
+            const bottomBlock = new BasicBlock_1.BasicBlock();
+            bottomBlock.getStmts().push(...stmts.slice(conditionalOperatorEndPos + 1, endPos + 1));
+            bottomBlocks.forEach(block => {
+                block.addSuccessorBlock(bottomBlock);
+                bottomBlock.addPredecessorBlock(block);
+            });
+            bottomBlocks = [bottomBlock];
+            allBlocks.push(bottomBlock);
+        }
+        return { topBlock: topBlock, bottomBlocks: bottomBlocks, allBlocks: allBlocks };
+    }
+    findConditionalOperator(stmts, beginPos, endPos) {
+        let ifTruePos = -1;
+        let ifFalsePos = -1;
+        let conditionalOperatorEndPos = -1;
+        let currConditionalOperatorNo = '';
+        for (let i = beginPos; i <= endPos; i++) {
+            const stmt = stmts[i];
+            if (stmt instanceof ArkIRTransformer_1.DummyStmt) {
+                if (stmt.toString()
+                    .startsWith(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT) && ifTruePos === -1) {
+                    ifTruePos = i;
+                    currConditionalOperatorNo =
+                        stmt.toString().replace(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT, '');
+                }
+                else if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT + currConditionalOperatorNo) {
+                    ifFalsePos = i;
+                }
+                else if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT + currConditionalOperatorNo) {
+                    conditionalOperatorEndPos = i;
+                }
+            }
+        }
+        return { ifTruePos: ifTruePos, ifFalsePos: ifFalsePos, conditionalOperatorEndPos: conditionalOperatorEndPos };
+    }
+    adjustSuccessorOfConditionalOperator(currBasicBlock, succBlocksOfIfBlock, stmts, bottomBlocks, conditionalOperatorEndPos, conditionalOperatorBlockSet) {
+        const oldSuccBlocks = Array.from(currBasicBlock.getSuccessors());
+        currBasicBlock.getSuccessors().splice(0, oldSuccBlocks.length, ...succBlocksOfIfBlock);
+        oldSuccBlocks.forEach((succBlock) => {
+            const originalPreds = succBlock.getPredecessors();
+            for (let i = 0; i < originalPreds.length; i++) {
+                if (originalPreds[i] === currBasicBlock) {
+                    succBlock.getPredecessors().splice(i, 1);
+                    break;
+                }
+            }
+        });
+        if (conditionalOperatorEndPos === stmts.length - 1) {
+            oldSuccBlocks.forEach((oldSuccBlock) => {
+                bottomBlocks.forEach((bottomBlock) => {
+                    bottomBlock.addSuccessorBlock(oldSuccBlock);
+                    oldSuccBlock.addSuccessorBlock(bottomBlock);
+                });
+            });
+        }
+        else {
+            const insertSuccBlock = new BasicBlock_1.BasicBlock();
+            insertSuccBlock.getStmts().push(...stmts.slice(conditionalOperatorEndPos + 1, stmts.length));
+            oldSuccBlocks.forEach((oldSuccBlock) => {
+                insertSuccBlock.addSuccessorBlock(oldSuccBlock);
+                oldSuccBlock.addPredecessorBlock(insertSuccBlock);
+            });
+            bottomBlocks.forEach((bottomBlock) => {
+                bottomBlock.addSuccessorBlock(insertSuccBlock);
+                insertSuccBlock.addPredecessorBlock(bottomBlock);
+            });
+            conditionalOperatorBlockSet.add(insertSuccBlock);
+            this.removeUnnecessaryBlocksInConditionalOperator(insertSuccBlock, conditionalOperatorBlockSet);
+        }
+    }
+    removeUnnecessaryBlocksInConditionalOperator(bottomBlock, allBlocks) {
+        const firstStmtInBottom = bottomBlock.getStmts()[0];
+        if (!(firstStmtInBottom instanceof Stmt_1.ArkAssignStmt)) {
+            return;
+        }
+        const targetValue = firstStmtInBottom.getLeftOp();
+        const tempResultValue = firstStmtInBottom.getRightOp();
+        if (!(targetValue instanceof Local_1.Local && IRUtils_1.IRUtils.isTempLocal(tempResultValue))) {
+            return;
+        }
+        bottomBlock.remove(firstStmtInBottom);
+        const oldPredecessors = bottomBlock.getPredecessors();
+        const newPredecessors = [];
+        for (const predecessor of oldPredecessors) {
+            newPredecessors.push(...this.replaceTempResultcursively(predecessor, targetValue, tempResultValue, allBlocks));
+        }
+        bottomBlock.getPredecessors().splice(0, oldPredecessors.length, ...newPredecessors);
+        newPredecessors.forEach((newPredecessor) => {
+            newPredecessor.setSuccessorBlock(0, bottomBlock);
+        });
+    }
+    replaceTempResultcursively(currBottomBlock, targetLocal, tempResultLocal, allBlocks) {
+        const stmts = currBottomBlock.getStmts();
+        const stmtsCnt = stmts.length;
+        let tempResultReassignStmt = null;
+        for (let i = stmtsCnt - 1; i >= 0; i--) {
+            const stmt = stmts[i];
+            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getLeftOp() === tempResultLocal) {
+                if (IRUtils_1.IRUtils.isTempLocal(stmt.getRightOp()) && this.isNewDefLocal(stmt.getRightOp(), stmts, i)) {
+                    tempResultReassignStmt = stmt;
+                }
+                else {
+                    stmt.setLeftOp(targetLocal);
+                }
+            }
+        }
+        let newBottomBlocks = [];
+        if (tempResultReassignStmt) {
+            const oldPredecessors = currBottomBlock.getPredecessors();
+            const newPredecessors = [];
+            const prevTempResultLocal = tempResultReassignStmt.getRightOp();
+            for (const predecessor of oldPredecessors) {
+                newPredecessors.push(...this.replaceTempResultcursively(predecessor, targetLocal, prevTempResultLocal, allBlocks));
+            }
+            currBottomBlock.remove(tempResultReassignStmt);
+            if (currBottomBlock.getStmts().length === 0) {
+                // remove this block
+                newBottomBlocks = newPredecessors;
+                allBlocks.delete(currBottomBlock);
+            }
+            else {
+                currBottomBlock.getPredecessors().splice(0, oldPredecessors.length, ...newPredecessors);
+                newPredecessors.forEach((newPredecessor) => {
+                    newPredecessor.setSuccessorBlock(0, currBottomBlock);
+                });
+                newBottomBlocks = [currBottomBlock];
+            }
+        }
+        else {
+            newBottomBlocks = [currBottomBlock];
+        }
+        return newBottomBlocks;
+    }
+    isNewDefLocal(local, stmts, pos) {
+        for (let i = pos - 1; i >= 0; i++) {
+            const stmt = stmts[i];
+            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getLeftOp() === local) {
+                return false;
+            }
+        }
+        return true;
+    }
+    rebuildBlocksInLoop(blockBuilderToCfgBlock, blocksContainLoopCondition, cfg) {
         for (const blockBuilder of blocksContainLoopCondition) {
             if (!blockBuilderToCfgBlock.get(blockBuilder)) {
                 continue;
@@ -1074,38 +1280,11 @@ class CfgBuilder {
             const blockId = block.getId();
             const stmts = block.getStmts();
             const stmtsCnt = stmts.length;
-            let ifStmtIdx = -1;
-            let iteratorNextStmtIdx = -1;
-            let dummyInitializerStmtIdx = -1;
-            for (let i = 0; i < stmtsCnt; i++) {
-                const stmt = stmts[i];
-                if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Expr_1.AbstractInvokeExpr) {
-                    const invokeExpr = stmt.getRightOp();
-                    if (invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName() == Builtin_1.Builtin.ITERATOR_NEXT) {
-                        iteratorNextStmtIdx = i;
-                        continue;
-                    }
-                }
-                if (stmt.toString() == ArkIRTransformer_1.DUMMY_INITIALIZER_STMT) {
-                    dummyInitializerStmtIdx = i;
-                    continue;
-                }
-                if (stmt instanceof Stmt_1.ArkIfStmt) {
-                    ifStmtIdx = i;
-                    break;
-                }
-            }
-            if (iteratorNextStmtIdx != -1 || dummyInitializerStmtIdx != -1) {
-                // put statements into block before condition
-                const lastStmtIdxBeforeCondition = iteratorNextStmtIdx != -1 ? iteratorNextStmtIdx : dummyInitializerStmtIdx;
+            const { ifStmtIdx, iteratorNextStmtIdx, dummyInitializerStmtIdx } = this.findIteratorIdx(stmts);
+            if (iteratorNextStmtIdx !== -1 || dummyInitializerStmtIdx !== -1) {
+                const lastStmtIdxBeforeCondition = iteratorNextStmtIdx !== -1 ? iteratorNextStmtIdx : dummyInitializerStmtIdx;
                 const stmtsInsertBeforeCondition = stmts.slice(0, lastStmtIdxBeforeCondition);
-                let prevBlockBuilderContainsLoop = false;
-                for (const prevBlockBuilder of blockBuilder.lasts) {
-                    if (prevBlockBuilder.id < blockId && blocksContainLoopCondition.has(prevBlockBuilder)) {
-                        prevBlockBuilderContainsLoop = true;
-                        break;
-                    }
-                }
+                let prevBlockBuilderContainsLoop = this.doesPrevBlockBuilderContainLoop(blockBuilder, blockId, blocksContainLoopCondition);
                 if (prevBlockBuilderContainsLoop) {
                     // should create an extra block when previous block contains loop condition
                     this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, blockBuilder, stmtsInsertBeforeCondition, false, cfg);
@@ -1115,27 +1294,11 @@ class CfgBuilder {
                     const blockBeforeCondition = blockBuilderToCfgBlock.get(blockBuilderBeforeCondition);
                     blockBeforeCondition === null || blockBeforeCondition === void 0 ? void 0 : blockBeforeCondition.getStmts().push(...stmtsInsertBeforeCondition);
                 }
-                if (dummyInitializerStmtIdx != -1 && ifStmtIdx != stmtsCnt - 1) {
+                if (dummyInitializerStmtIdx !== -1 && ifStmtIdx !== stmtsCnt - 1) {
                     // put incrementor statements into block which reenters condition
-                    const stmtsReenterCondition = stmts.slice(ifStmtIdx + 1);
-                    const blockBuildersReenterCondition = [];
-                    for (const prevBlockBuilder of blockBuilder.lasts) {
-                        const prevBlock = blockBuilderToCfgBlock.get(prevBlockBuilder);
-                        if (prevBlock.getId() > blockId) {
-                            blockBuildersReenterCondition.push(prevBlockBuilder);
-                        }
-                    }
-                    if (blockBuildersReenterCondition.length > 1 || blocksContainLoopCondition.has(blockBuildersReenterCondition[0])) {
-                        // put incrementor statements into an extra block
-                        this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, blockBuilder, stmtsReenterCondition, true, cfg);
-                    }
-                    else {
-                        // put incrementor statements into prev reenter block
-                        const blockReenterCondition = blockBuilderToCfgBlock.get(blockBuildersReenterCondition[0]);
-                        blockReenterCondition === null || blockReenterCondition === void 0 ? void 0 : blockReenterCondition.getStmts().push(...stmtsReenterCondition);
-                    }
+                    this.adjustIncrementorStmts(stmts, ifStmtIdx, blockBuilder, blockId, blockBuilderToCfgBlock, blocksContainLoopCondition, cfg);
                 }
-                else if (iteratorNextStmtIdx != -1) {
+                else if (iteratorNextStmtIdx !== -1) {
                     // put statements which get value of iterator into block after condition
                     const blockBuilderAfterCondition = blockBuilder.nexts[0];
                     const blockAfterCondition = blockBuilderToCfgBlock.get(blockBuilderAfterCondition);
@@ -1143,37 +1306,21 @@ class CfgBuilder {
                     blockAfterCondition === null || blockAfterCondition === void 0 ? void 0 : blockAfterCondition.getStmts().splice(0, 0, ...stmtsAfterCondition);
                 }
                 // remove statements which should not in condition
-                const firstStmtIdxInCondition = iteratorNextStmtIdx != -1 ? iteratorNextStmtIdx : dummyInitializerStmtIdx + 1;
+                const firstStmtIdxInCondition = iteratorNextStmtIdx !== -1 ? iteratorNextStmtIdx : dummyInitializerStmtIdx + 1;
                 stmts.splice(0, firstStmtIdxInCondition);
                 stmts.splice(ifStmtIdx - firstStmtIdxInCondition + 1);
             }
         }
-        for (const blockBuilder of this.blocks) {
-            if (blockBuilder.id == -1) {
-                blockBuilder.id = currBlockId++;
-                const block = blockBuilderToCfgBlock.get(blockBuilder);
-                block.setId(blockBuilder.id);
-            }
-        }
-        for (const stmt of cfg.getStmts()) {
-            stmt.setCfg(cfg);
-        }
-        const originalCfg = new Cfg_1.Cfg();
-        const originalCfgBlock = new BasicBlock_1.BasicBlock();
-        for (let i = 0; i < stmtsInOriginalCfg.length; i++) {
-            if (i === 0) {
-                originalCfg.setStartingStmt(stmtsInOriginalCfg[i]);
+    }
+    doesPrevBlockBuilderContainLoop(currBlockBuilder, currBlockId, blocksContainLoopCondition) {
+        let prevBlockBuilderContainsLoop = false;
+        for (const prevBlockBuilder of currBlockBuilder.lasts) {
+            if (prevBlockBuilder.id < currBlockId && blocksContainLoopCondition.has(prevBlockBuilder)) {
+                prevBlockBuilderContainsLoop = true;
+                break;
             }
-            originalCfgBlock.addStmt(stmtsInOriginalCfg[i]);
         }
-        originalCfg.addBlock(originalCfgBlock);
-        return {
-            cfg: cfg,
-            originalCfg: originalCfg,
-            stmtToOriginalStmt: stmtToOriginalStmt,
-            locals: arkIRTransformer.getLocals(),
-            aliasTypeMap: arkIRTransformer.getAliasTypeMap(),
-        };
+        return prevBlockBuilderContainsLoop;
     }
     insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, conditionBlockBuilder, stmtsInsertBeforeCondition, collectReenter, cfg) {
         const blockId = conditionBlockBuilder.id;
@@ -1213,7 +1360,7 @@ class CfgBuilder {
         for (const prevBlockBuilder of collectedBlockBuilders) {
             const prevBlock = blockBuilderToCfgBlock.get(prevBlockBuilder);
             for (let j = 0; j < prevBlockBuilder.nexts.length; j++) {
-                if (prevBlockBuilder.nexts[j] == conditionBlockBuilder) {
+                if (prevBlockBuilder.nexts[j] === conditionBlockBuilder) {
                     prevBlockBuilder.nexts[j] = blockBuilderInsertBeforeCondition;
                     prevBlock.setSuccessorBlock(j, blockInsertBeforeCondition);
                     break;
@@ -1237,5 +1384,54 @@ class CfgBuilder {
         cfg.addBlock(blockInsertBeforeCondition);
         blockBuilderToCfgBlock.set(blockBuilderInsertBeforeCondition, blockInsertBeforeCondition);
     }
+    findIteratorIdx(stmts) {
+        let ifStmtIdx = -1;
+        let iteratorNextStmtIdx = -1;
+        let dummyInitializerStmtIdx = -1;
+        const stmtsCnt = stmts.length;
+        for (let i = 0; i < stmtsCnt; i++) {
+            const stmt = stmts[i];
+            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Expr_1.AbstractInvokeExpr) {
+                const invokeExpr = stmt.getRightOp();
+                if (invokeExpr.getMethodSignature().getMethodSubSignature()
+                    .getMethodName() === Builtin_1.Builtin.ITERATOR_NEXT) {
+                    iteratorNextStmtIdx = i;
+                    continue;
+                }
+            }
+            if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT) {
+                dummyInitializerStmtIdx = i;
+                continue;
+            }
+            if (stmt instanceof Stmt_1.ArkIfStmt) {
+                ifStmtIdx = i;
+                break;
+            }
+        }
+        return {
+            ifStmtIdx: ifStmtIdx,
+            iteratorNextStmtIdx: iteratorNextStmtIdx,
+            dummyInitializerStmtIdx: dummyInitializerStmtIdx,
+        };
+    }
+    adjustIncrementorStmts(stmts, ifStmtIdx, currBlockBuilder, currBlockId, blockBuilderToCfgBlock, blocksContainLoopCondition, cfg) {
+        const stmtsReenterCondition = stmts.slice(ifStmtIdx + 1);
+        const blockBuildersReenterCondition = [];
+        for (const prevBlockBuilder of currBlockBuilder.lasts) {
+            const prevBlock = blockBuilderToCfgBlock.get(prevBlockBuilder);
+            if (prevBlock.getId() > currBlockId) {
+                blockBuildersReenterCondition.push(prevBlockBuilder);
+            }
+        }
+        if (blockBuildersReenterCondition.length > 1 || blocksContainLoopCondition.has(blockBuildersReenterCondition[0])) {
+            // put incrementor statements into an extra block
+            this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, currBlockBuilder, stmtsReenterCondition, true, cfg);
+        }
+        else {
+            // put incrementor statements into prev reenter block
+            const blockReenterCondition = blockBuilderToCfgBlock.get(blockBuildersReenterCondition[0]);
+            blockReenterCondition === null || blockReenterCondition === void 0 ? void 0 : blockReenterCondition.getStmts().push(...stmtsReenterCondition);
+        }
+    }
 }
 exports.CfgBuilder = CfgBuilder;