arkanalyzer 1.0.16 → 1.0.18

package/lib/core/graph/builder/SwitchBuilder.js

@@ -0,0 +1,152 @@
+"use strict";
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwitchBuilder = void 0;
+const BasicBlock_1 = require("../BasicBlock");
+const logger_1 = __importStar(require("../../../utils/logger"));
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'SwitchBuilder');
+/**
+ * Builder for switch statement in CFG
+ */
+class SwitchBuilder {
+    buildSwitch(blockBuilderToCfgBlock, blockBuildersContainSwitch, valueAndStmtsOfSwitchAndCasesAll, arkIRTransformer, basicBlockSet) {
+        for (let i = 0; i < blockBuildersContainSwitch.length; i++) {
+            const blockBuilderContainSwitch = blockBuildersContainSwitch[i];
+            if (!blockBuilderToCfgBlock.has(blockBuilderContainSwitch)) {
+                logger.error(`can't find basicBlock corresponding to the blockBuilder.`);
+                continue;
+            }
+            const blockContainSwitch = blockBuilderToCfgBlock.get(blockBuilderContainSwitch);
+            const valueAndStmtsOfSwitch = valueAndStmtsOfSwitchAndCasesAll[i][0];
+            const stmtsOfSwitch = valueAndStmtsOfSwitch.stmts;
+            stmtsOfSwitch.forEach((stmt) => {
+                blockContainSwitch.addStmt(stmt);
+            });
+            const stmtsCnt = blockBuilderContainSwitch.stmts.length;
+            const switchStmtBuilder = blockBuilderContainSwitch.stmts[stmtsCnt - 1];
+            const cases = switchStmtBuilder.cases;
+            let nonEmptyCaseCnt = 0;
+            for (const currCase of cases) {
+                if (currCase.stmt.block) { // there are stmts after this case
+                    nonEmptyCaseCnt++;
+                }
+            }
+            if (nonEmptyCaseCnt === 0) {
+                continue;
+            }
+            const caseCnt = cases.length;
+            const caseIfBlocks = this.generateIfBlocksForCases(valueAndStmtsOfSwitchAndCasesAll[i], caseCnt, blockContainSwitch, basicBlockSet, arkIRTransformer);
+            this.linkIfBlockAndCaseBlock(blockContainSwitch, caseIfBlocks, switchStmtBuilder, blockBuilderToCfgBlock);
+        }
+    }
+    generateIfBlocksForCases(valueAndStmtsOfSwitchAndCases, caseCnt, blockContainSwitch, basicBlockSet, arkIRTransformer) {
+        const valueAndStmtsOfSwitch = valueAndStmtsOfSwitchAndCases[0];
+        const valueOfSwitch = valueAndStmtsOfSwitch.value;
+        const caseIfBlocks = [];
+        for (let j = 0; j < caseCnt; j++) {
+            let caseIfBlock;
+            if (j === 0) {
+                caseIfBlock = blockContainSwitch;
+            }
+            else {
+                caseIfBlock = new BasicBlock_1.BasicBlock();
+                basicBlockSet.add(caseIfBlock);
+            }
+            caseIfBlocks.push(caseIfBlock);
+            const caseValueAndStmts = valueAndStmtsOfSwitchAndCases[j + 1];
+            const caseValue = caseValueAndStmts.value;
+            const caseStmts = caseValueAndStmts.stmts;
+            caseStmts.forEach((stmt) => {
+                caseIfBlock.addStmt(stmt);
+            });
+            const caseIfStmts = arkIRTransformer.generateIfStmtForValues(valueOfSwitch, valueAndStmtsOfSwitch.valueOriginalPositions, caseValue, caseValueAndStmts.valueOriginalPositions);
+            caseIfStmts.forEach((stmt) => {
+                caseIfBlock.addStmt(stmt);
+            });
+        }
+        return caseIfBlocks;
+    }
+    linkIfBlockAndCaseBlock(blockContainSwitch, caseIfBlocks, switchStmtBuilder, blockBuilderToCfgBlock) {
+        const successorsOfBlockContainSwitch = Array.from(blockContainSwitch.getSuccessors());
+        const expectedSuccessorsOfCaseIfBlock = [];
+        const defaultStmtBuilder = switchStmtBuilder.default;
+        if (defaultStmtBuilder && defaultStmtBuilder.block) {
+            expectedSuccessorsOfCaseIfBlock.push(...successorsOfBlockContainSwitch.splice(-1, 1));
+        }
+        else {
+            const afterSwitchStmtBuilder = switchStmtBuilder.afterSwitch;
+            const afterSwitchBlockBuilder = afterSwitchStmtBuilder === null || afterSwitchStmtBuilder === void 0 ? void 0 : afterSwitchStmtBuilder.block;
+            if (!afterSwitchBlockBuilder || !blockBuilderToCfgBlock.has(afterSwitchBlockBuilder)) {
+                logger.error(`can't find basicBlock corresponding to the blockBuilder.`);
+                return false;
+            }
+            expectedSuccessorsOfCaseIfBlock.push(blockBuilderToCfgBlock.get(afterSwitchBlockBuilder));
+        }
+        const caseCnt = switchStmtBuilder.cases.length;
+        for (let i = caseCnt - 1; i >= 0; i--) {
+            const currCase = switchStmtBuilder.cases[i];
+            if (currCase.stmt.block) {
+                expectedSuccessorsOfCaseIfBlock.push(...successorsOfBlockContainSwitch.splice(-1, 1));
+            }
+            else { // if there are no stmts after this case, reuse the successor of the next case
+                expectedSuccessorsOfCaseIfBlock.push(...expectedSuccessorsOfCaseIfBlock.slice(-1));
+            }
+        }
+        expectedSuccessorsOfCaseIfBlock.reverse();
+        blockContainSwitch.getSuccessors().forEach((successor) => {
+            successor.getPredecessors().splice(0, 1);
+        });
+        blockContainSwitch.getSuccessors().splice(0);
+        for (let j = 0; j < caseCnt; j++) {
+            const caseIfBlock = caseIfBlocks[j];
+            caseIfBlock.addSuccessorBlock(expectedSuccessorsOfCaseIfBlock[j]);
+            expectedSuccessorsOfCaseIfBlock[j].addPredecessorBlock(caseIfBlock);
+            if (j === caseCnt - 1) { // the false branch of last case should be default or block after switch statement
+                caseIfBlock.addSuccessorBlock(expectedSuccessorsOfCaseIfBlock[j + 1]);
+                expectedSuccessorsOfCaseIfBlock[j + 1].addPredecessorBlock(caseIfBlock);
+            }
+            else {
+                caseIfBlock.addSuccessorBlock(caseIfBlocks[j + 1]);
+                caseIfBlocks[j + 1].addPredecessorBlock(caseIfBlock);
+            }
+        }
+        return true;
+    }
+}
+exports.SwitchBuilder = SwitchBuilder;

