arkanalyzer 1.0.93 → 1.0.95

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

@@ -41,8 +41,11 @@ exports.TrapBuilder = void 0;
 const BasicBlock_1 = require("../BasicBlock");
 const Trap_1 = require("../../base/Trap");
 const Ref_1 = require("../../base/Ref");
+const Local_1 = require("../../base/Local");
 const Type_1 = require("../../base/Type");
 const Position_1 = require("../../base/Position");
+const Const_1 = require("../../common/Const");
+const ValueUtil_1 = require("../../common/ValueUtil");
 const Stmt_1 = require("../../base/Stmt");
 const CfgBuilder_1 = require("./CfgBuilder");
 const logger_1 = __importStar(require("../../../utils/logger"));
@@ -52,6 +55,7 @@ const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER,
  */
 class TrapBuilder {
     constructor(blockBuildersBeforeTry, blockBuilderToCfgBlock, arkIRTransformer, basicBlockSet) {
+        this.pendingFinallyPrunes = [];
         this.blockBuildersBeforeTry = blockBuildersBeforeTry;
         this.processedBlockBuildersBeforeTry = new Set();
         this.arkIRTransformer = arkIRTransformer;
@@ -64,8 +68,43 @@ class TrapBuilder {
         for (const blockBuilderBeforeTry of blockBuildersBeforeTry) {
             traps.push(...this.buildTrapGroup(blockBuilderBeforeTry).traps);
         }
+        for (const finallyBlocks of this.pendingFinallyPrunes) {
+            this.pruneOriginalFinallyIfUnreachable(finallyBlocks);
+        }
+        this.pendingFinallyPrunes = [];
         return traps;
     }
+    retainLiveTraps(traps) {
+        const liveTraps = [];
+        for (const trap of traps) {
+            const originalTryBlocks = trap.getTryBlocks();
+            const tryBlocks = [];
+            for (const block of originalTryBlocks) {
+                if (this.basicBlockSet.has(block)) {
+                    tryBlocks.push(block);
+                }
+            }
+            if (tryBlocks.length === 0) {
+                continue;
+            }
+            const originalCatchBlocks = trap.getCatchBlocks();
+            const catchBlocks = [];
+            for (const block of originalCatchBlocks) {
+                if (this.basicBlockSet.has(block)) {
+                    catchBlocks.push(block);
+                }
+            }
+            if (catchBlocks.length === 0) {
+                continue;
+            }
+            if (tryBlocks.length === originalTryBlocks.length && catchBlocks.length === originalCatchBlocks.length) {
+                liveTraps.push(trap);
+                continue;
+            }
+            liveTraps.push(new Trap_1.Trap(tryBlocks, catchBlocks));
+        }
+        return liveTraps;
+    }
     buildTrapGroup(blockBuilderBeforeTry) {
         if (this.shouldSkipProcessing(blockBuilderBeforeTry)) {
             return { traps: [], headBlockBuilder: null };
@@ -86,7 +125,7 @@ class TrapBuilder {
         const tryResult = this.processTryBlock(headBlockBuilderWithinTry, finallyBlockBuilder);
         traps.push(...tryResult.traps);
         const updatedHeadBlock = tryResult.newStartBlockBuilder;
-        const catchResult = this.processCatchBlock(tryStmtBuilder);
+        const catchResult = this.processCatchBlock(tryStmtBuilder, finallyBlockBuilder);
         traps.push(...catchResult.traps);
         const blockBuilderAfterFinally = this.getAfterFinallyBlock(tryStmtBuilder);
         const singleTraps = this.buildSingleTraps(tryResult.bfsBlocks, tryResult.tailBlocks, catchResult.bfsBlocks, catchResult.tailBlocks, finallyBlockBuilder, blockBuilderAfterFinally);
@@ -141,14 +180,14 @@ class TrapBuilder {
             tailBlocks
         };
     }
-    processCatchBlock(tryStmtBuilder) {
+    processCatchBlock(tryStmtBuilder, finallyBlockBuilder) {
         var _a;
         const catchBlockBuilder = (_a = tryStmtBuilder.catchStatement) === null || _a === void 0 ? void 0 : _a.block;
         if (!catchBlockBuilder) {
             return { traps: [], bfsBlocks: [], tailBlocks: [] };
         }
-        const result = this.buildTrapsRecursively(catchBlockBuilder);
-        const { bfsBlocks, tailBlocks } = this.getAllBlocksBFS(result.newStartBlockBuilder);
+        const result = this.buildTrapsRecursively(catchBlockBuilder, finallyBlockBuilder);
+        const { bfsBlocks, tailBlocks } = this.getAllBlocksBFS(result.newStartBlockBuilder, finallyBlockBuilder);
         return {
             traps: result.traps,
             bfsBlocks,
@@ -222,24 +261,54 @@ class TrapBuilder {
             return [];
         }
         const dummyFinallyBlock = this.blockBuilderToCfgBlock.get(dummyFinallyBlockBuilder);
+        const fallThroughSources = [...dummyFinallyBlock.getPredecessors()];
         CfgBuilder_1.CfgBuilder.pruneBasicBlock(dummyFinallyBlock);
         this.basicBlockSet.delete(dummyFinallyBlock);
         const blockBuilderAfterFinally = dummyFinallyBlockBuilder.nexts[0];
-        let blockAfterFinally = this.blockBuilderToCfgBlock.get(blockBuilderAfterFinally);
+        const mappedAfterFinally = blockBuilderAfterFinally ? this.blockBuilderToCfgBlock.get(blockBuilderAfterFinally) : undefined;
+        const blockAfterFinally = mappedAfterFinally !== null && mappedAfterFinally !== void 0 ? mappedAfterFinally : this.findUniqueCatchTailTarget(catchTailBlocks);
         if (!this.blockBuilderToCfgBlock.has(dummyFinallyBlockBuilder)) {
             logger.error(`can't find basicBlock corresponding to the blockBuilder.`);
             return [];
         }
         if (blockAfterFinally) {
+            for (const source of fallThroughSources) {
+                if (!this.basicBlockSet.has(source) || source.getSuccessors().length !== 0 || this.isReturnTerminator(source) || this.endsWithThrow(source)) {
+                    continue;
+                }
+                CfgBuilder_1.CfgBuilder.linkBasicBlock(source, blockAfterFinally);
+            }
             for (const catchTailBlock of catchTailBlocks) {
-                CfgBuilder_1.CfgBuilder.linkBasicBlock(catchTailBlock, blockAfterFinally);
+                if (!this.endsWithThrow(catchTailBlock) && !catchTailBlock.getSuccessors().includes(blockAfterFinally)) {
+                    CfgBuilder_1.CfgBuilder.linkBasicBlock(catchTailBlock, blockAfterFinally);
+                }
+            }
+            for (const catchBlock of catchBfsBlocks) {
+                if (!this.basicBlockSet.has(catchBlock) || catchBlock.getSuccessors().length !== 0 ||
+                    this.isReturnTerminator(catchBlock) || this.endsWithThrow(catchBlock)) {
+                    continue;
+                }
+                CfgBuilder_1.CfgBuilder.linkBasicBlock(catchBlock, blockAfterFinally);
             }
         }
-        for (const tryTailBlock of tryTailBlocks) {
-            CfgBuilder_1.CfgBuilder.linkExceptionalBasicBlock(tryTailBlock, catchBfsBlocks[0]);
-        }
+        this.linkUnprotectedTails(tryTailBlocks, catchBfsBlocks[0]);
         return [new Trap_1.Trap(tryBfsBlocks, catchBfsBlocks)];
     }
+    findUniqueCatchTailTarget(catchTailBlocks) {
+        const targets = new Set();
+        for (const catchTailBlock of catchTailBlocks) {
+            if (this.isReturnTerminator(catchTailBlock) || this.endsWithThrow(catchTailBlock)) {
+                continue;
+            }
+            for (const successor of catchTailBlock.getSuccessors()) {
+                targets.add(successor);
+            }
+        }
+        if (targets.size !== 1) {
+            return undefined;
+        }
+        return [...targets][0];
+    }
     buildTrapsIfFinallyExist(tryBfsBlocks, tryTailBlocks, catchBfsBlocks, catchTailBlocks, finallyBlockBuilder, blockBuilderAfterFinally) {
         const traps = [];
         const endBlock = blockBuilderAfterFinally !== null && blockBuilderAfterFinally !== void 0 ? blockBuilderAfterFinally : undefined;
@@ -250,35 +319,43 @@ class TrapBuilder {
         const { bfsBlocks: finallyBfsBlocks, tailBlocks: finallyTailBlocks } = this.getAllBlocksBFS(finallyBlockBuilder, endBlock);
         if (finallyBfsBlocks.length === 0) {
             if (catchBfsBlocks.length !== 0) {
-                for (const tryTailBlock of tryTailBlocks) {
-                    CfgBuilder_1.CfgBuilder.linkExceptionalBasicBlock(tryTailBlock, catchBfsBlocks[0]);
-                }
+                this.linkUnprotectedTails(tryTailBlocks, catchBfsBlocks[0]);
                 traps.push(new Trap_1.Trap(tryBfsBlocks, catchBfsBlocks));
             }
             return traps;
         }
-        const copyFinallyBfsBlocks = this.copyFinallyBlocks(finallyBfsBlocks, finallyTailBlocks);
-        if (catchBfsBlocks.length !== 0) {
-            for (const catchTailBlock of catchTailBlocks) {
-                CfgBuilder_1.CfgBuilder.linkBasicBlock(catchTailBlock, finallyBfsBlocks[0]);
-            }
-            // try -> catch trap
-            for (const tryTailBlock of tryTailBlocks) {
-                CfgBuilder_1.CfgBuilder.linkExceptionalBasicBlock(tryTailBlock, catchBfsBlocks[0]);
-            }
-            traps.push(new Trap_1.Trap(tryBfsBlocks, catchBfsBlocks));
-            // catch -> finally trap
-            for (const catchTailBlock of catchTailBlocks) {
-                CfgBuilder_1.CfgBuilder.linkExceptionalBasicBlock(catchTailBlock, copyFinallyBfsBlocks[0]);
+        const finallyEnd = endBlock ? this.blockBuilderToCfgBlock.get(endBlock) : undefined;
+        const exceptionalFinally = this.copyFinallyBlocks(finallyBfsBlocks, finallyTailBlocks, finallyEnd);
+        traps.push(...this.connectExits(tryBfsBlocks, tryTailBlocks, catchBfsBlocks, catchTailBlocks, finallyBfsBlocks, finallyTailBlocks, finallyEnd, exceptionalFinally));
+        this.pendingFinallyPrunes.push(finallyBfsBlocks);
+        return traps;
+    }
+    connectExits(tryBfsBlocks, tryTailBlocks, catchBfsBlocks, catchTailBlocks, finallyBfsBlocks, finallyTailBlocks, finallyEnd, exceptionalFinally) {
+        this.unlinkTryThrowFallThrough(tryBfsBlocks);
+        const abortTails = this.spliceFinallyAfterAbort(tryTailBlocks, catchTailBlocks, finallyBfsBlocks, finallyTailBlocks, new Set([...tryBfsBlocks, ...catchBfsBlocks]), finallyEnd);
+        const tryBlocks = this.liveBlocks(tryBfsBlocks);
+        const tryTails = this.liveBlocks(tryTailBlocks);
+        const catchBlocks = this.liveBlocks(catchBfsBlocks);
+        const catchTails = this.liveBlocks(catchTailBlocks);
+        const sharedFinally = finallyBfsBlocks[0];
+        const exceptionalHandler = exceptionalFinally[0];
+        const traps = [];
+        if (catchBlocks.length !== 0) {
+            const fallThroughCatchTails = [];
+            for (const tail of catchTails) {
+                if (!abortTails.has(tail) && !this.endsWithThrow(tail)) {
+                    fallThroughCatchTails.push(tail);
+                }
             }
-            traps.push(new Trap_1.Trap(catchBfsBlocks, copyFinallyBfsBlocks));
+            CfgBuilder_1.CfgBuilder.linkPredecessorsOfBasicBlock(sharedFinally, fallThroughCatchTails);
         }
-        else {
-            // try -> finally trap
-            for (const tryTailBlock of tryTailBlocks) {
-                CfgBuilder_1.CfgBuilder.linkExceptionalBasicBlock(tryTailBlock, copyFinallyBfsBlocks[0]);
-            }
-            traps.push(new Trap_1.Trap(tryBfsBlocks, copyFinallyBfsBlocks));
+        const tryHandler = catchBlocks.length !== 0 ? catchBlocks[0] : exceptionalHandler;
+        const tryHandlerBlocks = catchBlocks.length !== 0 ? catchBlocks : exceptionalFinally;
+        this.linkUnprotectedTails(tryTails, tryHandler);
+        traps.push(new Trap_1.Trap(tryBlocks, tryHandlerBlocks));
+        if (catchBlocks.length !== 0) {
+            this.linkUnprotectedTails(catchTails, exceptionalHandler);
+            traps.push(new Trap_1.Trap(catchBlocks, exceptionalFinally));
         }
         return traps;
     }
@@ -290,6 +367,8 @@ class TrapBuilder {
             return { bfsBlocks, tailBlocks };
         }
         const endBlock = endBlockBuilder ? this.blockBuilderToCfgBlock.get(endBlockBuilder) : undefined;
+        const region = endBlockBuilder ? this.collectRegionBasicBlocks(startBlockBuilder, endBlockBuilder) : undefined;
+        const sourceBlocks = new Set(this.blockBuilderToCfgBlock.values());
         const queue = [];
         const visitedBlocks = new Set();
         queue.push(startBlock);
@@ -301,47 +380,316 @@ class TrapBuilder {
             visitedBlocks.add(currBlock);
             bfsBlocks.push(currBlock);
             const successors = currBlock.getSuccessors();
-            if (successors.length !== 0) {
-                for (const successor of successors) {
-                    if (successor === endBlock) {
-                        tailBlocks.push(currBlock);
-                    }
-                    else {
-                        // A tail block's successor may be within the traversal range
+            const exceptionalSuccessors = currBlock.getExceptionalSuccessorBlocks();
+            if (successors.length === 0 && (!exceptionalSuccessors || exceptionalSuccessors.length === 0)) {
+                tailBlocks.push(currBlock);
+            }
+            for (const successor of successors) {
+                if (!this.successorLeavesTryRegion(successor, endBlock, region, sourceBlocks)) {
+                    queue.push(successor);
+                    continue;
+                }
+                if (!tailBlocks.includes(currBlock)) {
+                    tailBlocks.push(currBlock);
+                }
+            }
+            if (exceptionalSuccessors) {
+                for (const successor of exceptionalSuccessors) {
+                    if (successor !== endBlock) {
                         queue.push(successor);
+                        continue;
+                    }
+                    if (!tailBlocks.includes(currBlock)) {
+                        tailBlocks.push(currBlock);
                     }
                 }
             }
-            else {
-                tailBlocks.push(currBlock);
-            }
         }
         return { bfsBlocks, tailBlocks };
     }
-    copyFinallyBlocks(finallyBfsBlocks, finallyTailBlocks) {
-        const copyFinallyBfsBlocks = this.copyBlocks(finallyBfsBlocks);
+    linkUnprotectedTails(tails, handler) {
+        var _a, _b;
+        for (const tail of tails) {
+            if (((_b = (_a = tail.getExceptionalSuccessorBlocks()) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) !== 0) {
+                continue;
+            }
+            CfgBuilder_1.CfgBuilder.linkExceptionalBasicBlock(tail, handler);
+        }
+    }
+    collectRegionBasicBlocks(startBlockBuilder, endBlockBuilder) {
+        const tentative = new Set();
+        const queue = [startBlockBuilder];
+        while (queue.length !== 0) {
+            const curr = queue.splice(0, 1)[0];
+            if (tentative.has(curr) || curr === endBlockBuilder) {
+                continue;
+            }
+            tentative.add(curr);
+            for (const child of curr.nexts) {
+                if (child !== endBlockBuilder) {
+                    queue.push(child);
+                }
+            }
+        }
+        const region = new Set();
+        for (const builder of tentative) {
+            if (builder !== startBlockBuilder && this.hasPredecessorOutside(builder.lasts, tentative)) {
+                continue;
+            }
+            const basicBlock = this.blockBuilderToCfgBlock.get(builder);
+            if (basicBlock) {
+                region.add(basicBlock);
+            }
+        }
+        return region;
+    }
+    successorLeavesTryRegion(successor, endBlock, region, sourceBlocks) {
+        if (successor === endBlock) {
+            return true;
+        }
+        if (!region || region.has(successor)) {
+            return false;
+        }
+        return sourceBlocks.has(successor);
+    }
+    liveBlocks(blocks) {
+        const live = [];
+        for (const block of blocks) {
+            if (this.basicBlockSet.has(block)) {
+                live.push(block);
+            }
+        }
+        return live;
+    }
+    hasPredecessorOutside(lasts, tentative) {
+        for (const predecessor of lasts) {
+            if (!tentative.has(predecessor)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    unlinkTryThrowFallThrough(tryBlocks) {
+        for (const block of tryBlocks) {
+            if (!this.basicBlockSet.has(block) || !this.endsWithThrow(block) || block.getSuccessors().length === 0) {
+                continue;
+            }
+            CfgBuilder_1.CfgBuilder.unlinkSuccessorsOfBasicBlock(block);
+        }
+    }
+    spliceFinallyAfterAbort(tryTailBlocks, catchTailBlocks, finallyBfsBlocks, finallyTailBlocks, tryCatchRegion, finallyEnd) {
+        const abortTails = new Set();
+        const finallyHead = finallyBfsBlocks[0];
+        for (const tail of [...tryTailBlocks, ...catchTailBlocks]) {
+            if (!this.isAbortTail(tail, finallyHead, tryCatchRegion)) {
+                continue;
+            }
+            abortTails.add(tail);
+            this.linkFinallyCopyAfter(tail, finallyBfsBlocks, finallyTailBlocks, finallyEnd);
+        }
+        return abortTails;
+    }
+    isAbortTail(block, finallyHead, tryCatchRegion) {
+        const successors = block.getSuccessors();
+        if (successors.includes(finallyHead)) {
+            return false;
+        }
+        if (successors.length === 0) {
+            return this.isReturnTerminator(block);
+        }
+        for (const successor of successors) {
+            if (tryCatchRegion.has(successor)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    isReturnTerminator(block) {
+        const stmts = block.getStmts();
+        if (stmts.length === 0) {
+            return false;
+        }
+        const last = stmts[stmts.length - 1];
+        return last instanceof Stmt_1.ArkReturnStmt || last instanceof Stmt_1.ArkReturnVoidStmt;
+    }
+    endsWithThrow(block) {
+        const stmts = block.getStmts();
+        return stmts.length > 0 && stmts[stmts.length - 1] instanceof Stmt_1.ArkThrowStmt;
+    }
+    linkFinallyCopyAfter(abortTail, finallyBfsBlocks, finallyTailBlocks, finallyEnd) {
+        const originalSuccessors = [...abortTail.getSuccessors()];
+        CfgBuilder_1.CfgBuilder.unlinkSuccessorsOfBasicBlock(abortTail);
+        const { blocks: copiedBlocks, tails: copiedTails } = this.duplicateFinally(finallyBfsBlocks, finallyTailBlocks, finallyEnd);
+        const sourceReturn = this.takeReturnStmt(abortTail);
+        const slot = sourceReturn ? this.returnValueSlot(abortTail, sourceReturn) : undefined;
+        this.attachFinallyCopy(abortTail, copiedBlocks[0]);
+        if (sourceReturn && slot) {
+            this.placeReturnAfterFinally(copiedTails, copiedBlocks, slot, sourceReturn);
+            return;
+        }
+        this.linkFallThrough(this.fallThroughCopies(copiedTails, copiedBlocks), originalSuccessors);
+    }
+    attachFinallyCopy(abortTail, copyHead) {
+        if (abortTail.getStmts().length !== 0) {
+            CfgBuilder_1.CfgBuilder.linkBasicBlock(abortTail, copyHead);
+            return;
+        }
+        CfgBuilder_1.CfgBuilder.replaceBasicBlockInPredecessors(abortTail, copyHead);
+        this.retargetBlock(abortTail, copyHead);
+        this.basicBlockSet.delete(abortTail);
+    }
+    retargetBlock(from, to) {
+        for (const [builder, block] of this.blockBuilderToCfgBlock) {
+            if (block === from) {
+                this.blockBuilderToCfgBlock.set(builder, to);
+            }
+        }
+    }
+    takeReturnStmt(block) {
+        if (!this.isReturnTerminator(block)) {
+            return null;
+        }
+        const last = block.getTail();
+        block.removeTail();
+        return last;
+    }
+    returnValueSlot(block, sourceReturn) {
+        if (sourceReturn instanceof Stmt_1.ArkReturnStmt) {
+            const operand = sourceReturn.getOp();
+            if (operand instanceof Local_1.Local && operand.getName().startsWith(Const_1.TEMP_LOCAL_PREFIX)) {
+                return operand;
+            }
+            return this.assignReturnSlot(block, operand, sourceReturn);
+        }
+        return this.assignReturnSlot(block, ValueUtil_1.ValueUtil.getUndefinedConst(), sourceReturn);
+    }
+    assignReturnSlot(block, value, sourceReturn) {
+        const { value: slot, stmts } = this.arkIRTransformer.generateAssignStmtForValue(value, this.returnPositions(sourceReturn));
+        for (const stmt of stmts) {
+            this.copyOriginPosition(sourceReturn, stmt);
+            block.addStmt(stmt);
+        }
+        return slot;
+    }
+    duplicateFinally(sources, sourceTails, finallyEnd) {
+        const blocks = this.copyBlocks(sources, finallyEnd);
+        for (const block of blocks) {
+            this.basicBlockSet.add(block);
+        }
+        return { blocks, tails: this.getCopiedTails(blocks, sources, sourceTails) };
+    }
+    fallThroughCopies(tails, copiedBlocks) {
+        const copied = new Set(copiedBlocks);
+        const fallThrough = [];
+        for (const tail of tails) {
+            if (this.isReturnTerminator(tail) || tail.getTail() instanceof Stmt_1.ArkThrowStmt) {
+                continue;
+            }
+            const successors = tail.getSuccessors();
+            let staysInCopy = true;
+            for (const successor of successors) {
+                if (!copied.has(successor)) {
+                    staysInCopy = false;
+                    break;
+                }
+            }
+            if (staysInCopy) {
+                fallThrough.push(tail);
+            }
+        }
+        return fallThrough;
+    }
+    linkFallThrough(tails, targets) {
+        for (const target of targets) {
+            CfgBuilder_1.CfgBuilder.linkPredecessorsOfBasicBlock(target, tails);
+        }
+    }
+    placeReturnAfterFinally(copiedTails, copiedBlocks, slot, sourceReturn) {
+        const aliveTails = this.fallThroughCopies(copiedTails, copiedBlocks);
+        if (aliveTails.length === 0) {
+            return;
+        }
+        const returnBlock = new BasicBlock_1.BasicBlock();
+        const returnStmt = new Stmt_1.ArkReturnStmt(slot);
+        this.copyOriginPosition(sourceReturn, returnStmt);
+        const operandPositions = sourceReturn.getOperandOriginalPositions();
+        if (operandPositions) {
+            returnStmt.setOperandOriginalPositions(operandPositions);
+        }
+        returnBlock.addStmt(returnStmt);
+        this.basicBlockSet.add(returnBlock);
+        this.linkFallThrough(aliveTails, [returnBlock]);
+    }
+    returnPositions(stmt) {
+        const operandPositions = stmt.getOperandOriginalPositions();
+        if (operandPositions && operandPositions.length > 0) {
+            return operandPositions;
+        }
+        const origin = stmt.getOriginFullPosition();
+        if (origin) {
+            return [origin];
+        }
+        return [Position_1.FullPosition.DEFAULT];
+    }
+    getCopiedTails(copiedBlocks, sourceBlocks, sourceTails) {
+        const indexBySource = new Map();
+        for (let index = 0; index < sourceBlocks.length; index++) {
+            indexBySource.set(sourceBlocks[index], index);
+        }
+        const copiedTails = [];
+        for (const tail of sourceTails) {
+            copiedTails.push(copiedBlocks[indexBySource.get(tail)]);
+        }
+        return copiedTails;
+    }
+    pruneOriginalFinallyIfUnreachable(finallyBfsBlocks) {
+        var _a, _b;
+        if (finallyBfsBlocks.length === 0) {
+            return;
+        }
+        const head = finallyBfsBlocks[0];
+        if (head.getPredecessors().length > 0) {
+            return;
+        }
+        const finallySet = new Set(finallyBfsBlocks);
+        const outgoing = [];
+        for (const block of finallyBfsBlocks) {
+            for (const successor of block.getSuccessors()) {
+                if (!finallySet.has(successor)) {
+                    outgoing.push(successor);
+                }
+            }
+            CfgBuilder_1.CfgBuilder.unlinkPredecessorsAndSuccessorsOfBasicBlock(block);
+            this.basicBlockSet.delete(block);
+        }
+        for (const successor of outgoing) {
+            if (successor.getPredecessors().length === 0 && ((_b = (_a = successor.getExceptionalPredecessorBlocks()) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0) {
+                CfgBuilder_1.CfgBuilder.unlinkPredecessorsAndSuccessorsOfBasicBlock(successor);
+                this.basicBlockSet.delete(successor);
+            }
+        }
+    }
+    copyFinallyBlocks(finallyBfsBlocks, finallyTailBlocks, finallyEnd) {
+        const { blocks: copyFinallyBfsBlocks, tails: copiedTails } = this.duplicateFinally(finallyBfsBlocks, finallyTailBlocks, finallyEnd);
         const caughtExceptionRef = new Ref_1.ArkCaughtExceptionRef(Type_1.UnknownType.getInstance());
         const { value: exceptionValue, stmts: exceptionAssignStmts, } = this.arkIRTransformer.generateAssignStmtForValue(caughtExceptionRef, [Position_1.FullPosition.DEFAULT]);
         copyFinallyBfsBlocks[0].addHead(exceptionAssignStmts);
         CfgBuilder_1.CfgBuilder.unlinkPredecessorsOfBasicBlock(copyFinallyBfsBlocks[0]);
-        const throwStmt = new Stmt_1.ArkThrowStmt(exceptionValue);
-        let copyFinallyTailBlocks = copyFinallyBfsBlocks.splice(copyFinallyBfsBlocks.length - finallyTailBlocks.length, finallyTailBlocks.length);
-        if (copyFinallyTailBlocks.length > 1) {
-            const newCopyFinallyTailBlock = new BasicBlock_1.BasicBlock();
-            copyFinallyTailBlocks.forEach((copyFinallyTailBlock) => {
-                CfgBuilder_1.CfgBuilder.linkBasicBlock(copyFinallyTailBlock, newCopyFinallyTailBlock);
-            });
-            copyFinallyBfsBlocks.push(...copyFinallyTailBlocks);
-            copyFinallyTailBlocks = [newCopyFinallyTailBlock];
-        }
-        copyFinallyTailBlocks[0].addStmt(throwStmt);
-        copyFinallyBfsBlocks.push(...copyFinallyTailBlocks);
-        copyFinallyBfsBlocks.forEach((copyFinallyBfsBlock) => {
-            this.basicBlockSet.add(copyFinallyBfsBlock);
-        });
+        const fallThroughTails = this.fallThroughCopies(copiedTails, copyFinallyBfsBlocks);
+        if (fallThroughTails.length === 1 && fallThroughTails[0].getSuccessors().length === 0) {
+            fallThroughTails[0].addStmt(new Stmt_1.ArkThrowStmt(exceptionValue));
+        }
+        else if (fallThroughTails.length > 0) {
+            const join = new BasicBlock_1.BasicBlock();
+            join.addStmt(new Stmt_1.ArkThrowStmt(exceptionValue));
+            this.basicBlockSet.add(join);
+            this.linkFallThrough(fallThroughTails, [join]);
+            copyFinallyBfsBlocks.push(join);
+        }
         return copyFinallyBfsBlocks;
     }
-    copyBlocks(sourceBlocks) {
+    copyBlocks(sourceBlocks, fallThroughTarget) {
+        var _a;
         const sourceToTarget = new Map();
         const targetBlocks = [];
         for (const sourceBlock of sourceBlocks) {
@@ -356,8 +704,6 @@ class TrapBuilder {
             const targetBlock = sourceToTarget.get(sourceBlock);
             for (const predecessor of sourceBlock.getPredecessors()) {
                 const targetPredecessor = sourceToTarget.get(predecessor);
-                // Only include blocks within the copy range, so that predecessor and successor relationships to
-                // external blocks can be trimmed
                 if (targetPredecessor) {
                     targetBlock.addPredecessorBlock(targetPredecessor);
                 }
@@ -367,6 +713,15 @@ class TrapBuilder {
                 if (targetSuccessor) {
                     targetBlock.addSuccessorBlock(targetSuccessor);
                 }
+                else if (successor !== fallThroughTarget) {
+                    CfgBuilder_1.CfgBuilder.linkBasicBlock(targetBlock, successor);
+                }
+            }
+            for (const exceptional of (_a = sourceBlock.getExceptionalSuccessorBlocks()) !== null && _a !== void 0 ? _a : []) {
+                const targetExceptional = sourceToTarget.get(exceptional);
+                if (targetExceptional) {
+                    CfgBuilder_1.CfgBuilder.linkExceptionalBasicBlock(targetBlock, targetExceptional);
+                }
             }
         }
         return targetBlocks;

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

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

package/lib/core/model/ArkClass.js

@@ -46,7 +46,6 @@ const Const_1 = require("../common/Const");
 const Position_1 = require("../base/Position");
 const ArkBaseModel_1 = require("./ArkBaseModel");
 const ModelUtils_1 = require("../common/ModelUtils");
-const StringUtils_1 = require("../common/StringUtils");
 const logger_1 = __importStar(require("../../utils/logger"));
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkClass');
 var ClassCategory;
@@ -118,7 +117,7 @@ class ArkClass extends ArkBaseModel_1.ArkBaseModel {
         if (this.sourceCode !== undefined) {
             return this.sourceCode;
         }
-        const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkFile().getCode(), this.originFullPosition);
+        const code = this.getDeclaringArkFile().getSourceTextByFullPosition(this.originFullPosition);
         if (code !== undefined) {
             this.sourceCode = code;
         }

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

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