arkanalyzer 1.0.93 → 1.0.95

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

@@ -249,19 +249,28 @@ class CfgBuilder {
         while (p && p !== this.astRoot) {
             if (ts.isWhileStatement(p) || ts.isDoStatement(p) || ts.isForStatement(p) || ts.isForInStatement(p) || ts.isForOfStatement(p)) {
                 const lastLoopNextF = this.loopStack[this.loopStack.length - 1].nextF;
-                this.judgeLastType(lastLoopNextF, lastStatement);
-                lastLoopNextF.lasts.add(lastStatement);
+                this.linkAbruptCompletion(lastStatement, lastLoopNextF, 'breakStatement', c);
                 return;
             }
             if (ts.isCaseClause(p) || ts.isDefaultClause(p)) {
                 const lastSwitchExit = this.switchExitStack[this.switchExitStack.length - 1];
-                this.judgeLastType(lastSwitchExit, lastStatement);
-                lastSwitchExit.lasts.add(lastStatement);
+                this.linkAbruptCompletion(lastStatement, lastSwitchExit, 'breakStatement', c);
                 return;
             }
             p = p.parent;
         }
     }
+    linkAbruptCompletion(lastStatement, target, kind, node) {
+        if (!(lastStatement instanceof TryStatementBuilder) && lastStatement.type !== 'catchOrNot') {
+            this.judgeLastType(target, lastStatement);
+            target.lasts.add(lastStatement);
+            return;
+        }
+        const abrupt = new StatementBuilder(kind, kind === 'breakStatement' ? 'break' : 'continue', node, lastStatement.scopeID);
+        this.judgeLastType(abrupt, lastStatement);
+        abrupt.next = target;
+        target.lasts.add(abrupt);
+    }
     ASTNodeIfStatement(c, lastStatement, scopeID) {
         let ifstm = new ConditionStatementBuilder('ifStatement', '', c, scopeID);
         this.judgeLastType(ifstm, lastStatement);
@@ -535,8 +544,7 @@ class CfgBuilder {
             }
             else if (ts.isContinueStatement(c)) {
                 const lastLoop = this.loopStack[this.loopStack.length - 1];
-                this.judgeLastType(lastLoop, lastStatement);
-                lastLoop.lasts.add(lastStatement);
+                this.linkAbruptCompletion(lastStatement, lastLoop, 'continueStatement', c);
                 return;
             }
             else if (ts.isIfStatement(c)) {
@@ -1108,9 +1116,10 @@ class CfgBuilder {
         this.linkBasicBlocks(blockBuilderToCfgBlock);
         this.adjustBlocks(blockBuilderToCfgBlock, blocksContainLoopCondition, basicBlockSet, blockBuildersContainSwitch, valueAndStmtsOfSwitchAndCasesAll, arkIRTransformer);
         const trapBuilder = new TrapBuilder_1.TrapBuilder(blockBuildersBeforeTry, blockBuilderToCfgBlock, arkIRTransformer, basicBlockSet);
-        const traps = trapBuilder.buildTraps();
+        const builtTraps = trapBuilder.buildTraps();
         this.mergeLoopInitialBlocks(basicBlockSet);
         this.removeEmptyBlocks(basicBlockSet);
+        const traps = trapBuilder.retainLiveTraps(builtTraps);
         const cfg = this.createCfg(blockBuilderToCfgBlock, basicBlockSet);
         return {
             cfg,

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

@@ -11,8 +11,10 @@ export declare class TrapBuilder {
     private basicBlockSet;
     private blockBuilderToCfgBlock;
     private blockBuildersBeforeTry;
+    private pendingFinallyPrunes;
     constructor(blockBuildersBeforeTry: Set<BlockBuilder>, blockBuilderToCfgBlock: Map<BlockBuilder, BasicBlock>, arkIRTransformer: ArkIRTransformer, basicBlockSet: Set<BasicBlock>);
     buildTraps(): Trap[];
+    retainLiveTraps(traps: Trap[]): Trap[];
     private buildTrapGroup;
     private shouldSkipProcessing;
     private handleEmptyTryBody;
@@ -27,8 +29,33 @@ export declare class TrapBuilder {
     private removeEmptyBlockBeforeTry;
     private shouldRemoveEmptyBlockBeforeTry;
     private buildTrapsIfNoFinally;
+    private findUniqueCatchTailTarget;
     private buildTrapsIfFinallyExist;
+    private connectExits;
     private getAllBlocksBFS;
+    private linkUnprotectedTails;
+    private collectRegionBasicBlocks;
+    private successorLeavesTryRegion;
+    private liveBlocks;
+    private hasPredecessorOutside;
+    private unlinkTryThrowFallThrough;
+    private spliceFinallyAfterAbort;
+    private isAbortTail;
+    private isReturnTerminator;
+    private endsWithThrow;
+    private linkFinallyCopyAfter;
+    private attachFinallyCopy;
+    private retargetBlock;
+    private takeReturnStmt;
+    private returnValueSlot;
+    private assignReturnSlot;
+    private duplicateFinally;
+    private fallThroughCopies;
+    private linkFallThrough;
+    private placeReturnAfterFinally;
+    private returnPositions;
+    private getCopiedTails;
+    private pruneOriginalFinallyIfUnreachable;
     private copyFinallyBlocks;
     private copyBlocks;
     private copyStmt;

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

@@ -1 +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;AAcvC,OAAO,EAAE,YAAY,EAAmC,MAAM,cAAc,CAAC;AAK7E;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,+BAA+B,CAAoB;IAC3D,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,sBAAsB,CAAoB;gBAEtC,sBAAsB,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EACxG,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC;IAQ3B,UAAU,IAAI,IAAI,EAAE;IAS3B,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,gBAAgB;IA6BxB,OAAO,CAAC,qBAAqB;IAkC7B,OAAO,CAAC,yBAAyB;IAYjC,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,qBAAqB;IAiC7B,OAAO,CAAC,wBAAwB;IAyDhC,OAAO,CAAC,eAAe;IAsCvB,OAAO,CAAC,iBAAiB;IA0BzB,OAAO,CAAC,UAAU;IAgClB,OAAO,CAAC,QAAQ;IAmChB,OAAO,CAAC,kBAAkB;CAM7B"}
+{"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;AAkBvC,OAAO,EAAE,YAAY,EAAmC,MAAM,cAAc,CAAC;AAK7E;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,+BAA+B,CAAoB;IAC3D,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,sBAAsB,CAAoB;IAClD,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,sBAAsB,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EACxG,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC;IAQ3B,UAAU,IAAI,IAAI,EAAE;IAapB,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE;IAgC7C,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,gBAAgB;IA6BxB,OAAO,CAAC,qBAAqB;IAkC7B,OAAO,CAAC,yBAAyB;IAYjC,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,qBAAqB;IA8C7B,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,wBAAwB;IA8ChC,OAAO,CAAC,YAAY;IA8CpB,OAAO,CAAC,eAAe;IAoDvB,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,wBAAwB;IA6BhC,OAAO,CAAC,wBAAwB;IAehC,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,yBAAyB;IASjC,OAAO,CAAC,uBAAuB;IAoB/B,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iCAAiC;IA2BzC,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,UAAU;IAqClB,OAAO,CAAC,QAAQ;IAmChB,OAAO,CAAC,kBAAkB;CAM7B"}