package/lib/core/graph/builder/TrapBuilder.d.ts

@@ -0,0 +1,17 @@
+import { BasicBlock } from '../BasicBlock';
+import { ArkIRTransformer } from '../../common/ArkIRTransformer';
+import { Trap } from '../../base/Trap';
+import { BlockBuilder } from './CfgBuilder';
+/**
+ * Builder for traps from try...catch
+ */
+export declare class TrapBuilder {
+    buildTraps(blockBuilderToCfgBlock: Map<BlockBuilder, BasicBlock>, blockBuildersBeforeTry: Set<BlockBuilder>, arkIRTransformer: ArkIRTransformer, basicBlockSet: Set<BasicBlock>): Trap[];
+    private buildTrapsIfNoFinally;
+    private buildTrapsIfFinallyExist;
+    private getAllBlocksBFS;
+    private copyFinallyBlocks;
+    private copyBlocks;
+    private copyStmt;
+}
+//# sourceMappingURL=TrapBuilder.d.ts.map

package/lib/core/graph/builder/TrapBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TrapBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/TrapBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAavC,OAAO,EAAE,YAAY,EAAuB,MAAM,cAAc,CAAC;AAKjE;;GAEG;AACH,qBAAa,WAAW;IACb,UAAU,CAAC,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,sBAAsB,EAAE,GAAG,CAAC,YAAY,CAAC,EAChG,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC,GAAG,IAAI,EAAE;IA+C7F,OAAO,CAAC,qBAAqB;IA6C7B,OAAO,CAAC,wBAAwB;IAoChC,OAAO,CAAC,eAAe;IAoCvB,OAAO,CAAC,iBAAiB;IAmCzB,OAAO,CAAC,UAAU;IAyBlB,OAAO,CAAC,QAAQ;CAgBnB"}

package/lib/core/graph/builder/TrapBuilder.js

@@ -0,0 +1,272 @@
+"use strict";
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrapBuilder = void 0;
+const BasicBlock_1 = require("../BasicBlock");
+const Trap_1 = require("../../base/Trap");
+const Ref_1 = require("../../base/Ref");
+const Type_1 = require("../../base/Type");
+const Position_1 = require("../../base/Position");
+const Stmt_1 = require("../../base/Stmt");
+const logger_1 = __importStar(require("../../../utils/logger"));
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'TrapBuilder');
+/**
+ * Builder for traps from try...catch
+ */
+class TrapBuilder {
+    buildTraps(blockBuilderToCfgBlock, blockBuildersBeforeTry, arkIRTransformer, basicBlockSet) {
+        var _a, _b, _c;
+        const traps = [];
+        for (const blockBuilderBeforeTry of blockBuildersBeforeTry) {
+            if (blockBuilderBeforeTry.nexts.length === 0) {
+                logger.error(`can't find try block.`);
+                continue;
+            }
+            const blockBuilderContainTry = blockBuilderBeforeTry.nexts[0];
+            const stmtsCnt = blockBuilderBeforeTry.stmts.length;
+            const tryStmtBuilder = blockBuilderBeforeTry.stmts[stmtsCnt - 1];
+            const finallyBlockBuilder = (_a = tryStmtBuilder.finallyStatement) === null || _a === void 0 ? void 0 : _a.block;
+            if (!finallyBlockBuilder) {
+                logger.error(`can't find finally block or dummy finally block.`);
+                continue;
+            }
+            const { bfsBlocks: tryBfsBlocks, tailBlocks: tryTailBlocks } = this.getAllBlocksBFS(blockBuilderToCfgBlock, blockBuilderContainTry, finallyBlockBuilder);
+            let catchBfsBlocks = [];
+            let catchTailBlocks = [];
+            const catchBlockBuilder = (_b = tryStmtBuilder.catchStatement) === null || _b === void 0 ? void 0 : _b.block;
+            if (catchBlockBuilder) {
+                ({ bfsBlocks: catchBfsBlocks, tailBlocks: catchTailBlocks } = this.getAllBlocksBFS(blockBuilderToCfgBlock, catchBlockBuilder));
+            }
+            const finallyStmts = finallyBlockBuilder.stmts;
+            const blockBuilderAfterFinally = (_c = tryStmtBuilder.afterFinal) === null || _c === void 0 ? void 0 : _c.block;
+            if (!blockBuilderAfterFinally) {
+                logger.error(`can't find block after try...catch.`);
+                continue;
+            }
+            if (finallyStmts.length === 1 && finallyStmts[0].code === 'dummyFinally') { // no finally block
+                const trapsIfNoFinally = this.buildTrapsIfNoFinally(tryBfsBlocks, tryTailBlocks, catchBfsBlocks, catchTailBlocks, finallyBlockBuilder, blockBuilderAfterFinally, basicBlockSet, blockBuilderToCfgBlock);
+                if (trapsIfNoFinally) {
+                    traps.push(...trapsIfNoFinally);
+                }
+            }
+            else {
+                const trapsIfFinallyExist = this.buildTrapsIfFinallyExist(tryBfsBlocks, tryTailBlocks, catchBfsBlocks, catchTailBlocks, finallyBlockBuilder, blockBuilderAfterFinally, basicBlockSet, arkIRTransformer, blockBuilderToCfgBlock);
+                traps.push(...trapsIfFinallyExist);
+            }
+        }
+        return traps;
+    }
+    buildTrapsIfNoFinally(tryBfsBlocks, tryTailBlocks, catchBfsBlocks, catchTailBlocks, finallyBlockBuilder, blockBuilderAfterFinally, basicBlockSet, blockBuilderToCfgBlock) {
+        if (catchBfsBlocks.length === 0) {
+            logger.error(`catch block expected.`);
+            return null;
+        }
+        if (!blockBuilderToCfgBlock.has(blockBuilderAfterFinally)) {
+            logger.error(`can't find basicBlock corresponding to the blockBuilder.`);
+            return null;
+        }
+        let blockAfterFinally = blockBuilderToCfgBlock.get(blockBuilderAfterFinally);
+        if (!blockBuilderToCfgBlock.has(finallyBlockBuilder)) {
+            logger.error(`can't find basicBlock corresponding to the blockBuilder.`);
+            return null;
+        }
+        const finallyBlock = blockBuilderToCfgBlock.get(finallyBlockBuilder);
+        let dummyFinallyIdxInPredecessors = -1;
+        for (let i = 0; i < blockAfterFinally.getPredecessors().length; i++) {
+            if (blockAfterFinally.getPredecessors()[i] === finallyBlock) {
+                dummyFinallyIdxInPredecessors = i;
+                break;
+            }
+        }
+        if (dummyFinallyIdxInPredecessors === -1) {
+            return null;
+        }
+        blockAfterFinally.getPredecessors().splice(dummyFinallyIdxInPredecessors, 1);
+        for (const tryTailBlock of tryTailBlocks) {
+            tryTailBlock.setSuccessorBlock(0, blockAfterFinally);
+            blockAfterFinally.addPredecessorBlock(tryTailBlock);
+        }
+        basicBlockSet.delete(finallyBlock);
+        for (const catchTailBlock of catchTailBlocks) {
+            catchTailBlock.addSuccessorBlock(blockAfterFinally);
+            blockAfterFinally.addPredecessorBlock(catchTailBlock);
+        }
+        for (const tryTailBlock of tryTailBlocks) {
+            tryTailBlock.addExceptionalSuccessorBlock(catchBfsBlocks[0]);
+        }
+        return [new Trap_1.Trap(tryBfsBlocks, catchBfsBlocks)];
+    }
+    buildTrapsIfFinallyExist(tryBfsBlocks, tryTailBlocks, catchBfsBlocks, catchTailBlocks, finallyBlockBuilder, blockBuilderAfterFinally, basicBlockSet, arkIRTransformer, blockBuilderToCfgBlock) {
+        const { bfsBlocks: finallyBfsBlocks, tailBlocks: finallyTailBlocks } = this.getAllBlocksBFS(blockBuilderToCfgBlock, finallyBlockBuilder, blockBuilderAfterFinally);
+        const copyFinallyBfsBlocks = this.copyFinallyBlocks(finallyBfsBlocks, finallyTailBlocks, basicBlockSet, arkIRTransformer, blockBuilderToCfgBlock);
+        const traps = [];
+        if (catchBfsBlocks.length !== 0) {
+            for (const catchTailBlock of catchTailBlocks) {
+                catchTailBlock.addSuccessorBlock(finallyBfsBlocks[0]);
+                finallyBfsBlocks[0].addPredecessorBlock(catchTailBlock);
+            }
+            // try -> catch trap
+            for (const tryTailBlock of tryTailBlocks) {
+                tryTailBlock.addExceptionalSuccessorBlock(catchBfsBlocks[0]);
+            }
+            traps.push(new Trap_1.Trap(tryBfsBlocks, catchBfsBlocks));
+            // catch -> finally trap
+            for (const catchTailBlock of catchTailBlocks) {
+                catchTailBlock.addExceptionalSuccessorBlock(copyFinallyBfsBlocks[0]);
+            }
+            traps.push(new Trap_1.Trap(catchBfsBlocks, copyFinallyBfsBlocks));
+        }
+        else {
+            // try -> finally trap
+            for (const tryTailBlock of tryTailBlocks) {
+                tryTailBlock.addExceptionalSuccessorBlock(copyFinallyBfsBlocks[0]);
+            }
+            traps.push(new Trap_1.Trap(tryBfsBlocks, copyFinallyBfsBlocks));
+        }
+        return traps;
+    }
+    getAllBlocksBFS(blockBuilderToCfgBlock, startBlockBuilder, endBlockBuilder) {
+        const bfsBlocks = [];
+        const tailBlocks = [];
+        const queue = [];
+        const visitedBlockBuilders = new Set();
+        queue.push(startBlockBuilder);
+        while (queue.length !== 0) {
+            const currBlockBuilder = queue.splice(0, 1)[0];
+            if (visitedBlockBuilders.has(currBlockBuilder)) {
+                continue;
+            }
+            visitedBlockBuilders.add(currBlockBuilder);
+            if (!blockBuilderToCfgBlock.has(currBlockBuilder)) {
+                logger.error(`can't find basicBlock corresponding to the blockBuilder.`);
+                continue;
+            }
+            const currBlock = blockBuilderToCfgBlock.get(currBlockBuilder);
+            bfsBlocks.push(currBlock);
+            const childList = currBlockBuilder.nexts;
+            if (childList.length === 0 || (childList.length !== 0 && (childList[0] === endBlockBuilder))) {
+                if (childList[0] === endBlockBuilder) {
+                    tailBlocks.push(currBlock);
+                    continue;
+                }
+            }
+            if (childList.length !== 0) {
+                for (const child of childList) {
+                    queue.push(child);
+                }
+            }
+        }
+        return { bfsBlocks, tailBlocks };
+    }
+    copyFinallyBlocks(finallyBfsBlocks, finallyTailBlocks, basicBlockSet, arkIRTransformer, blockBuilderToCfgBlock) {
+        var _a;
+        const copyFinallyBfsBlocks = this.copyBlocks(finallyBfsBlocks);
+        const caughtExceptionRef = new Ref_1.ArkCaughtExceptionRef(Type_1.UnknownType.getInstance());
+        const { value: exceptionValue, stmts: exceptionAssignStmts, } = arkIRTransformer.generateAssignStmtForValue(caughtExceptionRef, [Position_1.FullPosition.DEFAULT]);
+        copyFinallyBfsBlocks[0].addHead(exceptionAssignStmts);
+        const finallyPredecessorsCnt = copyFinallyBfsBlocks[0].getPredecessors().length;
+        copyFinallyBfsBlocks[0].getPredecessors().splice(0, finallyPredecessorsCnt);
+        const throwStmt = new Stmt_1.ArkThrowStmt(exceptionValue);
+        let copyFinallyTailBlocks = copyFinallyBfsBlocks.splice(copyFinallyBfsBlocks.length - finallyTailBlocks.length, finallyTailBlocks.length);
+        copyFinallyTailBlocks.forEach((copyFinallyTailBlock) => {
+            const successorsCnt = copyFinallyTailBlock.getSuccessors().length;
+            copyFinallyTailBlock.getSuccessors().splice(0, successorsCnt);
+        });
+        if (copyFinallyTailBlocks.length > 1) {
+            const newCopyFinallyTailBlock = new BasicBlock_1.BasicBlock();
+            copyFinallyTailBlocks.forEach((copyFinallyTailBlock) => {
+                copyFinallyTailBlock.addSuccessorBlock(newCopyFinallyTailBlock);
+                newCopyFinallyTailBlock.addPredecessorBlock(copyFinallyTailBlock);
+            });
+            copyFinallyTailBlocks = [newCopyFinallyTailBlock];
+        }
+        (_a = copyFinallyTailBlocks[0]) === null || _a === void 0 ? void 0 : _a.addStmt(throwStmt);
+        copyFinallyBfsBlocks.push(...copyFinallyTailBlocks);
+        copyFinallyBfsBlocks.forEach((copyFinallyBfsBlock) => {
+            basicBlockSet.add(copyFinallyBfsBlock);
+        });
+        return copyFinallyBfsBlocks;
+    }
+    copyBlocks(sourceBlocks) {
+        const sourceToTarget = new Map();
+        const targetBlocks = [];
+        for (const sourceBlock of sourceBlocks) {
+            const targetBlock = new BasicBlock_1.BasicBlock();
+            for (const stmt of sourceBlock.getStmts()) {
+                targetBlock.addStmt(this.copyStmt(stmt));
+            }
+            sourceToTarget.set(sourceBlock, targetBlock);
+            targetBlocks.push(targetBlock);
+        }
+        for (const sourceBlock of sourceBlocks) {
+            const targetBlock = sourceToTarget.get(sourceBlock);
+            for (const predecessor of sourceBlock.getPredecessors()) {
+                const targetPredecessor = sourceToTarget.get(predecessor);
+                targetBlock.addPredecessorBlock(targetPredecessor);
+            }
+            for (const successor of sourceBlock.getSuccessors()) {
+                const targetSuccessor = sourceToTarget.get(successor);
+                targetBlock.addSuccessorBlock(targetSuccessor);
+            }
+        }
+        return targetBlocks;
+    }
+    copyStmt(sourceStmt) {
+        if (sourceStmt instanceof Stmt_1.ArkAssignStmt) {
+            return new Stmt_1.ArkAssignStmt(sourceStmt.getLeftOp(), sourceStmt.getRightOp());
+        }
+        else if (sourceStmt instanceof Stmt_1.ArkInvokeStmt) {
+            return new Stmt_1.ArkInvokeStmt(sourceStmt.getInvokeExpr());
+        }
+        else if (sourceStmt instanceof Stmt_1.ArkIfStmt) {
+            return new Stmt_1.ArkIfStmt(sourceStmt.getConditionExpr());
+        }
+        else if (sourceStmt instanceof Stmt_1.ArkReturnStmt) {
+            return new Stmt_1.ArkReturnStmt(sourceStmt.getOp());
+        }
+        else if (sourceStmt instanceof Stmt_1.ArkReturnVoidStmt) {
+            return new Stmt_1.ArkReturnVoidStmt();
+        }
+        else if (sourceStmt instanceof Stmt_1.ArkThrowStmt) {
+            return new Stmt_1.ArkThrowStmt(sourceStmt.getOp());
+        }
+        return null;
+    }
+}
+exports.TrapBuilder = TrapBuilder;

package/lib/core/model/ArkMethod.d.ts

@@ -7,7 +7,7 @@ import { ViewTree } from '../graph/ViewTree';
 import { ArkBody } from './ArkBody';
 import { ArkClass } from './ArkClass';
 import { MethodSignature } from './ArkSignature';
-import { BodyBuilder } from '../common/BodyBuilder';
+import { BodyBuilder } from './builder/BodyBuilder';
 import { ArkExport, ExportType } from './ArkExport';
 import { LineCol } from '../base/Position';
 import { ArkBaseModel } from './ArkBaseModel';

package/lib/core/model/ArkMethod.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

package/lib/core/model/ArkSignature.d.ts

@@ -1,6 +1,6 @@
 import { ClassType, Type } from '../base/Type';
 import { MethodParameter } from './builder/ArkMethodBuilder';
-export type Signature = FileSignature | NamespaceSignature | ClassSignature | MethodSignature | FieldSignature | LocalSignature;
+export type Signature = FileSignature | NamespaceSignature | ClassSignature | MethodSignature | FieldSignature | LocalSignature | AliasTypeSignature;
 export interface ArkSignature {
     getSignature(): Signature;
 }
@@ -146,6 +146,14 @@ export declare class LocalSignature {
     getDeclaringMethodSignature(): MethodSignature;
     toString(): string;
 }
+export declare class AliasTypeSignature {
+    private name;
+    private declaringMethodSignature;
+    constructor(name: string, declaringMethodSignature: MethodSignature);
+    getName(): string;
+    getDeclaringMethodSignature(): MethodSignature;
+    toString(): string;
+}
 export declare function fieldSignatureCompare(leftSig: FieldSignature, rightSig: FieldSignature): boolean;
 export declare function methodSignatureCompare(leftSig: MethodSignature, rightSig: MethodSignature): boolean;
 export declare function methodSubSignatureCompare(leftSig: MethodSubSignature, rightSig: MethodSubSignature): boolean;

package/lib/core/model/ArkSignature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkSignature.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkSignature.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ArkSignature.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkSignature.ts"],"names":[],"mappings":"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"}

package/lib/core/model/ArkSignature.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genSignature4ImportClause = exports.fileSignatureCompare = exports.classSignatureCompare = exports.methodSubSignatureCompare = exports.methodSignatureCompare = exports.fieldSignatureCompare = exports.LocalSignature = exports.MethodSignature = exports.MethodSubSignature = exports.FieldSignature = exports.AliasClassSignature = exports.ClassSignature = exports.NamespaceSignature = exports.FileSignature = void 0;
+exports.genSignature4ImportClause = exports.fileSignatureCompare = exports.classSignatureCompare = exports.methodSubSignatureCompare = exports.methodSignatureCompare = exports.fieldSignatureCompare = exports.AliasTypeSignature = exports.LocalSignature = exports.MethodSignature = exports.MethodSubSignature = exports.FieldSignature = exports.AliasClassSignature = exports.ClassSignature = exports.NamespaceSignature = exports.FileSignature = void 0;
 const path_1 = __importDefault(require("path"));
 const pathTransfer_1 = require("../../utils/pathTransfer");
 const Type_1 = require("../base/Type");
@@ -307,6 +307,22 @@ class LocalSignature {
     }
 }
 exports.LocalSignature = LocalSignature;
+class AliasTypeSignature {
+    constructor(name, declaringMethodSignature) {
+        this.name = name;
+        this.declaringMethodSignature = declaringMethodSignature;
+    }
+    getName() {
+        return this.name;
+    }
+    getDeclaringMethodSignature() {
+        return this.declaringMethodSignature;
+    }
+    toString() {
+        return this.declaringMethodSignature.toString() + '#' + this.name;
+    }
+}
+exports.AliasTypeSignature = AliasTypeSignature;
 //TODO, reconstruct
 function fieldSignatureCompare(leftSig, rightSig) {
     if (leftSig.getDeclaringSignature().toString() === rightSig.getDeclaringSignature().toString() &&

package/lib/core/model/builder/ArkClassBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AA8BtD,MAAM,MAAM,aAAa,GACrB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAU/B,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,QAG/G;AAED,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAClD,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAI3G;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,EAC3B,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAOxF;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EACvD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAYpG;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EACjE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAazG;AAgBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QA2BhI"}
+{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AA8BtD,MAAM,MAAM,aAAa,GACrB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAU/B,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,QAI/G;AAED,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAClD,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAI3G;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,EAC3B,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAOxF;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EACvD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAYpG;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EACjE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAazG;AAgBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QA2BhI"}

package/lib/core/model/builder/ArkClassBuilder.js

@@ -57,11 +57,12 @@ const ArkSignature_1 = require("../ArkSignature");
 const ArkSignatureBuilder_1 = require("./ArkSignatureBuilder");
 const Position_1 = require("../../base/Position");
 const Type_1 = require("../../base/Type");
-const BodyBuilder_1 = require("../../common/BodyBuilder");
+const BodyBuilder_1 = require("./BodyBuilder");
 const Expr_1 = require("../../base/Expr");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkClassBuilder');
 function buildDefaultArkClassFromArkFile(arkFile, defaultClass, astRoot) {
     defaultClass.setDeclaringArkFile(arkFile);
+    defaultClass.setCategory(ArkClass_1.ClassCategory.CLASS);
     buildDefaultArkClass(defaultClass, astRoot);
 }
 exports.buildDefaultArkClassFromArkFile = buildDefaultArkClassFromArkFile;

package/lib/core/model/builder/ArkMethodBuilder.js

@@ -42,7 +42,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAndUpdateMethod = exports.isMethodImplementation = exports.addInitInConstructor = exports.buildInitMethod = exports.buildDefaultConstructor = exports.MethodParameter = exports.ArrayBindingPatternParameter = exports.ObjectBindingPatternParameter = exports.buildArkMethodFromArkClass = exports.buildDefaultArkMethodFromArkClass = void 0;
 const Type_1 = require("../../base/Type");
-const BodyBuilder_1 = require("../../common/BodyBuilder");
+const BodyBuilder_1 = require("./BodyBuilder");
 const ViewTreeBuilder_1 = require("../../graph/builder/ViewTreeBuilder");
 const ArkClass_1 = require("../ArkClass");
 const ArkMethod_1 = require("../ArkMethod");

package/lib/core/{common → model/builder}/BodyBuilder.d.ts

@@ -1,9 +1,9 @@
-import { ArkBody } from '../model/ArkBody';
-import { ArkMethod } from '../model/ArkMethod';
-import { MethodSignature } from '../model/ArkSignature';
-import { CfgBuilder } from './CfgBuilder';
+import { ArkBody } from '../ArkBody';
+import { ArkMethod } from '../ArkMethod';
+import { MethodSignature } from '../ArkSignature';
+import { CfgBuilder } from '../../graph/builder/CfgBuilder';
 import * as ts from 'ohos-typescript';
-import { GlobalRef } from '../base/Ref';
+import { GlobalRef } from '../../base/Ref';
 export declare class BodyBuilder {
     private cfgBuilder;
     private globals?;

package/lib/core/model/builder/BodyBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAkB,eAAe,EAAsB,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAItC,OAAO,EAAuD,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAchG,qBAAa,WAAW;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAyB;gBAE7B,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAIpH,KAAK,IAAI,OAAO,GAAG,IAAI;IAcvB,aAAa,IAAI,UAAU;IAI3B,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS;IAIhD,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAIjD,sBAAsB,IAAI,IAAI;IAsDrC,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,sCAAsC;IA4B9C,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,8BAA8B;IAkBtC,OAAO,CAAC,6BAA6B;IA2BrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,4BAA4B;IAoBpC,OAAO,CAAC,2BAA2B;IAwBnC,OAAO,CAAC,oCAAoC;IA2B5C,OAAO,CAAC,8BAA8B;IAgBtC,OAAO,CAAC,qCAAqC;IA8B7C,OAAO,CAAC,2BAA2B;CAyCtC"}

package/lib/core/{common → model/builder}/BodyBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,16 +15,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BodyBuilder = void 0;
-const ArkBody_1 = require("../model/ArkBody");
-const ArkSignature_1 = require("../model/ArkSignature");
-const CfgBuilder_1 = require("./CfgBuilder");
-const Local_1 = require("../base/Local");
-const ArkMethodBuilder_1 = require("../model/builder/ArkMethodBuilder");
-const Const_1 = require("./Const");
-const Ref_1 = require("../base/Ref");
-const Stmt_1 = require("../base/Stmt");
-const Type_1 = require("../base/Type");
-const Expr_1 = require("../base/Expr");
+const ArkBody_1 = require("../ArkBody");
+const ArkSignature_1 = require("../ArkSignature");
+const CfgBuilder_1 = require("../../graph/builder/CfgBuilder");
+const Local_1 = require("../../base/Local");
+const ArkMethodBuilder_1 = require("./ArkMethodBuilder");
+const Const_1 = require("../../common/Const");
+const Ref_1 = require("../../base/Ref");
+const Stmt_1 = require("../../base/Stmt");
+const Type_1 = require("../../base/Type");
+const Expr_1 = require("../../base/Expr");
 class BodyBuilder {
     constructor(methodSignature, sourceAstNode, declaringMethod, sourceFile) {
         this.cfgBuilder = new CfgBuilder_1.CfgBuilder(sourceAstNode, methodSignature.getMethodSubSignature().getMethodName(), declaringMethod, sourceFile);
@@ -32,7 +32,7 @@ class BodyBuilder {
     build() {
         this.cfgBuilder.buildCfgBuilder();
         if (!this.cfgBuilder.isBodyEmpty()) {
-            const { cfg, locals, globals, aliasTypeMap, traps } = this.cfgBuilder.buildCfgAndOriginalCfg();
+            const { cfg, locals, globals, aliasTypeMap, traps } = this.cfgBuilder.buildCfg();
             if (globals !== null) {
                 this.setGlobals(globals);
             }